]> git.ipfire.org Git - thirdparty/grsecurity-scrape.git/blame - test/grsecurity-3.1-4.0.6-201506272327.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.6-201506272327.patch
CommitLineData
62b52422
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 af6da04..22820aa 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 be15e52..a089cc4 100644
6664--- a/arch/mips/kernel/irq.c
6665+++ b/arch/mips/kernel/irq.c
6666@@ -76,17 +76,17 @@ void ack_bad_irq(unsigned int irq)
6667 printk("unexpected IRQ # %d\n", irq);
6668 }
6669
6670-atomic_t irq_err_count;
6671+atomic_unchecked_t irq_err_count;
6672
6673 int arch_show_interrupts(struct seq_file *p, int prec)
6674 {
6675- seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
6676+ seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read_unchecked(&irq_err_count));
6677 return 0;
6678 }
6679
6680 asmlinkage void spurious_interrupt(void)
6681 {
6682- atomic_inc(&irq_err_count);
6683+ atomic_inc_unchecked(&irq_err_count);
6684 }
6685
6686 void __init init_IRQ(void)
6687@@ -110,6 +110,8 @@ void __init init_IRQ(void)
6688 }
6689
6690 #ifdef CONFIG_DEBUG_STACKOVERFLOW
6691+
6692+extern void gr_handle_kernel_exploit(void);
6693 static inline void check_stack_overflow(void)
6694 {
6695 unsigned long sp;
6696@@ -125,6 +127,7 @@ static inline void check_stack_overflow(void)
6697 printk("do_IRQ: stack overflow: %ld\n",
6698 sp - sizeof(struct thread_info));
6699 dump_stack();
6700+ gr_handle_kernel_exploit();
6701 }
6702 }
6703 #else
6704diff --git a/arch/mips/kernel/pm-cps.c b/arch/mips/kernel/pm-cps.c
6705index 0614717..002fa43 100644
6706--- a/arch/mips/kernel/pm-cps.c
6707+++ b/arch/mips/kernel/pm-cps.c
6708@@ -172,7 +172,7 @@ int cps_pm_enter_state(enum cps_pm_state state)
6709 nc_core_ready_count = nc_addr;
6710
6711 /* Ensure ready_count is zero-initialised before the assembly runs */
6712- ACCESS_ONCE(*nc_core_ready_count) = 0;
6713+ ACCESS_ONCE_RW(*nc_core_ready_count) = 0;
6714 coupled_barrier(&per_cpu(pm_barrier, core), online);
6715
6716 /* Run the generated entry code */
6717diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
6718index bf85cc1..b365c61 100644
6719--- a/arch/mips/kernel/process.c
6720+++ b/arch/mips/kernel/process.c
6721@@ -535,18 +535,6 @@ out:
6722 return pc;
6723 }
6724
6725-/*
6726- * Don't forget that the stack pointer must be aligned on a 8 bytes
6727- * boundary for 32-bits ABI and 16 bytes for 64-bits ABI.
6728- */
6729-unsigned long arch_align_stack(unsigned long sp)
6730-{
6731- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
6732- sp -= get_random_int() & ~PAGE_MASK;
6733-
6734- return sp & ALMASK;
6735-}
6736-
6737 static void arch_dump_stack(void *info)
6738 {
6739 struct pt_regs *regs;
6740diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c
6741index 5104528..950bbdc 100644
6742--- a/arch/mips/kernel/ptrace.c
6743+++ b/arch/mips/kernel/ptrace.c
6744@@ -761,6 +761,10 @@ long arch_ptrace(struct task_struct *child, long request,
6745 return ret;
6746 }
6747
6748+#ifdef CONFIG_GRKERNSEC_SETXID
6749+extern void gr_delayed_cred_worker(void);
6750+#endif
6751+
6752 /*
6753 * Notification of system call entry/exit
6754 * - triggered by current->work.syscall_trace
6755@@ -779,6 +783,11 @@ asmlinkage long syscall_trace_enter(struct pt_regs *regs, long syscall)
6756 tracehook_report_syscall_entry(regs))
6757 ret = -1;
6758
6759+#ifdef CONFIG_GRKERNSEC_SETXID
6760+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
6761+ gr_delayed_cred_worker();
6762+#endif
6763+
6764 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
6765 trace_sys_enter(regs, regs->regs[2]);
6766
6767diff --git a/arch/mips/kernel/reset.c b/arch/mips/kernel/reset.c
6768index 07fc524..b9d7f28 100644
6769--- a/arch/mips/kernel/reset.c
6770+++ b/arch/mips/kernel/reset.c
6771@@ -13,6 +13,7 @@
6772 #include <linux/reboot.h>
6773
6774 #include <asm/reboot.h>
6775+#include <asm/bug.h>
6776
6777 /*
6778 * Urgs ... Too many MIPS machines to handle this in a generic way.
6779@@ -29,16 +30,19 @@ void machine_restart(char *command)
6780 {
6781 if (_machine_restart)
6782 _machine_restart(command);
6783+ BUG();
6784 }
6785
6786 void machine_halt(void)
6787 {
6788 if (_machine_halt)
6789 _machine_halt();
6790+ BUG();
6791 }
6792
6793 void machine_power_off(void)
6794 {
6795 if (pm_power_off)
6796 pm_power_off();
6797+ BUG();
6798 }
6799diff --git a/arch/mips/kernel/sync-r4k.c b/arch/mips/kernel/sync-r4k.c
6800index 2242bdd..b284048 100644
6801--- a/arch/mips/kernel/sync-r4k.c
6802+++ b/arch/mips/kernel/sync-r4k.c
6803@@ -18,8 +18,8 @@
6804 #include <asm/mipsregs.h>
6805
6806 static atomic_t count_start_flag = ATOMIC_INIT(0);
6807-static atomic_t count_count_start = ATOMIC_INIT(0);
6808-static atomic_t count_count_stop = ATOMIC_INIT(0);
6809+static atomic_unchecked_t count_count_start = ATOMIC_INIT(0);
6810+static atomic_unchecked_t count_count_stop = ATOMIC_INIT(0);
6811 static atomic_t count_reference = ATOMIC_INIT(0);
6812
6813 #define COUNTON 100
6814@@ -58,13 +58,13 @@ void synchronise_count_master(int cpu)
6815
6816 for (i = 0; i < NR_LOOPS; i++) {
6817 /* slaves loop on '!= 2' */
6818- while (atomic_read(&count_count_start) != 1)
6819+ while (atomic_read_unchecked(&count_count_start) != 1)
6820 mb();
6821- atomic_set(&count_count_stop, 0);
6822+ atomic_set_unchecked(&count_count_stop, 0);
6823 smp_wmb();
6824
6825 /* this lets the slaves write their count register */
6826- atomic_inc(&count_count_start);
6827+ atomic_inc_unchecked(&count_count_start);
6828
6829 /*
6830 * Everyone initialises count in the last loop:
6831@@ -75,11 +75,11 @@ void synchronise_count_master(int cpu)
6832 /*
6833 * Wait for all slaves to leave the synchronization point:
6834 */
6835- while (atomic_read(&count_count_stop) != 1)
6836+ while (atomic_read_unchecked(&count_count_stop) != 1)
6837 mb();
6838- atomic_set(&count_count_start, 0);
6839+ atomic_set_unchecked(&count_count_start, 0);
6840 smp_wmb();
6841- atomic_inc(&count_count_stop);
6842+ atomic_inc_unchecked(&count_count_stop);
6843 }
6844 /* Arrange for an interrupt in a short while */
6845 write_c0_compare(read_c0_count() + COUNTON);
6846@@ -112,8 +112,8 @@ void synchronise_count_slave(int cpu)
6847 initcount = atomic_read(&count_reference);
6848
6849 for (i = 0; i < NR_LOOPS; i++) {
6850- atomic_inc(&count_count_start);
6851- while (atomic_read(&count_count_start) != 2)
6852+ atomic_inc_unchecked(&count_count_start);
6853+ while (atomic_read_unchecked(&count_count_start) != 2)
6854 mb();
6855
6856 /*
6857@@ -122,8 +122,8 @@ void synchronise_count_slave(int cpu)
6858 if (i == NR_LOOPS-1)
6859 write_c0_count(initcount);
6860
6861- atomic_inc(&count_count_stop);
6862- while (atomic_read(&count_count_stop) != 2)
6863+ atomic_inc_unchecked(&count_count_stop);
6864+ while (atomic_read_unchecked(&count_count_stop) != 2)
6865 mb();
6866 }
6867 /* Arrange for an interrupt in a short while */
6868diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
6869index 33984c0..666a96d 100644
6870--- a/arch/mips/kernel/traps.c
6871+++ b/arch/mips/kernel/traps.c
6872@@ -689,7 +689,18 @@ asmlinkage void do_ov(struct pt_regs *regs)
6873 siginfo_t info;
6874
6875 prev_state = exception_enter();
6876- die_if_kernel("Integer overflow", regs);
6877+ if (unlikely(!user_mode(regs))) {
6878+
6879+#ifdef CONFIG_PAX_REFCOUNT
6880+ if (fixup_exception(regs)) {
6881+ pax_report_refcount_overflow(regs);
6882+ exception_exit(prev_state);
6883+ return;
6884+ }
6885+#endif
6886+
6887+ die("Integer overflow", regs);
6888+ }
6889
6890 info.si_code = FPE_INTOVF;
6891 info.si_signo = SIGFPE;
6892diff --git a/arch/mips/kvm/mips.c b/arch/mips/kvm/mips.c
6893index f5e7dda..47198ec 100644
6894--- a/arch/mips/kvm/mips.c
6895+++ b/arch/mips/kvm/mips.c
6896@@ -816,7 +816,7 @@ long kvm_arch_vm_ioctl(struct file *filp, unsigned int ioctl, unsigned long arg)
6897 return r;
6898 }
6899
6900-int kvm_arch_init(void *opaque)
6901+int kvm_arch_init(const void *opaque)
6902 {
6903 if (kvm_mips_callbacks) {
6904 kvm_err("kvm: module already exists\n");
6905diff --git a/arch/mips/mm/fault.c b/arch/mips/mm/fault.c
6906index 7ff8637..6004edb 100644
6907--- a/arch/mips/mm/fault.c
6908+++ b/arch/mips/mm/fault.c
6909@@ -31,6 +31,23 @@
6910
6911 int show_unhandled_signals = 1;
6912
6913+#ifdef CONFIG_PAX_PAGEEXEC
6914+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
6915+{
6916+ unsigned long i;
6917+
6918+ printk(KERN_ERR "PAX: bytes at PC: ");
6919+ for (i = 0; i < 5; i++) {
6920+ unsigned int c;
6921+ if (get_user(c, (unsigned int *)pc+i))
6922+ printk(KERN_CONT "???????? ");
6923+ else
6924+ printk(KERN_CONT "%08x ", c);
6925+ }
6926+ printk("\n");
6927+}
6928+#endif
6929+
6930 /*
6931 * This routine handles page faults. It determines the address,
6932 * and the problem, and then passes it off to one of the appropriate
6933@@ -206,6 +223,14 @@ bad_area:
6934 bad_area_nosemaphore:
6935 /* User mode accesses just cause a SIGSEGV */
6936 if (user_mode(regs)) {
6937+
6938+#ifdef CONFIG_PAX_PAGEEXEC
6939+ if (cpu_has_rixi && (mm->pax_flags & MF_PAX_PAGEEXEC) && !write && address == instruction_pointer(regs)) {
6940+ pax_report_fault(regs, (void *)address, (void *)user_stack_pointer(regs));
6941+ do_group_exit(SIGKILL);
6942+ }
6943+#endif
6944+
6945 tsk->thread.cp0_badvaddr = address;
6946 tsk->thread.error_code = write;
6947 if (show_unhandled_signals &&
6948diff --git a/arch/mips/mm/mmap.c b/arch/mips/mm/mmap.c
6949index f1baadd..5472dca 100644
6950--- a/arch/mips/mm/mmap.c
6951+++ b/arch/mips/mm/mmap.c
6952@@ -59,6 +59,7 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
6953 struct vm_area_struct *vma;
6954 unsigned long addr = addr0;
6955 int do_color_align;
6956+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
6957 struct vm_unmapped_area_info info;
6958
6959 if (unlikely(len > TASK_SIZE))
6960@@ -84,6 +85,11 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
6961 do_color_align = 1;
6962
6963 /* requesting a specific address */
6964+
6965+#ifdef CONFIG_PAX_RANDMMAP
6966+ if (!(current->mm->pax_flags & MF_PAX_RANDMMAP))
6967+#endif
6968+
6969 if (addr) {
6970 if (do_color_align)
6971 addr = COLOUR_ALIGN(addr, pgoff);
6972@@ -91,14 +97,14 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
6973 addr = PAGE_ALIGN(addr);
6974
6975 vma = find_vma(mm, addr);
6976- if (TASK_SIZE - len >= addr &&
6977- (!vma || addr + len <= vma->vm_start))
6978+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
6979 return addr;
6980 }
6981
6982 info.length = len;
6983 info.align_mask = do_color_align ? (PAGE_MASK & shm_align_mask) : 0;
6984 info.align_offset = pgoff << PAGE_SHIFT;
6985+ info.threadstack_offset = offset;
6986
6987 if (dir == DOWN) {
6988 info.flags = VM_UNMAPPED_AREA_TOPDOWN;
6989@@ -146,6 +152,10 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
6990 {
6991 unsigned long random_factor = 0UL;
6992
6993+#ifdef CONFIG_PAX_RANDMMAP
6994+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
6995+#endif
6996+
6997 if (current->flags & PF_RANDOMIZE) {
6998 random_factor = get_random_int();
6999 random_factor = random_factor << PAGE_SHIFT;
7000@@ -157,40 +167,25 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
7001
7002 if (mmap_is_legacy()) {
7003 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
7004+
7005+#ifdef CONFIG_PAX_RANDMMAP
7006+ if (mm->pax_flags & MF_PAX_RANDMMAP)
7007+ mm->mmap_base += mm->delta_mmap;
7008+#endif
7009+
7010 mm->get_unmapped_area = arch_get_unmapped_area;
7011 } else {
7012 mm->mmap_base = mmap_base(random_factor);
7013+
7014+#ifdef CONFIG_PAX_RANDMMAP
7015+ if (mm->pax_flags & MF_PAX_RANDMMAP)
7016+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
7017+#endif
7018+
7019 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
7020 }
7021 }
7022
7023-static inline unsigned long brk_rnd(void)
7024-{
7025- unsigned long rnd = get_random_int();
7026-
7027- rnd = rnd << PAGE_SHIFT;
7028- /* 8MB for 32bit, 256MB for 64bit */
7029- if (TASK_IS_32BIT_ADDR)
7030- rnd = rnd & 0x7ffffful;
7031- else
7032- rnd = rnd & 0xffffffful;
7033-
7034- return rnd;
7035-}
7036-
7037-unsigned long arch_randomize_brk(struct mm_struct *mm)
7038-{
7039- unsigned long base = mm->brk;
7040- unsigned long ret;
7041-
7042- ret = PAGE_ALIGN(base + brk_rnd());
7043-
7044- if (ret < mm->brk)
7045- return mm->brk;
7046-
7047- return ret;
7048-}
7049-
7050 int __virt_addr_valid(const volatile void *kaddr)
7051 {
7052 return pfn_valid(PFN_DOWN(virt_to_phys(kaddr)));
7053diff --git a/arch/mips/sgi-ip27/ip27-nmi.c b/arch/mips/sgi-ip27/ip27-nmi.c
7054index a2358b4..7cead4f 100644
7055--- a/arch/mips/sgi-ip27/ip27-nmi.c
7056+++ b/arch/mips/sgi-ip27/ip27-nmi.c
7057@@ -187,9 +187,9 @@ void
7058 cont_nmi_dump(void)
7059 {
7060 #ifndef REAL_NMI_SIGNAL
7061- static atomic_t nmied_cpus = ATOMIC_INIT(0);
7062+ static atomic_unchecked_t nmied_cpus = ATOMIC_INIT(0);
7063
7064- atomic_inc(&nmied_cpus);
7065+ atomic_inc_unchecked(&nmied_cpus);
7066 #endif
7067 /*
7068 * Only allow 1 cpu to proceed
7069@@ -233,7 +233,7 @@ cont_nmi_dump(void)
7070 udelay(10000);
7071 }
7072 #else
7073- while (atomic_read(&nmied_cpus) != num_online_cpus());
7074+ while (atomic_read_unchecked(&nmied_cpus) != num_online_cpus());
7075 #endif
7076
7077 /*
7078diff --git a/arch/mips/sni/rm200.c b/arch/mips/sni/rm200.c
7079index a046b30..6799527 100644
7080--- a/arch/mips/sni/rm200.c
7081+++ b/arch/mips/sni/rm200.c
7082@@ -270,7 +270,7 @@ spurious_8259A_irq:
7083 "spurious RM200 8259A interrupt: IRQ%d.\n", irq);
7084 spurious_irq_mask |= irqmask;
7085 }
7086- atomic_inc(&irq_err_count);
7087+ atomic_inc_unchecked(&irq_err_count);
7088 /*
7089 * Theoretically we do not have to handle this IRQ,
7090 * but in Linux this does not cause problems and is
7091diff --git a/arch/mips/vr41xx/common/icu.c b/arch/mips/vr41xx/common/icu.c
7092index 41e873b..34d33a7 100644
7093--- a/arch/mips/vr41xx/common/icu.c
7094+++ b/arch/mips/vr41xx/common/icu.c
7095@@ -653,7 +653,7 @@ static int icu_get_irq(unsigned int irq)
7096
7097 printk(KERN_ERR "spurious ICU interrupt: %04x,%04x\n", pend1, pend2);
7098
7099- atomic_inc(&irq_err_count);
7100+ atomic_inc_unchecked(&irq_err_count);
7101
7102 return -1;
7103 }
7104diff --git a/arch/mips/vr41xx/common/irq.c b/arch/mips/vr41xx/common/irq.c
7105index ae0e4ee..e8f0692 100644
7106--- a/arch/mips/vr41xx/common/irq.c
7107+++ b/arch/mips/vr41xx/common/irq.c
7108@@ -64,7 +64,7 @@ static void irq_dispatch(unsigned int irq)
7109 irq_cascade_t *cascade;
7110
7111 if (irq >= NR_IRQS) {
7112- atomic_inc(&irq_err_count);
7113+ atomic_inc_unchecked(&irq_err_count);
7114 return;
7115 }
7116
7117@@ -84,7 +84,7 @@ static void irq_dispatch(unsigned int irq)
7118 ret = cascade->get_irq(irq);
7119 irq = ret;
7120 if (ret < 0)
7121- atomic_inc(&irq_err_count);
7122+ atomic_inc_unchecked(&irq_err_count);
7123 else
7124 irq_dispatch(irq);
7125 if (!irqd_irq_disabled(idata) && chip->irq_unmask)
7126diff --git a/arch/mn10300/proc-mn103e010/include/proc/cache.h b/arch/mn10300/proc-mn103e010/include/proc/cache.h
7127index 967d144..db12197 100644
7128--- a/arch/mn10300/proc-mn103e010/include/proc/cache.h
7129+++ b/arch/mn10300/proc-mn103e010/include/proc/cache.h
7130@@ -11,12 +11,14 @@
7131 #ifndef _ASM_PROC_CACHE_H
7132 #define _ASM_PROC_CACHE_H
7133
7134+#include <linux/const.h>
7135+
7136 /* L1 cache */
7137
7138 #define L1_CACHE_NWAYS 4 /* number of ways in caches */
7139 #define L1_CACHE_NENTRIES 256 /* number of entries in each way */
7140-#define L1_CACHE_BYTES 16 /* bytes per entry */
7141 #define L1_CACHE_SHIFT 4 /* shift for bytes per entry */
7142+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT) /* bytes per entry */
7143 #define L1_CACHE_WAYDISP 0x1000 /* displacement of one way from the next */
7144
7145 #define L1_CACHE_TAG_VALID 0x00000001 /* cache tag valid bit */
7146diff --git a/arch/mn10300/proc-mn2ws0050/include/proc/cache.h b/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
7147index bcb5df2..84fabd2 100644
7148--- a/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
7149+++ b/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
7150@@ -16,13 +16,15 @@
7151 #ifndef _ASM_PROC_CACHE_H
7152 #define _ASM_PROC_CACHE_H
7153
7154+#include <linux/const.h>
7155+
7156 /*
7157 * L1 cache
7158 */
7159 #define L1_CACHE_NWAYS 4 /* number of ways in caches */
7160 #define L1_CACHE_NENTRIES 128 /* number of entries in each way */
7161-#define L1_CACHE_BYTES 32 /* bytes per entry */
7162 #define L1_CACHE_SHIFT 5 /* shift for bytes per entry */
7163+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT) /* bytes per entry */
7164 #define L1_CACHE_WAYDISP 0x1000 /* distance from one way to the next */
7165
7166 #define L1_CACHE_TAG_VALID 0x00000001 /* cache tag valid bit */
7167diff --git a/arch/openrisc/include/asm/cache.h b/arch/openrisc/include/asm/cache.h
7168index 4ce7a01..449202a 100644
7169--- a/arch/openrisc/include/asm/cache.h
7170+++ b/arch/openrisc/include/asm/cache.h
7171@@ -19,11 +19,13 @@
7172 #ifndef __ASM_OPENRISC_CACHE_H
7173 #define __ASM_OPENRISC_CACHE_H
7174
7175+#include <linux/const.h>
7176+
7177 /* FIXME: How can we replace these with values from the CPU...
7178 * they shouldn't be hard-coded!
7179 */
7180
7181-#define L1_CACHE_BYTES 16
7182 #define L1_CACHE_SHIFT 4
7183+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
7184
7185 #endif /* __ASM_OPENRISC_CACHE_H */
7186diff --git a/arch/parisc/include/asm/atomic.h b/arch/parisc/include/asm/atomic.h
7187index 226f8ca9..9d9b87d 100644
7188--- a/arch/parisc/include/asm/atomic.h
7189+++ b/arch/parisc/include/asm/atomic.h
7190@@ -273,6 +273,16 @@ static inline long atomic64_dec_if_positive(atomic64_t *v)
7191 return dec;
7192 }
7193
7194+#define atomic64_read_unchecked(v) atomic64_read(v)
7195+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
7196+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
7197+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
7198+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
7199+#define atomic64_inc_unchecked(v) atomic64_inc(v)
7200+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
7201+#define atomic64_dec_unchecked(v) atomic64_dec(v)
7202+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
7203+
7204 #endif /* !CONFIG_64BIT */
7205
7206
7207diff --git a/arch/parisc/include/asm/cache.h b/arch/parisc/include/asm/cache.h
7208index 47f11c7..3420df2 100644
7209--- a/arch/parisc/include/asm/cache.h
7210+++ b/arch/parisc/include/asm/cache.h
7211@@ -5,6 +5,7 @@
7212 #ifndef __ARCH_PARISC_CACHE_H
7213 #define __ARCH_PARISC_CACHE_H
7214
7215+#include <linux/const.h>
7216
7217 /*
7218 * PA 2.0 processors have 64-byte cachelines; PA 1.1 processors have
7219@@ -15,13 +16,13 @@
7220 * just ruin performance.
7221 */
7222 #ifdef CONFIG_PA20
7223-#define L1_CACHE_BYTES 64
7224 #define L1_CACHE_SHIFT 6
7225 #else
7226-#define L1_CACHE_BYTES 32
7227 #define L1_CACHE_SHIFT 5
7228 #endif
7229
7230+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
7231+
7232 #ifndef __ASSEMBLY__
7233
7234 #define SMP_CACHE_BYTES L1_CACHE_BYTES
7235diff --git a/arch/parisc/include/asm/elf.h b/arch/parisc/include/asm/elf.h
7236index 78c9fd3..42fa66a 100644
7237--- a/arch/parisc/include/asm/elf.h
7238+++ b/arch/parisc/include/asm/elf.h
7239@@ -342,6 +342,13 @@ struct pt_regs; /* forward declaration... */
7240
7241 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000)
7242
7243+#ifdef CONFIG_PAX_ASLR
7244+#define PAX_ELF_ET_DYN_BASE 0x10000UL
7245+
7246+#define PAX_DELTA_MMAP_LEN 16
7247+#define PAX_DELTA_STACK_LEN 16
7248+#endif
7249+
7250 /* This yields a mask that user programs can use to figure out what
7251 instruction set this CPU supports. This could be done in user space,
7252 but it's not easy, and we've already done it here. */
7253diff --git a/arch/parisc/include/asm/pgalloc.h b/arch/parisc/include/asm/pgalloc.h
7254index d174372..f27fe5c 100644
7255--- a/arch/parisc/include/asm/pgalloc.h
7256+++ b/arch/parisc/include/asm/pgalloc.h
7257@@ -61,6 +61,11 @@ static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
7258 (__u32)(__pa((unsigned long)pmd) >> PxD_VALUE_SHIFT));
7259 }
7260
7261+static inline void pgd_populate_kernel(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
7262+{
7263+ pgd_populate(mm, pgd, pmd);
7264+}
7265+
7266 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address)
7267 {
7268 pmd_t *pmd = (pmd_t *)__get_free_pages(GFP_KERNEL|__GFP_REPEAT,
7269@@ -96,6 +101,7 @@ static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd)
7270 #define pmd_alloc_one(mm, addr) ({ BUG(); ((pmd_t *)2); })
7271 #define pmd_free(mm, x) do { } while (0)
7272 #define pgd_populate(mm, pmd, pte) BUG()
7273+#define pgd_populate_kernel(mm, pmd, pte) BUG()
7274
7275 #endif
7276
7277diff --git a/arch/parisc/include/asm/pgtable.h b/arch/parisc/include/asm/pgtable.h
7278index 15207b9..3209e65 100644
7279--- a/arch/parisc/include/asm/pgtable.h
7280+++ b/arch/parisc/include/asm/pgtable.h
7281@@ -215,6 +215,17 @@ extern void purge_tlb_entries(struct mm_struct *, unsigned long);
7282 #define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED)
7283 #define PAGE_COPY PAGE_EXECREAD
7284 #define PAGE_RWX __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_EXEC |_PAGE_ACCESSED)
7285+
7286+#ifdef CONFIG_PAX_PAGEEXEC
7287+# define PAGE_SHARED_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_ACCESSED)
7288+# define PAGE_COPY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_ACCESSED)
7289+# define PAGE_READONLY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_ACCESSED)
7290+#else
7291+# define PAGE_SHARED_NOEXEC PAGE_SHARED
7292+# define PAGE_COPY_NOEXEC PAGE_COPY
7293+# define PAGE_READONLY_NOEXEC PAGE_READONLY
7294+#endif
7295+
7296 #define PAGE_KERNEL __pgprot(_PAGE_KERNEL)
7297 #define PAGE_KERNEL_EXEC __pgprot(_PAGE_KERNEL_EXEC)
7298 #define PAGE_KERNEL_RWX __pgprot(_PAGE_KERNEL_RWX)
7299diff --git a/arch/parisc/include/asm/uaccess.h b/arch/parisc/include/asm/uaccess.h
7300index 0abdd4c..1af92f0 100644
7301--- a/arch/parisc/include/asm/uaccess.h
7302+++ b/arch/parisc/include/asm/uaccess.h
7303@@ -243,10 +243,10 @@ static inline unsigned long __must_check copy_from_user(void *to,
7304 const void __user *from,
7305 unsigned long n)
7306 {
7307- int sz = __compiletime_object_size(to);
7308+ size_t sz = __compiletime_object_size(to);
7309 int ret = -EFAULT;
7310
7311- if (likely(sz == -1 || !__builtin_constant_p(n) || sz >= n))
7312+ if (likely(sz == (size_t)-1 || !__builtin_constant_p(n) || sz >= n))
7313 ret = __copy_from_user(to, from, n);
7314 else
7315 copy_from_user_overflow();
7316diff --git a/arch/parisc/kernel/module.c b/arch/parisc/kernel/module.c
7317index 3c63a82..b1d6ee9 100644
7318--- a/arch/parisc/kernel/module.c
7319+++ b/arch/parisc/kernel/module.c
7320@@ -98,16 +98,38 @@
7321
7322 /* three functions to determine where in the module core
7323 * or init pieces the location is */
7324+static inline int in_init_rx(struct module *me, void *loc)
7325+{
7326+ return (loc >= me->module_init_rx &&
7327+ loc < (me->module_init_rx + me->init_size_rx));
7328+}
7329+
7330+static inline int in_init_rw(struct module *me, void *loc)
7331+{
7332+ return (loc >= me->module_init_rw &&
7333+ loc < (me->module_init_rw + me->init_size_rw));
7334+}
7335+
7336 static inline int in_init(struct module *me, void *loc)
7337 {
7338- return (loc >= me->module_init &&
7339- loc <= (me->module_init + me->init_size));
7340+ return in_init_rx(me, loc) || in_init_rw(me, loc);
7341+}
7342+
7343+static inline int in_core_rx(struct module *me, void *loc)
7344+{
7345+ return (loc >= me->module_core_rx &&
7346+ loc < (me->module_core_rx + me->core_size_rx));
7347+}
7348+
7349+static inline int in_core_rw(struct module *me, void *loc)
7350+{
7351+ return (loc >= me->module_core_rw &&
7352+ loc < (me->module_core_rw + me->core_size_rw));
7353 }
7354
7355 static inline int in_core(struct module *me, void *loc)
7356 {
7357- return (loc >= me->module_core &&
7358- loc <= (me->module_core + me->core_size));
7359+ return in_core_rx(me, loc) || in_core_rw(me, loc);
7360 }
7361
7362 static inline int in_local(struct module *me, void *loc)
7363@@ -367,13 +389,13 @@ int module_frob_arch_sections(CONST Elf_Ehdr *hdr,
7364 }
7365
7366 /* align things a bit */
7367- me->core_size = ALIGN(me->core_size, 16);
7368- me->arch.got_offset = me->core_size;
7369- me->core_size += gots * sizeof(struct got_entry);
7370+ me->core_size_rw = ALIGN(me->core_size_rw, 16);
7371+ me->arch.got_offset = me->core_size_rw;
7372+ me->core_size_rw += gots * sizeof(struct got_entry);
7373
7374- me->core_size = ALIGN(me->core_size, 16);
7375- me->arch.fdesc_offset = me->core_size;
7376- me->core_size += fdescs * sizeof(Elf_Fdesc);
7377+ me->core_size_rw = ALIGN(me->core_size_rw, 16);
7378+ me->arch.fdesc_offset = me->core_size_rw;
7379+ me->core_size_rw += fdescs * sizeof(Elf_Fdesc);
7380
7381 me->arch.got_max = gots;
7382 me->arch.fdesc_max = fdescs;
7383@@ -391,7 +413,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
7384
7385 BUG_ON(value == 0);
7386
7387- got = me->module_core + me->arch.got_offset;
7388+ got = me->module_core_rw + me->arch.got_offset;
7389 for (i = 0; got[i].addr; i++)
7390 if (got[i].addr == value)
7391 goto out;
7392@@ -409,7 +431,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
7393 #ifdef CONFIG_64BIT
7394 static Elf_Addr get_fdesc(struct module *me, unsigned long value)
7395 {
7396- Elf_Fdesc *fdesc = me->module_core + me->arch.fdesc_offset;
7397+ Elf_Fdesc *fdesc = me->module_core_rw + me->arch.fdesc_offset;
7398
7399 if (!value) {
7400 printk(KERN_ERR "%s: zero OPD requested!\n", me->name);
7401@@ -427,7 +449,7 @@ static Elf_Addr get_fdesc(struct module *me, unsigned long value)
7402
7403 /* Create new one */
7404 fdesc->addr = value;
7405- fdesc->gp = (Elf_Addr)me->module_core + me->arch.got_offset;
7406+ fdesc->gp = (Elf_Addr)me->module_core_rw + me->arch.got_offset;
7407 return (Elf_Addr)fdesc;
7408 }
7409 #endif /* CONFIG_64BIT */
7410@@ -839,7 +861,7 @@ register_unwind_table(struct module *me,
7411
7412 table = (unsigned char *)sechdrs[me->arch.unwind_section].sh_addr;
7413 end = table + sechdrs[me->arch.unwind_section].sh_size;
7414- gp = (Elf_Addr)me->module_core + me->arch.got_offset;
7415+ gp = (Elf_Addr)me->module_core_rw + me->arch.got_offset;
7416
7417 DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n",
7418 me->arch.unwind_section, table, end, gp);
7419diff --git a/arch/parisc/kernel/sys_parisc.c b/arch/parisc/kernel/sys_parisc.c
7420index 5aba01a..47cdd5a 100644
7421--- a/arch/parisc/kernel/sys_parisc.c
7422+++ b/arch/parisc/kernel/sys_parisc.c
7423@@ -92,6 +92,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
7424 unsigned long task_size = TASK_SIZE;
7425 int do_color_align, last_mmap;
7426 struct vm_unmapped_area_info info;
7427+ unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
7428
7429 if (len > task_size)
7430 return -ENOMEM;
7431@@ -109,6 +110,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
7432 goto found_addr;
7433 }
7434
7435+#ifdef CONFIG_PAX_RANDMMAP
7436+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
7437+#endif
7438+
7439 if (addr) {
7440 if (do_color_align && last_mmap)
7441 addr = COLOR_ALIGN(addr, last_mmap, pgoff);
7442@@ -127,6 +132,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
7443 info.high_limit = mmap_upper_limit();
7444 info.align_mask = last_mmap ? (PAGE_MASK & (SHM_COLOUR - 1)) : 0;
7445 info.align_offset = shared_align_offset(last_mmap, pgoff);
7446+ info.threadstack_offset = offset;
7447 addr = vm_unmapped_area(&info);
7448
7449 found_addr:
7450@@ -146,6 +152,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
7451 unsigned long addr = addr0;
7452 int do_color_align, last_mmap;
7453 struct vm_unmapped_area_info info;
7454+ unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
7455
7456 #ifdef CONFIG_64BIT
7457 /* This should only ever run for 32-bit processes. */
7458@@ -170,6 +177,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
7459 }
7460
7461 /* requesting a specific address */
7462+#ifdef CONFIG_PAX_RANDMMAP
7463+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
7464+#endif
7465+
7466 if (addr) {
7467 if (do_color_align && last_mmap)
7468 addr = COLOR_ALIGN(addr, last_mmap, pgoff);
7469@@ -187,6 +198,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
7470 info.high_limit = mm->mmap_base;
7471 info.align_mask = last_mmap ? (PAGE_MASK & (SHM_COLOUR - 1)) : 0;
7472 info.align_offset = shared_align_offset(last_mmap, pgoff);
7473+ info.threadstack_offset = offset;
7474 addr = vm_unmapped_area(&info);
7475 if (!(addr & ~PAGE_MASK))
7476 goto found_addr;
7477@@ -252,6 +264,13 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
7478 mm->mmap_legacy_base = mmap_legacy_base();
7479 mm->mmap_base = mmap_upper_limit();
7480
7481+#ifdef CONFIG_PAX_RANDMMAP
7482+ if (mm->pax_flags & MF_PAX_RANDMMAP) {
7483+ mm->mmap_legacy_base += mm->delta_mmap;
7484+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
7485+ }
7486+#endif
7487+
7488 if (mmap_is_legacy()) {
7489 mm->mmap_base = mm->mmap_legacy_base;
7490 mm->get_unmapped_area = arch_get_unmapped_area;
7491diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c
7492index 47ee620..1107387 100644
7493--- a/arch/parisc/kernel/traps.c
7494+++ b/arch/parisc/kernel/traps.c
7495@@ -726,9 +726,7 @@ void notrace handle_interruption(int code, struct pt_regs *regs)
7496
7497 down_read(&current->mm->mmap_sem);
7498 vma = find_vma(current->mm,regs->iaoq[0]);
7499- if (vma && (regs->iaoq[0] >= vma->vm_start)
7500- && (vma->vm_flags & VM_EXEC)) {
7501-
7502+ if (vma && (regs->iaoq[0] >= vma->vm_start)) {
7503 fault_address = regs->iaoq[0];
7504 fault_space = regs->iasq[0];
7505
7506diff --git a/arch/parisc/mm/fault.c b/arch/parisc/mm/fault.c
7507index e5120e6..8ddb5cc 100644
7508--- a/arch/parisc/mm/fault.c
7509+++ b/arch/parisc/mm/fault.c
7510@@ -15,6 +15,7 @@
7511 #include <linux/sched.h>
7512 #include <linux/interrupt.h>
7513 #include <linux/module.h>
7514+#include <linux/unistd.h>
7515
7516 #include <asm/uaccess.h>
7517 #include <asm/traps.h>
7518@@ -50,7 +51,7 @@ int show_unhandled_signals = 1;
7519 static unsigned long
7520 parisc_acctyp(unsigned long code, unsigned int inst)
7521 {
7522- if (code == 6 || code == 16)
7523+ if (code == 6 || code == 7 || code == 16)
7524 return VM_EXEC;
7525
7526 switch (inst & 0xf0000000) {
7527@@ -136,6 +137,116 @@ parisc_acctyp(unsigned long code, unsigned int inst)
7528 }
7529 #endif
7530
7531+#ifdef CONFIG_PAX_PAGEEXEC
7532+/*
7533+ * PaX: decide what to do with offenders (instruction_pointer(regs) = fault address)
7534+ *
7535+ * returns 1 when task should be killed
7536+ * 2 when rt_sigreturn trampoline was detected
7537+ * 3 when unpatched PLT trampoline was detected
7538+ */
7539+static int pax_handle_fetch_fault(struct pt_regs *regs)
7540+{
7541+
7542+#ifdef CONFIG_PAX_EMUPLT
7543+ int err;
7544+
7545+ do { /* PaX: unpatched PLT emulation */
7546+ unsigned int bl, depwi;
7547+
7548+ err = get_user(bl, (unsigned int *)instruction_pointer(regs));
7549+ err |= get_user(depwi, (unsigned int *)(instruction_pointer(regs)+4));
7550+
7551+ if (err)
7552+ break;
7553+
7554+ if (bl == 0xEA9F1FDDU && depwi == 0xD6801C1EU) {
7555+ unsigned int ldw, bv, ldw2, addr = instruction_pointer(regs)-12;
7556+
7557+ err = get_user(ldw, (unsigned int *)addr);
7558+ err |= get_user(bv, (unsigned int *)(addr+4));
7559+ err |= get_user(ldw2, (unsigned int *)(addr+8));
7560+
7561+ if (err)
7562+ break;
7563+
7564+ if (ldw == 0x0E801096U &&
7565+ bv == 0xEAC0C000U &&
7566+ ldw2 == 0x0E881095U)
7567+ {
7568+ unsigned int resolver, map;
7569+
7570+ err = get_user(resolver, (unsigned int *)(instruction_pointer(regs)+8));
7571+ err |= get_user(map, (unsigned int *)(instruction_pointer(regs)+12));
7572+ if (err)
7573+ break;
7574+
7575+ regs->gr[20] = instruction_pointer(regs)+8;
7576+ regs->gr[21] = map;
7577+ regs->gr[22] = resolver;
7578+ regs->iaoq[0] = resolver | 3UL;
7579+ regs->iaoq[1] = regs->iaoq[0] + 4;
7580+ return 3;
7581+ }
7582+ }
7583+ } while (0);
7584+#endif
7585+
7586+#ifdef CONFIG_PAX_EMUTRAMP
7587+
7588+#ifndef CONFIG_PAX_EMUSIGRT
7589+ if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP))
7590+ return 1;
7591+#endif
7592+
7593+ do { /* PaX: rt_sigreturn emulation */
7594+ unsigned int ldi1, ldi2, bel, nop;
7595+
7596+ err = get_user(ldi1, (unsigned int *)instruction_pointer(regs));
7597+ err |= get_user(ldi2, (unsigned int *)(instruction_pointer(regs)+4));
7598+ err |= get_user(bel, (unsigned int *)(instruction_pointer(regs)+8));
7599+ err |= get_user(nop, (unsigned int *)(instruction_pointer(regs)+12));
7600+
7601+ if (err)
7602+ break;
7603+
7604+ if ((ldi1 == 0x34190000U || ldi1 == 0x34190002U) &&
7605+ ldi2 == 0x3414015AU &&
7606+ bel == 0xE4008200U &&
7607+ nop == 0x08000240U)
7608+ {
7609+ regs->gr[25] = (ldi1 & 2) >> 1;
7610+ regs->gr[20] = __NR_rt_sigreturn;
7611+ regs->gr[31] = regs->iaoq[1] + 16;
7612+ regs->sr[0] = regs->iasq[1];
7613+ regs->iaoq[0] = 0x100UL;
7614+ regs->iaoq[1] = regs->iaoq[0] + 4;
7615+ regs->iasq[0] = regs->sr[2];
7616+ regs->iasq[1] = regs->sr[2];
7617+ return 2;
7618+ }
7619+ } while (0);
7620+#endif
7621+
7622+ return 1;
7623+}
7624+
7625+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
7626+{
7627+ unsigned long i;
7628+
7629+ printk(KERN_ERR "PAX: bytes at PC: ");
7630+ for (i = 0; i < 5; i++) {
7631+ unsigned int c;
7632+ if (get_user(c, (unsigned int *)pc+i))
7633+ printk(KERN_CONT "???????? ");
7634+ else
7635+ printk(KERN_CONT "%08x ", c);
7636+ }
7637+ printk("\n");
7638+}
7639+#endif
7640+
7641 int fixup_exception(struct pt_regs *regs)
7642 {
7643 const struct exception_table_entry *fix;
7644@@ -234,8 +345,33 @@ retry:
7645
7646 good_area:
7647
7648- if ((vma->vm_flags & acc_type) != acc_type)
7649+ if ((vma->vm_flags & acc_type) != acc_type) {
7650+
7651+#ifdef CONFIG_PAX_PAGEEXEC
7652+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && (acc_type & VM_EXEC) &&
7653+ (address & ~3UL) == instruction_pointer(regs))
7654+ {
7655+ up_read(&mm->mmap_sem);
7656+ switch (pax_handle_fetch_fault(regs)) {
7657+
7658+#ifdef CONFIG_PAX_EMUPLT
7659+ case 3:
7660+ return;
7661+#endif
7662+
7663+#ifdef CONFIG_PAX_EMUTRAMP
7664+ case 2:
7665+ return;
7666+#endif
7667+
7668+ }
7669+ pax_report_fault(regs, (void *)instruction_pointer(regs), (void *)regs->gr[30]);
7670+ do_group_exit(SIGKILL);
7671+ }
7672+#endif
7673+
7674 goto bad_area;
7675+ }
7676
7677 /*
7678 * If for any reason at all we couldn't handle the fault, make
7679diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
7680index 22b0940..309f790 100644
7681--- a/arch/powerpc/Kconfig
7682+++ b/arch/powerpc/Kconfig
7683@@ -409,6 +409,7 @@ config PPC64_SUPPORTS_MEMORY_FAILURE
7684 config KEXEC
7685 bool "kexec system call"
7686 depends on (PPC_BOOK3S || FSL_BOOKE || (44x && !SMP))
7687+ depends on !GRKERNSEC_KMEM
7688 help
7689 kexec is a system call that implements the ability to shutdown your
7690 current kernel, and to start another kernel. It is like a reboot
7691diff --git a/arch/powerpc/include/asm/atomic.h b/arch/powerpc/include/asm/atomic.h
7692index 512d278..d31fadd 100644
7693--- a/arch/powerpc/include/asm/atomic.h
7694+++ b/arch/powerpc/include/asm/atomic.h
7695@@ -12,6 +12,11 @@
7696
7697 #define ATOMIC_INIT(i) { (i) }
7698
7699+#define _ASM_EXTABLE(from, to) \
7700+" .section __ex_table,\"a\"\n" \
7701+ PPC_LONG" " #from ", " #to"\n" \
7702+" .previous\n"
7703+
7704 static __inline__ int atomic_read(const atomic_t *v)
7705 {
7706 int t;
7707@@ -21,39 +26,80 @@ static __inline__ int atomic_read(const atomic_t *v)
7708 return t;
7709 }
7710
7711+static __inline__ int atomic_read_unchecked(const atomic_unchecked_t *v)
7712+{
7713+ int t;
7714+
7715+ __asm__ __volatile__("lwz%U1%X1 %0,%1" : "=r"(t) : "m"(v->counter));
7716+
7717+ return t;
7718+}
7719+
7720 static __inline__ void atomic_set(atomic_t *v, int i)
7721 {
7722 __asm__ __volatile__("stw%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
7723 }
7724
7725-#define ATOMIC_OP(op, asm_op) \
7726-static __inline__ void atomic_##op(int a, atomic_t *v) \
7727+static __inline__ void atomic_set_unchecked(atomic_unchecked_t *v, int i)
7728+{
7729+ __asm__ __volatile__("stw%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
7730+}
7731+
7732+#ifdef CONFIG_PAX_REFCOUNT
7733+#define __REFCOUNT_OP(op) op##o.
7734+#define __OVERFLOW_PRE \
7735+ " mcrxr cr0\n"
7736+#define __OVERFLOW_POST \
7737+ " bf 4*cr0+so, 3f\n" \
7738+ "2: .long 0x00c00b00\n" \
7739+ "3:\n"
7740+#define __OVERFLOW_EXTABLE \
7741+ "\n4:\n"
7742+ _ASM_EXTABLE(2b, 4b)
7743+#else
7744+#define __REFCOUNT_OP(op) op
7745+#define __OVERFLOW_PRE
7746+#define __OVERFLOW_POST
7747+#define __OVERFLOW_EXTABLE
7748+#endif
7749+
7750+#define __ATOMIC_OP(op, suffix, pre_op, asm_op, post_op, extable) \
7751+static inline void atomic_##op##suffix(int a, atomic##suffix##_t *v) \
7752 { \
7753 int t; \
7754 \
7755 __asm__ __volatile__( \
7756-"1: lwarx %0,0,%3 # atomic_" #op "\n" \
7757+"1: lwarx %0,0,%3 # atomic_" #op #suffix "\n" \
7758+ pre_op \
7759 #asm_op " %0,%2,%0\n" \
7760+ post_op \
7761 PPC405_ERR77(0,%3) \
7762 " stwcx. %0,0,%3 \n" \
7763 " bne- 1b\n" \
7764+ extable \
7765 : "=&r" (t), "+m" (v->counter) \
7766 : "r" (a), "r" (&v->counter) \
7767 : "cc"); \
7768 } \
7769
7770-#define ATOMIC_OP_RETURN(op, asm_op) \
7771-static __inline__ int atomic_##op##_return(int a, atomic_t *v) \
7772+#define ATOMIC_OP(op, asm_op) __ATOMIC_OP(op, , , asm_op, , ) \
7773+ __ATOMIC_OP(op, _unchecked, __OVERFLOW_PRE, __REFCOUNT_OP(asm_op), __OVERFLOW_POST, __OVERFLOW_EXTABLE)
7774+
7775+#define __ATOMIC_OP_RETURN(op, suffix, pre_op, asm_op, post_op, extable)\
7776+static inline int atomic_##op##_return##suffix(int a, atomic##suffix##_t *v)\
7777 { \
7778 int t; \
7779 \
7780 __asm__ __volatile__( \
7781 PPC_ATOMIC_ENTRY_BARRIER \
7782-"1: lwarx %0,0,%2 # atomic_" #op "_return\n" \
7783+"1: lwarx %0,0,%2 # atomic_" #op "_return" #suffix "\n" \
7784+ pre_op \
7785 #asm_op " %0,%1,%0\n" \
7786+ post_op \
7787 PPC405_ERR77(0,%2) \
7788 " stwcx. %0,0,%2 \n" \
7789 " bne- 1b\n" \
7790+ extable \
7791 PPC_ATOMIC_EXIT_BARRIER \
7792 : "=&r" (t) \
7793 : "r" (a), "r" (&v->counter) \
7794@@ -62,6 +108,9 @@ static __inline__ int atomic_##op##_return(int a, atomic_t *v) \
7795 return t; \
7796 }
7797
7798+#define ATOMIC_OP_RETURN(op, asm_op) __ATOMIC_OP_RETURN(op, , , asm_op, , )\
7799+ __ATOMIC_OP_RETURN(op, _unchecked, __OVERFLOW_PRE, __REFCOUNT_OP(asm_op), __OVERFLOW_POST, __OVERFLOW_EXTABLE)
7800+
7801 #define ATOMIC_OPS(op, asm_op) ATOMIC_OP(op, asm_op) ATOMIC_OP_RETURN(op, asm_op)
7802
7803 ATOMIC_OPS(add, add)
7804@@ -69,42 +118,29 @@ ATOMIC_OPS(sub, subf)
7805
7806 #undef ATOMIC_OPS
7807 #undef ATOMIC_OP_RETURN
7808+#undef __ATOMIC_OP_RETURN
7809 #undef ATOMIC_OP
7810+#undef __ATOMIC_OP
7811
7812 #define atomic_add_negative(a, v) (atomic_add_return((a), (v)) < 0)
7813
7814-static __inline__ void atomic_inc(atomic_t *v)
7815-{
7816- int t;
7817+/*
7818+ * atomic_inc - increment atomic variable
7819+ * @v: pointer of type atomic_t
7820+ *
7821+ * Automatically increments @v by 1
7822+ */
7823+#define atomic_inc(v) atomic_add(1, (v))
7824+#define atomic_inc_return(v) atomic_add_return(1, (v))
7825
7826- __asm__ __volatile__(
7827-"1: lwarx %0,0,%2 # atomic_inc\n\
7828- addic %0,%0,1\n"
7829- PPC405_ERR77(0,%2)
7830-" stwcx. %0,0,%2 \n\
7831- bne- 1b"
7832- : "=&r" (t), "+m" (v->counter)
7833- : "r" (&v->counter)
7834- : "cc", "xer");
7835+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
7836+{
7837+ atomic_add_unchecked(1, v);
7838 }
7839
7840-static __inline__ int atomic_inc_return(atomic_t *v)
7841+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
7842 {
7843- int t;
7844-
7845- __asm__ __volatile__(
7846- PPC_ATOMIC_ENTRY_BARRIER
7847-"1: lwarx %0,0,%1 # atomic_inc_return\n\
7848- addic %0,%0,1\n"
7849- PPC405_ERR77(0,%1)
7850-" stwcx. %0,0,%1 \n\
7851- bne- 1b"
7852- PPC_ATOMIC_EXIT_BARRIER
7853- : "=&r" (t)
7854- : "r" (&v->counter)
7855- : "cc", "xer", "memory");
7856-
7857- return t;
7858+ return atomic_add_return_unchecked(1, v);
7859 }
7860
7861 /*
7862@@ -117,43 +153,38 @@ static __inline__ int atomic_inc_return(atomic_t *v)
7863 */
7864 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
7865
7866-static __inline__ void atomic_dec(atomic_t *v)
7867+static __inline__ int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
7868 {
7869- int t;
7870-
7871- __asm__ __volatile__(
7872-"1: lwarx %0,0,%2 # atomic_dec\n\
7873- addic %0,%0,-1\n"
7874- PPC405_ERR77(0,%2)\
7875-" stwcx. %0,0,%2\n\
7876- bne- 1b"
7877- : "=&r" (t), "+m" (v->counter)
7878- : "r" (&v->counter)
7879- : "cc", "xer");
7880+ return atomic_add_return_unchecked(1, v) == 0;
7881 }
7882
7883-static __inline__ int atomic_dec_return(atomic_t *v)
7884+/*
7885+ * atomic_dec - decrement atomic variable
7886+ * @v: pointer of type atomic_t
7887+ *
7888+ * Atomically decrements @v by 1
7889+ */
7890+#define atomic_dec(v) atomic_sub(1, (v))
7891+#define atomic_dec_return(v) atomic_sub_return(1, (v))
7892+
7893+static __inline__ void atomic_dec_unchecked(atomic_unchecked_t *v)
7894 {
7895- int t;
7896-
7897- __asm__ __volatile__(
7898- PPC_ATOMIC_ENTRY_BARRIER
7899-"1: lwarx %0,0,%1 # atomic_dec_return\n\
7900- addic %0,%0,-1\n"
7901- PPC405_ERR77(0,%1)
7902-" stwcx. %0,0,%1\n\
7903- bne- 1b"
7904- PPC_ATOMIC_EXIT_BARRIER
7905- : "=&r" (t)
7906- : "r" (&v->counter)
7907- : "cc", "xer", "memory");
7908-
7909- return t;
7910+ atomic_sub_unchecked(1, v);
7911 }
7912
7913 #define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
7914 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
7915
7916+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
7917+{
7918+ return cmpxchg(&(v->counter), old, new);
7919+}
7920+
7921+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
7922+{
7923+ return xchg(&(v->counter), new);
7924+}
7925+
7926 /**
7927 * __atomic_add_unless - add unless the number is a given value
7928 * @v: pointer of type atomic_t
7929@@ -171,11 +202,27 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
7930 PPC_ATOMIC_ENTRY_BARRIER
7931 "1: lwarx %0,0,%1 # __atomic_add_unless\n\
7932 cmpw 0,%0,%3 \n\
7933- beq- 2f \n\
7934- add %0,%2,%0 \n"
7935+ beq- 2f \n"
7936+
7937+#ifdef CONFIG_PAX_REFCOUNT
7938+" mcrxr cr0\n"
7939+" addo. %0,%2,%0\n"
7940+" bf 4*cr0+so, 4f\n"
7941+"3:.long " "0x00c00b00""\n"
7942+"4:\n"
7943+#else
7944+ "add %0,%2,%0 \n"
7945+#endif
7946+
7947 PPC405_ERR77(0,%2)
7948 " stwcx. %0,0,%1 \n\
7949 bne- 1b \n"
7950+"5:"
7951+
7952+#ifdef CONFIG_PAX_REFCOUNT
7953+ _ASM_EXTABLE(3b, 5b)
7954+#endif
7955+
7956 PPC_ATOMIC_EXIT_BARRIER
7957 " subf %0,%2,%0 \n\
7958 2:"
7959@@ -248,6 +295,11 @@ static __inline__ int atomic_dec_if_positive(atomic_t *v)
7960 }
7961 #define atomic_dec_if_positive atomic_dec_if_positive
7962
7963+#define smp_mb__before_atomic_dec() smp_mb()
7964+#define smp_mb__after_atomic_dec() smp_mb()
7965+#define smp_mb__before_atomic_inc() smp_mb()
7966+#define smp_mb__after_atomic_inc() smp_mb()
7967+
7968 #ifdef __powerpc64__
7969
7970 #define ATOMIC64_INIT(i) { (i) }
7971@@ -261,37 +313,60 @@ static __inline__ long atomic64_read(const atomic64_t *v)
7972 return t;
7973 }
7974
7975+static __inline__ long atomic64_read_unchecked(const atomic64_unchecked_t *v)
7976+{
7977+ long t;
7978+
7979+ __asm__ __volatile__("ld%U1%X1 %0,%1" : "=r"(t) : "m"(v->counter));
7980+
7981+ return t;
7982+}
7983+
7984 static __inline__ void atomic64_set(atomic64_t *v, long i)
7985 {
7986 __asm__ __volatile__("std%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
7987 }
7988
7989-#define ATOMIC64_OP(op, asm_op) \
7990-static __inline__ void atomic64_##op(long a, atomic64_t *v) \
7991+static __inline__ void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
7992+{
7993+ __asm__ __volatile__("std%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
7994+}
7995+
7996+#define __ATOMIC64_OP(op, suffix, pre_op, asm_op, post_op, extable) \
7997+static inline void atomic64_##op##suffix(long a, atomic64##suffix##_t *v)\
7998 { \
7999 long t; \
8000 \
8001 __asm__ __volatile__( \
8002 "1: ldarx %0,0,%3 # atomic64_" #op "\n" \
8003+ pre_op \
8004 #asm_op " %0,%2,%0\n" \
8005+ post_op \
8006 " stdcx. %0,0,%3 \n" \
8007 " bne- 1b\n" \
8008+ extable \
8009 : "=&r" (t), "+m" (v->counter) \
8010 : "r" (a), "r" (&v->counter) \
8011 : "cc"); \
8012 }
8013
8014-#define ATOMIC64_OP_RETURN(op, asm_op) \
8015-static __inline__ long atomic64_##op##_return(long a, atomic64_t *v) \
8016+#define ATOMIC64_OP(op, asm_op) __ATOMIC64_OP(op, , , asm_op, , ) \
8017+ __ATOMIC64_OP(op, _unchecked, __OVERFLOW_PRE, __REFCOUNT_OP(asm_op), __OVERFLOW_POST, __OVERFLOW_EXTABLE)
8018+
8019+#define __ATOMIC64_OP_RETURN(op, suffix, pre_op, asm_op, post_op, extable)\
8020+static inline long atomic64_##op##_return##suffix(long a, atomic64##suffix##_t *v)\
8021 { \
8022 long t; \
8023 \
8024 __asm__ __volatile__( \
8025 PPC_ATOMIC_ENTRY_BARRIER \
8026 "1: ldarx %0,0,%2 # atomic64_" #op "_return\n" \
8027+ pre_op \
8028 #asm_op " %0,%1,%0\n" \
8029+ post_op \
8030 " stdcx. %0,0,%2 \n" \
8031 " bne- 1b\n" \
8032+ extable \
8033 PPC_ATOMIC_EXIT_BARRIER \
8034 : "=&r" (t) \
8035 : "r" (a), "r" (&v->counter) \
8036@@ -300,6 +375,9 @@ static __inline__ long atomic64_##op##_return(long a, atomic64_t *v) \
8037 return t; \
8038 }
8039
8040+#define ATOMIC64_OP_RETURN(op, asm_op) __ATOMIC64_OP_RETURN(op, , , asm_op, , )\
8041+ __ATOMIC64_OP_RETURN(op, _unchecked, __OVERFLOW_PRE, __REFCOUNT_OP(asm_op), __OVERFLOW_POST, __OVERFLOW_EXTABLE)
8042+
8043 #define ATOMIC64_OPS(op, asm_op) ATOMIC64_OP(op, asm_op) ATOMIC64_OP_RETURN(op, asm_op)
8044
8045 ATOMIC64_OPS(add, add)
8046@@ -307,40 +385,33 @@ ATOMIC64_OPS(sub, subf)
8047
8048 #undef ATOMIC64_OPS
8049 #undef ATOMIC64_OP_RETURN
8050+#undef __ATOMIC64_OP_RETURN
8051 #undef ATOMIC64_OP
8052+#undef __ATOMIC64_OP
8053+#undef __OVERFLOW_EXTABLE
8054+#undef __OVERFLOW_POST
8055+#undef __OVERFLOW_PRE
8056+#undef __REFCOUNT_OP
8057
8058 #define atomic64_add_negative(a, v) (atomic64_add_return((a), (v)) < 0)
8059
8060-static __inline__ void atomic64_inc(atomic64_t *v)
8061-{
8062- long t;
8063+/*
8064+ * atomic64_inc - increment atomic variable
8065+ * @v: pointer of type atomic64_t
8066+ *
8067+ * Automatically increments @v by 1
8068+ */
8069+#define atomic64_inc(v) atomic64_add(1, (v))
8070+#define atomic64_inc_return(v) atomic64_add_return(1, (v))
8071
8072- __asm__ __volatile__(
8073-"1: ldarx %0,0,%2 # atomic64_inc\n\
8074- addic %0,%0,1\n\
8075- stdcx. %0,0,%2 \n\
8076- bne- 1b"
8077- : "=&r" (t), "+m" (v->counter)
8078- : "r" (&v->counter)
8079- : "cc", "xer");
8080+static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
8081+{
8082+ atomic64_add_unchecked(1, v);
8083 }
8084
8085-static __inline__ long atomic64_inc_return(atomic64_t *v)
8086+static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
8087 {
8088- long t;
8089-
8090- __asm__ __volatile__(
8091- PPC_ATOMIC_ENTRY_BARRIER
8092-"1: ldarx %0,0,%1 # atomic64_inc_return\n\
8093- addic %0,%0,1\n\
8094- stdcx. %0,0,%1 \n\
8095- bne- 1b"
8096- PPC_ATOMIC_EXIT_BARRIER
8097- : "=&r" (t)
8098- : "r" (&v->counter)
8099- : "cc", "xer", "memory");
8100-
8101- return t;
8102+ return atomic64_add_return_unchecked(1, v);
8103 }
8104
8105 /*
8106@@ -353,36 +424,18 @@ static __inline__ long atomic64_inc_return(atomic64_t *v)
8107 */
8108 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
8109
8110-static __inline__ void atomic64_dec(atomic64_t *v)
8111+/*
8112+ * atomic64_dec - decrement atomic variable
8113+ * @v: pointer of type atomic64_t
8114+ *
8115+ * Atomically decrements @v by 1
8116+ */
8117+#define atomic64_dec(v) atomic64_sub(1, (v))
8118+#define atomic64_dec_return(v) atomic64_sub_return(1, (v))
8119+
8120+static __inline__ void atomic64_dec_unchecked(atomic64_unchecked_t *v)
8121 {
8122- long t;
8123-
8124- __asm__ __volatile__(
8125-"1: ldarx %0,0,%2 # atomic64_dec\n\
8126- addic %0,%0,-1\n\
8127- stdcx. %0,0,%2\n\
8128- bne- 1b"
8129- : "=&r" (t), "+m" (v->counter)
8130- : "r" (&v->counter)
8131- : "cc", "xer");
8132-}
8133-
8134-static __inline__ long atomic64_dec_return(atomic64_t *v)
8135-{
8136- long t;
8137-
8138- __asm__ __volatile__(
8139- PPC_ATOMIC_ENTRY_BARRIER
8140-"1: ldarx %0,0,%1 # atomic64_dec_return\n\
8141- addic %0,%0,-1\n\
8142- stdcx. %0,0,%1\n\
8143- bne- 1b"
8144- PPC_ATOMIC_EXIT_BARRIER
8145- : "=&r" (t)
8146- : "r" (&v->counter)
8147- : "cc", "xer", "memory");
8148-
8149- return t;
8150+ atomic64_sub_unchecked(1, v);
8151 }
8152
8153 #define atomic64_sub_and_test(a, v) (atomic64_sub_return((a), (v)) == 0)
8154@@ -415,6 +468,16 @@ static __inline__ long atomic64_dec_if_positive(atomic64_t *v)
8155 #define atomic64_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
8156 #define atomic64_xchg(v, new) (xchg(&((v)->counter), new))
8157
8158+static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old, long new)
8159+{
8160+ return cmpxchg(&(v->counter), old, new);
8161+}
8162+
8163+static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
8164+{
8165+ return xchg(&(v->counter), new);
8166+}
8167+
8168 /**
8169 * atomic64_add_unless - add unless the number is a given value
8170 * @v: pointer of type atomic64_t
8171@@ -430,13 +493,29 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
8172
8173 __asm__ __volatile__ (
8174 PPC_ATOMIC_ENTRY_BARRIER
8175-"1: ldarx %0,0,%1 # __atomic_add_unless\n\
8176+"1: ldarx %0,0,%1 # atomic64_add_unless\n\
8177 cmpd 0,%0,%3 \n\
8178- beq- 2f \n\
8179- add %0,%2,%0 \n"
8180+ beq- 2f \n"
8181+
8182+#ifdef CONFIG_PAX_REFCOUNT
8183+" mcrxr cr0\n"
8184+" addo. %0,%2,%0\n"
8185+" bf 4*cr0+so, 4f\n"
8186+"3:.long " "0x00c00b00""\n"
8187+"4:\n"
8188+#else
8189+ "add %0,%2,%0 \n"
8190+#endif
8191+
8192 " stdcx. %0,0,%1 \n\
8193 bne- 1b \n"
8194 PPC_ATOMIC_EXIT_BARRIER
8195+"5:"
8196+
8197+#ifdef CONFIG_PAX_REFCOUNT
8198+ _ASM_EXTABLE(3b, 5b)
8199+#endif
8200+
8201 " subf %0,%2,%0 \n\
8202 2:"
8203 : "=&r" (t)
8204diff --git a/arch/powerpc/include/asm/barrier.h b/arch/powerpc/include/asm/barrier.h
8205index a3bf5be..e03ba81 100644
8206--- a/arch/powerpc/include/asm/barrier.h
8207+++ b/arch/powerpc/include/asm/barrier.h
8208@@ -76,7 +76,7 @@
8209 do { \
8210 compiletime_assert_atomic_type(*p); \
8211 smp_lwsync(); \
8212- ACCESS_ONCE(*p) = (v); \
8213+ ACCESS_ONCE_RW(*p) = (v); \
8214 } while (0)
8215
8216 #define smp_load_acquire(p) \
8217diff --git a/arch/powerpc/include/asm/cache.h b/arch/powerpc/include/asm/cache.h
8218index 34a05a1..a1f2c67 100644
8219--- a/arch/powerpc/include/asm/cache.h
8220+++ b/arch/powerpc/include/asm/cache.h
8221@@ -4,6 +4,7 @@
8222 #ifdef __KERNEL__
8223
8224 #include <asm/reg.h>
8225+#include <linux/const.h>
8226
8227 /* bytes per L1 cache line */
8228 #if defined(CONFIG_8xx) || defined(CONFIG_403GCX)
8229@@ -23,7 +24,7 @@
8230 #define L1_CACHE_SHIFT 7
8231 #endif
8232
8233-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
8234+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
8235
8236 #define SMP_CACHE_BYTES L1_CACHE_BYTES
8237
8238diff --git a/arch/powerpc/include/asm/elf.h b/arch/powerpc/include/asm/elf.h
8239index 57d289a..b36c98c 100644
8240--- a/arch/powerpc/include/asm/elf.h
8241+++ b/arch/powerpc/include/asm/elf.h
8242@@ -30,6 +30,18 @@
8243
8244 #define ELF_ET_DYN_BASE 0x20000000
8245
8246+#ifdef CONFIG_PAX_ASLR
8247+#define PAX_ELF_ET_DYN_BASE (0x10000000UL)
8248+
8249+#ifdef __powerpc64__
8250+#define PAX_DELTA_MMAP_LEN (is_32bit_task() ? 16 : 28)
8251+#define PAX_DELTA_STACK_LEN (is_32bit_task() ? 16 : 28)
8252+#else
8253+#define PAX_DELTA_MMAP_LEN 15
8254+#define PAX_DELTA_STACK_LEN 15
8255+#endif
8256+#endif
8257+
8258 #define ELF_CORE_EFLAGS (is_elf2_task() ? 2 : 0)
8259
8260 /*
8261@@ -128,10 +140,6 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm,
8262 (0x7ff >> (PAGE_SHIFT - 12)) : \
8263 (0x3ffff >> (PAGE_SHIFT - 12)))
8264
8265-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
8266-#define arch_randomize_brk arch_randomize_brk
8267-
8268-
8269 #ifdef CONFIG_SPU_BASE
8270 /* Notes used in ET_CORE. Note name is "SPU/<fd>/<filename>". */
8271 #define NT_SPU 1
8272diff --git a/arch/powerpc/include/asm/exec.h b/arch/powerpc/include/asm/exec.h
8273index 8196e9c..d83a9f3 100644
8274--- a/arch/powerpc/include/asm/exec.h
8275+++ b/arch/powerpc/include/asm/exec.h
8276@@ -4,6 +4,6 @@
8277 #ifndef _ASM_POWERPC_EXEC_H
8278 #define _ASM_POWERPC_EXEC_H
8279
8280-extern unsigned long arch_align_stack(unsigned long sp);
8281+#define arch_align_stack(x) ((x) & ~0xfUL)
8282
8283 #endif /* _ASM_POWERPC_EXEC_H */
8284diff --git a/arch/powerpc/include/asm/kmap_types.h b/arch/powerpc/include/asm/kmap_types.h
8285index 5acabbd..7ea14fa 100644
8286--- a/arch/powerpc/include/asm/kmap_types.h
8287+++ b/arch/powerpc/include/asm/kmap_types.h
8288@@ -10,7 +10,7 @@
8289 * 2 of the License, or (at your option) any later version.
8290 */
8291
8292-#define KM_TYPE_NR 16
8293+#define KM_TYPE_NR 17
8294
8295 #endif /* __KERNEL__ */
8296 #endif /* _ASM_POWERPC_KMAP_TYPES_H */
8297diff --git a/arch/powerpc/include/asm/local.h b/arch/powerpc/include/asm/local.h
8298index b8da913..c02b593 100644
8299--- a/arch/powerpc/include/asm/local.h
8300+++ b/arch/powerpc/include/asm/local.h
8301@@ -9,21 +9,65 @@ typedef struct
8302 atomic_long_t a;
8303 } local_t;
8304
8305+typedef struct
8306+{
8307+ atomic_long_unchecked_t a;
8308+} local_unchecked_t;
8309+
8310 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
8311
8312 #define local_read(l) atomic_long_read(&(l)->a)
8313+#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
8314 #define local_set(l,i) atomic_long_set(&(l)->a, (i))
8315+#define local_set_unchecked(l,i) atomic_long_set_unchecked(&(l)->a, (i))
8316
8317 #define local_add(i,l) atomic_long_add((i),(&(l)->a))
8318+#define local_add_unchecked(i,l) atomic_long_add_unchecked((i),(&(l)->a))
8319 #define local_sub(i,l) atomic_long_sub((i),(&(l)->a))
8320+#define local_sub_unchecked(i,l) atomic_long_sub_unchecked((i),(&(l)->a))
8321 #define local_inc(l) atomic_long_inc(&(l)->a)
8322+#define local_inc_unchecked(l) atomic_long_inc_unchecked(&(l)->a)
8323 #define local_dec(l) atomic_long_dec(&(l)->a)
8324+#define local_dec_unchecked(l) atomic_long_dec_unchecked(&(l)->a)
8325
8326 static __inline__ long local_add_return(long a, local_t *l)
8327 {
8328 long t;
8329
8330 __asm__ __volatile__(
8331+"1:" PPC_LLARX(%0,0,%2,0) " # local_add_return\n"
8332+
8333+#ifdef CONFIG_PAX_REFCOUNT
8334+" mcrxr cr0\n"
8335+" addo. %0,%1,%0\n"
8336+" bf 4*cr0+so, 3f\n"
8337+"2:.long " "0x00c00b00""\n"
8338+#else
8339+" add %0,%1,%0\n"
8340+#endif
8341+
8342+"3:\n"
8343+ PPC405_ERR77(0,%2)
8344+ PPC_STLCX "%0,0,%2 \n\
8345+ bne- 1b"
8346+
8347+#ifdef CONFIG_PAX_REFCOUNT
8348+"\n4:\n"
8349+ _ASM_EXTABLE(2b, 4b)
8350+#endif
8351+
8352+ : "=&r" (t)
8353+ : "r" (a), "r" (&(l->a.counter))
8354+ : "cc", "memory");
8355+
8356+ return t;
8357+}
8358+
8359+static __inline__ long local_add_return_unchecked(long a, local_unchecked_t *l)
8360+{
8361+ long t;
8362+
8363+ __asm__ __volatile__(
8364 "1:" PPC_LLARX(%0,0,%2,0) " # local_add_return\n\
8365 add %0,%1,%0\n"
8366 PPC405_ERR77(0,%2)
8367@@ -101,6 +145,8 @@ static __inline__ long local_dec_return(local_t *l)
8368
8369 #define local_cmpxchg(l, o, n) \
8370 (cmpxchg_local(&((l)->a.counter), (o), (n)))
8371+#define local_cmpxchg_unchecked(l, o, n) \
8372+ (cmpxchg_local(&((l)->a.counter), (o), (n)))
8373 #define local_xchg(l, n) (xchg_local(&((l)->a.counter), (n)))
8374
8375 /**
8376diff --git a/arch/powerpc/include/asm/mman.h b/arch/powerpc/include/asm/mman.h
8377index 8565c25..2865190 100644
8378--- a/arch/powerpc/include/asm/mman.h
8379+++ b/arch/powerpc/include/asm/mman.h
8380@@ -24,7 +24,7 @@ static inline unsigned long arch_calc_vm_prot_bits(unsigned long prot)
8381 }
8382 #define arch_calc_vm_prot_bits(prot) arch_calc_vm_prot_bits(prot)
8383
8384-static inline pgprot_t arch_vm_get_page_prot(unsigned long vm_flags)
8385+static inline pgprot_t arch_vm_get_page_prot(vm_flags_t vm_flags)
8386 {
8387 return (vm_flags & VM_SAO) ? __pgprot(_PAGE_SAO) : __pgprot(0);
8388 }
8389diff --git a/arch/powerpc/include/asm/page.h b/arch/powerpc/include/asm/page.h
8390index 69c0598..2c56964 100644
8391--- a/arch/powerpc/include/asm/page.h
8392+++ b/arch/powerpc/include/asm/page.h
8393@@ -227,8 +227,9 @@ extern long long virt_phys_offset;
8394 * and needs to be executable. This means the whole heap ends
8395 * up being executable.
8396 */
8397-#define VM_DATA_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
8398- VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8399+#define VM_DATA_DEFAULT_FLAGS32 \
8400+ (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
8401+ VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8402
8403 #define VM_DATA_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
8404 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8405@@ -256,6 +257,9 @@ extern long long virt_phys_offset;
8406 #define is_kernel_addr(x) ((x) >= PAGE_OFFSET)
8407 #endif
8408
8409+#define ktla_ktva(addr) (addr)
8410+#define ktva_ktla(addr) (addr)
8411+
8412 #ifndef CONFIG_PPC_BOOK3S_64
8413 /*
8414 * Use the top bit of the higher-level page table entries to indicate whether
8415diff --git a/arch/powerpc/include/asm/page_64.h b/arch/powerpc/include/asm/page_64.h
8416index d908a46..3753f71 100644
8417--- a/arch/powerpc/include/asm/page_64.h
8418+++ b/arch/powerpc/include/asm/page_64.h
8419@@ -172,15 +172,18 @@ do { \
8420 * stack by default, so in the absence of a PT_GNU_STACK program header
8421 * we turn execute permission off.
8422 */
8423-#define VM_STACK_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
8424- VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8425+#define VM_STACK_DEFAULT_FLAGS32 \
8426+ (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
8427+ VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8428
8429 #define VM_STACK_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
8430 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8431
8432+#ifndef CONFIG_PAX_PAGEEXEC
8433 #define VM_STACK_DEFAULT_FLAGS \
8434 (is_32bit_task() ? \
8435 VM_STACK_DEFAULT_FLAGS32 : VM_STACK_DEFAULT_FLAGS64)
8436+#endif
8437
8438 #include <asm-generic/getorder.h>
8439
8440diff --git a/arch/powerpc/include/asm/pgalloc-64.h b/arch/powerpc/include/asm/pgalloc-64.h
8441index 4b0be20..c15a27d 100644
8442--- a/arch/powerpc/include/asm/pgalloc-64.h
8443+++ b/arch/powerpc/include/asm/pgalloc-64.h
8444@@ -54,6 +54,7 @@ static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)
8445 #ifndef CONFIG_PPC_64K_PAGES
8446
8447 #define pgd_populate(MM, PGD, PUD) pgd_set(PGD, PUD)
8448+#define pgd_populate_kernel(MM, PGD, PUD) pgd_populate((MM), (PGD), (PUD))
8449
8450 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
8451 {
8452@@ -71,6 +72,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
8453 pud_set(pud, (unsigned long)pmd);
8454 }
8455
8456+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
8457+{
8458+ pud_populate(mm, pud, pmd);
8459+}
8460+
8461 #define pmd_populate(mm, pmd, pte_page) \
8462 pmd_populate_kernel(mm, pmd, page_address(pte_page))
8463 #define pmd_populate_kernel(mm, pmd, pte) pmd_set(pmd, (unsigned long)(pte))
8464@@ -173,6 +179,7 @@ extern void __tlb_remove_table(void *_table);
8465 #endif
8466
8467 #define pud_populate(mm, pud, pmd) pud_set(pud, (unsigned long)pmd)
8468+#define pud_populate_kernel(mm, pud, pmd) pud_populate((mm), (pud), (pmd))
8469
8470 static inline void pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmd,
8471 pte_t *pte)
8472diff --git a/arch/powerpc/include/asm/pgtable.h b/arch/powerpc/include/asm/pgtable.h
8473index 9835ac4..900430f 100644
8474--- a/arch/powerpc/include/asm/pgtable.h
8475+++ b/arch/powerpc/include/asm/pgtable.h
8476@@ -2,6 +2,7 @@
8477 #define _ASM_POWERPC_PGTABLE_H
8478 #ifdef __KERNEL__
8479
8480+#include <linux/const.h>
8481 #ifndef __ASSEMBLY__
8482 #include <linux/mmdebug.h>
8483 #include <linux/mmzone.h>
8484diff --git a/arch/powerpc/include/asm/pte-hash32.h b/arch/powerpc/include/asm/pte-hash32.h
8485index 62cfb0c..50c6402 100644
8486--- a/arch/powerpc/include/asm/pte-hash32.h
8487+++ b/arch/powerpc/include/asm/pte-hash32.h
8488@@ -20,6 +20,7 @@
8489 #define _PAGE_HASHPTE 0x002 /* hash_page has made an HPTE for this pte */
8490 #define _PAGE_USER 0x004 /* usermode access allowed */
8491 #define _PAGE_GUARDED 0x008 /* G: prohibit speculative access */
8492+#define _PAGE_EXEC _PAGE_GUARDED
8493 #define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */
8494 #define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */
8495 #define _PAGE_WRITETHRU 0x040 /* W: cache write-through */
8496diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h
8497index af56b5c..f86f3f6 100644
8498--- a/arch/powerpc/include/asm/reg.h
8499+++ b/arch/powerpc/include/asm/reg.h
8500@@ -253,6 +253,7 @@
8501 #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */
8502 #define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */
8503 #define DSISR_NOHPTE 0x40000000 /* no translation found */
8504+#define DSISR_GUARDED 0x10000000 /* fetch from guarded storage */
8505 #define DSISR_PROTFAULT 0x08000000 /* protection fault */
8506 #define DSISR_ISSTORE 0x02000000 /* access was a store */
8507 #define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */
8508diff --git a/arch/powerpc/include/asm/smp.h b/arch/powerpc/include/asm/smp.h
8509index d607df5..08dc9ae 100644
8510--- a/arch/powerpc/include/asm/smp.h
8511+++ b/arch/powerpc/include/asm/smp.h
8512@@ -51,7 +51,7 @@ struct smp_ops_t {
8513 int (*cpu_disable)(void);
8514 void (*cpu_die)(unsigned int nr);
8515 int (*cpu_bootable)(unsigned int nr);
8516-};
8517+} __no_const;
8518
8519 extern void smp_send_debugger_break(void);
8520 extern void start_secondary_resume(void);
8521diff --git a/arch/powerpc/include/asm/spinlock.h b/arch/powerpc/include/asm/spinlock.h
8522index 4dbe072..b803275 100644
8523--- a/arch/powerpc/include/asm/spinlock.h
8524+++ b/arch/powerpc/include/asm/spinlock.h
8525@@ -204,13 +204,29 @@ static inline long __arch_read_trylock(arch_rwlock_t *rw)
8526 __asm__ __volatile__(
8527 "1: " PPC_LWARX(%0,0,%1,1) "\n"
8528 __DO_SIGN_EXTEND
8529-" addic. %0,%0,1\n\
8530- ble- 2f\n"
8531+
8532+#ifdef CONFIG_PAX_REFCOUNT
8533+" mcrxr cr0\n"
8534+" addico. %0,%0,1\n"
8535+" bf 4*cr0+so, 3f\n"
8536+"2:.long " "0x00c00b00""\n"
8537+#else
8538+" addic. %0,%0,1\n"
8539+#endif
8540+
8541+"3:\n"
8542+ "ble- 4f\n"
8543 PPC405_ERR77(0,%1)
8544 " stwcx. %0,0,%1\n\
8545 bne- 1b\n"
8546 PPC_ACQUIRE_BARRIER
8547-"2:" : "=&r" (tmp)
8548+"4:"
8549+
8550+#ifdef CONFIG_PAX_REFCOUNT
8551+ _ASM_EXTABLE(2b,4b)
8552+#endif
8553+
8554+ : "=&r" (tmp)
8555 : "r" (&rw->lock)
8556 : "cr0", "xer", "memory");
8557
8558@@ -286,11 +302,27 @@ static inline void arch_read_unlock(arch_rwlock_t *rw)
8559 __asm__ __volatile__(
8560 "# read_unlock\n\t"
8561 PPC_RELEASE_BARRIER
8562-"1: lwarx %0,0,%1\n\
8563- addic %0,%0,-1\n"
8564+"1: lwarx %0,0,%1\n"
8565+
8566+#ifdef CONFIG_PAX_REFCOUNT
8567+" mcrxr cr0\n"
8568+" addico. %0,%0,-1\n"
8569+" bf 4*cr0+so, 3f\n"
8570+"2:.long " "0x00c00b00""\n"
8571+#else
8572+" addic. %0,%0,-1\n"
8573+#endif
8574+
8575+"3:\n"
8576 PPC405_ERR77(0,%1)
8577 " stwcx. %0,0,%1\n\
8578 bne- 1b"
8579+
8580+#ifdef CONFIG_PAX_REFCOUNT
8581+"\n4:\n"
8582+ _ASM_EXTABLE(2b, 4b)
8583+#endif
8584+
8585 : "=&r"(tmp)
8586 : "r"(&rw->lock)
8587 : "cr0", "xer", "memory");
8588diff --git a/arch/powerpc/include/asm/thread_info.h b/arch/powerpc/include/asm/thread_info.h
8589index 7248979..80b75de 100644
8590--- a/arch/powerpc/include/asm/thread_info.h
8591+++ b/arch/powerpc/include/asm/thread_info.h
8592@@ -103,6 +103,8 @@ static inline struct thread_info *current_thread_info(void)
8593 #if defined(CONFIG_PPC64)
8594 #define TIF_ELF2ABI 18 /* function descriptors must die! */
8595 #endif
8596+/* mask must be expressable within 16 bits to satisfy 'andi' instruction reqs */
8597+#define TIF_GRSEC_SETXID 6 /* update credentials on syscall entry/exit */
8598
8599 /* as above, but as bit values */
8600 #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE)
8601@@ -121,9 +123,10 @@ static inline struct thread_info *current_thread_info(void)
8602 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
8603 #define _TIF_EMULATE_STACK_STORE (1<<TIF_EMULATE_STACK_STORE)
8604 #define _TIF_NOHZ (1<<TIF_NOHZ)
8605+#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
8606 #define _TIF_SYSCALL_DOTRACE (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
8607 _TIF_SECCOMP | _TIF_SYSCALL_TRACEPOINT | \
8608- _TIF_NOHZ)
8609+ _TIF_NOHZ | _TIF_GRSEC_SETXID)
8610
8611 #define _TIF_USER_WORK_MASK (_TIF_SIGPENDING | _TIF_NEED_RESCHED | \
8612 _TIF_NOTIFY_RESUME | _TIF_UPROBE | \
8613diff --git a/arch/powerpc/include/asm/uaccess.h b/arch/powerpc/include/asm/uaccess.h
8614index a0c071d..49cdc7f 100644
8615--- a/arch/powerpc/include/asm/uaccess.h
8616+++ b/arch/powerpc/include/asm/uaccess.h
8617@@ -58,6 +58,7 @@
8618
8619 #endif
8620
8621+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
8622 #define access_ok(type, addr, size) \
8623 (__chk_user_ptr(addr), \
8624 __access_ok((__force unsigned long)(addr), (size), get_fs()))
8625@@ -318,52 +319,6 @@ do { \
8626 extern unsigned long __copy_tofrom_user(void __user *to,
8627 const void __user *from, unsigned long size);
8628
8629-#ifndef __powerpc64__
8630-
8631-static inline unsigned long copy_from_user(void *to,
8632- const void __user *from, unsigned long n)
8633-{
8634- unsigned long over;
8635-
8636- if (access_ok(VERIFY_READ, from, n))
8637- return __copy_tofrom_user((__force void __user *)to, from, n);
8638- if ((unsigned long)from < TASK_SIZE) {
8639- over = (unsigned long)from + n - TASK_SIZE;
8640- return __copy_tofrom_user((__force void __user *)to, from,
8641- n - over) + over;
8642- }
8643- return n;
8644-}
8645-
8646-static inline unsigned long copy_to_user(void __user *to,
8647- const void *from, unsigned long n)
8648-{
8649- unsigned long over;
8650-
8651- if (access_ok(VERIFY_WRITE, to, n))
8652- return __copy_tofrom_user(to, (__force void __user *)from, n);
8653- if ((unsigned long)to < TASK_SIZE) {
8654- over = (unsigned long)to + n - TASK_SIZE;
8655- return __copy_tofrom_user(to, (__force void __user *)from,
8656- n - over) + over;
8657- }
8658- return n;
8659-}
8660-
8661-#else /* __powerpc64__ */
8662-
8663-#define __copy_in_user(to, from, size) \
8664- __copy_tofrom_user((to), (from), (size))
8665-
8666-extern unsigned long copy_from_user(void *to, const void __user *from,
8667- unsigned long n);
8668-extern unsigned long copy_to_user(void __user *to, const void *from,
8669- unsigned long n);
8670-extern unsigned long copy_in_user(void __user *to, const void __user *from,
8671- unsigned long n);
8672-
8673-#endif /* __powerpc64__ */
8674-
8675 static inline unsigned long __copy_from_user_inatomic(void *to,
8676 const void __user *from, unsigned long n)
8677 {
8678@@ -387,6 +342,10 @@ static inline unsigned long __copy_from_user_inatomic(void *to,
8679 if (ret == 0)
8680 return 0;
8681 }
8682+
8683+ if (!__builtin_constant_p(n))
8684+ check_object_size(to, n, false);
8685+
8686 return __copy_tofrom_user((__force void __user *)to, from, n);
8687 }
8688
8689@@ -413,6 +372,10 @@ static inline unsigned long __copy_to_user_inatomic(void __user *to,
8690 if (ret == 0)
8691 return 0;
8692 }
8693+
8694+ if (!__builtin_constant_p(n))
8695+ check_object_size(from, n, true);
8696+
8697 return __copy_tofrom_user(to, (__force const void __user *)from, n);
8698 }
8699
8700@@ -430,6 +393,92 @@ static inline unsigned long __copy_to_user(void __user *to,
8701 return __copy_to_user_inatomic(to, from, size);
8702 }
8703
8704+#ifndef __powerpc64__
8705+
8706+static inline unsigned long __must_check copy_from_user(void *to,
8707+ const void __user *from, unsigned long n)
8708+{
8709+ unsigned long over;
8710+
8711+ if ((long)n < 0)
8712+ return n;
8713+
8714+ if (access_ok(VERIFY_READ, from, n)) {
8715+ if (!__builtin_constant_p(n))
8716+ check_object_size(to, n, false);
8717+ return __copy_tofrom_user((__force void __user *)to, from, n);
8718+ }
8719+ if ((unsigned long)from < TASK_SIZE) {
8720+ over = (unsigned long)from + n - TASK_SIZE;
8721+ if (!__builtin_constant_p(n - over))
8722+ check_object_size(to, n - over, false);
8723+ return __copy_tofrom_user((__force void __user *)to, from,
8724+ n - over) + over;
8725+ }
8726+ return n;
8727+}
8728+
8729+static inline unsigned long __must_check copy_to_user(void __user *to,
8730+ const void *from, unsigned long n)
8731+{
8732+ unsigned long over;
8733+
8734+ if ((long)n < 0)
8735+ return n;
8736+
8737+ if (access_ok(VERIFY_WRITE, to, n)) {
8738+ if (!__builtin_constant_p(n))
8739+ check_object_size(from, n, true);
8740+ return __copy_tofrom_user(to, (__force void __user *)from, n);
8741+ }
8742+ if ((unsigned long)to < TASK_SIZE) {
8743+ over = (unsigned long)to + n - TASK_SIZE;
8744+ if (!__builtin_constant_p(n))
8745+ check_object_size(from, n - over, true);
8746+ return __copy_tofrom_user(to, (__force void __user *)from,
8747+ n - over) + over;
8748+ }
8749+ return n;
8750+}
8751+
8752+#else /* __powerpc64__ */
8753+
8754+#define __copy_in_user(to, from, size) \
8755+ __copy_tofrom_user((to), (from), (size))
8756+
8757+static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
8758+{
8759+ if ((long)n < 0 || n > INT_MAX)
8760+ return n;
8761+
8762+ if (!__builtin_constant_p(n))
8763+ check_object_size(to, n, false);
8764+
8765+ if (likely(access_ok(VERIFY_READ, from, n)))
8766+ n = __copy_from_user(to, from, n);
8767+ else
8768+ memset(to, 0, n);
8769+ return n;
8770+}
8771+
8772+static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)
8773+{
8774+ if ((long)n < 0 || n > INT_MAX)
8775+ return n;
8776+
8777+ if (likely(access_ok(VERIFY_WRITE, to, n))) {
8778+ if (!__builtin_constant_p(n))
8779+ check_object_size(from, n, true);
8780+ n = __copy_to_user(to, from, n);
8781+ }
8782+ return n;
8783+}
8784+
8785+extern unsigned long copy_in_user(void __user *to, const void __user *from,
8786+ unsigned long n);
8787+
8788+#endif /* __powerpc64__ */
8789+
8790 extern unsigned long __clear_user(void __user *addr, unsigned long size);
8791
8792 static inline unsigned long clear_user(void __user *addr, unsigned long size)
8793diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
8794index 502cf69..53936a1 100644
8795--- a/arch/powerpc/kernel/Makefile
8796+++ b/arch/powerpc/kernel/Makefile
8797@@ -15,6 +15,11 @@ CFLAGS_prom_init.o += -fPIC
8798 CFLAGS_btext.o += -fPIC
8799 endif
8800
8801+CFLAGS_REMOVE_cputable.o = $(LATENT_ENTROPY_PLUGIN_CFLAGS)
8802+CFLAGS_REMOVE_prom_init.o = $(LATENT_ENTROPY_PLUGIN_CFLAGS)
8803+CFLAGS_REMOVE_btext.o = $(LATENT_ENTROPY_PLUGIN_CFLAGS)
8804+CFLAGS_REMOVE_prom.o = $(LATENT_ENTROPY_PLUGIN_CFLAGS)
8805+
8806 ifdef CONFIG_FUNCTION_TRACER
8807 # Do not trace early boot code
8808 CFLAGS_REMOVE_cputable.o = -pg -mno-sched-epilog
8809@@ -27,6 +32,8 @@ CFLAGS_REMOVE_ftrace.o = -pg -mno-sched-epilog
8810 CFLAGS_REMOVE_time.o = -pg -mno-sched-epilog
8811 endif
8812
8813+CFLAGS_REMOVE_prom_init.o += $(LATENT_ENTROPY_PLUGIN_CFLAGS)
8814+
8815 obj-y := cputable.o ptrace.o syscalls.o \
8816 irq.o align.o signal_32.o pmc.o vdso.o \
8817 process.o systbl.o idle.o \
8818diff --git a/arch/powerpc/kernel/exceptions-64e.S b/arch/powerpc/kernel/exceptions-64e.S
8819index 3e68d1c..72a5ee6 100644
8820--- a/arch/powerpc/kernel/exceptions-64e.S
8821+++ b/arch/powerpc/kernel/exceptions-64e.S
8822@@ -1010,6 +1010,7 @@ storage_fault_common:
8823 std r14,_DAR(r1)
8824 std r15,_DSISR(r1)
8825 addi r3,r1,STACK_FRAME_OVERHEAD
8826+ bl save_nvgprs
8827 mr r4,r14
8828 mr r5,r15
8829 ld r14,PACA_EXGEN+EX_R14(r13)
8830@@ -1018,8 +1019,7 @@ storage_fault_common:
8831 cmpdi r3,0
8832 bne- 1f
8833 b ret_from_except_lite
8834-1: bl save_nvgprs
8835- mr r5,r3
8836+1: mr r5,r3
8837 addi r3,r1,STACK_FRAME_OVERHEAD
8838 ld r4,_DAR(r1)
8839 bl bad_page_fault
8840diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
8841index 9519e6b..13f6c38 100644
8842--- a/arch/powerpc/kernel/exceptions-64s.S
8843+++ b/arch/powerpc/kernel/exceptions-64s.S
8844@@ -1599,10 +1599,10 @@ handle_page_fault:
8845 11: ld r4,_DAR(r1)
8846 ld r5,_DSISR(r1)
8847 addi r3,r1,STACK_FRAME_OVERHEAD
8848+ bl save_nvgprs
8849 bl do_page_fault
8850 cmpdi r3,0
8851 beq+ 12f
8852- bl save_nvgprs
8853 mr r5,r3
8854 addi r3,r1,STACK_FRAME_OVERHEAD
8855 lwz r4,_DAR(r1)
8856diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
8857index 4509603..cdb491f 100644
8858--- a/arch/powerpc/kernel/irq.c
8859+++ b/arch/powerpc/kernel/irq.c
8860@@ -460,6 +460,8 @@ void migrate_irqs(void)
8861 }
8862 #endif
8863
8864+extern void gr_handle_kernel_exploit(void);
8865+
8866 static inline void check_stack_overflow(void)
8867 {
8868 #ifdef CONFIG_DEBUG_STACKOVERFLOW
8869@@ -472,6 +474,7 @@ static inline void check_stack_overflow(void)
8870 pr_err("do_IRQ: stack overflow: %ld\n",
8871 sp - sizeof(struct thread_info));
8872 dump_stack();
8873+ gr_handle_kernel_exploit();
8874 }
8875 #endif
8876 }
8877diff --git a/arch/powerpc/kernel/module_32.c b/arch/powerpc/kernel/module_32.c
8878index c94d2e0..992a9ce 100644
8879--- a/arch/powerpc/kernel/module_32.c
8880+++ b/arch/powerpc/kernel/module_32.c
8881@@ -158,7 +158,7 @@ int module_frob_arch_sections(Elf32_Ehdr *hdr,
8882 me->arch.core_plt_section = i;
8883 }
8884 if (!me->arch.core_plt_section || !me->arch.init_plt_section) {
8885- pr_err("Module doesn't contain .plt or .init.plt sections.\n");
8886+ pr_err("Module $s doesn't contain .plt or .init.plt sections.\n", me->name);
8887 return -ENOEXEC;
8888 }
8889
8890@@ -188,11 +188,16 @@ static uint32_t do_plt_call(void *location,
8891
8892 pr_debug("Doing plt for call to 0x%x at 0x%x\n", val, (unsigned int)location);
8893 /* Init, or core PLT? */
8894- if (location >= mod->module_core
8895- && location < mod->module_core + mod->core_size)
8896+ if ((location >= mod->module_core_rx && location < mod->module_core_rx + mod->core_size_rx) ||
8897+ (location >= mod->module_core_rw && location < mod->module_core_rw + mod->core_size_rw))
8898 entry = (void *)sechdrs[mod->arch.core_plt_section].sh_addr;
8899- else
8900+ else if ((location >= mod->module_init_rx && location < mod->module_init_rx + mod->init_size_rx) ||
8901+ (location >= mod->module_init_rw && location < mod->module_init_rw + mod->init_size_rw))
8902 entry = (void *)sechdrs[mod->arch.init_plt_section].sh_addr;
8903+ else {
8904+ printk(KERN_ERR "%s: invalid R_PPC_REL24 entry found\n", mod->name);
8905+ return ~0UL;
8906+ }
8907
8908 /* Find this entry, or if that fails, the next avail. entry */
8909 while (entry->jump[0]) {
8910@@ -296,7 +301,7 @@ int apply_relocate_add(Elf32_Shdr *sechdrs,
8911 }
8912 #ifdef CONFIG_DYNAMIC_FTRACE
8913 module->arch.tramp =
8914- do_plt_call(module->module_core,
8915+ do_plt_call(module->module_core_rx,
8916 (unsigned long)ftrace_caller,
8917 sechdrs, module);
8918 #endif
8919diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
8920index b4cc7be..1fe8bb3 100644
8921--- a/arch/powerpc/kernel/process.c
8922+++ b/arch/powerpc/kernel/process.c
8923@@ -1036,8 +1036,8 @@ void show_regs(struct pt_regs * regs)
8924 * Lookup NIP late so we have the best change of getting the
8925 * above info out without failing
8926 */
8927- printk("NIP ["REG"] %pS\n", regs->nip, (void *)regs->nip);
8928- printk("LR ["REG"] %pS\n", regs->link, (void *)regs->link);
8929+ printk("NIP ["REG"] %pA\n", regs->nip, (void *)regs->nip);
8930+ printk("LR ["REG"] %pA\n", regs->link, (void *)regs->link);
8931 #endif
8932 show_stack(current, (unsigned long *) regs->gpr[1]);
8933 if (!user_mode(regs))
8934@@ -1549,10 +1549,10 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
8935 newsp = stack[0];
8936 ip = stack[STACK_FRAME_LR_SAVE];
8937 if (!firstframe || ip != lr) {
8938- printk("["REG"] ["REG"] %pS", sp, ip, (void *)ip);
8939+ printk("["REG"] ["REG"] %pA", sp, ip, (void *)ip);
8940 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
8941 if ((ip == rth) && curr_frame >= 0) {
8942- printk(" (%pS)",
8943+ printk(" (%pA)",
8944 (void *)current->ret_stack[curr_frame].ret);
8945 curr_frame--;
8946 }
8947@@ -1572,7 +1572,7 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
8948 struct pt_regs *regs = (struct pt_regs *)
8949 (sp + STACK_FRAME_OVERHEAD);
8950 lr = regs->link;
8951- printk("--- interrupt: %lx at %pS\n LR = %pS\n",
8952+ printk("--- interrupt: %lx at %pA\n LR = %pA\n",
8953 regs->trap, (void *)regs->nip, (void *)lr);
8954 firstframe = 1;
8955 }
8956@@ -1608,49 +1608,3 @@ void notrace __ppc64_runlatch_off(void)
8957 mtspr(SPRN_CTRLT, ctrl);
8958 }
8959 #endif /* CONFIG_PPC64 */
8960-
8961-unsigned long arch_align_stack(unsigned long sp)
8962-{
8963- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
8964- sp -= get_random_int() & ~PAGE_MASK;
8965- return sp & ~0xf;
8966-}
8967-
8968-static inline unsigned long brk_rnd(void)
8969-{
8970- unsigned long rnd = 0;
8971-
8972- /* 8MB for 32bit, 1GB for 64bit */
8973- if (is_32bit_task())
8974- rnd = (long)(get_random_int() % (1<<(23-PAGE_SHIFT)));
8975- else
8976- rnd = (long)(get_random_int() % (1<<(30-PAGE_SHIFT)));
8977-
8978- return rnd << PAGE_SHIFT;
8979-}
8980-
8981-unsigned long arch_randomize_brk(struct mm_struct *mm)
8982-{
8983- unsigned long base = mm->brk;
8984- unsigned long ret;
8985-
8986-#ifdef CONFIG_PPC_STD_MMU_64
8987- /*
8988- * If we are using 1TB segments and we are allowed to randomise
8989- * the heap, we can put it above 1TB so it is backed by a 1TB
8990- * segment. Otherwise the heap will be in the bottom 1TB
8991- * which always uses 256MB segments and this may result in a
8992- * performance penalty.
8993- */
8994- if (!is_32bit_task() && (mmu_highuser_ssize == MMU_SEGSIZE_1T))
8995- base = max_t(unsigned long, mm->brk, 1UL << SID_SHIFT_1T);
8996-#endif
8997-
8998- ret = PAGE_ALIGN(base + brk_rnd());
8999-
9000- if (ret < mm->brk)
9001- return mm->brk;
9002-
9003- return ret;
9004-}
9005-
9006diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
9007index f21897b..28c0428 100644
9008--- a/arch/powerpc/kernel/ptrace.c
9009+++ b/arch/powerpc/kernel/ptrace.c
9010@@ -1762,6 +1762,10 @@ long arch_ptrace(struct task_struct *child, long request,
9011 return ret;
9012 }
9013
9014+#ifdef CONFIG_GRKERNSEC_SETXID
9015+extern void gr_delayed_cred_worker(void);
9016+#endif
9017+
9018 /*
9019 * We must return the syscall number to actually look up in the table.
9020 * This can be -1L to skip running any syscall at all.
9021@@ -1774,6 +1778,11 @@ long do_syscall_trace_enter(struct pt_regs *regs)
9022
9023 secure_computing_strict(regs->gpr[0]);
9024
9025+#ifdef CONFIG_GRKERNSEC_SETXID
9026+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
9027+ gr_delayed_cred_worker();
9028+#endif
9029+
9030 if (test_thread_flag(TIF_SYSCALL_TRACE) &&
9031 tracehook_report_syscall_entry(regs))
9032 /*
9033@@ -1805,6 +1814,11 @@ void do_syscall_trace_leave(struct pt_regs *regs)
9034 {
9035 int step;
9036
9037+#ifdef CONFIG_GRKERNSEC_SETXID
9038+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
9039+ gr_delayed_cred_worker();
9040+#endif
9041+
9042 audit_syscall_exit(regs);
9043
9044 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
9045diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c
9046index d3a831a..3a33123 100644
9047--- a/arch/powerpc/kernel/signal_32.c
9048+++ b/arch/powerpc/kernel/signal_32.c
9049@@ -1011,7 +1011,7 @@ int handle_rt_signal32(struct ksignal *ksig, sigset_t *oldset,
9050 /* Save user registers on the stack */
9051 frame = &rt_sf->uc.uc_mcontext;
9052 addr = frame;
9053- if (vdso32_rt_sigtramp && current->mm->context.vdso_base) {
9054+ if (vdso32_rt_sigtramp && current->mm->context.vdso_base != ~0UL) {
9055 sigret = 0;
9056 tramp = current->mm->context.vdso_base + vdso32_rt_sigtramp;
9057 } else {
9058diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c
9059index c7c24d2..1bf7039 100644
9060--- a/arch/powerpc/kernel/signal_64.c
9061+++ b/arch/powerpc/kernel/signal_64.c
9062@@ -754,7 +754,7 @@ int handle_rt_signal64(struct ksignal *ksig, sigset_t *set, struct pt_regs *regs
9063 current->thread.fp_state.fpscr = 0;
9064
9065 /* Set up to return from userspace. */
9066- if (vdso64_rt_sigtramp && current->mm->context.vdso_base) {
9067+ if (vdso64_rt_sigtramp && current->mm->context.vdso_base != ~0UL) {
9068 regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp;
9069 } else {
9070 err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
9071diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
9072index 19e4744..28a8d7b 100644
9073--- a/arch/powerpc/kernel/traps.c
9074+++ b/arch/powerpc/kernel/traps.c
9075@@ -36,6 +36,7 @@
9076 #include <linux/debugfs.h>
9077 #include <linux/ratelimit.h>
9078 #include <linux/context_tracking.h>
9079+#include <linux/uaccess.h>
9080
9081 #include <asm/emulated_ops.h>
9082 #include <asm/pgtable.h>
9083@@ -142,6 +143,8 @@ static unsigned __kprobes long oops_begin(struct pt_regs *regs)
9084 return flags;
9085 }
9086
9087+extern void gr_handle_kernel_exploit(void);
9088+
9089 static void __kprobes oops_end(unsigned long flags, struct pt_regs *regs,
9090 int signr)
9091 {
9092@@ -191,6 +194,9 @@ static void __kprobes oops_end(unsigned long flags, struct pt_regs *regs,
9093 panic("Fatal exception in interrupt");
9094 if (panic_on_oops)
9095 panic("Fatal exception");
9096+
9097+ gr_handle_kernel_exploit();
9098+
9099 do_exit(signr);
9100 }
9101
9102@@ -1137,6 +1143,26 @@ void __kprobes program_check_exception(struct pt_regs *regs)
9103 enum ctx_state prev_state = exception_enter();
9104 unsigned int reason = get_reason(regs);
9105
9106+#ifdef CONFIG_PAX_REFCOUNT
9107+ unsigned int bkpt;
9108+ const struct exception_table_entry *entry;
9109+
9110+ if (reason & REASON_ILLEGAL) {
9111+ /* Check if PaX bad instruction */
9112+ if (!probe_kernel_address(regs->nip, bkpt) && bkpt == 0xc00b00) {
9113+ current->thread.trap_nr = 0;
9114+ pax_report_refcount_overflow(regs);
9115+ /* fixup_exception() for PowerPC does not exist, simulate its job */
9116+ if ((entry = search_exception_tables(regs->nip)) != NULL) {
9117+ regs->nip = entry->fixup;
9118+ return;
9119+ }
9120+ /* fixup_exception() could not handle */
9121+ goto bail;
9122+ }
9123+ }
9124+#endif
9125+
9126 /* We can now get here via a FP Unavailable exception if the core
9127 * has no FPU, in that case the reason flags will be 0 */
9128
9129diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
9130index 305eb0d..accc5b40 100644
9131--- a/arch/powerpc/kernel/vdso.c
9132+++ b/arch/powerpc/kernel/vdso.c
9133@@ -34,6 +34,7 @@
9134 #include <asm/vdso.h>
9135 #include <asm/vdso_datapage.h>
9136 #include <asm/setup.h>
9137+#include <asm/mman.h>
9138
9139 #undef DEBUG
9140
9141@@ -220,7 +221,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
9142 vdso_base = VDSO32_MBASE;
9143 #endif
9144
9145- current->mm->context.vdso_base = 0;
9146+ current->mm->context.vdso_base = ~0UL;
9147
9148 /* vDSO has a problem and was disabled, just don't "enable" it for the
9149 * process
9150@@ -240,7 +241,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
9151 vdso_base = get_unmapped_area(NULL, vdso_base,
9152 (vdso_pages << PAGE_SHIFT) +
9153 ((VDSO_ALIGNMENT - 1) & PAGE_MASK),
9154- 0, 0);
9155+ 0, MAP_PRIVATE | MAP_EXECUTABLE);
9156 if (IS_ERR_VALUE(vdso_base)) {
9157 rc = vdso_base;
9158 goto fail_mmapsem;
9159diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c
9160index 27c0fac..6ec4a32 100644
9161--- a/arch/powerpc/kvm/powerpc.c
9162+++ b/arch/powerpc/kvm/powerpc.c
9163@@ -1402,7 +1402,7 @@ void kvmppc_init_lpid(unsigned long nr_lpids_param)
9164 }
9165 EXPORT_SYMBOL_GPL(kvmppc_init_lpid);
9166
9167-int kvm_arch_init(void *opaque)
9168+int kvm_arch_init(const void *opaque)
9169 {
9170 return 0;
9171 }
9172diff --git a/arch/powerpc/lib/usercopy_64.c b/arch/powerpc/lib/usercopy_64.c
9173index 5eea6f3..5d10396 100644
9174--- a/arch/powerpc/lib/usercopy_64.c
9175+++ b/arch/powerpc/lib/usercopy_64.c
9176@@ -9,22 +9,6 @@
9177 #include <linux/module.h>
9178 #include <asm/uaccess.h>
9179
9180-unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
9181-{
9182- if (likely(access_ok(VERIFY_READ, from, n)))
9183- n = __copy_from_user(to, from, n);
9184- else
9185- memset(to, 0, n);
9186- return n;
9187-}
9188-
9189-unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
9190-{
9191- if (likely(access_ok(VERIFY_WRITE, to, n)))
9192- n = __copy_to_user(to, from, n);
9193- return n;
9194-}
9195-
9196 unsigned long copy_in_user(void __user *to, const void __user *from,
9197 unsigned long n)
9198 {
9199@@ -35,7 +19,5 @@ unsigned long copy_in_user(void __user *to, const void __user *from,
9200 return n;
9201 }
9202
9203-EXPORT_SYMBOL(copy_from_user);
9204-EXPORT_SYMBOL(copy_to_user);
9205 EXPORT_SYMBOL(copy_in_user);
9206
9207diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
9208index b396868..3eb6b9f 100644
9209--- a/arch/powerpc/mm/fault.c
9210+++ b/arch/powerpc/mm/fault.c
9211@@ -33,6 +33,10 @@
9212 #include <linux/ratelimit.h>
9213 #include <linux/context_tracking.h>
9214 #include <linux/hugetlb.h>
9215+#include <linux/slab.h>
9216+#include <linux/pagemap.h>
9217+#include <linux/compiler.h>
9218+#include <linux/unistd.h>
9219
9220 #include <asm/firmware.h>
9221 #include <asm/page.h>
9222@@ -68,6 +72,33 @@ static inline int notify_page_fault(struct pt_regs *regs)
9223 }
9224 #endif
9225
9226+#ifdef CONFIG_PAX_PAGEEXEC
9227+/*
9228+ * PaX: decide what to do with offenders (regs->nip = fault address)
9229+ *
9230+ * returns 1 when task should be killed
9231+ */
9232+static int pax_handle_fetch_fault(struct pt_regs *regs)
9233+{
9234+ return 1;
9235+}
9236+
9237+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
9238+{
9239+ unsigned long i;
9240+
9241+ printk(KERN_ERR "PAX: bytes at PC: ");
9242+ for (i = 0; i < 5; i++) {
9243+ unsigned int c;
9244+ if (get_user(c, (unsigned int __user *)pc+i))
9245+ printk(KERN_CONT "???????? ");
9246+ else
9247+ printk(KERN_CONT "%08x ", c);
9248+ }
9249+ printk("\n");
9250+}
9251+#endif
9252+
9253 /*
9254 * Check whether the instruction at regs->nip is a store using
9255 * an update addressing form which will update r1.
9256@@ -227,7 +258,7 @@ int __kprobes do_page_fault(struct pt_regs *regs, unsigned long address,
9257 * indicate errors in DSISR but can validly be set in SRR1.
9258 */
9259 if (trap == 0x400)
9260- error_code &= 0x48200000;
9261+ error_code &= 0x58200000;
9262 else
9263 is_write = error_code & DSISR_ISSTORE;
9264 #else
9265@@ -383,12 +414,16 @@ good_area:
9266 * "undefined". Of those that can be set, this is the only
9267 * one which seems bad.
9268 */
9269- if (error_code & 0x10000000)
9270+ if (error_code & DSISR_GUARDED)
9271 /* Guarded storage error. */
9272 goto bad_area;
9273 #endif /* CONFIG_8xx */
9274
9275 if (is_exec) {
9276+#ifdef CONFIG_PPC_STD_MMU
9277+ if (error_code & DSISR_GUARDED)
9278+ goto bad_area;
9279+#endif
9280 /*
9281 * Allow execution from readable areas if the MMU does not
9282 * provide separate controls over reading and executing.
9283@@ -483,6 +518,23 @@ bad_area:
9284 bad_area_nosemaphore:
9285 /* User mode accesses cause a SIGSEGV */
9286 if (user_mode(regs)) {
9287+
9288+#ifdef CONFIG_PAX_PAGEEXEC
9289+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
9290+#ifdef CONFIG_PPC_STD_MMU
9291+ if (is_exec && (error_code & (DSISR_PROTFAULT | DSISR_GUARDED))) {
9292+#else
9293+ if (is_exec && regs->nip == address) {
9294+#endif
9295+ switch (pax_handle_fetch_fault(regs)) {
9296+ }
9297+
9298+ pax_report_fault(regs, (void *)regs->nip, (void *)regs->gpr[PT_R1]);
9299+ do_group_exit(SIGKILL);
9300+ }
9301+ }
9302+#endif
9303+
9304 _exception(SIGSEGV, regs, code, address);
9305 goto bail;
9306 }
9307diff --git a/arch/powerpc/mm/mmap.c b/arch/powerpc/mm/mmap.c
9308index cb8bdbe..cde4bc7 100644
9309--- a/arch/powerpc/mm/mmap.c
9310+++ b/arch/powerpc/mm/mmap.c
9311@@ -53,10 +53,14 @@ static inline int mmap_is_legacy(void)
9312 return sysctl_legacy_va_layout;
9313 }
9314
9315-static unsigned long mmap_rnd(void)
9316+static unsigned long mmap_rnd(struct mm_struct *mm)
9317 {
9318 unsigned long rnd = 0;
9319
9320+#ifdef CONFIG_PAX_RANDMMAP
9321+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
9322+#endif
9323+
9324 if (current->flags & PF_RANDOMIZE) {
9325 /* 8MB for 32bit, 1GB for 64bit */
9326 if (is_32bit_task())
9327@@ -67,7 +71,7 @@ static unsigned long mmap_rnd(void)
9328 return rnd << PAGE_SHIFT;
9329 }
9330
9331-static inline unsigned long mmap_base(void)
9332+static inline unsigned long mmap_base(struct mm_struct *mm)
9333 {
9334 unsigned long gap = rlimit(RLIMIT_STACK);
9335
9336@@ -76,7 +80,7 @@ static inline unsigned long mmap_base(void)
9337 else if (gap > MAX_GAP)
9338 gap = MAX_GAP;
9339
9340- return PAGE_ALIGN(TASK_SIZE - gap - mmap_rnd());
9341+ return PAGE_ALIGN(TASK_SIZE - gap - mmap_rnd(mm));
9342 }
9343
9344 /*
9345@@ -91,9 +95,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
9346 */
9347 if (mmap_is_legacy()) {
9348 mm->mmap_base = TASK_UNMAPPED_BASE;
9349+
9350+#ifdef CONFIG_PAX_RANDMMAP
9351+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9352+ mm->mmap_base += mm->delta_mmap;
9353+#endif
9354+
9355 mm->get_unmapped_area = arch_get_unmapped_area;
9356 } else {
9357- mm->mmap_base = mmap_base();
9358+ mm->mmap_base = mmap_base(mm);
9359+
9360+#ifdef CONFIG_PAX_RANDMMAP
9361+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9362+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
9363+#endif
9364+
9365 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
9366 }
9367 }
9368diff --git a/arch/powerpc/mm/slice.c b/arch/powerpc/mm/slice.c
9369index 0f432a7..abfe841 100644
9370--- a/arch/powerpc/mm/slice.c
9371+++ b/arch/powerpc/mm/slice.c
9372@@ -105,7 +105,7 @@ static int slice_area_is_free(struct mm_struct *mm, unsigned long addr,
9373 if ((mm->task_size - len) < addr)
9374 return 0;
9375 vma = find_vma(mm, addr);
9376- return (!vma || (addr + len) <= vma->vm_start);
9377+ return check_heap_stack_gap(vma, addr, len, 0);
9378 }
9379
9380 static int slice_low_has_vma(struct mm_struct *mm, unsigned long slice)
9381@@ -277,6 +277,12 @@ static unsigned long slice_find_area_bottomup(struct mm_struct *mm,
9382 info.align_offset = 0;
9383
9384 addr = TASK_UNMAPPED_BASE;
9385+
9386+#ifdef CONFIG_PAX_RANDMMAP
9387+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9388+ addr += mm->delta_mmap;
9389+#endif
9390+
9391 while (addr < TASK_SIZE) {
9392 info.low_limit = addr;
9393 if (!slice_scan_available(addr, available, 1, &addr))
9394@@ -410,6 +416,11 @@ unsigned long slice_get_unmapped_area(unsigned long addr, unsigned long len,
9395 if (fixed && addr > (mm->task_size - len))
9396 return -ENOMEM;
9397
9398+#ifdef CONFIG_PAX_RANDMMAP
9399+ if (!fixed && (mm->pax_flags & MF_PAX_RANDMMAP))
9400+ addr = 0;
9401+#endif
9402+
9403 /* If hint, make sure it matches our alignment restrictions */
9404 if (!fixed && addr) {
9405 addr = _ALIGN_UP(addr, 1ul << pshift);
9406diff --git a/arch/powerpc/platforms/cell/spufs/file.c b/arch/powerpc/platforms/cell/spufs/file.c
9407index d966bbe..372124a 100644
9408--- a/arch/powerpc/platforms/cell/spufs/file.c
9409+++ b/arch/powerpc/platforms/cell/spufs/file.c
9410@@ -280,9 +280,9 @@ spufs_mem_mmap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
9411 return VM_FAULT_NOPAGE;
9412 }
9413
9414-static int spufs_mem_mmap_access(struct vm_area_struct *vma,
9415+static ssize_t spufs_mem_mmap_access(struct vm_area_struct *vma,
9416 unsigned long address,
9417- void *buf, int len, int write)
9418+ void *buf, size_t len, int write)
9419 {
9420 struct spu_context *ctx = vma->vm_file->private_data;
9421 unsigned long offset = address - vma->vm_start;
9422diff --git a/arch/s390/include/asm/atomic.h b/arch/s390/include/asm/atomic.h
9423index fa934fe..c296056 100644
9424--- a/arch/s390/include/asm/atomic.h
9425+++ b/arch/s390/include/asm/atomic.h
9426@@ -412,4 +412,14 @@ static inline long long atomic64_dec_if_positive(atomic64_t *v)
9427 #define atomic64_dec_and_test(_v) (atomic64_sub_return(1, _v) == 0)
9428 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
9429
9430+#define atomic64_read_unchecked(v) atomic64_read(v)
9431+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
9432+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
9433+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
9434+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
9435+#define atomic64_inc_unchecked(v) atomic64_inc(v)
9436+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
9437+#define atomic64_dec_unchecked(v) atomic64_dec(v)
9438+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
9439+
9440 #endif /* __ARCH_S390_ATOMIC__ */
9441diff --git a/arch/s390/include/asm/barrier.h b/arch/s390/include/asm/barrier.h
9442index 8d72471..5322500 100644
9443--- a/arch/s390/include/asm/barrier.h
9444+++ b/arch/s390/include/asm/barrier.h
9445@@ -42,7 +42,7 @@
9446 do { \
9447 compiletime_assert_atomic_type(*p); \
9448 barrier(); \
9449- ACCESS_ONCE(*p) = (v); \
9450+ ACCESS_ONCE_RW(*p) = (v); \
9451 } while (0)
9452
9453 #define smp_load_acquire(p) \
9454diff --git a/arch/s390/include/asm/cache.h b/arch/s390/include/asm/cache.h
9455index 4d7ccac..d03d0ad 100644
9456--- a/arch/s390/include/asm/cache.h
9457+++ b/arch/s390/include/asm/cache.h
9458@@ -9,8 +9,10 @@
9459 #ifndef __ARCH_S390_CACHE_H
9460 #define __ARCH_S390_CACHE_H
9461
9462-#define L1_CACHE_BYTES 256
9463+#include <linux/const.h>
9464+
9465 #define L1_CACHE_SHIFT 8
9466+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9467 #define NET_SKB_PAD 32
9468
9469 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
9470diff --git a/arch/s390/include/asm/elf.h b/arch/s390/include/asm/elf.h
9471index c9c875d..b4b0e4c 100644
9472--- a/arch/s390/include/asm/elf.h
9473+++ b/arch/s390/include/asm/elf.h
9474@@ -163,8 +163,14 @@ extern unsigned int vdso_enabled;
9475 the loader. We need to make sure that it is out of the way of the program
9476 that it will "exec", and that there is sufficient room for the brk. */
9477
9478-extern unsigned long randomize_et_dyn(void);
9479-#define ELF_ET_DYN_BASE randomize_et_dyn()
9480+#define ELF_ET_DYN_BASE (STACK_TOP / 3 * 2)
9481+
9482+#ifdef CONFIG_PAX_ASLR
9483+#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_31BIT) ? 0x10000UL : 0x80000000UL)
9484+
9485+#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26)
9486+#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26)
9487+#endif
9488
9489 /* This yields a mask that user programs can use to figure out what
9490 instruction set this CPU supports. */
9491@@ -225,9 +231,6 @@ struct linux_binprm;
9492 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
9493 int arch_setup_additional_pages(struct linux_binprm *, int);
9494
9495-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
9496-#define arch_randomize_brk arch_randomize_brk
9497-
9498 void *fill_cpu_elf_notes(void *ptr, struct save_area *sa, __vector128 *vxrs);
9499
9500 #endif
9501diff --git a/arch/s390/include/asm/exec.h b/arch/s390/include/asm/exec.h
9502index c4a93d6..4d2a9b4 100644
9503--- a/arch/s390/include/asm/exec.h
9504+++ b/arch/s390/include/asm/exec.h
9505@@ -7,6 +7,6 @@
9506 #ifndef __ASM_EXEC_H
9507 #define __ASM_EXEC_H
9508
9509-extern unsigned long arch_align_stack(unsigned long sp);
9510+#define arch_align_stack(x) ((x) & ~0xfUL)
9511
9512 #endif /* __ASM_EXEC_H */
9513diff --git a/arch/s390/include/asm/uaccess.h b/arch/s390/include/asm/uaccess.h
9514index cd4c68e..6764641 100644
9515--- a/arch/s390/include/asm/uaccess.h
9516+++ b/arch/s390/include/asm/uaccess.h
9517@@ -59,6 +59,7 @@ static inline int __range_ok(unsigned long addr, unsigned long size)
9518 __range_ok((unsigned long)(addr), (size)); \
9519 })
9520
9521+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
9522 #define access_ok(type, addr, size) __access_ok(addr, size)
9523
9524 /*
9525@@ -275,6 +276,10 @@ static inline unsigned long __must_check
9526 copy_to_user(void __user *to, const void *from, unsigned long n)
9527 {
9528 might_fault();
9529+
9530+ if ((long)n < 0)
9531+ return n;
9532+
9533 return __copy_to_user(to, from, n);
9534 }
9535
9536@@ -303,10 +308,14 @@ __compiletime_warning("copy_from_user() buffer size is not provably correct")
9537 static inline unsigned long __must_check
9538 copy_from_user(void *to, const void __user *from, unsigned long n)
9539 {
9540- unsigned int sz = __compiletime_object_size(to);
9541+ size_t sz = __compiletime_object_size(to);
9542
9543 might_fault();
9544- if (unlikely(sz != -1 && sz < n)) {
9545+
9546+ if ((long)n < 0)
9547+ return n;
9548+
9549+ if (unlikely(sz != (size_t)-1 && sz < n)) {
9550 copy_from_user_overflow();
9551 return n;
9552 }
9553diff --git a/arch/s390/kernel/module.c b/arch/s390/kernel/module.c
9554index 2ca9586..55682a9 100644
9555--- a/arch/s390/kernel/module.c
9556+++ b/arch/s390/kernel/module.c
9557@@ -165,11 +165,11 @@ int module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
9558
9559 /* Increase core size by size of got & plt and set start
9560 offsets for got and plt. */
9561- me->core_size = ALIGN(me->core_size, 4);
9562- me->arch.got_offset = me->core_size;
9563- me->core_size += me->arch.got_size;
9564- me->arch.plt_offset = me->core_size;
9565- me->core_size += me->arch.plt_size;
9566+ me->core_size_rw = ALIGN(me->core_size_rw, 4);
9567+ me->arch.got_offset = me->core_size_rw;
9568+ me->core_size_rw += me->arch.got_size;
9569+ me->arch.plt_offset = me->core_size_rx;
9570+ me->core_size_rx += me->arch.plt_size;
9571 return 0;
9572 }
9573
9574@@ -285,7 +285,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9575 if (info->got_initialized == 0) {
9576 Elf_Addr *gotent;
9577
9578- gotent = me->module_core + me->arch.got_offset +
9579+ gotent = me->module_core_rw + me->arch.got_offset +
9580 info->got_offset;
9581 *gotent = val;
9582 info->got_initialized = 1;
9583@@ -308,7 +308,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9584 rc = apply_rela_bits(loc, val, 0, 64, 0);
9585 else if (r_type == R_390_GOTENT ||
9586 r_type == R_390_GOTPLTENT) {
9587- val += (Elf_Addr) me->module_core - loc;
9588+ val += (Elf_Addr) me->module_core_rw - loc;
9589 rc = apply_rela_bits(loc, val, 1, 32, 1);
9590 }
9591 break;
9592@@ -321,7 +321,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9593 case R_390_PLTOFF64: /* 16 bit offset from GOT to PLT. */
9594 if (info->plt_initialized == 0) {
9595 unsigned int *ip;
9596- ip = me->module_core + me->arch.plt_offset +
9597+ ip = me->module_core_rx + me->arch.plt_offset +
9598 info->plt_offset;
9599 #ifndef CONFIG_64BIT
9600 ip[0] = 0x0d105810; /* basr 1,0; l 1,6(1); br 1 */
9601@@ -346,7 +346,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9602 val - loc + 0xffffUL < 0x1ffffeUL) ||
9603 (r_type == R_390_PLT32DBL &&
9604 val - loc + 0xffffffffULL < 0x1fffffffeULL)))
9605- val = (Elf_Addr) me->module_core +
9606+ val = (Elf_Addr) me->module_core_rx +
9607 me->arch.plt_offset +
9608 info->plt_offset;
9609 val += rela->r_addend - loc;
9610@@ -368,7 +368,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9611 case R_390_GOTOFF32: /* 32 bit offset to GOT. */
9612 case R_390_GOTOFF64: /* 64 bit offset to GOT. */
9613 val = val + rela->r_addend -
9614- ((Elf_Addr) me->module_core + me->arch.got_offset);
9615+ ((Elf_Addr) me->module_core_rw + me->arch.got_offset);
9616 if (r_type == R_390_GOTOFF16)
9617 rc = apply_rela_bits(loc, val, 0, 16, 0);
9618 else if (r_type == R_390_GOTOFF32)
9619@@ -378,7 +378,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9620 break;
9621 case R_390_GOTPC: /* 32 bit PC relative offset to GOT. */
9622 case R_390_GOTPCDBL: /* 32 bit PC rel. off. to GOT shifted by 1. */
9623- val = (Elf_Addr) me->module_core + me->arch.got_offset +
9624+ val = (Elf_Addr) me->module_core_rw + me->arch.got_offset +
9625 rela->r_addend - loc;
9626 if (r_type == R_390_GOTPC)
9627 rc = apply_rela_bits(loc, val, 1, 32, 0);
9628diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c
9629index 13fc097..84d375f 100644
9630--- a/arch/s390/kernel/process.c
9631+++ b/arch/s390/kernel/process.c
9632@@ -227,27 +227,3 @@ unsigned long get_wchan(struct task_struct *p)
9633 }
9634 return 0;
9635 }
9636-
9637-unsigned long arch_align_stack(unsigned long sp)
9638-{
9639- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
9640- sp -= get_random_int() & ~PAGE_MASK;
9641- return sp & ~0xf;
9642-}
9643-
9644-static inline unsigned long brk_rnd(void)
9645-{
9646- /* 8MB for 32bit, 1GB for 64bit */
9647- if (is_32bit_task())
9648- return (get_random_int() & 0x7ffUL) << PAGE_SHIFT;
9649- else
9650- return (get_random_int() & 0x3ffffUL) << PAGE_SHIFT;
9651-}
9652-
9653-unsigned long arch_randomize_brk(struct mm_struct *mm)
9654-{
9655- unsigned long ret;
9656-
9657- ret = PAGE_ALIGN(mm->brk + brk_rnd());
9658- return (ret > mm->brk) ? ret : mm->brk;
9659-}
9660diff --git a/arch/s390/mm/mmap.c b/arch/s390/mm/mmap.c
9661index 179a2c2..4ba9137 100644
9662--- a/arch/s390/mm/mmap.c
9663+++ b/arch/s390/mm/mmap.c
9664@@ -62,6 +62,12 @@ static inline int mmap_is_legacy(void)
9665
9666 static unsigned long mmap_rnd(void)
9667 {
9668+
9669+#ifdef CONFIG_PAX_RANDMMAP
9670+ if (current->mm->pax_flags & MF_PAX_RANDMMAP)
9671+ return 0;
9672+#endif
9673+
9674 if (!(current->flags & PF_RANDOMIZE))
9675 return 0;
9676 if (is_32bit_task())
9677@@ -204,9 +210,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
9678 */
9679 if (mmap_is_legacy()) {
9680 mm->mmap_base = mmap_base_legacy();
9681+
9682+#ifdef CONFIG_PAX_RANDMMAP
9683+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9684+ mm->mmap_base += mm->delta_mmap;
9685+#endif
9686+
9687 mm->get_unmapped_area = arch_get_unmapped_area;
9688 } else {
9689 mm->mmap_base = mmap_base();
9690+
9691+#ifdef CONFIG_PAX_RANDMMAP
9692+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9693+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
9694+#endif
9695+
9696 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
9697 }
9698 }
9699@@ -279,9 +297,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
9700 */
9701 if (mmap_is_legacy()) {
9702 mm->mmap_base = mmap_base_legacy();
9703+
9704+#ifdef CONFIG_PAX_RANDMMAP
9705+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9706+ mm->mmap_base += mm->delta_mmap;
9707+#endif
9708+
9709 mm->get_unmapped_area = s390_get_unmapped_area;
9710 } else {
9711 mm->mmap_base = mmap_base();
9712+
9713+#ifdef CONFIG_PAX_RANDMMAP
9714+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9715+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
9716+#endif
9717+
9718 mm->get_unmapped_area = s390_get_unmapped_area_topdown;
9719 }
9720 }
9721diff --git a/arch/score/include/asm/cache.h b/arch/score/include/asm/cache.h
9722index ae3d59f..f65f075 100644
9723--- a/arch/score/include/asm/cache.h
9724+++ b/arch/score/include/asm/cache.h
9725@@ -1,7 +1,9 @@
9726 #ifndef _ASM_SCORE_CACHE_H
9727 #define _ASM_SCORE_CACHE_H
9728
9729+#include <linux/const.h>
9730+
9731 #define L1_CACHE_SHIFT 4
9732-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
9733+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9734
9735 #endif /* _ASM_SCORE_CACHE_H */
9736diff --git a/arch/score/include/asm/exec.h b/arch/score/include/asm/exec.h
9737index f9f3cd5..58ff438 100644
9738--- a/arch/score/include/asm/exec.h
9739+++ b/arch/score/include/asm/exec.h
9740@@ -1,6 +1,6 @@
9741 #ifndef _ASM_SCORE_EXEC_H
9742 #define _ASM_SCORE_EXEC_H
9743
9744-extern unsigned long arch_align_stack(unsigned long sp);
9745+#define arch_align_stack(x) (x)
9746
9747 #endif /* _ASM_SCORE_EXEC_H */
9748diff --git a/arch/score/kernel/process.c b/arch/score/kernel/process.c
9749index a1519ad3..e8ac1ff 100644
9750--- a/arch/score/kernel/process.c
9751+++ b/arch/score/kernel/process.c
9752@@ -116,8 +116,3 @@ unsigned long get_wchan(struct task_struct *task)
9753
9754 return task_pt_regs(task)->cp0_epc;
9755 }
9756-
9757-unsigned long arch_align_stack(unsigned long sp)
9758-{
9759- return sp;
9760-}
9761diff --git a/arch/sh/include/asm/cache.h b/arch/sh/include/asm/cache.h
9762index ef9e555..331bd29 100644
9763--- a/arch/sh/include/asm/cache.h
9764+++ b/arch/sh/include/asm/cache.h
9765@@ -9,10 +9,11 @@
9766 #define __ASM_SH_CACHE_H
9767 #ifdef __KERNEL__
9768
9769+#include <linux/const.h>
9770 #include <linux/init.h>
9771 #include <cpu/cache.h>
9772
9773-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
9774+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9775
9776 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
9777
9778diff --git a/arch/sh/mm/mmap.c b/arch/sh/mm/mmap.c
9779index 6777177..cb5e44f 100644
9780--- a/arch/sh/mm/mmap.c
9781+++ b/arch/sh/mm/mmap.c
9782@@ -36,6 +36,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
9783 struct mm_struct *mm = current->mm;
9784 struct vm_area_struct *vma;
9785 int do_colour_align;
9786+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
9787 struct vm_unmapped_area_info info;
9788
9789 if (flags & MAP_FIXED) {
9790@@ -55,6 +56,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
9791 if (filp || (flags & MAP_SHARED))
9792 do_colour_align = 1;
9793
9794+#ifdef CONFIG_PAX_RANDMMAP
9795+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
9796+#endif
9797+
9798 if (addr) {
9799 if (do_colour_align)
9800 addr = COLOUR_ALIGN(addr, pgoff);
9801@@ -62,14 +67,13 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
9802 addr = PAGE_ALIGN(addr);
9803
9804 vma = find_vma(mm, addr);
9805- if (TASK_SIZE - len >= addr &&
9806- (!vma || addr + len <= vma->vm_start))
9807+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
9808 return addr;
9809 }
9810
9811 info.flags = 0;
9812 info.length = len;
9813- info.low_limit = TASK_UNMAPPED_BASE;
9814+ info.low_limit = mm->mmap_base;
9815 info.high_limit = TASK_SIZE;
9816 info.align_mask = do_colour_align ? (PAGE_MASK & shm_align_mask) : 0;
9817 info.align_offset = pgoff << PAGE_SHIFT;
9818@@ -85,6 +89,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9819 struct mm_struct *mm = current->mm;
9820 unsigned long addr = addr0;
9821 int do_colour_align;
9822+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
9823 struct vm_unmapped_area_info info;
9824
9825 if (flags & MAP_FIXED) {
9826@@ -104,6 +109,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9827 if (filp || (flags & MAP_SHARED))
9828 do_colour_align = 1;
9829
9830+#ifdef CONFIG_PAX_RANDMMAP
9831+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
9832+#endif
9833+
9834 /* requesting a specific address */
9835 if (addr) {
9836 if (do_colour_align)
9837@@ -112,8 +121,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9838 addr = PAGE_ALIGN(addr);
9839
9840 vma = find_vma(mm, addr);
9841- if (TASK_SIZE - len >= addr &&
9842- (!vma || addr + len <= vma->vm_start))
9843+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
9844 return addr;
9845 }
9846
9847@@ -135,6 +143,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9848 VM_BUG_ON(addr != -ENOMEM);
9849 info.flags = 0;
9850 info.low_limit = TASK_UNMAPPED_BASE;
9851+
9852+#ifdef CONFIG_PAX_RANDMMAP
9853+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9854+ info.low_limit += mm->delta_mmap;
9855+#endif
9856+
9857 info.high_limit = TASK_SIZE;
9858 addr = vm_unmapped_area(&info);
9859 }
9860diff --git a/arch/sparc/include/asm/atomic_64.h b/arch/sparc/include/asm/atomic_64.h
9861index 4082749..fd97781 100644
9862--- a/arch/sparc/include/asm/atomic_64.h
9863+++ b/arch/sparc/include/asm/atomic_64.h
9864@@ -15,18 +15,38 @@
9865 #define ATOMIC64_INIT(i) { (i) }
9866
9867 #define atomic_read(v) ACCESS_ONCE((v)->counter)
9868+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
9869+{
9870+ return ACCESS_ONCE(v->counter);
9871+}
9872 #define atomic64_read(v) ACCESS_ONCE((v)->counter)
9873+static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
9874+{
9875+ return ACCESS_ONCE(v->counter);
9876+}
9877
9878 #define atomic_set(v, i) (((v)->counter) = i)
9879+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
9880+{
9881+ v->counter = i;
9882+}
9883 #define atomic64_set(v, i) (((v)->counter) = i)
9884+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
9885+{
9886+ v->counter = i;
9887+}
9888
9889-#define ATOMIC_OP(op) \
9890-void atomic_##op(int, atomic_t *); \
9891-void atomic64_##op(long, atomic64_t *);
9892+#define __ATOMIC_OP(op, suffix) \
9893+void atomic_##op##suffix(int, atomic##suffix##_t *); \
9894+void atomic64_##op##suffix(long, atomic64##suffix##_t *);
9895
9896-#define ATOMIC_OP_RETURN(op) \
9897-int atomic_##op##_return(int, atomic_t *); \
9898-long atomic64_##op##_return(long, atomic64_t *);
9899+#define ATOMIC_OP(op) __ATOMIC_OP(op, ) __ATOMIC_OP(op, _unchecked)
9900+
9901+#define __ATOMIC_OP_RETURN(op, suffix) \
9902+int atomic_##op##_return##suffix(int, atomic##suffix##_t *); \
9903+long atomic64_##op##_return##suffix(long, atomic64##suffix##_t *);
9904+
9905+#define ATOMIC_OP_RETURN(op) __ATOMIC_OP_RETURN(op, ) __ATOMIC_OP_RETURN(op, _unchecked)
9906
9907 #define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_OP_RETURN(op)
9908
9909@@ -35,13 +55,23 @@ ATOMIC_OPS(sub)
9910
9911 #undef ATOMIC_OPS
9912 #undef ATOMIC_OP_RETURN
9913+#undef __ATOMIC_OP_RETURN
9914 #undef ATOMIC_OP
9915+#undef __ATOMIC_OP
9916
9917 #define atomic_dec_return(v) atomic_sub_return(1, v)
9918 #define atomic64_dec_return(v) atomic64_sub_return(1, v)
9919
9920 #define atomic_inc_return(v) atomic_add_return(1, v)
9921+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
9922+{
9923+ return atomic_add_return_unchecked(1, v);
9924+}
9925 #define atomic64_inc_return(v) atomic64_add_return(1, v)
9926+static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
9927+{
9928+ return atomic64_add_return_unchecked(1, v);
9929+}
9930
9931 /*
9932 * atomic_inc_and_test - increment and test
9933@@ -52,6 +82,10 @@ ATOMIC_OPS(sub)
9934 * other cases.
9935 */
9936 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
9937+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
9938+{
9939+ return atomic_inc_return_unchecked(v) == 0;
9940+}
9941 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
9942
9943 #define atomic_sub_and_test(i, v) (atomic_sub_return(i, v) == 0)
9944@@ -61,25 +95,60 @@ ATOMIC_OPS(sub)
9945 #define atomic64_dec_and_test(v) (atomic64_sub_return(1, v) == 0)
9946
9947 #define atomic_inc(v) atomic_add(1, v)
9948+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
9949+{
9950+ atomic_add_unchecked(1, v);
9951+}
9952 #define atomic64_inc(v) atomic64_add(1, v)
9953+static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
9954+{
9955+ atomic64_add_unchecked(1, v);
9956+}
9957
9958 #define atomic_dec(v) atomic_sub(1, v)
9959+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
9960+{
9961+ atomic_sub_unchecked(1, v);
9962+}
9963 #define atomic64_dec(v) atomic64_sub(1, v)
9964+static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
9965+{
9966+ atomic64_sub_unchecked(1, v);
9967+}
9968
9969 #define atomic_add_negative(i, v) (atomic_add_return(i, v) < 0)
9970 #define atomic64_add_negative(i, v) (atomic64_add_return(i, v) < 0)
9971
9972 #define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
9973+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
9974+{
9975+ return cmpxchg(&v->counter, old, new);
9976+}
9977 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
9978+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
9979+{
9980+ return xchg(&v->counter, new);
9981+}
9982
9983 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
9984 {
9985- int c, old;
9986+ int c, old, new;
9987 c = atomic_read(v);
9988 for (;;) {
9989- if (unlikely(c == (u)))
9990+ if (unlikely(c == u))
9991 break;
9992- old = atomic_cmpxchg((v), c, c + (a));
9993+
9994+ asm volatile("addcc %2, %0, %0\n"
9995+
9996+#ifdef CONFIG_PAX_REFCOUNT
9997+ "tvs %%icc, 6\n"
9998+#endif
9999+
10000+ : "=r" (new)
10001+ : "0" (c), "ir" (a)
10002+ : "cc");
10003+
10004+ old = atomic_cmpxchg(v, c, new);
10005 if (likely(old == c))
10006 break;
10007 c = old;
10008@@ -90,20 +159,35 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
10009 #define atomic64_cmpxchg(v, o, n) \
10010 ((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n)))
10011 #define atomic64_xchg(v, new) (xchg(&((v)->counter), new))
10012+static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
10013+{
10014+ return xchg(&v->counter, new);
10015+}
10016
10017 static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
10018 {
10019- long c, old;
10020+ long c, old, new;
10021 c = atomic64_read(v);
10022 for (;;) {
10023- if (unlikely(c == (u)))
10024+ if (unlikely(c == u))
10025 break;
10026- old = atomic64_cmpxchg((v), c, c + (a));
10027+
10028+ asm volatile("addcc %2, %0, %0\n"
10029+
10030+#ifdef CONFIG_PAX_REFCOUNT
10031+ "tvs %%xcc, 6\n"
10032+#endif
10033+
10034+ : "=r" (new)
10035+ : "0" (c), "ir" (a)
10036+ : "cc");
10037+
10038+ old = atomic64_cmpxchg(v, c, new);
10039 if (likely(old == c))
10040 break;
10041 c = old;
10042 }
10043- return c != (u);
10044+ return c != u;
10045 }
10046
10047 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
10048diff --git a/arch/sparc/include/asm/barrier_64.h b/arch/sparc/include/asm/barrier_64.h
10049index 7664894..45a974b 100644
10050--- a/arch/sparc/include/asm/barrier_64.h
10051+++ b/arch/sparc/include/asm/barrier_64.h
10052@@ -60,7 +60,7 @@ do { __asm__ __volatile__("ba,pt %%xcc, 1f\n\t" \
10053 do { \
10054 compiletime_assert_atomic_type(*p); \
10055 barrier(); \
10056- ACCESS_ONCE(*p) = (v); \
10057+ ACCESS_ONCE_RW(*p) = (v); \
10058 } while (0)
10059
10060 #define smp_load_acquire(p) \
10061diff --git a/arch/sparc/include/asm/cache.h b/arch/sparc/include/asm/cache.h
10062index 5bb6991..5c2132e 100644
10063--- a/arch/sparc/include/asm/cache.h
10064+++ b/arch/sparc/include/asm/cache.h
10065@@ -7,10 +7,12 @@
10066 #ifndef _SPARC_CACHE_H
10067 #define _SPARC_CACHE_H
10068
10069+#include <linux/const.h>
10070+
10071 #define ARCH_SLAB_MINALIGN __alignof__(unsigned long long)
10072
10073 #define L1_CACHE_SHIFT 5
10074-#define L1_CACHE_BYTES 32
10075+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
10076
10077 #ifdef CONFIG_SPARC32
10078 #define SMP_CACHE_BYTES_SHIFT 5
10079diff --git a/arch/sparc/include/asm/elf_32.h b/arch/sparc/include/asm/elf_32.h
10080index a24e41f..47677ff 100644
10081--- a/arch/sparc/include/asm/elf_32.h
10082+++ b/arch/sparc/include/asm/elf_32.h
10083@@ -114,6 +114,13 @@ typedef struct {
10084
10085 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE)
10086
10087+#ifdef CONFIG_PAX_ASLR
10088+#define PAX_ELF_ET_DYN_BASE 0x10000UL
10089+
10090+#define PAX_DELTA_MMAP_LEN 16
10091+#define PAX_DELTA_STACK_LEN 16
10092+#endif
10093+
10094 /* This yields a mask that user programs can use to figure out what
10095 instruction set this cpu supports. This can NOT be done in userspace
10096 on Sparc. */
10097diff --git a/arch/sparc/include/asm/elf_64.h b/arch/sparc/include/asm/elf_64.h
10098index 370ca1e..d4f4a98 100644
10099--- a/arch/sparc/include/asm/elf_64.h
10100+++ b/arch/sparc/include/asm/elf_64.h
10101@@ -189,6 +189,13 @@ typedef struct {
10102 #define ELF_ET_DYN_BASE 0x0000010000000000UL
10103 #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL
10104
10105+#ifdef CONFIG_PAX_ASLR
10106+#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_32BIT) ? 0x10000UL : 0x100000UL)
10107+
10108+#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_32BIT) ? 14 : 28)
10109+#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_32BIT) ? 15 : 29)
10110+#endif
10111+
10112 extern unsigned long sparc64_elf_hwcap;
10113 #define ELF_HWCAP sparc64_elf_hwcap
10114
10115diff --git a/arch/sparc/include/asm/pgalloc_32.h b/arch/sparc/include/asm/pgalloc_32.h
10116index a3890da..f6a408e 100644
10117--- a/arch/sparc/include/asm/pgalloc_32.h
10118+++ b/arch/sparc/include/asm/pgalloc_32.h
10119@@ -35,6 +35,7 @@ static inline void pgd_set(pgd_t * pgdp, pmd_t * pmdp)
10120 }
10121
10122 #define pgd_populate(MM, PGD, PMD) pgd_set(PGD, PMD)
10123+#define pgd_populate_kernel(MM, PGD, PMD) pgd_populate((MM), (PGD), (PMD))
10124
10125 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm,
10126 unsigned long address)
10127diff --git a/arch/sparc/include/asm/pgalloc_64.h b/arch/sparc/include/asm/pgalloc_64.h
10128index 5e31871..13469c6 100644
10129--- a/arch/sparc/include/asm/pgalloc_64.h
10130+++ b/arch/sparc/include/asm/pgalloc_64.h
10131@@ -21,6 +21,7 @@ static inline void __pgd_populate(pgd_t *pgd, pud_t *pud)
10132 }
10133
10134 #define pgd_populate(MM, PGD, PUD) __pgd_populate(PGD, PUD)
10135+#define pgd_populate_kernel(MM, PGD, PMD) pgd_populate((MM), (PGD), (PMD))
10136
10137 static inline pgd_t *pgd_alloc(struct mm_struct *mm)
10138 {
10139@@ -38,6 +39,7 @@ static inline void __pud_populate(pud_t *pud, pmd_t *pmd)
10140 }
10141
10142 #define pud_populate(MM, PUD, PMD) __pud_populate(PUD, PMD)
10143+#define pud_populate_kernel(MM, PUD, PMD) pud_populate((MM), (PUD), (PMD))
10144
10145 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
10146 {
10147diff --git a/arch/sparc/include/asm/pgtable.h b/arch/sparc/include/asm/pgtable.h
10148index 59ba6f6..4518128 100644
10149--- a/arch/sparc/include/asm/pgtable.h
10150+++ b/arch/sparc/include/asm/pgtable.h
10151@@ -5,4 +5,8 @@
10152 #else
10153 #include <asm/pgtable_32.h>
10154 #endif
10155+
10156+#define ktla_ktva(addr) (addr)
10157+#define ktva_ktla(addr) (addr)
10158+
10159 #endif
10160diff --git a/arch/sparc/include/asm/pgtable_32.h b/arch/sparc/include/asm/pgtable_32.h
10161index f06b36a..bca3189 100644
10162--- a/arch/sparc/include/asm/pgtable_32.h
10163+++ b/arch/sparc/include/asm/pgtable_32.h
10164@@ -51,6 +51,9 @@ unsigned long __init bootmem_init(unsigned long *pages_avail);
10165 #define PAGE_SHARED SRMMU_PAGE_SHARED
10166 #define PAGE_COPY SRMMU_PAGE_COPY
10167 #define PAGE_READONLY SRMMU_PAGE_RDONLY
10168+#define PAGE_SHARED_NOEXEC SRMMU_PAGE_SHARED_NOEXEC
10169+#define PAGE_COPY_NOEXEC SRMMU_PAGE_COPY_NOEXEC
10170+#define PAGE_READONLY_NOEXEC SRMMU_PAGE_RDONLY_NOEXEC
10171 #define PAGE_KERNEL SRMMU_PAGE_KERNEL
10172
10173 /* Top-level page directory - dummy used by init-mm.
10174@@ -63,18 +66,18 @@ extern unsigned long ptr_in_current_pgd;
10175
10176 /* xwr */
10177 #define __P000 PAGE_NONE
10178-#define __P001 PAGE_READONLY
10179-#define __P010 PAGE_COPY
10180-#define __P011 PAGE_COPY
10181+#define __P001 PAGE_READONLY_NOEXEC
10182+#define __P010 PAGE_COPY_NOEXEC
10183+#define __P011 PAGE_COPY_NOEXEC
10184 #define __P100 PAGE_READONLY
10185 #define __P101 PAGE_READONLY
10186 #define __P110 PAGE_COPY
10187 #define __P111 PAGE_COPY
10188
10189 #define __S000 PAGE_NONE
10190-#define __S001 PAGE_READONLY
10191-#define __S010 PAGE_SHARED
10192-#define __S011 PAGE_SHARED
10193+#define __S001 PAGE_READONLY_NOEXEC
10194+#define __S010 PAGE_SHARED_NOEXEC
10195+#define __S011 PAGE_SHARED_NOEXEC
10196 #define __S100 PAGE_READONLY
10197 #define __S101 PAGE_READONLY
10198 #define __S110 PAGE_SHARED
10199diff --git a/arch/sparc/include/asm/pgtsrmmu.h b/arch/sparc/include/asm/pgtsrmmu.h
10200index ae51a11..eadfd03 100644
10201--- a/arch/sparc/include/asm/pgtsrmmu.h
10202+++ b/arch/sparc/include/asm/pgtsrmmu.h
10203@@ -111,6 +111,11 @@
10204 SRMMU_EXEC | SRMMU_REF)
10205 #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \
10206 SRMMU_EXEC | SRMMU_REF)
10207+
10208+#define SRMMU_PAGE_SHARED_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_WRITE | SRMMU_REF)
10209+#define SRMMU_PAGE_COPY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
10210+#define SRMMU_PAGE_RDONLY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
10211+
10212 #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \
10213 SRMMU_DIRTY | SRMMU_REF)
10214
10215diff --git a/arch/sparc/include/asm/setup.h b/arch/sparc/include/asm/setup.h
10216index 29d64b1..4272fe8 100644
10217--- a/arch/sparc/include/asm/setup.h
10218+++ b/arch/sparc/include/asm/setup.h
10219@@ -55,8 +55,8 @@ int handle_ldf_stq(u32 insn, struct pt_regs *regs);
10220 void handle_ld_nf(u32 insn, struct pt_regs *regs);
10221
10222 /* init_64.c */
10223-extern atomic_t dcpage_flushes;
10224-extern atomic_t dcpage_flushes_xcall;
10225+extern atomic_unchecked_t dcpage_flushes;
10226+extern atomic_unchecked_t dcpage_flushes_xcall;
10227
10228 extern int sysctl_tsb_ratio;
10229 #endif
10230diff --git a/arch/sparc/include/asm/spinlock_64.h b/arch/sparc/include/asm/spinlock_64.h
10231index 9689176..63c18ea 100644
10232--- a/arch/sparc/include/asm/spinlock_64.h
10233+++ b/arch/sparc/include/asm/spinlock_64.h
10234@@ -92,14 +92,19 @@ static inline void arch_spin_lock_flags(arch_spinlock_t *lock, unsigned long fla
10235
10236 /* Multi-reader locks, these are much saner than the 32-bit Sparc ones... */
10237
10238-static void inline arch_read_lock(arch_rwlock_t *lock)
10239+static inline void arch_read_lock(arch_rwlock_t *lock)
10240 {
10241 unsigned long tmp1, tmp2;
10242
10243 __asm__ __volatile__ (
10244 "1: ldsw [%2], %0\n"
10245 " brlz,pn %0, 2f\n"
10246-"4: add %0, 1, %1\n"
10247+"4: addcc %0, 1, %1\n"
10248+
10249+#ifdef CONFIG_PAX_REFCOUNT
10250+" tvs %%icc, 6\n"
10251+#endif
10252+
10253 " cas [%2], %0, %1\n"
10254 " cmp %0, %1\n"
10255 " bne,pn %%icc, 1b\n"
10256@@ -112,10 +117,10 @@ static void inline arch_read_lock(arch_rwlock_t *lock)
10257 " .previous"
10258 : "=&r" (tmp1), "=&r" (tmp2)
10259 : "r" (lock)
10260- : "memory");
10261+ : "memory", "cc");
10262 }
10263
10264-static int inline arch_read_trylock(arch_rwlock_t *lock)
10265+static inline int arch_read_trylock(arch_rwlock_t *lock)
10266 {
10267 int tmp1, tmp2;
10268
10269@@ -123,7 +128,12 @@ static int inline arch_read_trylock(arch_rwlock_t *lock)
10270 "1: ldsw [%2], %0\n"
10271 " brlz,a,pn %0, 2f\n"
10272 " mov 0, %0\n"
10273-" add %0, 1, %1\n"
10274+" addcc %0, 1, %1\n"
10275+
10276+#ifdef CONFIG_PAX_REFCOUNT
10277+" tvs %%icc, 6\n"
10278+#endif
10279+
10280 " cas [%2], %0, %1\n"
10281 " cmp %0, %1\n"
10282 " bne,pn %%icc, 1b\n"
10283@@ -136,13 +146,18 @@ static int inline arch_read_trylock(arch_rwlock_t *lock)
10284 return tmp1;
10285 }
10286
10287-static void inline arch_read_unlock(arch_rwlock_t *lock)
10288+static inline void arch_read_unlock(arch_rwlock_t *lock)
10289 {
10290 unsigned long tmp1, tmp2;
10291
10292 __asm__ __volatile__(
10293 "1: lduw [%2], %0\n"
10294-" sub %0, 1, %1\n"
10295+" subcc %0, 1, %1\n"
10296+
10297+#ifdef CONFIG_PAX_REFCOUNT
10298+" tvs %%icc, 6\n"
10299+#endif
10300+
10301 " cas [%2], %0, %1\n"
10302 " cmp %0, %1\n"
10303 " bne,pn %%xcc, 1b\n"
10304@@ -152,7 +167,7 @@ static void inline arch_read_unlock(arch_rwlock_t *lock)
10305 : "memory");
10306 }
10307
10308-static void inline arch_write_lock(arch_rwlock_t *lock)
10309+static inline void arch_write_lock(arch_rwlock_t *lock)
10310 {
10311 unsigned long mask, tmp1, tmp2;
10312
10313@@ -177,7 +192,7 @@ static void inline arch_write_lock(arch_rwlock_t *lock)
10314 : "memory");
10315 }
10316
10317-static void inline arch_write_unlock(arch_rwlock_t *lock)
10318+static inline void arch_write_unlock(arch_rwlock_t *lock)
10319 {
10320 __asm__ __volatile__(
10321 " stw %%g0, [%0]"
10322@@ -186,7 +201,7 @@ static void inline arch_write_unlock(arch_rwlock_t *lock)
10323 : "memory");
10324 }
10325
10326-static int inline arch_write_trylock(arch_rwlock_t *lock)
10327+static inline int arch_write_trylock(arch_rwlock_t *lock)
10328 {
10329 unsigned long mask, tmp1, tmp2, result;
10330
10331diff --git a/arch/sparc/include/asm/thread_info_32.h b/arch/sparc/include/asm/thread_info_32.h
10332index fd7bd0a..2e2fa7a 100644
10333--- a/arch/sparc/include/asm/thread_info_32.h
10334+++ b/arch/sparc/include/asm/thread_info_32.h
10335@@ -47,6 +47,7 @@ struct thread_info {
10336 struct reg_window32 reg_window[NSWINS]; /* align for ldd! */
10337 unsigned long rwbuf_stkptrs[NSWINS];
10338 unsigned long w_saved;
10339+ unsigned long lowest_stack;
10340 };
10341
10342 /*
10343diff --git a/arch/sparc/include/asm/thread_info_64.h b/arch/sparc/include/asm/thread_info_64.h
10344index ff45516..73001ab 100644
10345--- a/arch/sparc/include/asm/thread_info_64.h
10346+++ b/arch/sparc/include/asm/thread_info_64.h
10347@@ -61,6 +61,8 @@ struct thread_info {
10348 struct pt_regs *kern_una_regs;
10349 unsigned int kern_una_insn;
10350
10351+ unsigned long lowest_stack;
10352+
10353 unsigned long fpregs[(7 * 256) / sizeof(unsigned long)]
10354 __attribute__ ((aligned(64)));
10355 };
10356@@ -184,12 +186,13 @@ register struct thread_info *current_thread_info_reg asm("g6");
10357 #define TIF_NEED_RESCHED 3 /* rescheduling necessary */
10358 /* flag bit 4 is available */
10359 #define TIF_UNALIGNED 5 /* allowed to do unaligned accesses */
10360-/* flag bit 6 is available */
10361+#define TIF_GRSEC_SETXID 6 /* update credentials on syscall entry/exit */
10362 #define TIF_32BIT 7 /* 32-bit binary */
10363 #define TIF_NOHZ 8 /* in adaptive nohz mode */
10364 #define TIF_SECCOMP 9 /* secure computing */
10365 #define TIF_SYSCALL_AUDIT 10 /* syscall auditing active */
10366 #define TIF_SYSCALL_TRACEPOINT 11 /* syscall tracepoint instrumentation */
10367+
10368 /* NOTE: Thread flags >= 12 should be ones we have no interest
10369 * in using in assembly, else we can't use the mask as
10370 * an immediate value in instructions such as andcc.
10371@@ -209,12 +212,17 @@ register struct thread_info *current_thread_info_reg asm("g6");
10372 #define _TIF_SYSCALL_AUDIT (1<<TIF_SYSCALL_AUDIT)
10373 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
10374 #define _TIF_POLLING_NRFLAG (1<<TIF_POLLING_NRFLAG)
10375+#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
10376
10377 #define _TIF_USER_WORK_MASK ((0xff << TI_FLAG_WSAVED_SHIFT) | \
10378 _TIF_DO_NOTIFY_RESUME_MASK | \
10379 _TIF_NEED_RESCHED)
10380 #define _TIF_DO_NOTIFY_RESUME_MASK (_TIF_NOTIFY_RESUME | _TIF_SIGPENDING)
10381
10382+#define _TIF_WORK_SYSCALL \
10383+ (_TIF_SYSCALL_TRACE | _TIF_SECCOMP | _TIF_SYSCALL_AUDIT | \
10384+ _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ | _TIF_GRSEC_SETXID)
10385+
10386 #define is_32bit_task() (test_thread_flag(TIF_32BIT))
10387
10388 /*
10389diff --git a/arch/sparc/include/asm/uaccess.h b/arch/sparc/include/asm/uaccess.h
10390index bd56c28..4b63d83 100644
10391--- a/arch/sparc/include/asm/uaccess.h
10392+++ b/arch/sparc/include/asm/uaccess.h
10393@@ -1,5 +1,6 @@
10394 #ifndef ___ASM_SPARC_UACCESS_H
10395 #define ___ASM_SPARC_UACCESS_H
10396+
10397 #if defined(__sparc__) && defined(__arch64__)
10398 #include <asm/uaccess_64.h>
10399 #else
10400diff --git a/arch/sparc/include/asm/uaccess_32.h b/arch/sparc/include/asm/uaccess_32.h
10401index 64ee103..388aef0 100644
10402--- a/arch/sparc/include/asm/uaccess_32.h
10403+++ b/arch/sparc/include/asm/uaccess_32.h
10404@@ -47,6 +47,7 @@
10405 #define __user_ok(addr, size) ({ (void)(size); (addr) < STACK_TOP; })
10406 #define __kernel_ok (segment_eq(get_fs(), KERNEL_DS))
10407 #define __access_ok(addr, size) (__user_ok((addr) & get_fs().seg, (size)))
10408+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
10409 #define access_ok(type, addr, size) \
10410 ({ (void)(type); __access_ok((unsigned long)(addr), size); })
10411
10412@@ -313,27 +314,46 @@ unsigned long __copy_user(void __user *to, const void __user *from, unsigned lon
10413
10414 static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
10415 {
10416- if (n && __access_ok((unsigned long) to, n))
10417+ if ((long)n < 0)
10418+ return n;
10419+
10420+ if (n && __access_ok((unsigned long) to, n)) {
10421+ if (!__builtin_constant_p(n))
10422+ check_object_size(from, n, true);
10423 return __copy_user(to, (__force void __user *) from, n);
10424- else
10425+ } else
10426 return n;
10427 }
10428
10429 static inline unsigned long __copy_to_user(void __user *to, const void *from, unsigned long n)
10430 {
10431+ if ((long)n < 0)
10432+ return n;
10433+
10434+ if (!__builtin_constant_p(n))
10435+ check_object_size(from, n, true);
10436+
10437 return __copy_user(to, (__force void __user *) from, n);
10438 }
10439
10440 static inline unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
10441 {
10442- if (n && __access_ok((unsigned long) from, n))
10443+ if ((long)n < 0)
10444+ return n;
10445+
10446+ if (n && __access_ok((unsigned long) from, n)) {
10447+ if (!__builtin_constant_p(n))
10448+ check_object_size(to, n, false);
10449 return __copy_user((__force void __user *) to, from, n);
10450- else
10451+ } else
10452 return n;
10453 }
10454
10455 static inline unsigned long __copy_from_user(void *to, const void __user *from, unsigned long n)
10456 {
10457+ if ((long)n < 0)
10458+ return n;
10459+
10460 return __copy_user((__force void __user *) to, from, n);
10461 }
10462
10463diff --git a/arch/sparc/include/asm/uaccess_64.h b/arch/sparc/include/asm/uaccess_64.h
10464index a35194b..47dabc0d 100644
10465--- a/arch/sparc/include/asm/uaccess_64.h
10466+++ b/arch/sparc/include/asm/uaccess_64.h
10467@@ -10,6 +10,7 @@
10468 #include <linux/compiler.h>
10469 #include <linux/string.h>
10470 #include <linux/thread_info.h>
10471+#include <linux/kernel.h>
10472 #include <asm/asi.h>
10473 #include <asm/spitfire.h>
10474 #include <asm-generic/uaccess-unaligned.h>
10475@@ -54,6 +55,11 @@ static inline int __access_ok(const void __user * addr, unsigned long size)
10476 return 1;
10477 }
10478
10479+static inline int access_ok_noprefault(int type, const void __user * addr, unsigned long size)
10480+{
10481+ return 1;
10482+}
10483+
10484 static inline int access_ok(int type, const void __user * addr, unsigned long size)
10485 {
10486 return 1;
10487@@ -228,8 +234,15 @@ unsigned long copy_from_user_fixup(void *to, const void __user *from,
10488 static inline unsigned long __must_check
10489 copy_from_user(void *to, const void __user *from, unsigned long size)
10490 {
10491- unsigned long ret = ___copy_from_user(to, from, size);
10492+ unsigned long ret;
10493
10494+ if ((long)size < 0 || size > INT_MAX)
10495+ return size;
10496+
10497+ if (!__builtin_constant_p(size))
10498+ check_object_size(to, size, false);
10499+
10500+ ret = ___copy_from_user(to, from, size);
10501 if (unlikely(ret))
10502 ret = copy_from_user_fixup(to, from, size);
10503
10504@@ -245,8 +258,15 @@ unsigned long copy_to_user_fixup(void __user *to, const void *from,
10505 static inline unsigned long __must_check
10506 copy_to_user(void __user *to, const void *from, unsigned long size)
10507 {
10508- unsigned long ret = ___copy_to_user(to, from, size);
10509+ unsigned long ret;
10510
10511+ if ((long)size < 0 || size > INT_MAX)
10512+ return size;
10513+
10514+ if (!__builtin_constant_p(size))
10515+ check_object_size(from, size, true);
10516+
10517+ ret = ___copy_to_user(to, from, size);
10518 if (unlikely(ret))
10519 ret = copy_to_user_fixup(to, from, size);
10520 return ret;
10521diff --git a/arch/sparc/kernel/Makefile b/arch/sparc/kernel/Makefile
10522index 7cf9c6e..6206648 100644
10523--- a/arch/sparc/kernel/Makefile
10524+++ b/arch/sparc/kernel/Makefile
10525@@ -4,7 +4,7 @@
10526 #
10527
10528 asflags-y := -ansi
10529-ccflags-y := -Werror
10530+#ccflags-y := -Werror
10531
10532 extra-y := head_$(BITS).o
10533
10534diff --git a/arch/sparc/kernel/process_32.c b/arch/sparc/kernel/process_32.c
10535index 50e7b62..79fae35 100644
10536--- a/arch/sparc/kernel/process_32.c
10537+++ b/arch/sparc/kernel/process_32.c
10538@@ -123,14 +123,14 @@ void show_regs(struct pt_regs *r)
10539
10540 printk("PSR: %08lx PC: %08lx NPC: %08lx Y: %08lx %s\n",
10541 r->psr, r->pc, r->npc, r->y, print_tainted());
10542- printk("PC: <%pS>\n", (void *) r->pc);
10543+ printk("PC: <%pA>\n", (void *) r->pc);
10544 printk("%%G: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
10545 r->u_regs[0], r->u_regs[1], r->u_regs[2], r->u_regs[3],
10546 r->u_regs[4], r->u_regs[5], r->u_regs[6], r->u_regs[7]);
10547 printk("%%O: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
10548 r->u_regs[8], r->u_regs[9], r->u_regs[10], r->u_regs[11],
10549 r->u_regs[12], r->u_regs[13], r->u_regs[14], r->u_regs[15]);
10550- printk("RPC: <%pS>\n", (void *) r->u_regs[15]);
10551+ printk("RPC: <%pA>\n", (void *) r->u_regs[15]);
10552
10553 printk("%%L: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
10554 rw->locals[0], rw->locals[1], rw->locals[2], rw->locals[3],
10555@@ -167,7 +167,7 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
10556 rw = (struct reg_window32 *) fp;
10557 pc = rw->ins[7];
10558 printk("[%08lx : ", pc);
10559- printk("%pS ] ", (void *) pc);
10560+ printk("%pA ] ", (void *) pc);
10561 fp = rw->ins[6];
10562 } while (++count < 16);
10563 printk("\n");
10564diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c
10565index 46a5964..a35c62c 100644
10566--- a/arch/sparc/kernel/process_64.c
10567+++ b/arch/sparc/kernel/process_64.c
10568@@ -161,7 +161,7 @@ static void show_regwindow(struct pt_regs *regs)
10569 printk("i4: %016lx i5: %016lx i6: %016lx i7: %016lx\n",
10570 rwk->ins[4], rwk->ins[5], rwk->ins[6], rwk->ins[7]);
10571 if (regs->tstate & TSTATE_PRIV)
10572- printk("I7: <%pS>\n", (void *) rwk->ins[7]);
10573+ printk("I7: <%pA>\n", (void *) rwk->ins[7]);
10574 }
10575
10576 void show_regs(struct pt_regs *regs)
10577@@ -170,7 +170,7 @@ void show_regs(struct pt_regs *regs)
10578
10579 printk("TSTATE: %016lx TPC: %016lx TNPC: %016lx Y: %08x %s\n", regs->tstate,
10580 regs->tpc, regs->tnpc, regs->y, print_tainted());
10581- printk("TPC: <%pS>\n", (void *) regs->tpc);
10582+ printk("TPC: <%pA>\n", (void *) regs->tpc);
10583 printk("g0: %016lx g1: %016lx g2: %016lx g3: %016lx\n",
10584 regs->u_regs[0], regs->u_regs[1], regs->u_regs[2],
10585 regs->u_regs[3]);
10586@@ -183,7 +183,7 @@ void show_regs(struct pt_regs *regs)
10587 printk("o4: %016lx o5: %016lx sp: %016lx ret_pc: %016lx\n",
10588 regs->u_regs[12], regs->u_regs[13], regs->u_regs[14],
10589 regs->u_regs[15]);
10590- printk("RPC: <%pS>\n", (void *) regs->u_regs[15]);
10591+ printk("RPC: <%pA>\n", (void *) regs->u_regs[15]);
10592 show_regwindow(regs);
10593 show_stack(current, (unsigned long *) regs->u_regs[UREG_FP]);
10594 }
10595@@ -278,7 +278,7 @@ void arch_trigger_all_cpu_backtrace(bool include_self)
10596 ((tp && tp->task) ? tp->task->pid : -1));
10597
10598 if (gp->tstate & TSTATE_PRIV) {
10599- printk(" TPC[%pS] O7[%pS] I7[%pS] RPC[%pS]\n",
10600+ printk(" TPC[%pA] O7[%pA] I7[%pA] RPC[%pA]\n",
10601 (void *) gp->tpc,
10602 (void *) gp->o7,
10603 (void *) gp->i7,
10604diff --git a/arch/sparc/kernel/prom_common.c b/arch/sparc/kernel/prom_common.c
10605index 79cc0d1..ec62734 100644
10606--- a/arch/sparc/kernel/prom_common.c
10607+++ b/arch/sparc/kernel/prom_common.c
10608@@ -144,7 +144,7 @@ static int __init prom_common_nextprop(phandle node, char *prev, char *buf)
10609
10610 unsigned int prom_early_allocated __initdata;
10611
10612-static struct of_pdt_ops prom_sparc_ops __initdata = {
10613+static struct of_pdt_ops prom_sparc_ops __initconst = {
10614 .nextprop = prom_common_nextprop,
10615 .getproplen = prom_getproplen,
10616 .getproperty = prom_getproperty,
10617diff --git a/arch/sparc/kernel/ptrace_64.c b/arch/sparc/kernel/ptrace_64.c
10618index 9ddc492..27a5619 100644
10619--- a/arch/sparc/kernel/ptrace_64.c
10620+++ b/arch/sparc/kernel/ptrace_64.c
10621@@ -1060,6 +1060,10 @@ long arch_ptrace(struct task_struct *child, long request,
10622 return ret;
10623 }
10624
10625+#ifdef CONFIG_GRKERNSEC_SETXID
10626+extern void gr_delayed_cred_worker(void);
10627+#endif
10628+
10629 asmlinkage int syscall_trace_enter(struct pt_regs *regs)
10630 {
10631 int ret = 0;
10632@@ -1070,6 +1074,11 @@ asmlinkage int syscall_trace_enter(struct pt_regs *regs)
10633 if (test_thread_flag(TIF_NOHZ))
10634 user_exit();
10635
10636+#ifdef CONFIG_GRKERNSEC_SETXID
10637+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
10638+ gr_delayed_cred_worker();
10639+#endif
10640+
10641 if (test_thread_flag(TIF_SYSCALL_TRACE))
10642 ret = tracehook_report_syscall_entry(regs);
10643
10644@@ -1088,6 +1097,11 @@ asmlinkage void syscall_trace_leave(struct pt_regs *regs)
10645 if (test_thread_flag(TIF_NOHZ))
10646 user_exit();
10647
10648+#ifdef CONFIG_GRKERNSEC_SETXID
10649+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
10650+ gr_delayed_cred_worker();
10651+#endif
10652+
10653 audit_syscall_exit(regs);
10654
10655 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
10656diff --git a/arch/sparc/kernel/smp_64.c b/arch/sparc/kernel/smp_64.c
10657index 61139d9..c1a5f28 100644
10658--- a/arch/sparc/kernel/smp_64.c
10659+++ b/arch/sparc/kernel/smp_64.c
10660@@ -887,7 +887,7 @@ void smp_flush_dcache_page_impl(struct page *page, int cpu)
10661 return;
10662
10663 #ifdef CONFIG_DEBUG_DCFLUSH
10664- atomic_inc(&dcpage_flushes);
10665+ atomic_inc_unchecked(&dcpage_flushes);
10666 #endif
10667
10668 this_cpu = get_cpu();
10669@@ -911,7 +911,7 @@ void smp_flush_dcache_page_impl(struct page *page, int cpu)
10670 xcall_deliver(data0, __pa(pg_addr),
10671 (u64) pg_addr, cpumask_of(cpu));
10672 #ifdef CONFIG_DEBUG_DCFLUSH
10673- atomic_inc(&dcpage_flushes_xcall);
10674+ atomic_inc_unchecked(&dcpage_flushes_xcall);
10675 #endif
10676 }
10677 }
10678@@ -930,7 +930,7 @@ void flush_dcache_page_all(struct mm_struct *mm, struct page *page)
10679 preempt_disable();
10680
10681 #ifdef CONFIG_DEBUG_DCFLUSH
10682- atomic_inc(&dcpage_flushes);
10683+ atomic_inc_unchecked(&dcpage_flushes);
10684 #endif
10685 data0 = 0;
10686 pg_addr = page_address(page);
10687@@ -947,7 +947,7 @@ void flush_dcache_page_all(struct mm_struct *mm, struct page *page)
10688 xcall_deliver(data0, __pa(pg_addr),
10689 (u64) pg_addr, cpu_online_mask);
10690 #ifdef CONFIG_DEBUG_DCFLUSH
10691- atomic_inc(&dcpage_flushes_xcall);
10692+ atomic_inc_unchecked(&dcpage_flushes_xcall);
10693 #endif
10694 }
10695 __local_flush_dcache_page(page);
10696diff --git a/arch/sparc/kernel/sys_sparc_32.c b/arch/sparc/kernel/sys_sparc_32.c
10697index 646988d..b88905f 100644
10698--- a/arch/sparc/kernel/sys_sparc_32.c
10699+++ b/arch/sparc/kernel/sys_sparc_32.c
10700@@ -54,7 +54,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10701 if (len > TASK_SIZE - PAGE_SIZE)
10702 return -ENOMEM;
10703 if (!addr)
10704- addr = TASK_UNMAPPED_BASE;
10705+ addr = current->mm->mmap_base;
10706
10707 info.flags = 0;
10708 info.length = len;
10709diff --git a/arch/sparc/kernel/sys_sparc_64.c b/arch/sparc/kernel/sys_sparc_64.c
10710index 30e7ddb..266a3b0 100644
10711--- a/arch/sparc/kernel/sys_sparc_64.c
10712+++ b/arch/sparc/kernel/sys_sparc_64.c
10713@@ -89,13 +89,14 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10714 struct vm_area_struct * vma;
10715 unsigned long task_size = TASK_SIZE;
10716 int do_color_align;
10717+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
10718 struct vm_unmapped_area_info info;
10719
10720 if (flags & MAP_FIXED) {
10721 /* We do not accept a shared mapping if it would violate
10722 * cache aliasing constraints.
10723 */
10724- if ((flags & MAP_SHARED) &&
10725+ if ((filp || (flags & MAP_SHARED)) &&
10726 ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
10727 return -EINVAL;
10728 return addr;
10729@@ -110,6 +111,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10730 if (filp || (flags & MAP_SHARED))
10731 do_color_align = 1;
10732
10733+#ifdef CONFIG_PAX_RANDMMAP
10734+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
10735+#endif
10736+
10737 if (addr) {
10738 if (do_color_align)
10739 addr = COLOR_ALIGN(addr, pgoff);
10740@@ -117,22 +122,28 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10741 addr = PAGE_ALIGN(addr);
10742
10743 vma = find_vma(mm, addr);
10744- if (task_size - len >= addr &&
10745- (!vma || addr + len <= vma->vm_start))
10746+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
10747 return addr;
10748 }
10749
10750 info.flags = 0;
10751 info.length = len;
10752- info.low_limit = TASK_UNMAPPED_BASE;
10753+ info.low_limit = mm->mmap_base;
10754 info.high_limit = min(task_size, VA_EXCLUDE_START);
10755 info.align_mask = do_color_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
10756 info.align_offset = pgoff << PAGE_SHIFT;
10757+ info.threadstack_offset = offset;
10758 addr = vm_unmapped_area(&info);
10759
10760 if ((addr & ~PAGE_MASK) && task_size > VA_EXCLUDE_END) {
10761 VM_BUG_ON(addr != -ENOMEM);
10762 info.low_limit = VA_EXCLUDE_END;
10763+
10764+#ifdef CONFIG_PAX_RANDMMAP
10765+ if (mm->pax_flags & MF_PAX_RANDMMAP)
10766+ info.low_limit += mm->delta_mmap;
10767+#endif
10768+
10769 info.high_limit = task_size;
10770 addr = vm_unmapped_area(&info);
10771 }
10772@@ -150,6 +161,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10773 unsigned long task_size = STACK_TOP32;
10774 unsigned long addr = addr0;
10775 int do_color_align;
10776+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
10777 struct vm_unmapped_area_info info;
10778
10779 /* This should only ever run for 32-bit processes. */
10780@@ -159,7 +171,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10781 /* We do not accept a shared mapping if it would violate
10782 * cache aliasing constraints.
10783 */
10784- if ((flags & MAP_SHARED) &&
10785+ if ((filp || (flags & MAP_SHARED)) &&
10786 ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
10787 return -EINVAL;
10788 return addr;
10789@@ -172,6 +184,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10790 if (filp || (flags & MAP_SHARED))
10791 do_color_align = 1;
10792
10793+#ifdef CONFIG_PAX_RANDMMAP
10794+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
10795+#endif
10796+
10797 /* requesting a specific address */
10798 if (addr) {
10799 if (do_color_align)
10800@@ -180,8 +196,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10801 addr = PAGE_ALIGN(addr);
10802
10803 vma = find_vma(mm, addr);
10804- if (task_size - len >= addr &&
10805- (!vma || addr + len <= vma->vm_start))
10806+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
10807 return addr;
10808 }
10809
10810@@ -191,6 +206,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10811 info.high_limit = mm->mmap_base;
10812 info.align_mask = do_color_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
10813 info.align_offset = pgoff << PAGE_SHIFT;
10814+ info.threadstack_offset = offset;
10815 addr = vm_unmapped_area(&info);
10816
10817 /*
10818@@ -203,6 +219,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10819 VM_BUG_ON(addr != -ENOMEM);
10820 info.flags = 0;
10821 info.low_limit = TASK_UNMAPPED_BASE;
10822+
10823+#ifdef CONFIG_PAX_RANDMMAP
10824+ if (mm->pax_flags & MF_PAX_RANDMMAP)
10825+ info.low_limit += mm->delta_mmap;
10826+#endif
10827+
10828 info.high_limit = STACK_TOP32;
10829 addr = vm_unmapped_area(&info);
10830 }
10831@@ -259,10 +281,14 @@ unsigned long get_fb_unmapped_area(struct file *filp, unsigned long orig_addr, u
10832 EXPORT_SYMBOL(get_fb_unmapped_area);
10833
10834 /* Essentially the same as PowerPC. */
10835-static unsigned long mmap_rnd(void)
10836+static unsigned long mmap_rnd(struct mm_struct *mm)
10837 {
10838 unsigned long rnd = 0UL;
10839
10840+#ifdef CONFIG_PAX_RANDMMAP
10841+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
10842+#endif
10843+
10844 if (current->flags & PF_RANDOMIZE) {
10845 unsigned long val = get_random_int();
10846 if (test_thread_flag(TIF_32BIT))
10847@@ -275,7 +301,7 @@ static unsigned long mmap_rnd(void)
10848
10849 void arch_pick_mmap_layout(struct mm_struct *mm)
10850 {
10851- unsigned long random_factor = mmap_rnd();
10852+ unsigned long random_factor = mmap_rnd(mm);
10853 unsigned long gap;
10854
10855 /*
10856@@ -288,6 +314,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
10857 gap == RLIM_INFINITY ||
10858 sysctl_legacy_va_layout) {
10859 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
10860+
10861+#ifdef CONFIG_PAX_RANDMMAP
10862+ if (mm->pax_flags & MF_PAX_RANDMMAP)
10863+ mm->mmap_base += mm->delta_mmap;
10864+#endif
10865+
10866 mm->get_unmapped_area = arch_get_unmapped_area;
10867 } else {
10868 /* We know it's 32-bit */
10869@@ -299,6 +331,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
10870 gap = (task_size / 6 * 5);
10871
10872 mm->mmap_base = PAGE_ALIGN(task_size - gap - random_factor);
10873+
10874+#ifdef CONFIG_PAX_RANDMMAP
10875+ if (mm->pax_flags & MF_PAX_RANDMMAP)
10876+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
10877+#endif
10878+
10879 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
10880 }
10881 }
10882diff --git a/arch/sparc/kernel/syscalls.S b/arch/sparc/kernel/syscalls.S
10883index bb00089..e0ea580 100644
10884--- a/arch/sparc/kernel/syscalls.S
10885+++ b/arch/sparc/kernel/syscalls.S
10886@@ -62,7 +62,7 @@ sys32_rt_sigreturn:
10887 #endif
10888 .align 32
10889 1: ldx [%g6 + TI_FLAGS], %l5
10890- andcc %l5, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10891+ andcc %l5, _TIF_WORK_SYSCALL, %g0
10892 be,pt %icc, rtrap
10893 nop
10894 call syscall_trace_leave
10895@@ -194,7 +194,7 @@ linux_sparc_syscall32:
10896
10897 srl %i3, 0, %o3 ! IEU0
10898 srl %i2, 0, %o2 ! IEU0 Group
10899- andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10900+ andcc %l0, _TIF_WORK_SYSCALL, %g0
10901 bne,pn %icc, linux_syscall_trace32 ! CTI
10902 mov %i0, %l5 ! IEU1
10903 5: call %l7 ! CTI Group brk forced
10904@@ -218,7 +218,7 @@ linux_sparc_syscall:
10905
10906 mov %i3, %o3 ! IEU1
10907 mov %i4, %o4 ! IEU0 Group
10908- andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10909+ andcc %l0, _TIF_WORK_SYSCALL, %g0
10910 bne,pn %icc, linux_syscall_trace ! CTI Group
10911 mov %i0, %l5 ! IEU0
10912 2: call %l7 ! CTI Group brk forced
10913@@ -233,7 +233,7 @@ ret_sys_call:
10914
10915 cmp %o0, -ERESTART_RESTARTBLOCK
10916 bgeu,pn %xcc, 1f
10917- andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10918+ andcc %l0, _TIF_WORK_SYSCALL, %g0
10919 ldx [%sp + PTREGS_OFF + PT_V9_TNPC], %l1 ! pc = npc
10920
10921 2:
10922diff --git a/arch/sparc/kernel/traps_32.c b/arch/sparc/kernel/traps_32.c
10923index 6fd386c5..6907d81 100644
10924--- a/arch/sparc/kernel/traps_32.c
10925+++ b/arch/sparc/kernel/traps_32.c
10926@@ -44,6 +44,8 @@ static void instruction_dump(unsigned long *pc)
10927 #define __SAVE __asm__ __volatile__("save %sp, -0x40, %sp\n\t")
10928 #define __RESTORE __asm__ __volatile__("restore %g0, %g0, %g0\n\t")
10929
10930+extern void gr_handle_kernel_exploit(void);
10931+
10932 void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
10933 {
10934 static int die_counter;
10935@@ -76,15 +78,17 @@ void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
10936 count++ < 30 &&
10937 (((unsigned long) rw) >= PAGE_OFFSET) &&
10938 !(((unsigned long) rw) & 0x7)) {
10939- printk("Caller[%08lx]: %pS\n", rw->ins[7],
10940+ printk("Caller[%08lx]: %pA\n", rw->ins[7],
10941 (void *) rw->ins[7]);
10942 rw = (struct reg_window32 *)rw->ins[6];
10943 }
10944 }
10945 printk("Instruction DUMP:");
10946 instruction_dump ((unsigned long *) regs->pc);
10947- if(regs->psr & PSR_PS)
10948+ if(regs->psr & PSR_PS) {
10949+ gr_handle_kernel_exploit();
10950 do_exit(SIGKILL);
10951+ }
10952 do_exit(SIGSEGV);
10953 }
10954
10955diff --git a/arch/sparc/kernel/traps_64.c b/arch/sparc/kernel/traps_64.c
10956index 0e69974..0c15a6e 100644
10957--- a/arch/sparc/kernel/traps_64.c
10958+++ b/arch/sparc/kernel/traps_64.c
10959@@ -79,7 +79,7 @@ static void dump_tl1_traplog(struct tl1_traplog *p)
10960 i + 1,
10961 p->trapstack[i].tstate, p->trapstack[i].tpc,
10962 p->trapstack[i].tnpc, p->trapstack[i].tt);
10963- printk("TRAPLOG: TPC<%pS>\n", (void *) p->trapstack[i].tpc);
10964+ printk("TRAPLOG: TPC<%pA>\n", (void *) p->trapstack[i].tpc);
10965 }
10966 }
10967
10968@@ -99,6 +99,12 @@ void bad_trap(struct pt_regs *regs, long lvl)
10969
10970 lvl -= 0x100;
10971 if (regs->tstate & TSTATE_PRIV) {
10972+
10973+#ifdef CONFIG_PAX_REFCOUNT
10974+ if (lvl == 6)
10975+ pax_report_refcount_overflow(regs);
10976+#endif
10977+
10978 sprintf(buffer, "Kernel bad sw trap %lx", lvl);
10979 die_if_kernel(buffer, regs);
10980 }
10981@@ -117,11 +123,16 @@ void bad_trap(struct pt_regs *regs, long lvl)
10982 void bad_trap_tl1(struct pt_regs *regs, long lvl)
10983 {
10984 char buffer[32];
10985-
10986+
10987 if (notify_die(DIE_TRAP_TL1, "bad trap tl1", regs,
10988 0, lvl, SIGTRAP) == NOTIFY_STOP)
10989 return;
10990
10991+#ifdef CONFIG_PAX_REFCOUNT
10992+ if (lvl == 6)
10993+ pax_report_refcount_overflow(regs);
10994+#endif
10995+
10996 dump_tl1_traplog((struct tl1_traplog *)(regs + 1));
10997
10998 sprintf (buffer, "Bad trap %lx at tl>0", lvl);
10999@@ -1151,7 +1162,7 @@ static void cheetah_log_errors(struct pt_regs *regs, struct cheetah_err_info *in
11000 regs->tpc, regs->tnpc, regs->u_regs[UREG_I7], regs->tstate);
11001 printk("%s" "ERROR(%d): ",
11002 (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id());
11003- printk("TPC<%pS>\n", (void *) regs->tpc);
11004+ printk("TPC<%pA>\n", (void *) regs->tpc);
11005 printk("%s" "ERROR(%d): M_SYND(%lx), E_SYND(%lx)%s%s\n",
11006 (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id(),
11007 (afsr & CHAFSR_M_SYNDROME) >> CHAFSR_M_SYNDROME_SHIFT,
11008@@ -1758,7 +1769,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
11009 smp_processor_id(),
11010 (type & 0x1) ? 'I' : 'D',
11011 regs->tpc);
11012- printk(KERN_EMERG "TPC<%pS>\n", (void *) regs->tpc);
11013+ printk(KERN_EMERG "TPC<%pA>\n", (void *) regs->tpc);
11014 panic("Irrecoverable Cheetah+ parity error.");
11015 }
11016
11017@@ -1766,7 +1777,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
11018 smp_processor_id(),
11019 (type & 0x1) ? 'I' : 'D',
11020 regs->tpc);
11021- printk(KERN_WARNING "TPC<%pS>\n", (void *) regs->tpc);
11022+ printk(KERN_WARNING "TPC<%pA>\n", (void *) regs->tpc);
11023 }
11024
11025 struct sun4v_error_entry {
11026@@ -1839,8 +1850,8 @@ struct sun4v_error_entry {
11027 /*0x38*/u64 reserved_5;
11028 };
11029
11030-static atomic_t sun4v_resum_oflow_cnt = ATOMIC_INIT(0);
11031-static atomic_t sun4v_nonresum_oflow_cnt = ATOMIC_INIT(0);
11032+static atomic_unchecked_t sun4v_resum_oflow_cnt = ATOMIC_INIT(0);
11033+static atomic_unchecked_t sun4v_nonresum_oflow_cnt = ATOMIC_INIT(0);
11034
11035 static const char *sun4v_err_type_to_str(u8 type)
11036 {
11037@@ -1932,7 +1943,7 @@ static void sun4v_report_real_raddr(const char *pfx, struct pt_regs *regs)
11038 }
11039
11040 static void sun4v_log_error(struct pt_regs *regs, struct sun4v_error_entry *ent,
11041- int cpu, const char *pfx, atomic_t *ocnt)
11042+ int cpu, const char *pfx, atomic_unchecked_t *ocnt)
11043 {
11044 u64 *raw_ptr = (u64 *) ent;
11045 u32 attrs;
11046@@ -1990,8 +2001,8 @@ static void sun4v_log_error(struct pt_regs *regs, struct sun4v_error_entry *ent,
11047
11048 show_regs(regs);
11049
11050- if ((cnt = atomic_read(ocnt)) != 0) {
11051- atomic_set(ocnt, 0);
11052+ if ((cnt = atomic_read_unchecked(ocnt)) != 0) {
11053+ atomic_set_unchecked(ocnt, 0);
11054 wmb();
11055 printk("%s: Queue overflowed %d times.\n",
11056 pfx, cnt);
11057@@ -2048,7 +2059,7 @@ out:
11058 */
11059 void sun4v_resum_overflow(struct pt_regs *regs)
11060 {
11061- atomic_inc(&sun4v_resum_oflow_cnt);
11062+ atomic_inc_unchecked(&sun4v_resum_oflow_cnt);
11063 }
11064
11065 /* We run with %pil set to PIL_NORMAL_MAX and PSTATE_IE enabled in %pstate.
11066@@ -2101,7 +2112,7 @@ void sun4v_nonresum_overflow(struct pt_regs *regs)
11067 /* XXX Actually even this can make not that much sense. Perhaps
11068 * XXX we should just pull the plug and panic directly from here?
11069 */
11070- atomic_inc(&sun4v_nonresum_oflow_cnt);
11071+ atomic_inc_unchecked(&sun4v_nonresum_oflow_cnt);
11072 }
11073
11074 static void sun4v_tlb_error(struct pt_regs *regs)
11075@@ -2120,9 +2131,9 @@ void sun4v_itlb_error_report(struct pt_regs *regs, int tl)
11076
11077 printk(KERN_EMERG "SUN4V-ITLB: Error at TPC[%lx], tl %d\n",
11078 regs->tpc, tl);
11079- printk(KERN_EMERG "SUN4V-ITLB: TPC<%pS>\n", (void *) regs->tpc);
11080+ printk(KERN_EMERG "SUN4V-ITLB: TPC<%pA>\n", (void *) regs->tpc);
11081 printk(KERN_EMERG "SUN4V-ITLB: O7[%lx]\n", regs->u_regs[UREG_I7]);
11082- printk(KERN_EMERG "SUN4V-ITLB: O7<%pS>\n",
11083+ printk(KERN_EMERG "SUN4V-ITLB: O7<%pA>\n",
11084 (void *) regs->u_regs[UREG_I7]);
11085 printk(KERN_EMERG "SUN4V-ITLB: vaddr[%lx] ctx[%lx] "
11086 "pte[%lx] error[%lx]\n",
11087@@ -2143,9 +2154,9 @@ void sun4v_dtlb_error_report(struct pt_regs *regs, int tl)
11088
11089 printk(KERN_EMERG "SUN4V-DTLB: Error at TPC[%lx], tl %d\n",
11090 regs->tpc, tl);
11091- printk(KERN_EMERG "SUN4V-DTLB: TPC<%pS>\n", (void *) regs->tpc);
11092+ printk(KERN_EMERG "SUN4V-DTLB: TPC<%pA>\n", (void *) regs->tpc);
11093 printk(KERN_EMERG "SUN4V-DTLB: O7[%lx]\n", regs->u_regs[UREG_I7]);
11094- printk(KERN_EMERG "SUN4V-DTLB: O7<%pS>\n",
11095+ printk(KERN_EMERG "SUN4V-DTLB: O7<%pA>\n",
11096 (void *) regs->u_regs[UREG_I7]);
11097 printk(KERN_EMERG "SUN4V-DTLB: vaddr[%lx] ctx[%lx] "
11098 "pte[%lx] error[%lx]\n",
11099@@ -2362,13 +2373,13 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
11100 fp = (unsigned long)sf->fp + STACK_BIAS;
11101 }
11102
11103- printk(" [%016lx] %pS\n", pc, (void *) pc);
11104+ printk(" [%016lx] %pA\n", pc, (void *) pc);
11105 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
11106 if ((pc + 8UL) == (unsigned long) &return_to_handler) {
11107 int index = tsk->curr_ret_stack;
11108 if (tsk->ret_stack && index >= graph) {
11109 pc = tsk->ret_stack[index - graph].ret;
11110- printk(" [%016lx] %pS\n", pc, (void *) pc);
11111+ printk(" [%016lx] %pA\n", pc, (void *) pc);
11112 graph++;
11113 }
11114 }
11115@@ -2386,6 +2397,8 @@ static inline struct reg_window *kernel_stack_up(struct reg_window *rw)
11116 return (struct reg_window *) (fp + STACK_BIAS);
11117 }
11118
11119+extern void gr_handle_kernel_exploit(void);
11120+
11121 void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
11122 {
11123 static int die_counter;
11124@@ -2414,7 +2427,7 @@ void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
11125 while (rw &&
11126 count++ < 30 &&
11127 kstack_valid(tp, (unsigned long) rw)) {
11128- printk("Caller[%016lx]: %pS\n", rw->ins[7],
11129+ printk("Caller[%016lx]: %pA\n", rw->ins[7],
11130 (void *) rw->ins[7]);
11131
11132 rw = kernel_stack_up(rw);
11133@@ -2429,8 +2442,10 @@ void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
11134 }
11135 if (panic_on_oops)
11136 panic("Fatal exception");
11137- if (regs->tstate & TSTATE_PRIV)
11138+ if (regs->tstate & TSTATE_PRIV) {
11139+ gr_handle_kernel_exploit();
11140 do_exit(SIGKILL);
11141+ }
11142 do_exit(SIGSEGV);
11143 }
11144 EXPORT_SYMBOL(die_if_kernel);
11145diff --git a/arch/sparc/kernel/unaligned_64.c b/arch/sparc/kernel/unaligned_64.c
11146index 62098a8..547ab2c 100644
11147--- a/arch/sparc/kernel/unaligned_64.c
11148+++ b/arch/sparc/kernel/unaligned_64.c
11149@@ -297,7 +297,7 @@ static void log_unaligned(struct pt_regs *regs)
11150 static DEFINE_RATELIMIT_STATE(ratelimit, 5 * HZ, 5);
11151
11152 if (__ratelimit(&ratelimit)) {
11153- printk("Kernel unaligned access at TPC[%lx] %pS\n",
11154+ printk("Kernel unaligned access at TPC[%lx] %pA\n",
11155 regs->tpc, (void *) regs->tpc);
11156 }
11157 }
11158diff --git a/arch/sparc/lib/Makefile b/arch/sparc/lib/Makefile
11159index 3269b02..64f5231 100644
11160--- a/arch/sparc/lib/Makefile
11161+++ b/arch/sparc/lib/Makefile
11162@@ -2,7 +2,7 @@
11163 #
11164
11165 asflags-y := -ansi -DST_DIV0=0x02
11166-ccflags-y := -Werror
11167+#ccflags-y := -Werror
11168
11169 lib-$(CONFIG_SPARC32) += ashrdi3.o
11170 lib-$(CONFIG_SPARC32) += memcpy.o memset.o
11171diff --git a/arch/sparc/lib/atomic_64.S b/arch/sparc/lib/atomic_64.S
11172index 05dac43..76f8ed4 100644
11173--- a/arch/sparc/lib/atomic_64.S
11174+++ b/arch/sparc/lib/atomic_64.S
11175@@ -15,11 +15,22 @@
11176 * a value and does the barriers.
11177 */
11178
11179-#define ATOMIC_OP(op) \
11180-ENTRY(atomic_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
11181+#ifdef CONFIG_PAX_REFCOUNT
11182+#define __REFCOUNT_OP(op) op##cc
11183+#define __OVERFLOW_IOP tvs %icc, 6;
11184+#define __OVERFLOW_XOP tvs %xcc, 6;
11185+#else
11186+#define __REFCOUNT_OP(op) op
11187+#define __OVERFLOW_IOP
11188+#define __OVERFLOW_XOP
11189+#endif
11190+
11191+#define __ATOMIC_OP(op, suffix, asm_op, post_op) \
11192+ENTRY(atomic_##op##suffix) /* %o0 = increment, %o1 = atomic_ptr */ \
11193 BACKOFF_SETUP(%o2); \
11194 1: lduw [%o1], %g1; \
11195- op %g1, %o0, %g7; \
11196+ asm_op %g1, %o0, %g7; \
11197+ post_op \
11198 cas [%o1], %g1, %g7; \
11199 cmp %g1, %g7; \
11200 bne,pn %icc, BACKOFF_LABEL(2f, 1b); \
11201@@ -29,11 +40,15 @@ ENTRY(atomic_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
11202 2: BACKOFF_SPIN(%o2, %o3, 1b); \
11203 ENDPROC(atomic_##op); \
11204
11205-#define ATOMIC_OP_RETURN(op) \
11206-ENTRY(atomic_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
11207+#define ATOMIC_OP(op) __ATOMIC_OP(op, , op, ) \
11208+ __ATOMIC_OP(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_IOP)
11209+
11210+#define __ATOMIC_OP_RETURN(op, suffix, asm_op, post_op) \
11211+ENTRY(atomic_##op##_return##suffix) /* %o0 = increment, %o1 = atomic_ptr */\
11212 BACKOFF_SETUP(%o2); \
11213 1: lduw [%o1], %g1; \
11214- op %g1, %o0, %g7; \
11215+ asm_op %g1, %o0, %g7; \
11216+ post_op \
11217 cas [%o1], %g1, %g7; \
11218 cmp %g1, %g7; \
11219 bne,pn %icc, BACKOFF_LABEL(2f, 1b); \
11220@@ -43,6 +58,9 @@ ENTRY(atomic_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
11221 2: BACKOFF_SPIN(%o2, %o3, 1b); \
11222 ENDPROC(atomic_##op##_return);
11223
11224+#define ATOMIC_OP_RETURN(op) __ATOMIC_OP_RETURN(op, , op, ) \
11225+ __ATOMIC_OP_RETURN(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_IOP)
11226+
11227 #define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_OP_RETURN(op)
11228
11229 ATOMIC_OPS(add)
11230@@ -50,13 +68,16 @@ ATOMIC_OPS(sub)
11231
11232 #undef ATOMIC_OPS
11233 #undef ATOMIC_OP_RETURN
11234+#undef __ATOMIC_OP_RETURN
11235 #undef ATOMIC_OP
11236+#undef __ATOMIC_OP
11237
11238-#define ATOMIC64_OP(op) \
11239-ENTRY(atomic64_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
11240+#define __ATOMIC64_OP(op, suffix, asm_op, post_op) \
11241+ENTRY(atomic64_##op##suffix) /* %o0 = increment, %o1 = atomic_ptr */ \
11242 BACKOFF_SETUP(%o2); \
11243 1: ldx [%o1], %g1; \
11244- op %g1, %o0, %g7; \
11245+ asm_op %g1, %o0, %g7; \
11246+ post_op \
11247 casx [%o1], %g1, %g7; \
11248 cmp %g1, %g7; \
11249 bne,pn %xcc, BACKOFF_LABEL(2f, 1b); \
11250@@ -66,11 +87,15 @@ ENTRY(atomic64_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
11251 2: BACKOFF_SPIN(%o2, %o3, 1b); \
11252 ENDPROC(atomic64_##op); \
11253
11254-#define ATOMIC64_OP_RETURN(op) \
11255-ENTRY(atomic64_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
11256+#define ATOMIC64_OP(op) __ATOMIC64_OP(op, , op, ) \
11257+ __ATOMIC64_OP(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_XOP)
11258+
11259+#define __ATOMIC64_OP_RETURN(op, suffix, asm_op, post_op) \
11260+ENTRY(atomic64_##op##_return##suffix) /* %o0 = increment, %o1 = atomic_ptr */\
11261 BACKOFF_SETUP(%o2); \
11262 1: ldx [%o1], %g1; \
11263- op %g1, %o0, %g7; \
11264+ asm_op %g1, %o0, %g7; \
11265+ post_op \
11266 casx [%o1], %g1, %g7; \
11267 cmp %g1, %g7; \
11268 bne,pn %xcc, BACKOFF_LABEL(2f, 1b); \
11269@@ -80,6 +105,9 @@ ENTRY(atomic64_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
11270 2: BACKOFF_SPIN(%o2, %o3, 1b); \
11271 ENDPROC(atomic64_##op##_return);
11272
11273+#define ATOMIC64_OP_RETURN(op) __ATOMIC64_OP_RETURN(op, , op, ) \
11274+i __ATOMIC64_OP_RETURN(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_XOP)
11275+
11276 #define ATOMIC64_OPS(op) ATOMIC64_OP(op) ATOMIC64_OP_RETURN(op)
11277
11278 ATOMIC64_OPS(add)
11279@@ -87,7 +115,12 @@ ATOMIC64_OPS(sub)
11280
11281 #undef ATOMIC64_OPS
11282 #undef ATOMIC64_OP_RETURN
11283+#undef __ATOMIC64_OP_RETURN
11284 #undef ATOMIC64_OP
11285+#undef __ATOMIC64_OP
11286+#undef __OVERFLOW_XOP
11287+#undef __OVERFLOW_IOP
11288+#undef __REFCOUNT_OP
11289
11290 ENTRY(atomic64_dec_if_positive) /* %o0 = atomic_ptr */
11291 BACKOFF_SETUP(%o2)
11292diff --git a/arch/sparc/lib/ksyms.c b/arch/sparc/lib/ksyms.c
11293index 1d649a9..fbc5bfc 100644
11294--- a/arch/sparc/lib/ksyms.c
11295+++ b/arch/sparc/lib/ksyms.c
11296@@ -101,7 +101,9 @@ EXPORT_SYMBOL(__clear_user);
11297 /* Atomic counter implementation. */
11298 #define ATOMIC_OP(op) \
11299 EXPORT_SYMBOL(atomic_##op); \
11300-EXPORT_SYMBOL(atomic64_##op);
11301+EXPORT_SYMBOL(atomic_##op##_unchecked); \
11302+EXPORT_SYMBOL(atomic64_##op); \
11303+EXPORT_SYMBOL(atomic64_##op##_unchecked);
11304
11305 #define ATOMIC_OP_RETURN(op) \
11306 EXPORT_SYMBOL(atomic_##op##_return); \
11307@@ -110,6 +112,8 @@ EXPORT_SYMBOL(atomic64_##op##_return);
11308 #define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_OP_RETURN(op)
11309
11310 ATOMIC_OPS(add)
11311+EXPORT_SYMBOL(atomic_add_ret_unchecked);
11312+EXPORT_SYMBOL(atomic64_add_ret_unchecked);
11313 ATOMIC_OPS(sub)
11314
11315 #undef ATOMIC_OPS
11316diff --git a/arch/sparc/mm/Makefile b/arch/sparc/mm/Makefile
11317index 30c3ecc..736f015 100644
11318--- a/arch/sparc/mm/Makefile
11319+++ b/arch/sparc/mm/Makefile
11320@@ -2,7 +2,7 @@
11321 #
11322
11323 asflags-y := -ansi
11324-ccflags-y := -Werror
11325+#ccflags-y := -Werror
11326
11327 obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o gup.o
11328 obj-y += fault_$(BITS).o
11329diff --git a/arch/sparc/mm/fault_32.c b/arch/sparc/mm/fault_32.c
11330index 70d8171..274c6c0 100644
11331--- a/arch/sparc/mm/fault_32.c
11332+++ b/arch/sparc/mm/fault_32.c
11333@@ -21,6 +21,9 @@
11334 #include <linux/perf_event.h>
11335 #include <linux/interrupt.h>
11336 #include <linux/kdebug.h>
11337+#include <linux/slab.h>
11338+#include <linux/pagemap.h>
11339+#include <linux/compiler.h>
11340
11341 #include <asm/page.h>
11342 #include <asm/pgtable.h>
11343@@ -156,6 +159,277 @@ static unsigned long compute_si_addr(struct pt_regs *regs, int text_fault)
11344 return safe_compute_effective_address(regs, insn);
11345 }
11346
11347+#ifdef CONFIG_PAX_PAGEEXEC
11348+#ifdef CONFIG_PAX_DLRESOLVE
11349+static void pax_emuplt_close(struct vm_area_struct *vma)
11350+{
11351+ vma->vm_mm->call_dl_resolve = 0UL;
11352+}
11353+
11354+static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
11355+{
11356+ unsigned int *kaddr;
11357+
11358+ vmf->page = alloc_page(GFP_HIGHUSER);
11359+ if (!vmf->page)
11360+ return VM_FAULT_OOM;
11361+
11362+ kaddr = kmap(vmf->page);
11363+ memset(kaddr, 0, PAGE_SIZE);
11364+ kaddr[0] = 0x9DE3BFA8U; /* save */
11365+ flush_dcache_page(vmf->page);
11366+ kunmap(vmf->page);
11367+ return VM_FAULT_MAJOR;
11368+}
11369+
11370+static const struct vm_operations_struct pax_vm_ops = {
11371+ .close = pax_emuplt_close,
11372+ .fault = pax_emuplt_fault
11373+};
11374+
11375+static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
11376+{
11377+ int ret;
11378+
11379+ INIT_LIST_HEAD(&vma->anon_vma_chain);
11380+ vma->vm_mm = current->mm;
11381+ vma->vm_start = addr;
11382+ vma->vm_end = addr + PAGE_SIZE;
11383+ vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC;
11384+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
11385+ vma->vm_ops = &pax_vm_ops;
11386+
11387+ ret = insert_vm_struct(current->mm, vma);
11388+ if (ret)
11389+ return ret;
11390+
11391+ ++current->mm->total_vm;
11392+ return 0;
11393+}
11394+#endif
11395+
11396+/*
11397+ * PaX: decide what to do with offenders (regs->pc = fault address)
11398+ *
11399+ * returns 1 when task should be killed
11400+ * 2 when patched PLT trampoline was detected
11401+ * 3 when unpatched PLT trampoline was detected
11402+ */
11403+static int pax_handle_fetch_fault(struct pt_regs *regs)
11404+{
11405+
11406+#ifdef CONFIG_PAX_EMUPLT
11407+ int err;
11408+
11409+ do { /* PaX: patched PLT emulation #1 */
11410+ unsigned int sethi1, sethi2, jmpl;
11411+
11412+ err = get_user(sethi1, (unsigned int *)regs->pc);
11413+ err |= get_user(sethi2, (unsigned int *)(regs->pc+4));
11414+ err |= get_user(jmpl, (unsigned int *)(regs->pc+8));
11415+
11416+ if (err)
11417+ break;
11418+
11419+ if ((sethi1 & 0xFFC00000U) == 0x03000000U &&
11420+ (sethi2 & 0xFFC00000U) == 0x03000000U &&
11421+ (jmpl & 0xFFFFE000U) == 0x81C06000U)
11422+ {
11423+ unsigned int addr;
11424+
11425+ regs->u_regs[UREG_G1] = (sethi2 & 0x003FFFFFU) << 10;
11426+ addr = regs->u_regs[UREG_G1];
11427+ addr += (((jmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
11428+ regs->pc = addr;
11429+ regs->npc = addr+4;
11430+ return 2;
11431+ }
11432+ } while (0);
11433+
11434+ do { /* PaX: patched PLT emulation #2 */
11435+ unsigned int ba;
11436+
11437+ err = get_user(ba, (unsigned int *)regs->pc);
11438+
11439+ if (err)
11440+ break;
11441+
11442+ if ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30480000U) {
11443+ unsigned int addr;
11444+
11445+ if ((ba & 0xFFC00000U) == 0x30800000U)
11446+ addr = regs->pc + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00200000U) << 2);
11447+ else
11448+ addr = regs->pc + ((((ba | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
11449+ regs->pc = addr;
11450+ regs->npc = addr+4;
11451+ return 2;
11452+ }
11453+ } while (0);
11454+
11455+ do { /* PaX: patched PLT emulation #3 */
11456+ unsigned int sethi, bajmpl, nop;
11457+
11458+ err = get_user(sethi, (unsigned int *)regs->pc);
11459+ err |= get_user(bajmpl, (unsigned int *)(regs->pc+4));
11460+ err |= get_user(nop, (unsigned int *)(regs->pc+8));
11461+
11462+ if (err)
11463+ break;
11464+
11465+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11466+ ((bajmpl & 0xFFFFE000U) == 0x81C06000U || (bajmpl & 0xFFF80000U) == 0x30480000U) &&
11467+ nop == 0x01000000U)
11468+ {
11469+ unsigned int addr;
11470+
11471+ addr = (sethi & 0x003FFFFFU) << 10;
11472+ regs->u_regs[UREG_G1] = addr;
11473+ if ((bajmpl & 0xFFFFE000U) == 0x81C06000U)
11474+ addr += (((bajmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
11475+ else
11476+ addr = regs->pc + ((((bajmpl | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
11477+ regs->pc = addr;
11478+ regs->npc = addr+4;
11479+ return 2;
11480+ }
11481+ } while (0);
11482+
11483+ do { /* PaX: unpatched PLT emulation step 1 */
11484+ unsigned int sethi, ba, nop;
11485+
11486+ err = get_user(sethi, (unsigned int *)regs->pc);
11487+ err |= get_user(ba, (unsigned int *)(regs->pc+4));
11488+ err |= get_user(nop, (unsigned int *)(regs->pc+8));
11489+
11490+ if (err)
11491+ break;
11492+
11493+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11494+ ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30680000U) &&
11495+ nop == 0x01000000U)
11496+ {
11497+ unsigned int addr, save, call;
11498+
11499+ if ((ba & 0xFFC00000U) == 0x30800000U)
11500+ addr = regs->pc + 4 + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00200000U) << 2);
11501+ else
11502+ addr = regs->pc + 4 + ((((ba | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
11503+
11504+ err = get_user(save, (unsigned int *)addr);
11505+ err |= get_user(call, (unsigned int *)(addr+4));
11506+ err |= get_user(nop, (unsigned int *)(addr+8));
11507+ if (err)
11508+ break;
11509+
11510+#ifdef CONFIG_PAX_DLRESOLVE
11511+ if (save == 0x9DE3BFA8U &&
11512+ (call & 0xC0000000U) == 0x40000000U &&
11513+ nop == 0x01000000U)
11514+ {
11515+ struct vm_area_struct *vma;
11516+ unsigned long call_dl_resolve;
11517+
11518+ down_read(&current->mm->mmap_sem);
11519+ call_dl_resolve = current->mm->call_dl_resolve;
11520+ up_read(&current->mm->mmap_sem);
11521+ if (likely(call_dl_resolve))
11522+ goto emulate;
11523+
11524+ vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
11525+
11526+ down_write(&current->mm->mmap_sem);
11527+ if (current->mm->call_dl_resolve) {
11528+ call_dl_resolve = current->mm->call_dl_resolve;
11529+ up_write(&current->mm->mmap_sem);
11530+ if (vma)
11531+ kmem_cache_free(vm_area_cachep, vma);
11532+ goto emulate;
11533+ }
11534+
11535+ call_dl_resolve = get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MAP_PRIVATE);
11536+ if (!vma || (call_dl_resolve & ~PAGE_MASK)) {
11537+ up_write(&current->mm->mmap_sem);
11538+ if (vma)
11539+ kmem_cache_free(vm_area_cachep, vma);
11540+ return 1;
11541+ }
11542+
11543+ if (pax_insert_vma(vma, call_dl_resolve)) {
11544+ up_write(&current->mm->mmap_sem);
11545+ kmem_cache_free(vm_area_cachep, vma);
11546+ return 1;
11547+ }
11548+
11549+ current->mm->call_dl_resolve = call_dl_resolve;
11550+ up_write(&current->mm->mmap_sem);
11551+
11552+emulate:
11553+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11554+ regs->pc = call_dl_resolve;
11555+ regs->npc = addr+4;
11556+ return 3;
11557+ }
11558+#endif
11559+
11560+ /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */
11561+ if ((save & 0xFFC00000U) == 0x05000000U &&
11562+ (call & 0xFFFFE000U) == 0x85C0A000U &&
11563+ nop == 0x01000000U)
11564+ {
11565+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11566+ regs->u_regs[UREG_G2] = addr + 4;
11567+ addr = (save & 0x003FFFFFU) << 10;
11568+ addr += (((call | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
11569+ regs->pc = addr;
11570+ regs->npc = addr+4;
11571+ return 3;
11572+ }
11573+ }
11574+ } while (0);
11575+
11576+ do { /* PaX: unpatched PLT emulation step 2 */
11577+ unsigned int save, call, nop;
11578+
11579+ err = get_user(save, (unsigned int *)(regs->pc-4));
11580+ err |= get_user(call, (unsigned int *)regs->pc);
11581+ err |= get_user(nop, (unsigned int *)(regs->pc+4));
11582+ if (err)
11583+ break;
11584+
11585+ if (save == 0x9DE3BFA8U &&
11586+ (call & 0xC0000000U) == 0x40000000U &&
11587+ nop == 0x01000000U)
11588+ {
11589+ unsigned int dl_resolve = regs->pc + ((((call | 0xC0000000U) ^ 0x20000000U) + 0x20000000U) << 2);
11590+
11591+ regs->u_regs[UREG_RETPC] = regs->pc;
11592+ regs->pc = dl_resolve;
11593+ regs->npc = dl_resolve+4;
11594+ return 3;
11595+ }
11596+ } while (0);
11597+#endif
11598+
11599+ return 1;
11600+}
11601+
11602+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
11603+{
11604+ unsigned long i;
11605+
11606+ printk(KERN_ERR "PAX: bytes at PC: ");
11607+ for (i = 0; i < 8; i++) {
11608+ unsigned int c;
11609+ if (get_user(c, (unsigned int *)pc+i))
11610+ printk(KERN_CONT "???????? ");
11611+ else
11612+ printk(KERN_CONT "%08x ", c);
11613+ }
11614+ printk("\n");
11615+}
11616+#endif
11617+
11618 static noinline void do_fault_siginfo(int code, int sig, struct pt_regs *regs,
11619 int text_fault)
11620 {
11621@@ -226,6 +500,24 @@ good_area:
11622 if (!(vma->vm_flags & VM_WRITE))
11623 goto bad_area;
11624 } else {
11625+
11626+#ifdef CONFIG_PAX_PAGEEXEC
11627+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && text_fault && !(vma->vm_flags & VM_EXEC)) {
11628+ up_read(&mm->mmap_sem);
11629+ switch (pax_handle_fetch_fault(regs)) {
11630+
11631+#ifdef CONFIG_PAX_EMUPLT
11632+ case 2:
11633+ case 3:
11634+ return;
11635+#endif
11636+
11637+ }
11638+ pax_report_fault(regs, (void *)regs->pc, (void *)regs->u_regs[UREG_FP]);
11639+ do_group_exit(SIGKILL);
11640+ }
11641+#endif
11642+
11643 /* Allow reads even for write-only mappings */
11644 if (!(vma->vm_flags & (VM_READ | VM_EXEC)))
11645 goto bad_area;
11646diff --git a/arch/sparc/mm/fault_64.c b/arch/sparc/mm/fault_64.c
11647index 4798232..f76e3aa 100644
11648--- a/arch/sparc/mm/fault_64.c
11649+++ b/arch/sparc/mm/fault_64.c
11650@@ -22,6 +22,9 @@
11651 #include <linux/kdebug.h>
11652 #include <linux/percpu.h>
11653 #include <linux/context_tracking.h>
11654+#include <linux/slab.h>
11655+#include <linux/pagemap.h>
11656+#include <linux/compiler.h>
11657
11658 #include <asm/page.h>
11659 #include <asm/pgtable.h>
11660@@ -76,7 +79,7 @@ static void __kprobes bad_kernel_pc(struct pt_regs *regs, unsigned long vaddr)
11661 printk(KERN_CRIT "OOPS: Bogus kernel PC [%016lx] in fault handler\n",
11662 regs->tpc);
11663 printk(KERN_CRIT "OOPS: RPC [%016lx]\n", regs->u_regs[15]);
11664- printk("OOPS: RPC <%pS>\n", (void *) regs->u_regs[15]);
11665+ printk("OOPS: RPC <%pA>\n", (void *) regs->u_regs[15]);
11666 printk(KERN_CRIT "OOPS: Fault was to vaddr[%lx]\n", vaddr);
11667 dump_stack();
11668 unhandled_fault(regs->tpc, current, regs);
11669@@ -279,6 +282,466 @@ static void noinline __kprobes bogus_32bit_fault_tpc(struct pt_regs *regs)
11670 show_regs(regs);
11671 }
11672
11673+#ifdef CONFIG_PAX_PAGEEXEC
11674+#ifdef CONFIG_PAX_DLRESOLVE
11675+static void pax_emuplt_close(struct vm_area_struct *vma)
11676+{
11677+ vma->vm_mm->call_dl_resolve = 0UL;
11678+}
11679+
11680+static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
11681+{
11682+ unsigned int *kaddr;
11683+
11684+ vmf->page = alloc_page(GFP_HIGHUSER);
11685+ if (!vmf->page)
11686+ return VM_FAULT_OOM;
11687+
11688+ kaddr = kmap(vmf->page);
11689+ memset(kaddr, 0, PAGE_SIZE);
11690+ kaddr[0] = 0x9DE3BFA8U; /* save */
11691+ flush_dcache_page(vmf->page);
11692+ kunmap(vmf->page);
11693+ return VM_FAULT_MAJOR;
11694+}
11695+
11696+static const struct vm_operations_struct pax_vm_ops = {
11697+ .close = pax_emuplt_close,
11698+ .fault = pax_emuplt_fault
11699+};
11700+
11701+static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
11702+{
11703+ int ret;
11704+
11705+ INIT_LIST_HEAD(&vma->anon_vma_chain);
11706+ vma->vm_mm = current->mm;
11707+ vma->vm_start = addr;
11708+ vma->vm_end = addr + PAGE_SIZE;
11709+ vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC;
11710+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
11711+ vma->vm_ops = &pax_vm_ops;
11712+
11713+ ret = insert_vm_struct(current->mm, vma);
11714+ if (ret)
11715+ return ret;
11716+
11717+ ++current->mm->total_vm;
11718+ return 0;
11719+}
11720+#endif
11721+
11722+/*
11723+ * PaX: decide what to do with offenders (regs->tpc = fault address)
11724+ *
11725+ * returns 1 when task should be killed
11726+ * 2 when patched PLT trampoline was detected
11727+ * 3 when unpatched PLT trampoline was detected
11728+ */
11729+static int pax_handle_fetch_fault(struct pt_regs *regs)
11730+{
11731+
11732+#ifdef CONFIG_PAX_EMUPLT
11733+ int err;
11734+
11735+ do { /* PaX: patched PLT emulation #1 */
11736+ unsigned int sethi1, sethi2, jmpl;
11737+
11738+ err = get_user(sethi1, (unsigned int *)regs->tpc);
11739+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+4));
11740+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+8));
11741+
11742+ if (err)
11743+ break;
11744+
11745+ if ((sethi1 & 0xFFC00000U) == 0x03000000U &&
11746+ (sethi2 & 0xFFC00000U) == 0x03000000U &&
11747+ (jmpl & 0xFFFFE000U) == 0x81C06000U)
11748+ {
11749+ unsigned long addr;
11750+
11751+ regs->u_regs[UREG_G1] = (sethi2 & 0x003FFFFFU) << 10;
11752+ addr = regs->u_regs[UREG_G1];
11753+ addr += (((jmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
11754+
11755+ if (test_thread_flag(TIF_32BIT))
11756+ addr &= 0xFFFFFFFFUL;
11757+
11758+ regs->tpc = addr;
11759+ regs->tnpc = addr+4;
11760+ return 2;
11761+ }
11762+ } while (0);
11763+
11764+ do { /* PaX: patched PLT emulation #2 */
11765+ unsigned int ba;
11766+
11767+ err = get_user(ba, (unsigned int *)regs->tpc);
11768+
11769+ if (err)
11770+ break;
11771+
11772+ if ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30480000U) {
11773+ unsigned long addr;
11774+
11775+ if ((ba & 0xFFC00000U) == 0x30800000U)
11776+ addr = regs->tpc + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2);
11777+ else
11778+ addr = regs->tpc + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
11779+
11780+ if (test_thread_flag(TIF_32BIT))
11781+ addr &= 0xFFFFFFFFUL;
11782+
11783+ regs->tpc = addr;
11784+ regs->tnpc = addr+4;
11785+ return 2;
11786+ }
11787+ } while (0);
11788+
11789+ do { /* PaX: patched PLT emulation #3 */
11790+ unsigned int sethi, bajmpl, nop;
11791+
11792+ err = get_user(sethi, (unsigned int *)regs->tpc);
11793+ err |= get_user(bajmpl, (unsigned int *)(regs->tpc+4));
11794+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
11795+
11796+ if (err)
11797+ break;
11798+
11799+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11800+ ((bajmpl & 0xFFFFE000U) == 0x81C06000U || (bajmpl & 0xFFF80000U) == 0x30480000U) &&
11801+ nop == 0x01000000U)
11802+ {
11803+ unsigned long addr;
11804+
11805+ addr = (sethi & 0x003FFFFFU) << 10;
11806+ regs->u_regs[UREG_G1] = addr;
11807+ if ((bajmpl & 0xFFFFE000U) == 0x81C06000U)
11808+ addr += (((bajmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
11809+ else
11810+ addr = regs->tpc + ((((bajmpl | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
11811+
11812+ if (test_thread_flag(TIF_32BIT))
11813+ addr &= 0xFFFFFFFFUL;
11814+
11815+ regs->tpc = addr;
11816+ regs->tnpc = addr+4;
11817+ return 2;
11818+ }
11819+ } while (0);
11820+
11821+ do { /* PaX: patched PLT emulation #4 */
11822+ unsigned int sethi, mov1, call, mov2;
11823+
11824+ err = get_user(sethi, (unsigned int *)regs->tpc);
11825+ err |= get_user(mov1, (unsigned int *)(regs->tpc+4));
11826+ err |= get_user(call, (unsigned int *)(regs->tpc+8));
11827+ err |= get_user(mov2, (unsigned int *)(regs->tpc+12));
11828+
11829+ if (err)
11830+ break;
11831+
11832+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11833+ mov1 == 0x8210000FU &&
11834+ (call & 0xC0000000U) == 0x40000000U &&
11835+ mov2 == 0x9E100001U)
11836+ {
11837+ unsigned long addr;
11838+
11839+ regs->u_regs[UREG_G1] = regs->u_regs[UREG_RETPC];
11840+ addr = regs->tpc + 4 + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x20000000UL) + 0x20000000UL) << 2);
11841+
11842+ if (test_thread_flag(TIF_32BIT))
11843+ addr &= 0xFFFFFFFFUL;
11844+
11845+ regs->tpc = addr;
11846+ regs->tnpc = addr+4;
11847+ return 2;
11848+ }
11849+ } while (0);
11850+
11851+ do { /* PaX: patched PLT emulation #5 */
11852+ unsigned int sethi, sethi1, sethi2, or1, or2, sllx, jmpl, nop;
11853+
11854+ err = get_user(sethi, (unsigned int *)regs->tpc);
11855+ err |= get_user(sethi1, (unsigned int *)(regs->tpc+4));
11856+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+8));
11857+ err |= get_user(or1, (unsigned int *)(regs->tpc+12));
11858+ err |= get_user(or2, (unsigned int *)(regs->tpc+16));
11859+ err |= get_user(sllx, (unsigned int *)(regs->tpc+20));
11860+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+24));
11861+ err |= get_user(nop, (unsigned int *)(regs->tpc+28));
11862+
11863+ if (err)
11864+ break;
11865+
11866+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11867+ (sethi1 & 0xFFC00000U) == 0x03000000U &&
11868+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
11869+ (or1 & 0xFFFFE000U) == 0x82106000U &&
11870+ (or2 & 0xFFFFE000U) == 0x8A116000U &&
11871+ sllx == 0x83287020U &&
11872+ jmpl == 0x81C04005U &&
11873+ nop == 0x01000000U)
11874+ {
11875+ unsigned long addr;
11876+
11877+ regs->u_regs[UREG_G1] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU);
11878+ regs->u_regs[UREG_G1] <<= 32;
11879+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU);
11880+ addr = regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5];
11881+ regs->tpc = addr;
11882+ regs->tnpc = addr+4;
11883+ return 2;
11884+ }
11885+ } while (0);
11886+
11887+ do { /* PaX: patched PLT emulation #6 */
11888+ unsigned int sethi, sethi1, sethi2, sllx, or, jmpl, nop;
11889+
11890+ err = get_user(sethi, (unsigned int *)regs->tpc);
11891+ err |= get_user(sethi1, (unsigned int *)(regs->tpc+4));
11892+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+8));
11893+ err |= get_user(sllx, (unsigned int *)(regs->tpc+12));
11894+ err |= get_user(or, (unsigned int *)(regs->tpc+16));
11895+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+20));
11896+ err |= get_user(nop, (unsigned int *)(regs->tpc+24));
11897+
11898+ if (err)
11899+ break;
11900+
11901+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11902+ (sethi1 & 0xFFC00000U) == 0x03000000U &&
11903+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
11904+ sllx == 0x83287020U &&
11905+ (or & 0xFFFFE000U) == 0x8A116000U &&
11906+ jmpl == 0x81C04005U &&
11907+ nop == 0x01000000U)
11908+ {
11909+ unsigned long addr;
11910+
11911+ regs->u_regs[UREG_G1] = (sethi1 & 0x003FFFFFU) << 10;
11912+ regs->u_regs[UREG_G1] <<= 32;
11913+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or & 0x3FFU);
11914+ addr = regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5];
11915+ regs->tpc = addr;
11916+ regs->tnpc = addr+4;
11917+ return 2;
11918+ }
11919+ } while (0);
11920+
11921+ do { /* PaX: unpatched PLT emulation step 1 */
11922+ unsigned int sethi, ba, nop;
11923+
11924+ err = get_user(sethi, (unsigned int *)regs->tpc);
11925+ err |= get_user(ba, (unsigned int *)(regs->tpc+4));
11926+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
11927+
11928+ if (err)
11929+ break;
11930+
11931+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11932+ ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30680000U) &&
11933+ nop == 0x01000000U)
11934+ {
11935+ unsigned long addr;
11936+ unsigned int save, call;
11937+ unsigned int sethi1, sethi2, or1, or2, sllx, add, jmpl;
11938+
11939+ if ((ba & 0xFFC00000U) == 0x30800000U)
11940+ addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2);
11941+ else
11942+ addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
11943+
11944+ if (test_thread_flag(TIF_32BIT))
11945+ addr &= 0xFFFFFFFFUL;
11946+
11947+ err = get_user(save, (unsigned int *)addr);
11948+ err |= get_user(call, (unsigned int *)(addr+4));
11949+ err |= get_user(nop, (unsigned int *)(addr+8));
11950+ if (err)
11951+ break;
11952+
11953+#ifdef CONFIG_PAX_DLRESOLVE
11954+ if (save == 0x9DE3BFA8U &&
11955+ (call & 0xC0000000U) == 0x40000000U &&
11956+ nop == 0x01000000U)
11957+ {
11958+ struct vm_area_struct *vma;
11959+ unsigned long call_dl_resolve;
11960+
11961+ down_read(&current->mm->mmap_sem);
11962+ call_dl_resolve = current->mm->call_dl_resolve;
11963+ up_read(&current->mm->mmap_sem);
11964+ if (likely(call_dl_resolve))
11965+ goto emulate;
11966+
11967+ vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
11968+
11969+ down_write(&current->mm->mmap_sem);
11970+ if (current->mm->call_dl_resolve) {
11971+ call_dl_resolve = current->mm->call_dl_resolve;
11972+ up_write(&current->mm->mmap_sem);
11973+ if (vma)
11974+ kmem_cache_free(vm_area_cachep, vma);
11975+ goto emulate;
11976+ }
11977+
11978+ call_dl_resolve = get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MAP_PRIVATE);
11979+ if (!vma || (call_dl_resolve & ~PAGE_MASK)) {
11980+ up_write(&current->mm->mmap_sem);
11981+ if (vma)
11982+ kmem_cache_free(vm_area_cachep, vma);
11983+ return 1;
11984+ }
11985+
11986+ if (pax_insert_vma(vma, call_dl_resolve)) {
11987+ up_write(&current->mm->mmap_sem);
11988+ kmem_cache_free(vm_area_cachep, vma);
11989+ return 1;
11990+ }
11991+
11992+ current->mm->call_dl_resolve = call_dl_resolve;
11993+ up_write(&current->mm->mmap_sem);
11994+
11995+emulate:
11996+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11997+ regs->tpc = call_dl_resolve;
11998+ regs->tnpc = addr+4;
11999+ return 3;
12000+ }
12001+#endif
12002+
12003+ /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */
12004+ if ((save & 0xFFC00000U) == 0x05000000U &&
12005+ (call & 0xFFFFE000U) == 0x85C0A000U &&
12006+ nop == 0x01000000U)
12007+ {
12008+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
12009+ regs->u_regs[UREG_G2] = addr + 4;
12010+ addr = (save & 0x003FFFFFU) << 10;
12011+ addr += (((call | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
12012+
12013+ if (test_thread_flag(TIF_32BIT))
12014+ addr &= 0xFFFFFFFFUL;
12015+
12016+ regs->tpc = addr;
12017+ regs->tnpc = addr+4;
12018+ return 3;
12019+ }
12020+
12021+ /* PaX: 64-bit PLT stub */
12022+ err = get_user(sethi1, (unsigned int *)addr);
12023+ err |= get_user(sethi2, (unsigned int *)(addr+4));
12024+ err |= get_user(or1, (unsigned int *)(addr+8));
12025+ err |= get_user(or2, (unsigned int *)(addr+12));
12026+ err |= get_user(sllx, (unsigned int *)(addr+16));
12027+ err |= get_user(add, (unsigned int *)(addr+20));
12028+ err |= get_user(jmpl, (unsigned int *)(addr+24));
12029+ err |= get_user(nop, (unsigned int *)(addr+28));
12030+ if (err)
12031+ break;
12032+
12033+ if ((sethi1 & 0xFFC00000U) == 0x09000000U &&
12034+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
12035+ (or1 & 0xFFFFE000U) == 0x88112000U &&
12036+ (or2 & 0xFFFFE000U) == 0x8A116000U &&
12037+ sllx == 0x89293020U &&
12038+ add == 0x8A010005U &&
12039+ jmpl == 0x89C14000U &&
12040+ nop == 0x01000000U)
12041+ {
12042+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
12043+ regs->u_regs[UREG_G4] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU);
12044+ regs->u_regs[UREG_G4] <<= 32;
12045+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU);
12046+ regs->u_regs[UREG_G5] += regs->u_regs[UREG_G4];
12047+ regs->u_regs[UREG_G4] = addr + 24;
12048+ addr = regs->u_regs[UREG_G5];
12049+ regs->tpc = addr;
12050+ regs->tnpc = addr+4;
12051+ return 3;
12052+ }
12053+ }
12054+ } while (0);
12055+
12056+#ifdef CONFIG_PAX_DLRESOLVE
12057+ do { /* PaX: unpatched PLT emulation step 2 */
12058+ unsigned int save, call, nop;
12059+
12060+ err = get_user(save, (unsigned int *)(regs->tpc-4));
12061+ err |= get_user(call, (unsigned int *)regs->tpc);
12062+ err |= get_user(nop, (unsigned int *)(regs->tpc+4));
12063+ if (err)
12064+ break;
12065+
12066+ if (save == 0x9DE3BFA8U &&
12067+ (call & 0xC0000000U) == 0x40000000U &&
12068+ nop == 0x01000000U)
12069+ {
12070+ unsigned long dl_resolve = regs->tpc + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x20000000UL) + 0x20000000UL) << 2);
12071+
12072+ if (test_thread_flag(TIF_32BIT))
12073+ dl_resolve &= 0xFFFFFFFFUL;
12074+
12075+ regs->u_regs[UREG_RETPC] = regs->tpc;
12076+ regs->tpc = dl_resolve;
12077+ regs->tnpc = dl_resolve+4;
12078+ return 3;
12079+ }
12080+ } while (0);
12081+#endif
12082+
12083+ do { /* PaX: patched PLT emulation #7, must be AFTER the unpatched PLT emulation */
12084+ unsigned int sethi, ba, nop;
12085+
12086+ err = get_user(sethi, (unsigned int *)regs->tpc);
12087+ err |= get_user(ba, (unsigned int *)(regs->tpc+4));
12088+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
12089+
12090+ if (err)
12091+ break;
12092+
12093+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
12094+ (ba & 0xFFF00000U) == 0x30600000U &&
12095+ nop == 0x01000000U)
12096+ {
12097+ unsigned long addr;
12098+
12099+ addr = (sethi & 0x003FFFFFU) << 10;
12100+ regs->u_regs[UREG_G1] = addr;
12101+ addr = regs->tpc + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
12102+
12103+ if (test_thread_flag(TIF_32BIT))
12104+ addr &= 0xFFFFFFFFUL;
12105+
12106+ regs->tpc = addr;
12107+ regs->tnpc = addr+4;
12108+ return 2;
12109+ }
12110+ } while (0);
12111+
12112+#endif
12113+
12114+ return 1;
12115+}
12116+
12117+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
12118+{
12119+ unsigned long i;
12120+
12121+ printk(KERN_ERR "PAX: bytes at PC: ");
12122+ for (i = 0; i < 8; i++) {
12123+ unsigned int c;
12124+ if (get_user(c, (unsigned int *)pc+i))
12125+ printk(KERN_CONT "???????? ");
12126+ else
12127+ printk(KERN_CONT "%08x ", c);
12128+ }
12129+ printk("\n");
12130+}
12131+#endif
12132+
12133 asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs)
12134 {
12135 enum ctx_state prev_state = exception_enter();
12136@@ -353,6 +816,29 @@ retry:
12137 if (!vma)
12138 goto bad_area;
12139
12140+#ifdef CONFIG_PAX_PAGEEXEC
12141+ /* PaX: detect ITLB misses on non-exec pages */
12142+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && vma->vm_start <= address &&
12143+ !(vma->vm_flags & VM_EXEC) && (fault_code & FAULT_CODE_ITLB))
12144+ {
12145+ if (address != regs->tpc)
12146+ goto good_area;
12147+
12148+ up_read(&mm->mmap_sem);
12149+ switch (pax_handle_fetch_fault(regs)) {
12150+
12151+#ifdef CONFIG_PAX_EMUPLT
12152+ case 2:
12153+ case 3:
12154+ return;
12155+#endif
12156+
12157+ }
12158+ pax_report_fault(regs, (void *)regs->tpc, (void *)(regs->u_regs[UREG_FP] + STACK_BIAS));
12159+ do_group_exit(SIGKILL);
12160+ }
12161+#endif
12162+
12163 /* Pure DTLB misses do not tell us whether the fault causing
12164 * load/store/atomic was a write or not, it only says that there
12165 * was no match. So in such a case we (carefully) read the
12166diff --git a/arch/sparc/mm/hugetlbpage.c b/arch/sparc/mm/hugetlbpage.c
12167index 4242eab..9ae6360 100644
12168--- a/arch/sparc/mm/hugetlbpage.c
12169+++ b/arch/sparc/mm/hugetlbpage.c
12170@@ -25,8 +25,10 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *filp,
12171 unsigned long addr,
12172 unsigned long len,
12173 unsigned long pgoff,
12174- unsigned long flags)
12175+ unsigned long flags,
12176+ unsigned long offset)
12177 {
12178+ struct mm_struct *mm = current->mm;
12179 unsigned long task_size = TASK_SIZE;
12180 struct vm_unmapped_area_info info;
12181
12182@@ -35,15 +37,22 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *filp,
12183
12184 info.flags = 0;
12185 info.length = len;
12186- info.low_limit = TASK_UNMAPPED_BASE;
12187+ info.low_limit = mm->mmap_base;
12188 info.high_limit = min(task_size, VA_EXCLUDE_START);
12189 info.align_mask = PAGE_MASK & ~HPAGE_MASK;
12190 info.align_offset = 0;
12191+ info.threadstack_offset = offset;
12192 addr = vm_unmapped_area(&info);
12193
12194 if ((addr & ~PAGE_MASK) && task_size > VA_EXCLUDE_END) {
12195 VM_BUG_ON(addr != -ENOMEM);
12196 info.low_limit = VA_EXCLUDE_END;
12197+
12198+#ifdef CONFIG_PAX_RANDMMAP
12199+ if (mm->pax_flags & MF_PAX_RANDMMAP)
12200+ info.low_limit += mm->delta_mmap;
12201+#endif
12202+
12203 info.high_limit = task_size;
12204 addr = vm_unmapped_area(&info);
12205 }
12206@@ -55,7 +64,8 @@ static unsigned long
12207 hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
12208 const unsigned long len,
12209 const unsigned long pgoff,
12210- const unsigned long flags)
12211+ const unsigned long flags,
12212+ const unsigned long offset)
12213 {
12214 struct mm_struct *mm = current->mm;
12215 unsigned long addr = addr0;
12216@@ -70,6 +80,7 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
12217 info.high_limit = mm->mmap_base;
12218 info.align_mask = PAGE_MASK & ~HPAGE_MASK;
12219 info.align_offset = 0;
12220+ info.threadstack_offset = offset;
12221 addr = vm_unmapped_area(&info);
12222
12223 /*
12224@@ -82,6 +93,12 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
12225 VM_BUG_ON(addr != -ENOMEM);
12226 info.flags = 0;
12227 info.low_limit = TASK_UNMAPPED_BASE;
12228+
12229+#ifdef CONFIG_PAX_RANDMMAP
12230+ if (mm->pax_flags & MF_PAX_RANDMMAP)
12231+ info.low_limit += mm->delta_mmap;
12232+#endif
12233+
12234 info.high_limit = STACK_TOP32;
12235 addr = vm_unmapped_area(&info);
12236 }
12237@@ -96,6 +113,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
12238 struct mm_struct *mm = current->mm;
12239 struct vm_area_struct *vma;
12240 unsigned long task_size = TASK_SIZE;
12241+ unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
12242
12243 if (test_thread_flag(TIF_32BIT))
12244 task_size = STACK_TOP32;
12245@@ -111,19 +129,22 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
12246 return addr;
12247 }
12248
12249+#ifdef CONFIG_PAX_RANDMMAP
12250+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
12251+#endif
12252+
12253 if (addr) {
12254 addr = ALIGN(addr, HPAGE_SIZE);
12255 vma = find_vma(mm, addr);
12256- if (task_size - len >= addr &&
12257- (!vma || addr + len <= vma->vm_start))
12258+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
12259 return addr;
12260 }
12261 if (mm->get_unmapped_area == arch_get_unmapped_area)
12262 return hugetlb_get_unmapped_area_bottomup(file, addr, len,
12263- pgoff, flags);
12264+ pgoff, flags, offset);
12265 else
12266 return hugetlb_get_unmapped_area_topdown(file, addr, len,
12267- pgoff, flags);
12268+ pgoff, flags, offset);
12269 }
12270
12271 pte_t *huge_pte_alloc(struct mm_struct *mm,
12272diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
12273index 4ca0d6b..e89bca1 100644
12274--- a/arch/sparc/mm/init_64.c
12275+++ b/arch/sparc/mm/init_64.c
12276@@ -186,9 +186,9 @@ unsigned long sparc64_kern_sec_context __read_mostly;
12277 int num_kernel_image_mappings;
12278
12279 #ifdef CONFIG_DEBUG_DCFLUSH
12280-atomic_t dcpage_flushes = ATOMIC_INIT(0);
12281+atomic_unchecked_t dcpage_flushes = ATOMIC_INIT(0);
12282 #ifdef CONFIG_SMP
12283-atomic_t dcpage_flushes_xcall = ATOMIC_INIT(0);
12284+atomic_unchecked_t dcpage_flushes_xcall = ATOMIC_INIT(0);
12285 #endif
12286 #endif
12287
12288@@ -196,7 +196,7 @@ inline void flush_dcache_page_impl(struct page *page)
12289 {
12290 BUG_ON(tlb_type == hypervisor);
12291 #ifdef CONFIG_DEBUG_DCFLUSH
12292- atomic_inc(&dcpage_flushes);
12293+ atomic_inc_unchecked(&dcpage_flushes);
12294 #endif
12295
12296 #ifdef DCACHE_ALIASING_POSSIBLE
12297@@ -468,10 +468,10 @@ void mmu_info(struct seq_file *m)
12298
12299 #ifdef CONFIG_DEBUG_DCFLUSH
12300 seq_printf(m, "DCPageFlushes\t: %d\n",
12301- atomic_read(&dcpage_flushes));
12302+ atomic_read_unchecked(&dcpage_flushes));
12303 #ifdef CONFIG_SMP
12304 seq_printf(m, "DCPageFlushesXC\t: %d\n",
12305- atomic_read(&dcpage_flushes_xcall));
12306+ atomic_read_unchecked(&dcpage_flushes_xcall));
12307 #endif /* CONFIG_SMP */
12308 #endif /* CONFIG_DEBUG_DCFLUSH */
12309 }
12310diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig
12311index 7cca418..53fc030 100644
12312--- a/arch/tile/Kconfig
12313+++ b/arch/tile/Kconfig
12314@@ -192,6 +192,7 @@ source "kernel/Kconfig.hz"
12315
12316 config KEXEC
12317 bool "kexec system call"
12318+ depends on !GRKERNSEC_KMEM
12319 ---help---
12320 kexec is a system call that implements the ability to shutdown your
12321 current kernel, and to start another kernel. It is like a reboot
12322diff --git a/arch/tile/include/asm/atomic_64.h b/arch/tile/include/asm/atomic_64.h
12323index 7b11c5f..755a026 100644
12324--- a/arch/tile/include/asm/atomic_64.h
12325+++ b/arch/tile/include/asm/atomic_64.h
12326@@ -105,6 +105,16 @@ static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
12327
12328 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
12329
12330+#define atomic64_read_unchecked(v) atomic64_read(v)
12331+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
12332+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
12333+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
12334+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
12335+#define atomic64_inc_unchecked(v) atomic64_inc(v)
12336+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
12337+#define atomic64_dec_unchecked(v) atomic64_dec(v)
12338+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
12339+
12340 /* Define this to indicate that cmpxchg is an efficient operation. */
12341 #define __HAVE_ARCH_CMPXCHG
12342
12343diff --git a/arch/tile/include/asm/cache.h b/arch/tile/include/asm/cache.h
12344index 6160761..00cac88 100644
12345--- a/arch/tile/include/asm/cache.h
12346+++ b/arch/tile/include/asm/cache.h
12347@@ -15,11 +15,12 @@
12348 #ifndef _ASM_TILE_CACHE_H
12349 #define _ASM_TILE_CACHE_H
12350
12351+#include <linux/const.h>
12352 #include <arch/chip.h>
12353
12354 /* bytes per L1 data cache line */
12355 #define L1_CACHE_SHIFT CHIP_L1D_LOG_LINE_SIZE()
12356-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
12357+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
12358
12359 /* bytes per L2 cache line */
12360 #define L2_CACHE_SHIFT CHIP_L2_LOG_LINE_SIZE()
12361diff --git a/arch/tile/include/asm/uaccess.h b/arch/tile/include/asm/uaccess.h
12362index f41cb53..31d3ab4 100644
12363--- a/arch/tile/include/asm/uaccess.h
12364+++ b/arch/tile/include/asm/uaccess.h
12365@@ -417,9 +417,9 @@ static inline unsigned long __must_check copy_from_user(void *to,
12366 const void __user *from,
12367 unsigned long n)
12368 {
12369- int sz = __compiletime_object_size(to);
12370+ size_t sz = __compiletime_object_size(to);
12371
12372- if (likely(sz == -1 || sz >= n))
12373+ if (likely(sz == (size_t)-1 || sz >= n))
12374 n = _copy_from_user(to, from, n);
12375 else
12376 copy_from_user_overflow();
12377diff --git a/arch/tile/mm/hugetlbpage.c b/arch/tile/mm/hugetlbpage.c
12378index 8416240..a012fb7 100644
12379--- a/arch/tile/mm/hugetlbpage.c
12380+++ b/arch/tile/mm/hugetlbpage.c
12381@@ -179,6 +179,7 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
12382 info.high_limit = TASK_SIZE;
12383 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
12384 info.align_offset = 0;
12385+ info.threadstack_offset = 0;
12386 return vm_unmapped_area(&info);
12387 }
12388
12389@@ -196,6 +197,7 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
12390 info.high_limit = current->mm->mmap_base;
12391 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
12392 info.align_offset = 0;
12393+ info.threadstack_offset = 0;
12394 addr = vm_unmapped_area(&info);
12395
12396 /*
12397diff --git a/arch/um/Makefile b/arch/um/Makefile
12398index e4b1a96..16162f8 100644
12399--- a/arch/um/Makefile
12400+++ b/arch/um/Makefile
12401@@ -72,6 +72,10 @@ USER_CFLAGS = $(patsubst $(KERNEL_DEFINES),,$(patsubst -D__KERNEL__,,\
12402 $(patsubst -I%,,$(KBUILD_CFLAGS)))) $(ARCH_INCLUDE) $(MODE_INCLUDE) \
12403 $(filter -I%,$(CFLAGS)) -D_FILE_OFFSET_BITS=64 -idirafter include
12404
12405+ifdef CONSTIFY_PLUGIN
12406+USER_CFLAGS += -fplugin-arg-constify_plugin-no-constify
12407+endif
12408+
12409 #This will adjust *FLAGS accordingly to the platform.
12410 include $(srctree)/$(ARCH_DIR)/Makefile-os-$(OS)
12411
12412diff --git a/arch/um/include/asm/cache.h b/arch/um/include/asm/cache.h
12413index 19e1bdd..3665b77 100644
12414--- a/arch/um/include/asm/cache.h
12415+++ b/arch/um/include/asm/cache.h
12416@@ -1,6 +1,7 @@
12417 #ifndef __UM_CACHE_H
12418 #define __UM_CACHE_H
12419
12420+#include <linux/const.h>
12421
12422 #if defined(CONFIG_UML_X86) && !defined(CONFIG_64BIT)
12423 # define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT)
12424@@ -12,6 +13,6 @@
12425 # define L1_CACHE_SHIFT 5
12426 #endif
12427
12428-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
12429+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
12430
12431 #endif
12432diff --git a/arch/um/include/asm/kmap_types.h b/arch/um/include/asm/kmap_types.h
12433index 2e0a6b1..a64d0f5 100644
12434--- a/arch/um/include/asm/kmap_types.h
12435+++ b/arch/um/include/asm/kmap_types.h
12436@@ -8,6 +8,6 @@
12437
12438 /* No more #include "asm/arch/kmap_types.h" ! */
12439
12440-#define KM_TYPE_NR 14
12441+#define KM_TYPE_NR 15
12442
12443 #endif
12444diff --git a/arch/um/include/asm/page.h b/arch/um/include/asm/page.h
12445index 71c5d13..4c7b9f1 100644
12446--- a/arch/um/include/asm/page.h
12447+++ b/arch/um/include/asm/page.h
12448@@ -14,6 +14,9 @@
12449 #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)
12450 #define PAGE_MASK (~(PAGE_SIZE-1))
12451
12452+#define ktla_ktva(addr) (addr)
12453+#define ktva_ktla(addr) (addr)
12454+
12455 #ifndef __ASSEMBLY__
12456
12457 struct page;
12458diff --git a/arch/um/include/asm/pgtable-3level.h b/arch/um/include/asm/pgtable-3level.h
12459index 2b4274e..754fe06 100644
12460--- a/arch/um/include/asm/pgtable-3level.h
12461+++ b/arch/um/include/asm/pgtable-3level.h
12462@@ -58,6 +58,7 @@
12463 #define pud_present(x) (pud_val(x) & _PAGE_PRESENT)
12464 #define pud_populate(mm, pud, pmd) \
12465 set_pud(pud, __pud(_PAGE_TABLE + __pa(pmd)))
12466+#define pud_populate_kernel(mm, pud, pmd) pud_populate((mm), (pud), (pmd))
12467
12468 #ifdef CONFIG_64BIT
12469 #define set_pud(pudptr, pudval) set_64bit((u64 *) (pudptr), pud_val(pudval))
12470diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
12471index f17bca8..48adb87 100644
12472--- a/arch/um/kernel/process.c
12473+++ b/arch/um/kernel/process.c
12474@@ -356,22 +356,6 @@ int singlestepping(void * t)
12475 return 2;
12476 }
12477
12478-/*
12479- * Only x86 and x86_64 have an arch_align_stack().
12480- * All other arches have "#define arch_align_stack(x) (x)"
12481- * in their asm/exec.h
12482- * As this is included in UML from asm-um/system-generic.h,
12483- * we can use it to behave as the subarch does.
12484- */
12485-#ifndef arch_align_stack
12486-unsigned long arch_align_stack(unsigned long sp)
12487-{
12488- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
12489- sp -= get_random_int() % 8192;
12490- return sp & ~0xf;
12491-}
12492-#endif
12493-
12494 unsigned long get_wchan(struct task_struct *p)
12495 {
12496 unsigned long stack_page, sp, ip;
12497diff --git a/arch/unicore32/include/asm/cache.h b/arch/unicore32/include/asm/cache.h
12498index ad8f795..2c7eec6 100644
12499--- a/arch/unicore32/include/asm/cache.h
12500+++ b/arch/unicore32/include/asm/cache.h
12501@@ -12,8 +12,10 @@
12502 #ifndef __UNICORE_CACHE_H__
12503 #define __UNICORE_CACHE_H__
12504
12505-#define L1_CACHE_SHIFT (5)
12506-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
12507+#include <linux/const.h>
12508+
12509+#define L1_CACHE_SHIFT 5
12510+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
12511
12512 /*
12513 * Memory returned by kmalloc() may be used for DMA, so we must make
12514diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
12515index b7d31ca..9481ec5 100644
12516--- a/arch/x86/Kconfig
12517+++ b/arch/x86/Kconfig
12518@@ -132,7 +132,7 @@ config X86
12519 select RTC_LIB
12520 select HAVE_DEBUG_STACKOVERFLOW
12521 select HAVE_IRQ_EXIT_ON_IRQ_STACK if X86_64
12522- select HAVE_CC_STACKPROTECTOR
12523+ select HAVE_CC_STACKPROTECTOR if X86_64 || !PAX_MEMORY_UDEREF
12524 select GENERIC_CPU_AUTOPROBE
12525 select HAVE_ARCH_AUDITSYSCALL
12526 select ARCH_SUPPORTS_ATOMIC_RMW
12527@@ -266,7 +266,7 @@ config X86_HT
12528
12529 config X86_32_LAZY_GS
12530 def_bool y
12531- depends on X86_32 && !CC_STACKPROTECTOR
12532+ depends on X86_32 && !CC_STACKPROTECTOR && !PAX_MEMORY_UDEREF
12533
12534 config ARCH_HWEIGHT_CFLAGS
12535 string
12536@@ -632,6 +632,7 @@ config SCHED_OMIT_FRAME_POINTER
12537
12538 menuconfig HYPERVISOR_GUEST
12539 bool "Linux guest support"
12540+ depends on !GRKERNSEC_CONFIG_AUTO || GRKERNSEC_CONFIG_VIRT_GUEST || (GRKERNSEC_CONFIG_VIRT_HOST && GRKERNSEC_CONFIG_VIRT_XEN)
12541 ---help---
12542 Say Y here to enable options for running Linux under various hyper-
12543 visors. This option enables basic hypervisor detection and platform
12544@@ -1013,6 +1014,7 @@ config VM86
12545
12546 config X86_16BIT
12547 bool "Enable support for 16-bit segments" if EXPERT
12548+ depends on !GRKERNSEC
12549 default y
12550 ---help---
12551 This option is required by programs like Wine to run 16-bit
12552@@ -1186,6 +1188,7 @@ choice
12553
12554 config NOHIGHMEM
12555 bool "off"
12556+ depends on !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
12557 ---help---
12558 Linux can use up to 64 Gigabytes of physical memory on x86 systems.
12559 However, the address space of 32-bit x86 processors is only 4
12560@@ -1222,6 +1225,7 @@ config NOHIGHMEM
12561
12562 config HIGHMEM4G
12563 bool "4GB"
12564+ depends on !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
12565 ---help---
12566 Select this if you have a 32-bit processor and between 1 and 4
12567 gigabytes of physical RAM.
12568@@ -1274,7 +1278,7 @@ config PAGE_OFFSET
12569 hex
12570 default 0xB0000000 if VMSPLIT_3G_OPT
12571 default 0x80000000 if VMSPLIT_2G
12572- default 0x78000000 if VMSPLIT_2G_OPT
12573+ default 0x70000000 if VMSPLIT_2G_OPT
12574 default 0x40000000 if VMSPLIT_1G
12575 default 0xC0000000
12576 depends on X86_32
12577@@ -1715,6 +1719,7 @@ source kernel/Kconfig.hz
12578
12579 config KEXEC
12580 bool "kexec system call"
12581+ depends on !GRKERNSEC_KMEM
12582 ---help---
12583 kexec is a system call that implements the ability to shutdown your
12584 current kernel, and to start another kernel. It is like a reboot
12585@@ -1900,7 +1905,9 @@ config X86_NEED_RELOCS
12586
12587 config PHYSICAL_ALIGN
12588 hex "Alignment value to which kernel should be aligned"
12589- default "0x200000"
12590+ default "0x1000000"
12591+ range 0x200000 0x1000000 if PAX_KERNEXEC && X86_PAE
12592+ range 0x400000 0x1000000 if PAX_KERNEXEC && !X86_PAE
12593 range 0x2000 0x1000000 if X86_32
12594 range 0x200000 0x1000000 if X86_64
12595 ---help---
12596@@ -1983,6 +1990,7 @@ config COMPAT_VDSO
12597 def_bool n
12598 prompt "Disable the 32-bit vDSO (needed for glibc 2.3.3)"
12599 depends on X86_32 || IA32_EMULATION
12600+ depends on !PAX_PAGEEXEC && !PAX_SEGMEXEC && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
12601 ---help---
12602 Certain buggy versions of glibc will crash if they are
12603 presented with a 32-bit vDSO that is not mapped at the address
12604diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
12605index 6983314..54ad7e8 100644
12606--- a/arch/x86/Kconfig.cpu
12607+++ b/arch/x86/Kconfig.cpu
12608@@ -319,7 +319,7 @@ config X86_PPRO_FENCE
12609
12610 config X86_F00F_BUG
12611 def_bool y
12612- depends on M586MMX || M586TSC || M586 || M486
12613+ depends on (M586MMX || M586TSC || M586 || M486) && !PAX_KERNEXEC
12614
12615 config X86_INVD_BUG
12616 def_bool y
12617@@ -327,7 +327,7 @@ config X86_INVD_BUG
12618
12619 config X86_ALIGNMENT_16
12620 def_bool y
12621- depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
12622+ depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK8 || MK7 || MK6 || MCORE2 || MPENTIUM4 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
12623
12624 config X86_INTEL_USERCOPY
12625 def_bool y
12626@@ -369,7 +369,7 @@ config X86_CMPXCHG64
12627 # generates cmov.
12628 config X86_CMOV
12629 def_bool y
12630- depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
12631+ depends on (MK8 || MK7 || MCORE2 || MPSC || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
12632
12633 config X86_MINIMUM_CPU_FAMILY
12634 int
12635diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
12636index 20028da..88d5946 100644
12637--- a/arch/x86/Kconfig.debug
12638+++ b/arch/x86/Kconfig.debug
12639@@ -93,7 +93,7 @@ config EFI_PGT_DUMP
12640 config DEBUG_RODATA
12641 bool "Write protect kernel read-only data structures"
12642 default y
12643- depends on DEBUG_KERNEL
12644+ depends on DEBUG_KERNEL && BROKEN
12645 ---help---
12646 Mark the kernel read-only data as write-protected in the pagetables,
12647 in order to catch accidental (and incorrect) writes to such const
12648@@ -111,7 +111,7 @@ config DEBUG_RODATA_TEST
12649
12650 config DEBUG_SET_MODULE_RONX
12651 bool "Set loadable kernel module data as NX and text as RO"
12652- depends on MODULES
12653+ depends on MODULES && BROKEN
12654 ---help---
12655 This option helps catch unintended modifications to loadable
12656 kernel module's text and read-only data. It also prevents execution
12657diff --git a/arch/x86/Makefile b/arch/x86/Makefile
12658index 5ba2d9c..41e5bb6 100644
12659--- a/arch/x86/Makefile
12660+++ b/arch/x86/Makefile
12661@@ -65,9 +65,6 @@ ifeq ($(CONFIG_X86_32),y)
12662 # CPU-specific tuning. Anything which can be shared with UML should go here.
12663 include $(srctree)/arch/x86/Makefile_32.cpu
12664 KBUILD_CFLAGS += $(cflags-y)
12665-
12666- # temporary until string.h is fixed
12667- KBUILD_CFLAGS += -ffreestanding
12668 else
12669 BITS := 64
12670 UTS_MACHINE := x86_64
12671@@ -107,6 +104,9 @@ else
12672 KBUILD_CFLAGS += $(call cc-option,-maccumulate-outgoing-args)
12673 endif
12674
12675+# temporary until string.h is fixed
12676+KBUILD_CFLAGS += -ffreestanding
12677+
12678 # Make sure compiler does not have buggy stack-protector support.
12679 ifdef CONFIG_CC_STACKPROTECTOR
12680 cc_has_sp := $(srctree)/scripts/gcc-x86_$(BITS)-has-stack-protector.sh
12681@@ -181,6 +181,7 @@ archheaders:
12682 $(Q)$(MAKE) $(build)=arch/x86/syscalls all
12683
12684 archprepare:
12685+ $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
12686 ifeq ($(CONFIG_KEXEC_FILE),y)
12687 $(Q)$(MAKE) $(build)=arch/x86/purgatory arch/x86/purgatory/kexec-purgatory.c
12688 endif
12689@@ -264,3 +265,9 @@ define archhelp
12690 echo ' FDARGS="..." arguments for the booted kernel'
12691 echo ' FDINITRD=file initrd for the booted kernel'
12692 endef
12693+
12694+define OLD_LD
12695+
12696+*** ${VERSION}.${PATCHLEVEL} PaX kernels no longer build correctly with old versions of binutils.
12697+*** Please upgrade your binutils to 2.18 or newer
12698+endef
12699diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile
12700index 57bbf2f..b100fce 100644
12701--- a/arch/x86/boot/Makefile
12702+++ b/arch/x86/boot/Makefile
12703@@ -58,6 +58,9 @@ clean-files += cpustr.h
12704 # ---------------------------------------------------------------------------
12705
12706 KBUILD_CFLAGS := $(USERINCLUDE) $(REALMODE_CFLAGS) -D_SETUP
12707+ifdef CONSTIFY_PLUGIN
12708+KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
12709+endif
12710 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
12711 GCOV_PROFILE := n
12712
12713diff --git a/arch/x86/boot/bitops.h b/arch/x86/boot/bitops.h
12714index 878e4b9..20537ab 100644
12715--- a/arch/x86/boot/bitops.h
12716+++ b/arch/x86/boot/bitops.h
12717@@ -26,7 +26,7 @@ static inline int variable_test_bit(int nr, const void *addr)
12718 u8 v;
12719 const u32 *p = (const u32 *)addr;
12720
12721- asm("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr));
12722+ asm volatile("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr));
12723 return v;
12724 }
12725
12726@@ -37,7 +37,7 @@ static inline int variable_test_bit(int nr, const void *addr)
12727
12728 static inline void set_bit(int nr, void *addr)
12729 {
12730- asm("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr));
12731+ asm volatile("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr));
12732 }
12733
12734 #endif /* BOOT_BITOPS_H */
12735diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h
12736index bd49ec6..94c7f58 100644
12737--- a/arch/x86/boot/boot.h
12738+++ b/arch/x86/boot/boot.h
12739@@ -84,7 +84,7 @@ static inline void io_delay(void)
12740 static inline u16 ds(void)
12741 {
12742 u16 seg;
12743- asm("movw %%ds,%0" : "=rm" (seg));
12744+ asm volatile("movw %%ds,%0" : "=rm" (seg));
12745 return seg;
12746 }
12747
12748diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile
12749index 0a291cd..9686efc 100644
12750--- a/arch/x86/boot/compressed/Makefile
12751+++ b/arch/x86/boot/compressed/Makefile
12752@@ -30,6 +30,9 @@ KBUILD_CFLAGS += $(cflags-y)
12753 KBUILD_CFLAGS += -mno-mmx -mno-sse
12754 KBUILD_CFLAGS += $(call cc-option,-ffreestanding)
12755 KBUILD_CFLAGS += $(call cc-option,-fno-stack-protector)
12756+ifdef CONSTIFY_PLUGIN
12757+KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
12758+endif
12759
12760 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
12761 GCOV_PROFILE := n
12762diff --git a/arch/x86/boot/compressed/efi_stub_32.S b/arch/x86/boot/compressed/efi_stub_32.S
12763index a53440e..c3dbf1e 100644
12764--- a/arch/x86/boot/compressed/efi_stub_32.S
12765+++ b/arch/x86/boot/compressed/efi_stub_32.S
12766@@ -46,16 +46,13 @@ ENTRY(efi_call_phys)
12767 * parameter 2, ..., param n. To make things easy, we save the return
12768 * address of efi_call_phys in a global variable.
12769 */
12770- popl %ecx
12771- movl %ecx, saved_return_addr(%edx)
12772- /* get the function pointer into ECX*/
12773- popl %ecx
12774- movl %ecx, efi_rt_function_ptr(%edx)
12775+ popl saved_return_addr(%edx)
12776+ popl efi_rt_function_ptr(%edx)
12777
12778 /*
12779 * 3. Call the physical function.
12780 */
12781- call *%ecx
12782+ call *efi_rt_function_ptr(%edx)
12783
12784 /*
12785 * 4. Balance the stack. And because EAX contain the return value,
12786@@ -67,15 +64,12 @@ ENTRY(efi_call_phys)
12787 1: popl %edx
12788 subl $1b, %edx
12789
12790- movl efi_rt_function_ptr(%edx), %ecx
12791- pushl %ecx
12792+ pushl efi_rt_function_ptr(%edx)
12793
12794 /*
12795 * 10. Push the saved return address onto the stack and return.
12796 */
12797- movl saved_return_addr(%edx), %ecx
12798- pushl %ecx
12799- ret
12800+ jmpl *saved_return_addr(%edx)
12801 ENDPROC(efi_call_phys)
12802 .previous
12803
12804diff --git a/arch/x86/boot/compressed/efi_thunk_64.S b/arch/x86/boot/compressed/efi_thunk_64.S
12805index 630384a..278e788 100644
12806--- a/arch/x86/boot/compressed/efi_thunk_64.S
12807+++ b/arch/x86/boot/compressed/efi_thunk_64.S
12808@@ -189,8 +189,8 @@ efi_gdt64:
12809 .long 0 /* Filled out by user */
12810 .word 0
12811 .quad 0x0000000000000000 /* NULL descriptor */
12812- .quad 0x00af9a000000ffff /* __KERNEL_CS */
12813- .quad 0x00cf92000000ffff /* __KERNEL_DS */
12814+ .quad 0x00af9b000000ffff /* __KERNEL_CS */
12815+ .quad 0x00cf93000000ffff /* __KERNEL_DS */
12816 .quad 0x0080890000000000 /* TS descriptor */
12817 .quad 0x0000000000000000 /* TS continued */
12818 efi_gdt64_end:
12819diff --git a/arch/x86/boot/compressed/head_32.S b/arch/x86/boot/compressed/head_32.S
12820index 1d7fbbc..36ecd58 100644
12821--- a/arch/x86/boot/compressed/head_32.S
12822+++ b/arch/x86/boot/compressed/head_32.S
12823@@ -140,10 +140,10 @@ preferred_addr:
12824 addl %eax, %ebx
12825 notl %eax
12826 andl %eax, %ebx
12827- cmpl $LOAD_PHYSICAL_ADDR, %ebx
12828+ cmpl $____LOAD_PHYSICAL_ADDR, %ebx
12829 jge 1f
12830 #endif
12831- movl $LOAD_PHYSICAL_ADDR, %ebx
12832+ movl $____LOAD_PHYSICAL_ADDR, %ebx
12833 1:
12834
12835 /* Target address to relocate to for decompression */
12836diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S
12837index 6b1766c..ad465c9 100644
12838--- a/arch/x86/boot/compressed/head_64.S
12839+++ b/arch/x86/boot/compressed/head_64.S
12840@@ -94,10 +94,10 @@ ENTRY(startup_32)
12841 addl %eax, %ebx
12842 notl %eax
12843 andl %eax, %ebx
12844- cmpl $LOAD_PHYSICAL_ADDR, %ebx
12845+ cmpl $____LOAD_PHYSICAL_ADDR, %ebx
12846 jge 1f
12847 #endif
12848- movl $LOAD_PHYSICAL_ADDR, %ebx
12849+ movl $____LOAD_PHYSICAL_ADDR, %ebx
12850 1:
12851
12852 /* Target address to relocate to for decompression */
12853@@ -322,10 +322,10 @@ preferred_addr:
12854 addq %rax, %rbp
12855 notq %rax
12856 andq %rax, %rbp
12857- cmpq $LOAD_PHYSICAL_ADDR, %rbp
12858+ cmpq $____LOAD_PHYSICAL_ADDR, %rbp
12859 jge 1f
12860 #endif
12861- movq $LOAD_PHYSICAL_ADDR, %rbp
12862+ movq $____LOAD_PHYSICAL_ADDR, %rbp
12863 1:
12864
12865 /* Target address to relocate to for decompression */
12866@@ -434,8 +434,8 @@ gdt:
12867 .long gdt
12868 .word 0
12869 .quad 0x0000000000000000 /* NULL descriptor */
12870- .quad 0x00af9a000000ffff /* __KERNEL_CS */
12871- .quad 0x00cf92000000ffff /* __KERNEL_DS */
12872+ .quad 0x00af9b000000ffff /* __KERNEL_CS */
12873+ .quad 0x00cf93000000ffff /* __KERNEL_DS */
12874 .quad 0x0080890000000000 /* TS descriptor */
12875 .quad 0x0000000000000000 /* TS continued */
12876 gdt_end:
12877diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c
12878index a950864..c710239 100644
12879--- a/arch/x86/boot/compressed/misc.c
12880+++ b/arch/x86/boot/compressed/misc.c
12881@@ -242,7 +242,7 @@ static void handle_relocations(void *output, unsigned long output_len)
12882 * Calculate the delta between where vmlinux was linked to load
12883 * and where it was actually loaded.
12884 */
12885- delta = min_addr - LOAD_PHYSICAL_ADDR;
12886+ delta = min_addr - ____LOAD_PHYSICAL_ADDR;
12887 if (!delta) {
12888 debug_putstr("No relocation needed... ");
12889 return;
12890@@ -324,7 +324,7 @@ static void parse_elf(void *output)
12891 Elf32_Ehdr ehdr;
12892 Elf32_Phdr *phdrs, *phdr;
12893 #endif
12894- void *dest;
12895+ void *dest, *prev;
12896 int i;
12897
12898 memcpy(&ehdr, output, sizeof(ehdr));
12899@@ -351,13 +351,16 @@ static void parse_elf(void *output)
12900 case PT_LOAD:
12901 #ifdef CONFIG_RELOCATABLE
12902 dest = output;
12903- dest += (phdr->p_paddr - LOAD_PHYSICAL_ADDR);
12904+ dest += (phdr->p_paddr - ____LOAD_PHYSICAL_ADDR);
12905 #else
12906 dest = (void *)(phdr->p_paddr);
12907 #endif
12908 memcpy(dest,
12909 output + phdr->p_offset,
12910 phdr->p_filesz);
12911+ if (i)
12912+ memset(prev, 0xff, dest - prev);
12913+ prev = dest + phdr->p_filesz;
12914 break;
12915 default: /* Ignore other PT_* */ break;
12916 }
12917@@ -416,7 +419,7 @@ asmlinkage __visible void *decompress_kernel(void *rmode, memptr heap,
12918 error("Destination address too large");
12919 #endif
12920 #ifndef CONFIG_RELOCATABLE
12921- if ((unsigned long)output != LOAD_PHYSICAL_ADDR)
12922+ if ((unsigned long)output != ____LOAD_PHYSICAL_ADDR)
12923 error("Wrong destination address");
12924 #endif
12925
12926diff --git a/arch/x86/boot/cpucheck.c b/arch/x86/boot/cpucheck.c
12927index 1fd7d57..0f7d096 100644
12928--- a/arch/x86/boot/cpucheck.c
12929+++ b/arch/x86/boot/cpucheck.c
12930@@ -125,9 +125,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
12931 u32 ecx = MSR_K7_HWCR;
12932 u32 eax, edx;
12933
12934- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12935+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12936 eax &= ~(1 << 15);
12937- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12938+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12939
12940 get_cpuflags(); /* Make sure it really did something */
12941 err = check_cpuflags();
12942@@ -140,9 +140,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
12943 u32 ecx = MSR_VIA_FCR;
12944 u32 eax, edx;
12945
12946- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12947+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12948 eax |= (1<<1)|(1<<7);
12949- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12950+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12951
12952 set_bit(X86_FEATURE_CX8, cpu.flags);
12953 err = check_cpuflags();
12954@@ -153,12 +153,12 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
12955 u32 eax, edx;
12956 u32 level = 1;
12957
12958- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12959- asm("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx));
12960- asm("cpuid"
12961+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12962+ asm volatile("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx));
12963+ asm volatile("cpuid"
12964 : "+a" (level), "=d" (cpu.flags[0])
12965 : : "ecx", "ebx");
12966- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12967+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12968
12969 err = check_cpuflags();
12970 } else if (err == 0x01 &&
12971diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S
12972index 16ef025..91e033b 100644
12973--- a/arch/x86/boot/header.S
12974+++ b/arch/x86/boot/header.S
12975@@ -438,10 +438,14 @@ setup_data: .quad 0 # 64-bit physical pointer to
12976 # single linked list of
12977 # struct setup_data
12978
12979-pref_address: .quad LOAD_PHYSICAL_ADDR # preferred load addr
12980+pref_address: .quad ____LOAD_PHYSICAL_ADDR # preferred load addr
12981
12982 #define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset)
12983+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
12984+#define VO_INIT_SIZE (VO__end - VO__text - __PAGE_OFFSET - ____LOAD_PHYSICAL_ADDR)
12985+#else
12986 #define VO_INIT_SIZE (VO__end - VO__text)
12987+#endif
12988 #if ZO_INIT_SIZE > VO_INIT_SIZE
12989 #define INIT_SIZE ZO_INIT_SIZE
12990 #else
12991diff --git a/arch/x86/boot/memory.c b/arch/x86/boot/memory.c
12992index db75d07..8e6d0af 100644
12993--- a/arch/x86/boot/memory.c
12994+++ b/arch/x86/boot/memory.c
12995@@ -19,7 +19,7 @@
12996
12997 static int detect_memory_e820(void)
12998 {
12999- int count = 0;
13000+ unsigned int count = 0;
13001 struct biosregs ireg, oreg;
13002 struct e820entry *desc = boot_params.e820_map;
13003 static struct e820entry buf; /* static so it is zeroed */
13004diff --git a/arch/x86/boot/video-vesa.c b/arch/x86/boot/video-vesa.c
13005index ba3e100..6501b8f 100644
13006--- a/arch/x86/boot/video-vesa.c
13007+++ b/arch/x86/boot/video-vesa.c
13008@@ -201,6 +201,7 @@ static void vesa_store_pm_info(void)
13009
13010 boot_params.screen_info.vesapm_seg = oreg.es;
13011 boot_params.screen_info.vesapm_off = oreg.di;
13012+ boot_params.screen_info.vesapm_size = oreg.cx;
13013 }
13014
13015 /*
13016diff --git a/arch/x86/boot/video.c b/arch/x86/boot/video.c
13017index 43eda28..5ab5fdb 100644
13018--- a/arch/x86/boot/video.c
13019+++ b/arch/x86/boot/video.c
13020@@ -96,7 +96,7 @@ static void store_mode_params(void)
13021 static unsigned int get_entry(void)
13022 {
13023 char entry_buf[4];
13024- int i, len = 0;
13025+ unsigned int i, len = 0;
13026 int key;
13027 unsigned int v;
13028
13029diff --git a/arch/x86/crypto/aes-x86_64-asm_64.S b/arch/x86/crypto/aes-x86_64-asm_64.S
13030index 9105655..41779c1 100644
13031--- a/arch/x86/crypto/aes-x86_64-asm_64.S
13032+++ b/arch/x86/crypto/aes-x86_64-asm_64.S
13033@@ -8,6 +8,8 @@
13034 * including this sentence is retained in full.
13035 */
13036
13037+#include <asm/alternative-asm.h>
13038+
13039 .extern crypto_ft_tab
13040 .extern crypto_it_tab
13041 .extern crypto_fl_tab
13042@@ -70,6 +72,8 @@
13043 je B192; \
13044 leaq 32(r9),r9;
13045
13046+#define ret pax_force_retaddr; ret
13047+
13048 #define epilogue(FUNC,r1,r2,r3,r4,r5,r6,r7,r8,r9) \
13049 movq r1,r2; \
13050 movq r3,r4; \
13051diff --git a/arch/x86/crypto/aesni-intel_asm.S b/arch/x86/crypto/aesni-intel_asm.S
13052index 6bd2c6c..368c93e 100644
13053--- a/arch/x86/crypto/aesni-intel_asm.S
13054+++ b/arch/x86/crypto/aesni-intel_asm.S
13055@@ -31,6 +31,7 @@
13056
13057 #include <linux/linkage.h>
13058 #include <asm/inst.h>
13059+#include <asm/alternative-asm.h>
13060
13061 /*
13062 * The following macros are used to move an (un)aligned 16 byte value to/from
13063@@ -217,7 +218,7 @@ enc: .octa 0x2
13064 * num_initial_blocks = b mod 4
13065 * encrypt the initial num_initial_blocks blocks and apply ghash on
13066 * the ciphertext
13067-* %r10, %r11, %r12, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
13068+* %r10, %r11, %r15, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
13069 * are clobbered
13070 * arg1, %arg2, %arg3, %r14 are used as a pointer only, not modified
13071 */
13072@@ -227,8 +228,8 @@ enc: .octa 0x2
13073 XMM2 XMM3 XMM4 XMMDst TMP6 TMP7 i i_seq operation
13074 MOVADQ SHUF_MASK(%rip), %xmm14
13075 mov arg7, %r10 # %r10 = AAD
13076- mov arg8, %r12 # %r12 = aadLen
13077- mov %r12, %r11
13078+ mov arg8, %r15 # %r15 = aadLen
13079+ mov %r15, %r11
13080 pxor %xmm\i, %xmm\i
13081
13082 _get_AAD_loop\num_initial_blocks\operation:
13083@@ -237,17 +238,17 @@ _get_AAD_loop\num_initial_blocks\operation:
13084 psrldq $4, %xmm\i
13085 pxor \TMP1, %xmm\i
13086 add $4, %r10
13087- sub $4, %r12
13088+ sub $4, %r15
13089 jne _get_AAD_loop\num_initial_blocks\operation
13090
13091 cmp $16, %r11
13092 je _get_AAD_loop2_done\num_initial_blocks\operation
13093
13094- mov $16, %r12
13095+ mov $16, %r15
13096 _get_AAD_loop2\num_initial_blocks\operation:
13097 psrldq $4, %xmm\i
13098- sub $4, %r12
13099- cmp %r11, %r12
13100+ sub $4, %r15
13101+ cmp %r11, %r15
13102 jne _get_AAD_loop2\num_initial_blocks\operation
13103
13104 _get_AAD_loop2_done\num_initial_blocks\operation:
13105@@ -442,7 +443,7 @@ _initial_blocks_done\num_initial_blocks\operation:
13106 * num_initial_blocks = b mod 4
13107 * encrypt the initial num_initial_blocks blocks and apply ghash on
13108 * the ciphertext
13109-* %r10, %r11, %r12, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
13110+* %r10, %r11, %r15, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
13111 * are clobbered
13112 * arg1, %arg2, %arg3, %r14 are used as a pointer only, not modified
13113 */
13114@@ -452,8 +453,8 @@ _initial_blocks_done\num_initial_blocks\operation:
13115 XMM2 XMM3 XMM4 XMMDst TMP6 TMP7 i i_seq operation
13116 MOVADQ SHUF_MASK(%rip), %xmm14
13117 mov arg7, %r10 # %r10 = AAD
13118- mov arg8, %r12 # %r12 = aadLen
13119- mov %r12, %r11
13120+ mov arg8, %r15 # %r15 = aadLen
13121+ mov %r15, %r11
13122 pxor %xmm\i, %xmm\i
13123 _get_AAD_loop\num_initial_blocks\operation:
13124 movd (%r10), \TMP1
13125@@ -461,15 +462,15 @@ _get_AAD_loop\num_initial_blocks\operation:
13126 psrldq $4, %xmm\i
13127 pxor \TMP1, %xmm\i
13128 add $4, %r10
13129- sub $4, %r12
13130+ sub $4, %r15
13131 jne _get_AAD_loop\num_initial_blocks\operation
13132 cmp $16, %r11
13133 je _get_AAD_loop2_done\num_initial_blocks\operation
13134- mov $16, %r12
13135+ mov $16, %r15
13136 _get_AAD_loop2\num_initial_blocks\operation:
13137 psrldq $4, %xmm\i
13138- sub $4, %r12
13139- cmp %r11, %r12
13140+ sub $4, %r15
13141+ cmp %r11, %r15
13142 jne _get_AAD_loop2\num_initial_blocks\operation
13143 _get_AAD_loop2_done\num_initial_blocks\operation:
13144 PSHUFB_XMM %xmm14, %xmm\i # byte-reflect the AAD data
13145@@ -1280,7 +1281,7 @@ _esb_loop_\@:
13146 *
13147 *****************************************************************************/
13148 ENTRY(aesni_gcm_dec)
13149- push %r12
13150+ push %r15
13151 push %r13
13152 push %r14
13153 mov %rsp, %r14
13154@@ -1290,8 +1291,8 @@ ENTRY(aesni_gcm_dec)
13155 */
13156 sub $VARIABLE_OFFSET, %rsp
13157 and $~63, %rsp # align rsp to 64 bytes
13158- mov %arg6, %r12
13159- movdqu (%r12), %xmm13 # %xmm13 = HashKey
13160+ mov %arg6, %r15
13161+ movdqu (%r15), %xmm13 # %xmm13 = HashKey
13162 movdqa SHUF_MASK(%rip), %xmm2
13163 PSHUFB_XMM %xmm2, %xmm13
13164
13165@@ -1319,10 +1320,10 @@ ENTRY(aesni_gcm_dec)
13166 movdqa %xmm13, HashKey(%rsp) # store HashKey<<1 (mod poly)
13167 mov %arg4, %r13 # save the number of bytes of plaintext/ciphertext
13168 and $-16, %r13 # %r13 = %r13 - (%r13 mod 16)
13169- mov %r13, %r12
13170- and $(3<<4), %r12
13171+ mov %r13, %r15
13172+ and $(3<<4), %r15
13173 jz _initial_num_blocks_is_0_decrypt
13174- cmp $(2<<4), %r12
13175+ cmp $(2<<4), %r15
13176 jb _initial_num_blocks_is_1_decrypt
13177 je _initial_num_blocks_is_2_decrypt
13178 _initial_num_blocks_is_3_decrypt:
13179@@ -1372,16 +1373,16 @@ _zero_cipher_left_decrypt:
13180 sub $16, %r11
13181 add %r13, %r11
13182 movdqu (%arg3,%r11,1), %xmm1 # receive the last <16 byte block
13183- lea SHIFT_MASK+16(%rip), %r12
13184- sub %r13, %r12
13185+ lea SHIFT_MASK+16(%rip), %r15
13186+ sub %r13, %r15
13187 # adjust the shuffle mask pointer to be able to shift 16-%r13 bytes
13188 # (%r13 is the number of bytes in plaintext mod 16)
13189- movdqu (%r12), %xmm2 # get the appropriate shuffle mask
13190+ movdqu (%r15), %xmm2 # get the appropriate shuffle mask
13191 PSHUFB_XMM %xmm2, %xmm1 # right shift 16-%r13 butes
13192
13193 movdqa %xmm1, %xmm2
13194 pxor %xmm1, %xmm0 # Ciphertext XOR E(K, Yn)
13195- movdqu ALL_F-SHIFT_MASK(%r12), %xmm1
13196+ movdqu ALL_F-SHIFT_MASK(%r15), %xmm1
13197 # get the appropriate mask to mask out top 16-%r13 bytes of %xmm0
13198 pand %xmm1, %xmm0 # mask out top 16-%r13 bytes of %xmm0
13199 pand %xmm1, %xmm2
13200@@ -1410,9 +1411,9 @@ _less_than_8_bytes_left_decrypt:
13201 sub $1, %r13
13202 jne _less_than_8_bytes_left_decrypt
13203 _multiple_of_16_bytes_decrypt:
13204- mov arg8, %r12 # %r13 = aadLen (number of bytes)
13205- shl $3, %r12 # convert into number of bits
13206- movd %r12d, %xmm15 # len(A) in %xmm15
13207+ mov arg8, %r15 # %r13 = aadLen (number of bytes)
13208+ shl $3, %r15 # convert into number of bits
13209+ movd %r15d, %xmm15 # len(A) in %xmm15
13210 shl $3, %arg4 # len(C) in bits (*128)
13211 MOVQ_R64_XMM %arg4, %xmm1
13212 pslldq $8, %xmm15 # %xmm15 = len(A)||0x0000000000000000
13213@@ -1451,7 +1452,8 @@ _return_T_done_decrypt:
13214 mov %r14, %rsp
13215 pop %r14
13216 pop %r13
13217- pop %r12
13218+ pop %r15
13219+ pax_force_retaddr
13220 ret
13221 ENDPROC(aesni_gcm_dec)
13222
13223@@ -1540,7 +1542,7 @@ ENDPROC(aesni_gcm_dec)
13224 * poly = x^128 + x^127 + x^126 + x^121 + 1
13225 ***************************************************************************/
13226 ENTRY(aesni_gcm_enc)
13227- push %r12
13228+ push %r15
13229 push %r13
13230 push %r14
13231 mov %rsp, %r14
13232@@ -1550,8 +1552,8 @@ ENTRY(aesni_gcm_enc)
13233 #
13234 sub $VARIABLE_OFFSET, %rsp
13235 and $~63, %rsp
13236- mov %arg6, %r12
13237- movdqu (%r12), %xmm13
13238+ mov %arg6, %r15
13239+ movdqu (%r15), %xmm13
13240 movdqa SHUF_MASK(%rip), %xmm2
13241 PSHUFB_XMM %xmm2, %xmm13
13242
13243@@ -1575,13 +1577,13 @@ ENTRY(aesni_gcm_enc)
13244 movdqa %xmm13, HashKey(%rsp)
13245 mov %arg4, %r13 # %xmm13 holds HashKey<<1 (mod poly)
13246 and $-16, %r13
13247- mov %r13, %r12
13248+ mov %r13, %r15
13249
13250 # Encrypt first few blocks
13251
13252- and $(3<<4), %r12
13253+ and $(3<<4), %r15
13254 jz _initial_num_blocks_is_0_encrypt
13255- cmp $(2<<4), %r12
13256+ cmp $(2<<4), %r15
13257 jb _initial_num_blocks_is_1_encrypt
13258 je _initial_num_blocks_is_2_encrypt
13259 _initial_num_blocks_is_3_encrypt:
13260@@ -1634,14 +1636,14 @@ _zero_cipher_left_encrypt:
13261 sub $16, %r11
13262 add %r13, %r11
13263 movdqu (%arg3,%r11,1), %xmm1 # receive the last <16 byte blocks
13264- lea SHIFT_MASK+16(%rip), %r12
13265- sub %r13, %r12
13266+ lea SHIFT_MASK+16(%rip), %r15
13267+ sub %r13, %r15
13268 # adjust the shuffle mask pointer to be able to shift 16-r13 bytes
13269 # (%r13 is the number of bytes in plaintext mod 16)
13270- movdqu (%r12), %xmm2 # get the appropriate shuffle mask
13271+ movdqu (%r15), %xmm2 # get the appropriate shuffle mask
13272 PSHUFB_XMM %xmm2, %xmm1 # shift right 16-r13 byte
13273 pxor %xmm1, %xmm0 # Plaintext XOR Encrypt(K, Yn)
13274- movdqu ALL_F-SHIFT_MASK(%r12), %xmm1
13275+ movdqu ALL_F-SHIFT_MASK(%r15), %xmm1
13276 # get the appropriate mask to mask out top 16-r13 bytes of xmm0
13277 pand %xmm1, %xmm0 # mask out top 16-r13 bytes of xmm0
13278 movdqa SHUF_MASK(%rip), %xmm10
13279@@ -1674,9 +1676,9 @@ _less_than_8_bytes_left_encrypt:
13280 sub $1, %r13
13281 jne _less_than_8_bytes_left_encrypt
13282 _multiple_of_16_bytes_encrypt:
13283- mov arg8, %r12 # %r12 = addLen (number of bytes)
13284- shl $3, %r12
13285- movd %r12d, %xmm15 # len(A) in %xmm15
13286+ mov arg8, %r15 # %r15 = addLen (number of bytes)
13287+ shl $3, %r15
13288+ movd %r15d, %xmm15 # len(A) in %xmm15
13289 shl $3, %arg4 # len(C) in bits (*128)
13290 MOVQ_R64_XMM %arg4, %xmm1
13291 pslldq $8, %xmm15 # %xmm15 = len(A)||0x0000000000000000
13292@@ -1715,7 +1717,8 @@ _return_T_done_encrypt:
13293 mov %r14, %rsp
13294 pop %r14
13295 pop %r13
13296- pop %r12
13297+ pop %r15
13298+ pax_force_retaddr
13299 ret
13300 ENDPROC(aesni_gcm_enc)
13301
13302@@ -1733,6 +1736,7 @@ _key_expansion_256a:
13303 pxor %xmm1, %xmm0
13304 movaps %xmm0, (TKEYP)
13305 add $0x10, TKEYP
13306+ pax_force_retaddr
13307 ret
13308 ENDPROC(_key_expansion_128)
13309 ENDPROC(_key_expansion_256a)
13310@@ -1759,6 +1763,7 @@ _key_expansion_192a:
13311 shufps $0b01001110, %xmm2, %xmm1
13312 movaps %xmm1, 0x10(TKEYP)
13313 add $0x20, TKEYP
13314+ pax_force_retaddr
13315 ret
13316 ENDPROC(_key_expansion_192a)
13317
13318@@ -1779,6 +1784,7 @@ _key_expansion_192b:
13319
13320 movaps %xmm0, (TKEYP)
13321 add $0x10, TKEYP
13322+ pax_force_retaddr
13323 ret
13324 ENDPROC(_key_expansion_192b)
13325
13326@@ -1792,6 +1798,7 @@ _key_expansion_256b:
13327 pxor %xmm1, %xmm2
13328 movaps %xmm2, (TKEYP)
13329 add $0x10, TKEYP
13330+ pax_force_retaddr
13331 ret
13332 ENDPROC(_key_expansion_256b)
13333
13334@@ -1905,6 +1912,7 @@ ENTRY(aesni_set_key)
13335 #ifndef __x86_64__
13336 popl KEYP
13337 #endif
13338+ pax_force_retaddr
13339 ret
13340 ENDPROC(aesni_set_key)
13341
13342@@ -1927,6 +1935,7 @@ ENTRY(aesni_enc)
13343 popl KLEN
13344 popl KEYP
13345 #endif
13346+ pax_force_retaddr
13347 ret
13348 ENDPROC(aesni_enc)
13349
13350@@ -1985,6 +1994,7 @@ _aesni_enc1:
13351 AESENC KEY STATE
13352 movaps 0x70(TKEYP), KEY
13353 AESENCLAST KEY STATE
13354+ pax_force_retaddr
13355 ret
13356 ENDPROC(_aesni_enc1)
13357
13358@@ -2094,6 +2104,7 @@ _aesni_enc4:
13359 AESENCLAST KEY STATE2
13360 AESENCLAST KEY STATE3
13361 AESENCLAST KEY STATE4
13362+ pax_force_retaddr
13363 ret
13364 ENDPROC(_aesni_enc4)
13365
13366@@ -2117,6 +2128,7 @@ ENTRY(aesni_dec)
13367 popl KLEN
13368 popl KEYP
13369 #endif
13370+ pax_force_retaddr
13371 ret
13372 ENDPROC(aesni_dec)
13373
13374@@ -2175,6 +2187,7 @@ _aesni_dec1:
13375 AESDEC KEY STATE
13376 movaps 0x70(TKEYP), KEY
13377 AESDECLAST KEY STATE
13378+ pax_force_retaddr
13379 ret
13380 ENDPROC(_aesni_dec1)
13381
13382@@ -2284,6 +2297,7 @@ _aesni_dec4:
13383 AESDECLAST KEY STATE2
13384 AESDECLAST KEY STATE3
13385 AESDECLAST KEY STATE4
13386+ pax_force_retaddr
13387 ret
13388 ENDPROC(_aesni_dec4)
13389
13390@@ -2342,6 +2356,7 @@ ENTRY(aesni_ecb_enc)
13391 popl KEYP
13392 popl LEN
13393 #endif
13394+ pax_force_retaddr
13395 ret
13396 ENDPROC(aesni_ecb_enc)
13397
13398@@ -2401,6 +2416,7 @@ ENTRY(aesni_ecb_dec)
13399 popl KEYP
13400 popl LEN
13401 #endif
13402+ pax_force_retaddr
13403 ret
13404 ENDPROC(aesni_ecb_dec)
13405
13406@@ -2443,6 +2459,7 @@ ENTRY(aesni_cbc_enc)
13407 popl LEN
13408 popl IVP
13409 #endif
13410+ pax_force_retaddr
13411 ret
13412 ENDPROC(aesni_cbc_enc)
13413
13414@@ -2534,6 +2551,7 @@ ENTRY(aesni_cbc_dec)
13415 popl LEN
13416 popl IVP
13417 #endif
13418+ pax_force_retaddr
13419 ret
13420 ENDPROC(aesni_cbc_dec)
13421
13422@@ -2561,6 +2579,7 @@ _aesni_inc_init:
13423 mov $1, TCTR_LOW
13424 MOVQ_R64_XMM TCTR_LOW INC
13425 MOVQ_R64_XMM CTR TCTR_LOW
13426+ pax_force_retaddr
13427 ret
13428 ENDPROC(_aesni_inc_init)
13429
13430@@ -2590,6 +2609,7 @@ _aesni_inc:
13431 .Linc_low:
13432 movaps CTR, IV
13433 PSHUFB_XMM BSWAP_MASK IV
13434+ pax_force_retaddr
13435 ret
13436 ENDPROC(_aesni_inc)
13437
13438@@ -2651,6 +2671,7 @@ ENTRY(aesni_ctr_enc)
13439 .Lctr_enc_ret:
13440 movups IV, (IVP)
13441 .Lctr_enc_just_ret:
13442+ pax_force_retaddr
13443 ret
13444 ENDPROC(aesni_ctr_enc)
13445
13446@@ -2777,6 +2798,7 @@ ENTRY(aesni_xts_crypt8)
13447 pxor INC, STATE4
13448 movdqu STATE4, 0x70(OUTP)
13449
13450+ pax_force_retaddr
13451 ret
13452 ENDPROC(aesni_xts_crypt8)
13453
13454diff --git a/arch/x86/crypto/blowfish-x86_64-asm_64.S b/arch/x86/crypto/blowfish-x86_64-asm_64.S
13455index 246c670..466e2d6 100644
13456--- a/arch/x86/crypto/blowfish-x86_64-asm_64.S
13457+++ b/arch/x86/crypto/blowfish-x86_64-asm_64.S
13458@@ -21,6 +21,7 @@
13459 */
13460
13461 #include <linux/linkage.h>
13462+#include <asm/alternative-asm.h>
13463
13464 .file "blowfish-x86_64-asm.S"
13465 .text
13466@@ -149,9 +150,11 @@ ENTRY(__blowfish_enc_blk)
13467 jnz .L__enc_xor;
13468
13469 write_block();
13470+ pax_force_retaddr
13471 ret;
13472 .L__enc_xor:
13473 xor_block();
13474+ pax_force_retaddr
13475 ret;
13476 ENDPROC(__blowfish_enc_blk)
13477
13478@@ -183,6 +186,7 @@ ENTRY(blowfish_dec_blk)
13479
13480 movq %r11, %rbp;
13481
13482+ pax_force_retaddr
13483 ret;
13484 ENDPROC(blowfish_dec_blk)
13485
13486@@ -334,6 +338,7 @@ ENTRY(__blowfish_enc_blk_4way)
13487
13488 popq %rbx;
13489 popq %rbp;
13490+ pax_force_retaddr
13491 ret;
13492
13493 .L__enc_xor4:
13494@@ -341,6 +346,7 @@ ENTRY(__blowfish_enc_blk_4way)
13495
13496 popq %rbx;
13497 popq %rbp;
13498+ pax_force_retaddr
13499 ret;
13500 ENDPROC(__blowfish_enc_blk_4way)
13501
13502@@ -375,5 +381,6 @@ ENTRY(blowfish_dec_blk_4way)
13503 popq %rbx;
13504 popq %rbp;
13505
13506+ pax_force_retaddr
13507 ret;
13508 ENDPROC(blowfish_dec_blk_4way)
13509diff --git a/arch/x86/crypto/camellia-aesni-avx-asm_64.S b/arch/x86/crypto/camellia-aesni-avx-asm_64.S
13510index ce71f92..1dce7ec 100644
13511--- a/arch/x86/crypto/camellia-aesni-avx-asm_64.S
13512+++ b/arch/x86/crypto/camellia-aesni-avx-asm_64.S
13513@@ -16,6 +16,7 @@
13514 */
13515
13516 #include <linux/linkage.h>
13517+#include <asm/alternative-asm.h>
13518
13519 #define CAMELLIA_TABLE_BYTE_LEN 272
13520
13521@@ -191,6 +192,7 @@ roundsm16_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd:
13522 roundsm16(%xmm0, %xmm1, %xmm2, %xmm3, %xmm4, %xmm5, %xmm6, %xmm7,
13523 %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14, %xmm15,
13524 %rcx, (%r9));
13525+ pax_force_retaddr
13526 ret;
13527 ENDPROC(roundsm16_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd)
13528
13529@@ -199,6 +201,7 @@ roundsm16_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab:
13530 roundsm16(%xmm4, %xmm5, %xmm6, %xmm7, %xmm0, %xmm1, %xmm2, %xmm3,
13531 %xmm12, %xmm13, %xmm14, %xmm15, %xmm8, %xmm9, %xmm10, %xmm11,
13532 %rax, (%r9));
13533+ pax_force_retaddr
13534 ret;
13535 ENDPROC(roundsm16_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab)
13536
13537@@ -780,6 +783,7 @@ __camellia_enc_blk16:
13538 %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14,
13539 %xmm15, (key_table)(CTX, %r8, 8), (%rax), 1 * 16(%rax));
13540
13541+ pax_force_retaddr
13542 ret;
13543
13544 .align 8
13545@@ -865,6 +869,7 @@ __camellia_dec_blk16:
13546 %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14,
13547 %xmm15, (key_table)(CTX), (%rax), 1 * 16(%rax));
13548
13549+ pax_force_retaddr
13550 ret;
13551
13552 .align 8
13553@@ -904,6 +909,7 @@ ENTRY(camellia_ecb_enc_16way)
13554 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13555 %xmm8, %rsi);
13556
13557+ pax_force_retaddr
13558 ret;
13559 ENDPROC(camellia_ecb_enc_16way)
13560
13561@@ -932,6 +938,7 @@ ENTRY(camellia_ecb_dec_16way)
13562 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13563 %xmm8, %rsi);
13564
13565+ pax_force_retaddr
13566 ret;
13567 ENDPROC(camellia_ecb_dec_16way)
13568
13569@@ -981,6 +988,7 @@ ENTRY(camellia_cbc_dec_16way)
13570 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13571 %xmm8, %rsi);
13572
13573+ pax_force_retaddr
13574 ret;
13575 ENDPROC(camellia_cbc_dec_16way)
13576
13577@@ -1092,6 +1100,7 @@ ENTRY(camellia_ctr_16way)
13578 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13579 %xmm8, %rsi);
13580
13581+ pax_force_retaddr
13582 ret;
13583 ENDPROC(camellia_ctr_16way)
13584
13585@@ -1234,6 +1243,7 @@ camellia_xts_crypt_16way:
13586 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13587 %xmm8, %rsi);
13588
13589+ pax_force_retaddr
13590 ret;
13591 ENDPROC(camellia_xts_crypt_16way)
13592
13593diff --git a/arch/x86/crypto/camellia-aesni-avx2-asm_64.S b/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
13594index 0e0b886..5a3123c 100644
13595--- a/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
13596+++ b/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
13597@@ -11,6 +11,7 @@
13598 */
13599
13600 #include <linux/linkage.h>
13601+#include <asm/alternative-asm.h>
13602
13603 #define CAMELLIA_TABLE_BYTE_LEN 272
13604
13605@@ -230,6 +231,7 @@ roundsm32_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd:
13606 roundsm32(%ymm0, %ymm1, %ymm2, %ymm3, %ymm4, %ymm5, %ymm6, %ymm7,
13607 %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14, %ymm15,
13608 %rcx, (%r9));
13609+ pax_force_retaddr
13610 ret;
13611 ENDPROC(roundsm32_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd)
13612
13613@@ -238,6 +240,7 @@ roundsm32_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab:
13614 roundsm32(%ymm4, %ymm5, %ymm6, %ymm7, %ymm0, %ymm1, %ymm2, %ymm3,
13615 %ymm12, %ymm13, %ymm14, %ymm15, %ymm8, %ymm9, %ymm10, %ymm11,
13616 %rax, (%r9));
13617+ pax_force_retaddr
13618 ret;
13619 ENDPROC(roundsm32_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab)
13620
13621@@ -820,6 +823,7 @@ __camellia_enc_blk32:
13622 %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14,
13623 %ymm15, (key_table)(CTX, %r8, 8), (%rax), 1 * 32(%rax));
13624
13625+ pax_force_retaddr
13626 ret;
13627
13628 .align 8
13629@@ -905,6 +909,7 @@ __camellia_dec_blk32:
13630 %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14,
13631 %ymm15, (key_table)(CTX), (%rax), 1 * 32(%rax));
13632
13633+ pax_force_retaddr
13634 ret;
13635
13636 .align 8
13637@@ -948,6 +953,7 @@ ENTRY(camellia_ecb_enc_32way)
13638
13639 vzeroupper;
13640
13641+ pax_force_retaddr
13642 ret;
13643 ENDPROC(camellia_ecb_enc_32way)
13644
13645@@ -980,6 +986,7 @@ ENTRY(camellia_ecb_dec_32way)
13646
13647 vzeroupper;
13648
13649+ pax_force_retaddr
13650 ret;
13651 ENDPROC(camellia_ecb_dec_32way)
13652
13653@@ -1046,6 +1053,7 @@ ENTRY(camellia_cbc_dec_32way)
13654
13655 vzeroupper;
13656
13657+ pax_force_retaddr
13658 ret;
13659 ENDPROC(camellia_cbc_dec_32way)
13660
13661@@ -1184,6 +1192,7 @@ ENTRY(camellia_ctr_32way)
13662
13663 vzeroupper;
13664
13665+ pax_force_retaddr
13666 ret;
13667 ENDPROC(camellia_ctr_32way)
13668
13669@@ -1349,6 +1358,7 @@ camellia_xts_crypt_32way:
13670
13671 vzeroupper;
13672
13673+ pax_force_retaddr
13674 ret;
13675 ENDPROC(camellia_xts_crypt_32way)
13676
13677diff --git a/arch/x86/crypto/camellia-x86_64-asm_64.S b/arch/x86/crypto/camellia-x86_64-asm_64.S
13678index 310319c..db3d7b5 100644
13679--- a/arch/x86/crypto/camellia-x86_64-asm_64.S
13680+++ b/arch/x86/crypto/camellia-x86_64-asm_64.S
13681@@ -21,6 +21,7 @@
13682 */
13683
13684 #include <linux/linkage.h>
13685+#include <asm/alternative-asm.h>
13686
13687 .file "camellia-x86_64-asm_64.S"
13688 .text
13689@@ -228,12 +229,14 @@ ENTRY(__camellia_enc_blk)
13690 enc_outunpack(mov, RT1);
13691
13692 movq RRBP, %rbp;
13693+ pax_force_retaddr
13694 ret;
13695
13696 .L__enc_xor:
13697 enc_outunpack(xor, RT1);
13698
13699 movq RRBP, %rbp;
13700+ pax_force_retaddr
13701 ret;
13702 ENDPROC(__camellia_enc_blk)
13703
13704@@ -272,6 +275,7 @@ ENTRY(camellia_dec_blk)
13705 dec_outunpack();
13706
13707 movq RRBP, %rbp;
13708+ pax_force_retaddr
13709 ret;
13710 ENDPROC(camellia_dec_blk)
13711
13712@@ -463,6 +467,7 @@ ENTRY(__camellia_enc_blk_2way)
13713
13714 movq RRBP, %rbp;
13715 popq %rbx;
13716+ pax_force_retaddr
13717 ret;
13718
13719 .L__enc2_xor:
13720@@ -470,6 +475,7 @@ ENTRY(__camellia_enc_blk_2way)
13721
13722 movq RRBP, %rbp;
13723 popq %rbx;
13724+ pax_force_retaddr
13725 ret;
13726 ENDPROC(__camellia_enc_blk_2way)
13727
13728@@ -510,5 +516,6 @@ ENTRY(camellia_dec_blk_2way)
13729
13730 movq RRBP, %rbp;
13731 movq RXOR, %rbx;
13732+ pax_force_retaddr
13733 ret;
13734 ENDPROC(camellia_dec_blk_2way)
13735diff --git a/arch/x86/crypto/cast5-avx-x86_64-asm_64.S b/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
13736index c35fd5d..2d8c7db 100644
13737--- a/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
13738+++ b/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
13739@@ -24,6 +24,7 @@
13740 */
13741
13742 #include <linux/linkage.h>
13743+#include <asm/alternative-asm.h>
13744
13745 .file "cast5-avx-x86_64-asm_64.S"
13746
13747@@ -281,6 +282,7 @@ __cast5_enc_blk16:
13748 outunpack_blocks(RR3, RL3, RTMP, RX, RKM);
13749 outunpack_blocks(RR4, RL4, RTMP, RX, RKM);
13750
13751+ pax_force_retaddr
13752 ret;
13753 ENDPROC(__cast5_enc_blk16)
13754
13755@@ -352,6 +354,7 @@ __cast5_dec_blk16:
13756 outunpack_blocks(RR3, RL3, RTMP, RX, RKM);
13757 outunpack_blocks(RR4, RL4, RTMP, RX, RKM);
13758
13759+ pax_force_retaddr
13760 ret;
13761
13762 .L__skip_dec:
13763@@ -388,6 +391,7 @@ ENTRY(cast5_ecb_enc_16way)
13764 vmovdqu RR4, (6*4*4)(%r11);
13765 vmovdqu RL4, (7*4*4)(%r11);
13766
13767+ pax_force_retaddr
13768 ret;
13769 ENDPROC(cast5_ecb_enc_16way)
13770
13771@@ -420,6 +424,7 @@ ENTRY(cast5_ecb_dec_16way)
13772 vmovdqu RR4, (6*4*4)(%r11);
13773 vmovdqu RL4, (7*4*4)(%r11);
13774
13775+ pax_force_retaddr
13776 ret;
13777 ENDPROC(cast5_ecb_dec_16way)
13778
13779@@ -430,10 +435,10 @@ ENTRY(cast5_cbc_dec_16way)
13780 * %rdx: src
13781 */
13782
13783- pushq %r12;
13784+ pushq %r14;
13785
13786 movq %rsi, %r11;
13787- movq %rdx, %r12;
13788+ movq %rdx, %r14;
13789
13790 vmovdqu (0*16)(%rdx), RL1;
13791 vmovdqu (1*16)(%rdx), RR1;
13792@@ -447,16 +452,16 @@ ENTRY(cast5_cbc_dec_16way)
13793 call __cast5_dec_blk16;
13794
13795 /* xor with src */
13796- vmovq (%r12), RX;
13797+ vmovq (%r14), RX;
13798 vpshufd $0x4f, RX, RX;
13799 vpxor RX, RR1, RR1;
13800- vpxor 0*16+8(%r12), RL1, RL1;
13801- vpxor 1*16+8(%r12), RR2, RR2;
13802- vpxor 2*16+8(%r12), RL2, RL2;
13803- vpxor 3*16+8(%r12), RR3, RR3;
13804- vpxor 4*16+8(%r12), RL3, RL3;
13805- vpxor 5*16+8(%r12), RR4, RR4;
13806- vpxor 6*16+8(%r12), RL4, RL4;
13807+ vpxor 0*16+8(%r14), RL1, RL1;
13808+ vpxor 1*16+8(%r14), RR2, RR2;
13809+ vpxor 2*16+8(%r14), RL2, RL2;
13810+ vpxor 3*16+8(%r14), RR3, RR3;
13811+ vpxor 4*16+8(%r14), RL3, RL3;
13812+ vpxor 5*16+8(%r14), RR4, RR4;
13813+ vpxor 6*16+8(%r14), RL4, RL4;
13814
13815 vmovdqu RR1, (0*16)(%r11);
13816 vmovdqu RL1, (1*16)(%r11);
13817@@ -467,8 +472,9 @@ ENTRY(cast5_cbc_dec_16way)
13818 vmovdqu RR4, (6*16)(%r11);
13819 vmovdqu RL4, (7*16)(%r11);
13820
13821- popq %r12;
13822+ popq %r14;
13823
13824+ pax_force_retaddr
13825 ret;
13826 ENDPROC(cast5_cbc_dec_16way)
13827
13828@@ -480,10 +486,10 @@ ENTRY(cast5_ctr_16way)
13829 * %rcx: iv (big endian, 64bit)
13830 */
13831
13832- pushq %r12;
13833+ pushq %r14;
13834
13835 movq %rsi, %r11;
13836- movq %rdx, %r12;
13837+ movq %rdx, %r14;
13838
13839 vpcmpeqd RTMP, RTMP, RTMP;
13840 vpsrldq $8, RTMP, RTMP; /* low: -1, high: 0 */
13841@@ -523,14 +529,14 @@ ENTRY(cast5_ctr_16way)
13842 call __cast5_enc_blk16;
13843
13844 /* dst = src ^ iv */
13845- vpxor (0*16)(%r12), RR1, RR1;
13846- vpxor (1*16)(%r12), RL1, RL1;
13847- vpxor (2*16)(%r12), RR2, RR2;
13848- vpxor (3*16)(%r12), RL2, RL2;
13849- vpxor (4*16)(%r12), RR3, RR3;
13850- vpxor (5*16)(%r12), RL3, RL3;
13851- vpxor (6*16)(%r12), RR4, RR4;
13852- vpxor (7*16)(%r12), RL4, RL4;
13853+ vpxor (0*16)(%r14), RR1, RR1;
13854+ vpxor (1*16)(%r14), RL1, RL1;
13855+ vpxor (2*16)(%r14), RR2, RR2;
13856+ vpxor (3*16)(%r14), RL2, RL2;
13857+ vpxor (4*16)(%r14), RR3, RR3;
13858+ vpxor (5*16)(%r14), RL3, RL3;
13859+ vpxor (6*16)(%r14), RR4, RR4;
13860+ vpxor (7*16)(%r14), RL4, RL4;
13861 vmovdqu RR1, (0*16)(%r11);
13862 vmovdqu RL1, (1*16)(%r11);
13863 vmovdqu RR2, (2*16)(%r11);
13864@@ -540,7 +546,8 @@ ENTRY(cast5_ctr_16way)
13865 vmovdqu RR4, (6*16)(%r11);
13866 vmovdqu RL4, (7*16)(%r11);
13867
13868- popq %r12;
13869+ popq %r14;
13870
13871+ pax_force_retaddr
13872 ret;
13873 ENDPROC(cast5_ctr_16way)
13874diff --git a/arch/x86/crypto/cast6-avx-x86_64-asm_64.S b/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
13875index e3531f8..e123f35 100644
13876--- a/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
13877+++ b/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
13878@@ -24,6 +24,7 @@
13879 */
13880
13881 #include <linux/linkage.h>
13882+#include <asm/alternative-asm.h>
13883 #include "glue_helper-asm-avx.S"
13884
13885 .file "cast6-avx-x86_64-asm_64.S"
13886@@ -295,6 +296,7 @@ __cast6_enc_blk8:
13887 outunpack_blocks(RA1, RB1, RC1, RD1, RTMP, RX, RKRF, RKM);
13888 outunpack_blocks(RA2, RB2, RC2, RD2, RTMP, RX, RKRF, RKM);
13889
13890+ pax_force_retaddr
13891 ret;
13892 ENDPROC(__cast6_enc_blk8)
13893
13894@@ -340,6 +342,7 @@ __cast6_dec_blk8:
13895 outunpack_blocks(RA1, RB1, RC1, RD1, RTMP, RX, RKRF, RKM);
13896 outunpack_blocks(RA2, RB2, RC2, RD2, RTMP, RX, RKRF, RKM);
13897
13898+ pax_force_retaddr
13899 ret;
13900 ENDPROC(__cast6_dec_blk8)
13901
13902@@ -358,6 +361,7 @@ ENTRY(cast6_ecb_enc_8way)
13903
13904 store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13905
13906+ pax_force_retaddr
13907 ret;
13908 ENDPROC(cast6_ecb_enc_8way)
13909
13910@@ -376,6 +380,7 @@ ENTRY(cast6_ecb_dec_8way)
13911
13912 store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13913
13914+ pax_force_retaddr
13915 ret;
13916 ENDPROC(cast6_ecb_dec_8way)
13917
13918@@ -386,19 +391,20 @@ ENTRY(cast6_cbc_dec_8way)
13919 * %rdx: src
13920 */
13921
13922- pushq %r12;
13923+ pushq %r14;
13924
13925 movq %rsi, %r11;
13926- movq %rdx, %r12;
13927+ movq %rdx, %r14;
13928
13929 load_8way(%rdx, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13930
13931 call __cast6_dec_blk8;
13932
13933- store_cbc_8way(%r12, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13934+ store_cbc_8way(%r14, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13935
13936- popq %r12;
13937+ popq %r14;
13938
13939+ pax_force_retaddr
13940 ret;
13941 ENDPROC(cast6_cbc_dec_8way)
13942
13943@@ -410,20 +416,21 @@ ENTRY(cast6_ctr_8way)
13944 * %rcx: iv (little endian, 128bit)
13945 */
13946
13947- pushq %r12;
13948+ pushq %r14;
13949
13950 movq %rsi, %r11;
13951- movq %rdx, %r12;
13952+ movq %rdx, %r14;
13953
13954 load_ctr_8way(%rcx, .Lbswap128_mask, RA1, RB1, RC1, RD1, RA2, RB2, RC2,
13955 RD2, RX, RKR, RKM);
13956
13957 call __cast6_enc_blk8;
13958
13959- store_ctr_8way(%r12, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13960+ store_ctr_8way(%r14, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13961
13962- popq %r12;
13963+ popq %r14;
13964
13965+ pax_force_retaddr
13966 ret;
13967 ENDPROC(cast6_ctr_8way)
13968
13969@@ -446,6 +453,7 @@ ENTRY(cast6_xts_enc_8way)
13970 /* dst <= regs xor IVs(in dst) */
13971 store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13972
13973+ pax_force_retaddr
13974 ret;
13975 ENDPROC(cast6_xts_enc_8way)
13976
13977@@ -468,5 +476,6 @@ ENTRY(cast6_xts_dec_8way)
13978 /* dst <= regs xor IVs(in dst) */
13979 store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13980
13981+ pax_force_retaddr
13982 ret;
13983 ENDPROC(cast6_xts_dec_8way)
13984diff --git a/arch/x86/crypto/crc32c-pcl-intel-asm_64.S b/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
13985index 26d49eb..8bf39c8 100644
13986--- a/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
13987+++ b/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
13988@@ -45,6 +45,7 @@
13989
13990 #include <asm/inst.h>
13991 #include <linux/linkage.h>
13992+#include <asm/alternative-asm.h>
13993
13994 ## ISCSI CRC 32 Implementation with crc32 and pclmulqdq Instruction
13995
13996@@ -309,6 +310,7 @@ do_return:
13997 popq %rsi
13998 popq %rdi
13999 popq %rbx
14000+ pax_force_retaddr
14001 ret
14002
14003 ################################################################
14004@@ -330,7 +332,7 @@ ENDPROC(crc_pcl)
14005 ## PCLMULQDQ tables
14006 ## Table is 128 entries x 2 words (8 bytes) each
14007 ################################################################
14008-.section .rotata, "a", %progbits
14009+.section .rodata, "a", %progbits
14010 .align 8
14011 K_table:
14012 .long 0x493c7d27, 0x00000001
14013diff --git a/arch/x86/crypto/ghash-clmulni-intel_asm.S b/arch/x86/crypto/ghash-clmulni-intel_asm.S
14014index 5d1e007..098cb4f 100644
14015--- a/arch/x86/crypto/ghash-clmulni-intel_asm.S
14016+++ b/arch/x86/crypto/ghash-clmulni-intel_asm.S
14017@@ -18,6 +18,7 @@
14018
14019 #include <linux/linkage.h>
14020 #include <asm/inst.h>
14021+#include <asm/alternative-asm.h>
14022
14023 .data
14024
14025@@ -89,6 +90,7 @@ __clmul_gf128mul_ble:
14026 psrlq $1, T2
14027 pxor T2, T1
14028 pxor T1, DATA
14029+ pax_force_retaddr
14030 ret
14031 ENDPROC(__clmul_gf128mul_ble)
14032
14033@@ -101,6 +103,7 @@ ENTRY(clmul_ghash_mul)
14034 call __clmul_gf128mul_ble
14035 PSHUFB_XMM BSWAP DATA
14036 movups DATA, (%rdi)
14037+ pax_force_retaddr
14038 ret
14039 ENDPROC(clmul_ghash_mul)
14040
14041@@ -128,5 +131,6 @@ ENTRY(clmul_ghash_update)
14042 PSHUFB_XMM BSWAP DATA
14043 movups DATA, (%rdi)
14044 .Lupdate_just_ret:
14045+ pax_force_retaddr
14046 ret
14047 ENDPROC(clmul_ghash_update)
14048diff --git a/arch/x86/crypto/salsa20-x86_64-asm_64.S b/arch/x86/crypto/salsa20-x86_64-asm_64.S
14049index 9279e0b..c4b3d2c 100644
14050--- a/arch/x86/crypto/salsa20-x86_64-asm_64.S
14051+++ b/arch/x86/crypto/salsa20-x86_64-asm_64.S
14052@@ -1,4 +1,5 @@
14053 #include <linux/linkage.h>
14054+#include <asm/alternative-asm.h>
14055
14056 # enter salsa20_encrypt_bytes
14057 ENTRY(salsa20_encrypt_bytes)
14058@@ -789,6 +790,7 @@ ENTRY(salsa20_encrypt_bytes)
14059 add %r11,%rsp
14060 mov %rdi,%rax
14061 mov %rsi,%rdx
14062+ pax_force_retaddr
14063 ret
14064 # bytesatleast65:
14065 ._bytesatleast65:
14066@@ -889,6 +891,7 @@ ENTRY(salsa20_keysetup)
14067 add %r11,%rsp
14068 mov %rdi,%rax
14069 mov %rsi,%rdx
14070+ pax_force_retaddr
14071 ret
14072 ENDPROC(salsa20_keysetup)
14073
14074@@ -914,5 +917,6 @@ ENTRY(salsa20_ivsetup)
14075 add %r11,%rsp
14076 mov %rdi,%rax
14077 mov %rsi,%rdx
14078+ pax_force_retaddr
14079 ret
14080 ENDPROC(salsa20_ivsetup)
14081diff --git a/arch/x86/crypto/serpent-avx-x86_64-asm_64.S b/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
14082index 2f202f4..d9164d6 100644
14083--- a/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
14084+++ b/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
14085@@ -24,6 +24,7 @@
14086 */
14087
14088 #include <linux/linkage.h>
14089+#include <asm/alternative-asm.h>
14090 #include "glue_helper-asm-avx.S"
14091
14092 .file "serpent-avx-x86_64-asm_64.S"
14093@@ -618,6 +619,7 @@ __serpent_enc_blk8_avx:
14094 write_blocks(RA1, RB1, RC1, RD1, RK0, RK1, RK2);
14095 write_blocks(RA2, RB2, RC2, RD2, RK0, RK1, RK2);
14096
14097+ pax_force_retaddr
14098 ret;
14099 ENDPROC(__serpent_enc_blk8_avx)
14100
14101@@ -672,6 +674,7 @@ __serpent_dec_blk8_avx:
14102 write_blocks(RC1, RD1, RB1, RE1, RK0, RK1, RK2);
14103 write_blocks(RC2, RD2, RB2, RE2, RK0, RK1, RK2);
14104
14105+ pax_force_retaddr
14106 ret;
14107 ENDPROC(__serpent_dec_blk8_avx)
14108
14109@@ -688,6 +691,7 @@ ENTRY(serpent_ecb_enc_8way_avx)
14110
14111 store_8way(%rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14112
14113+ pax_force_retaddr
14114 ret;
14115 ENDPROC(serpent_ecb_enc_8way_avx)
14116
14117@@ -704,6 +708,7 @@ ENTRY(serpent_ecb_dec_8way_avx)
14118
14119 store_8way(%rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
14120
14121+ pax_force_retaddr
14122 ret;
14123 ENDPROC(serpent_ecb_dec_8way_avx)
14124
14125@@ -720,6 +725,7 @@ ENTRY(serpent_cbc_dec_8way_avx)
14126
14127 store_cbc_8way(%rdx, %rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
14128
14129+ pax_force_retaddr
14130 ret;
14131 ENDPROC(serpent_cbc_dec_8way_avx)
14132
14133@@ -738,6 +744,7 @@ ENTRY(serpent_ctr_8way_avx)
14134
14135 store_ctr_8way(%rdx, %rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14136
14137+ pax_force_retaddr
14138 ret;
14139 ENDPROC(serpent_ctr_8way_avx)
14140
14141@@ -758,6 +765,7 @@ ENTRY(serpent_xts_enc_8way_avx)
14142 /* dst <= regs xor IVs(in dst) */
14143 store_xts_8way(%rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14144
14145+ pax_force_retaddr
14146 ret;
14147 ENDPROC(serpent_xts_enc_8way_avx)
14148
14149@@ -778,5 +786,6 @@ ENTRY(serpent_xts_dec_8way_avx)
14150 /* dst <= regs xor IVs(in dst) */
14151 store_xts_8way(%rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
14152
14153+ pax_force_retaddr
14154 ret;
14155 ENDPROC(serpent_xts_dec_8way_avx)
14156diff --git a/arch/x86/crypto/serpent-avx2-asm_64.S b/arch/x86/crypto/serpent-avx2-asm_64.S
14157index b222085..abd483c 100644
14158--- a/arch/x86/crypto/serpent-avx2-asm_64.S
14159+++ b/arch/x86/crypto/serpent-avx2-asm_64.S
14160@@ -15,6 +15,7 @@
14161 */
14162
14163 #include <linux/linkage.h>
14164+#include <asm/alternative-asm.h>
14165 #include "glue_helper-asm-avx2.S"
14166
14167 .file "serpent-avx2-asm_64.S"
14168@@ -610,6 +611,7 @@ __serpent_enc_blk16:
14169 write_blocks(RA1, RB1, RC1, RD1, RK0, RK1, RK2);
14170 write_blocks(RA2, RB2, RC2, RD2, RK0, RK1, RK2);
14171
14172+ pax_force_retaddr
14173 ret;
14174 ENDPROC(__serpent_enc_blk16)
14175
14176@@ -664,6 +666,7 @@ __serpent_dec_blk16:
14177 write_blocks(RC1, RD1, RB1, RE1, RK0, RK1, RK2);
14178 write_blocks(RC2, RD2, RB2, RE2, RK0, RK1, RK2);
14179
14180+ pax_force_retaddr
14181 ret;
14182 ENDPROC(__serpent_dec_blk16)
14183
14184@@ -684,6 +687,7 @@ ENTRY(serpent_ecb_enc_16way)
14185
14186 vzeroupper;
14187
14188+ pax_force_retaddr
14189 ret;
14190 ENDPROC(serpent_ecb_enc_16way)
14191
14192@@ -704,6 +708,7 @@ ENTRY(serpent_ecb_dec_16way)
14193
14194 vzeroupper;
14195
14196+ pax_force_retaddr
14197 ret;
14198 ENDPROC(serpent_ecb_dec_16way)
14199
14200@@ -725,6 +730,7 @@ ENTRY(serpent_cbc_dec_16way)
14201
14202 vzeroupper;
14203
14204+ pax_force_retaddr
14205 ret;
14206 ENDPROC(serpent_cbc_dec_16way)
14207
14208@@ -748,6 +754,7 @@ ENTRY(serpent_ctr_16way)
14209
14210 vzeroupper;
14211
14212+ pax_force_retaddr
14213 ret;
14214 ENDPROC(serpent_ctr_16way)
14215
14216@@ -772,6 +779,7 @@ ENTRY(serpent_xts_enc_16way)
14217
14218 vzeroupper;
14219
14220+ pax_force_retaddr
14221 ret;
14222 ENDPROC(serpent_xts_enc_16way)
14223
14224@@ -796,5 +804,6 @@ ENTRY(serpent_xts_dec_16way)
14225
14226 vzeroupper;
14227
14228+ pax_force_retaddr
14229 ret;
14230 ENDPROC(serpent_xts_dec_16way)
14231diff --git a/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S b/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
14232index acc066c..1559cc4 100644
14233--- a/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
14234+++ b/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
14235@@ -25,6 +25,7 @@
14236 */
14237
14238 #include <linux/linkage.h>
14239+#include <asm/alternative-asm.h>
14240
14241 .file "serpent-sse2-x86_64-asm_64.S"
14242 .text
14243@@ -690,12 +691,14 @@ ENTRY(__serpent_enc_blk_8way)
14244 write_blocks(%rsi, RA1, RB1, RC1, RD1, RK0, RK1, RK2);
14245 write_blocks(%rax, RA2, RB2, RC2, RD2, RK0, RK1, RK2);
14246
14247+ pax_force_retaddr
14248 ret;
14249
14250 .L__enc_xor8:
14251 xor_blocks(%rsi, RA1, RB1, RC1, RD1, RK0, RK1, RK2);
14252 xor_blocks(%rax, RA2, RB2, RC2, RD2, RK0, RK1, RK2);
14253
14254+ pax_force_retaddr
14255 ret;
14256 ENDPROC(__serpent_enc_blk_8way)
14257
14258@@ -750,5 +753,6 @@ ENTRY(serpent_dec_blk_8way)
14259 write_blocks(%rsi, RC1, RD1, RB1, RE1, RK0, RK1, RK2);
14260 write_blocks(%rax, RC2, RD2, RB2, RE2, RK0, RK1, RK2);
14261
14262+ pax_force_retaddr
14263 ret;
14264 ENDPROC(serpent_dec_blk_8way)
14265diff --git a/arch/x86/crypto/sha1_ssse3_asm.S b/arch/x86/crypto/sha1_ssse3_asm.S
14266index a410950..9dfe7ad 100644
14267--- a/arch/x86/crypto/sha1_ssse3_asm.S
14268+++ b/arch/x86/crypto/sha1_ssse3_asm.S
14269@@ -29,6 +29,7 @@
14270 */
14271
14272 #include <linux/linkage.h>
14273+#include <asm/alternative-asm.h>
14274
14275 #define CTX %rdi // arg1
14276 #define BUF %rsi // arg2
14277@@ -75,9 +76,9 @@
14278
14279 push %rbx
14280 push %rbp
14281- push %r12
14282+ push %r14
14283
14284- mov %rsp, %r12
14285+ mov %rsp, %r14
14286 sub $64, %rsp # allocate workspace
14287 and $~15, %rsp # align stack
14288
14289@@ -99,11 +100,12 @@
14290 xor %rax, %rax
14291 rep stosq
14292
14293- mov %r12, %rsp # deallocate workspace
14294+ mov %r14, %rsp # deallocate workspace
14295
14296- pop %r12
14297+ pop %r14
14298 pop %rbp
14299 pop %rbx
14300+ pax_force_retaddr
14301 ret
14302
14303 ENDPROC(\name)
14304diff --git a/arch/x86/crypto/sha256-avx-asm.S b/arch/x86/crypto/sha256-avx-asm.S
14305index 642f156..51a513c 100644
14306--- a/arch/x86/crypto/sha256-avx-asm.S
14307+++ b/arch/x86/crypto/sha256-avx-asm.S
14308@@ -49,6 +49,7 @@
14309
14310 #ifdef CONFIG_AS_AVX
14311 #include <linux/linkage.h>
14312+#include <asm/alternative-asm.h>
14313
14314 ## assume buffers not aligned
14315 #define VMOVDQ vmovdqu
14316@@ -460,6 +461,7 @@ done_hash:
14317 popq %r13
14318 popq %rbp
14319 popq %rbx
14320+ pax_force_retaddr
14321 ret
14322 ENDPROC(sha256_transform_avx)
14323
14324diff --git a/arch/x86/crypto/sha256-avx2-asm.S b/arch/x86/crypto/sha256-avx2-asm.S
14325index 9e86944..3795e6a 100644
14326--- a/arch/x86/crypto/sha256-avx2-asm.S
14327+++ b/arch/x86/crypto/sha256-avx2-asm.S
14328@@ -50,6 +50,7 @@
14329
14330 #ifdef CONFIG_AS_AVX2
14331 #include <linux/linkage.h>
14332+#include <asm/alternative-asm.h>
14333
14334 ## assume buffers not aligned
14335 #define VMOVDQ vmovdqu
14336@@ -720,6 +721,7 @@ done_hash:
14337 popq %r12
14338 popq %rbp
14339 popq %rbx
14340+ pax_force_retaddr
14341 ret
14342 ENDPROC(sha256_transform_rorx)
14343
14344diff --git a/arch/x86/crypto/sha256-ssse3-asm.S b/arch/x86/crypto/sha256-ssse3-asm.S
14345index f833b74..8c62a9e 100644
14346--- a/arch/x86/crypto/sha256-ssse3-asm.S
14347+++ b/arch/x86/crypto/sha256-ssse3-asm.S
14348@@ -47,6 +47,7 @@
14349 ########################################################################
14350
14351 #include <linux/linkage.h>
14352+#include <asm/alternative-asm.h>
14353
14354 ## assume buffers not aligned
14355 #define MOVDQ movdqu
14356@@ -471,6 +472,7 @@ done_hash:
14357 popq %rbp
14358 popq %rbx
14359
14360+ pax_force_retaddr
14361 ret
14362 ENDPROC(sha256_transform_ssse3)
14363
14364diff --git a/arch/x86/crypto/sha512-avx-asm.S b/arch/x86/crypto/sha512-avx-asm.S
14365index 974dde9..a823ff9 100644
14366--- a/arch/x86/crypto/sha512-avx-asm.S
14367+++ b/arch/x86/crypto/sha512-avx-asm.S
14368@@ -49,6 +49,7 @@
14369
14370 #ifdef CONFIG_AS_AVX
14371 #include <linux/linkage.h>
14372+#include <asm/alternative-asm.h>
14373
14374 .text
14375
14376@@ -364,6 +365,7 @@ updateblock:
14377 mov frame_RSPSAVE(%rsp), %rsp
14378
14379 nowork:
14380+ pax_force_retaddr
14381 ret
14382 ENDPROC(sha512_transform_avx)
14383
14384diff --git a/arch/x86/crypto/sha512-avx2-asm.S b/arch/x86/crypto/sha512-avx2-asm.S
14385index 568b961..ed20c37 100644
14386--- a/arch/x86/crypto/sha512-avx2-asm.S
14387+++ b/arch/x86/crypto/sha512-avx2-asm.S
14388@@ -51,6 +51,7 @@
14389
14390 #ifdef CONFIG_AS_AVX2
14391 #include <linux/linkage.h>
14392+#include <asm/alternative-asm.h>
14393
14394 .text
14395
14396@@ -678,6 +679,7 @@ done_hash:
14397
14398 # Restore Stack Pointer
14399 mov frame_RSPSAVE(%rsp), %rsp
14400+ pax_force_retaddr
14401 ret
14402 ENDPROC(sha512_transform_rorx)
14403
14404diff --git a/arch/x86/crypto/sha512-ssse3-asm.S b/arch/x86/crypto/sha512-ssse3-asm.S
14405index fb56855..6edd768 100644
14406--- a/arch/x86/crypto/sha512-ssse3-asm.S
14407+++ b/arch/x86/crypto/sha512-ssse3-asm.S
14408@@ -48,6 +48,7 @@
14409 ########################################################################
14410
14411 #include <linux/linkage.h>
14412+#include <asm/alternative-asm.h>
14413
14414 .text
14415
14416@@ -363,6 +364,7 @@ updateblock:
14417 mov frame_RSPSAVE(%rsp), %rsp
14418
14419 nowork:
14420+ pax_force_retaddr
14421 ret
14422 ENDPROC(sha512_transform_ssse3)
14423
14424diff --git a/arch/x86/crypto/twofish-avx-x86_64-asm_64.S b/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
14425index 0505813..b067311 100644
14426--- a/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
14427+++ b/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
14428@@ -24,6 +24,7 @@
14429 */
14430
14431 #include <linux/linkage.h>
14432+#include <asm/alternative-asm.h>
14433 #include "glue_helper-asm-avx.S"
14434
14435 .file "twofish-avx-x86_64-asm_64.S"
14436@@ -284,6 +285,7 @@ __twofish_enc_blk8:
14437 outunpack_blocks(RC1, RD1, RA1, RB1, RK1, RX0, RY0, RK2);
14438 outunpack_blocks(RC2, RD2, RA2, RB2, RK1, RX0, RY0, RK2);
14439
14440+ pax_force_retaddr
14441 ret;
14442 ENDPROC(__twofish_enc_blk8)
14443
14444@@ -324,6 +326,7 @@ __twofish_dec_blk8:
14445 outunpack_blocks(RA1, RB1, RC1, RD1, RK1, RX0, RY0, RK2);
14446 outunpack_blocks(RA2, RB2, RC2, RD2, RK1, RX0, RY0, RK2);
14447
14448+ pax_force_retaddr
14449 ret;
14450 ENDPROC(__twofish_dec_blk8)
14451
14452@@ -342,6 +345,7 @@ ENTRY(twofish_ecb_enc_8way)
14453
14454 store_8way(%r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14455
14456+ pax_force_retaddr
14457 ret;
14458 ENDPROC(twofish_ecb_enc_8way)
14459
14460@@ -360,6 +364,7 @@ ENTRY(twofish_ecb_dec_8way)
14461
14462 store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14463
14464+ pax_force_retaddr
14465 ret;
14466 ENDPROC(twofish_ecb_dec_8way)
14467
14468@@ -370,19 +375,20 @@ ENTRY(twofish_cbc_dec_8way)
14469 * %rdx: src
14470 */
14471
14472- pushq %r12;
14473+ pushq %r14;
14474
14475 movq %rsi, %r11;
14476- movq %rdx, %r12;
14477+ movq %rdx, %r14;
14478
14479 load_8way(%rdx, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14480
14481 call __twofish_dec_blk8;
14482
14483- store_cbc_8way(%r12, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14484+ store_cbc_8way(%r14, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14485
14486- popq %r12;
14487+ popq %r14;
14488
14489+ pax_force_retaddr
14490 ret;
14491 ENDPROC(twofish_cbc_dec_8way)
14492
14493@@ -394,20 +400,21 @@ ENTRY(twofish_ctr_8way)
14494 * %rcx: iv (little endian, 128bit)
14495 */
14496
14497- pushq %r12;
14498+ pushq %r14;
14499
14500 movq %rsi, %r11;
14501- movq %rdx, %r12;
14502+ movq %rdx, %r14;
14503
14504 load_ctr_8way(%rcx, .Lbswap128_mask, RA1, RB1, RC1, RD1, RA2, RB2, RC2,
14505 RD2, RX0, RX1, RY0);
14506
14507 call __twofish_enc_blk8;
14508
14509- store_ctr_8way(%r12, %r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14510+ store_ctr_8way(%r14, %r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14511
14512- popq %r12;
14513+ popq %r14;
14514
14515+ pax_force_retaddr
14516 ret;
14517 ENDPROC(twofish_ctr_8way)
14518
14519@@ -430,6 +437,7 @@ ENTRY(twofish_xts_enc_8way)
14520 /* dst <= regs xor IVs(in dst) */
14521 store_xts_8way(%r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14522
14523+ pax_force_retaddr
14524 ret;
14525 ENDPROC(twofish_xts_enc_8way)
14526
14527@@ -452,5 +460,6 @@ ENTRY(twofish_xts_dec_8way)
14528 /* dst <= regs xor IVs(in dst) */
14529 store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14530
14531+ pax_force_retaddr
14532 ret;
14533 ENDPROC(twofish_xts_dec_8way)
14534diff --git a/arch/x86/crypto/twofish-x86_64-asm_64-3way.S b/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
14535index 1c3b7ce..02f578d 100644
14536--- a/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
14537+++ b/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
14538@@ -21,6 +21,7 @@
14539 */
14540
14541 #include <linux/linkage.h>
14542+#include <asm/alternative-asm.h>
14543
14544 .file "twofish-x86_64-asm-3way.S"
14545 .text
14546@@ -258,6 +259,7 @@ ENTRY(__twofish_enc_blk_3way)
14547 popq %r13;
14548 popq %r14;
14549 popq %r15;
14550+ pax_force_retaddr
14551 ret;
14552
14553 .L__enc_xor3:
14554@@ -269,6 +271,7 @@ ENTRY(__twofish_enc_blk_3way)
14555 popq %r13;
14556 popq %r14;
14557 popq %r15;
14558+ pax_force_retaddr
14559 ret;
14560 ENDPROC(__twofish_enc_blk_3way)
14561
14562@@ -308,5 +311,6 @@ ENTRY(twofish_dec_blk_3way)
14563 popq %r13;
14564 popq %r14;
14565 popq %r15;
14566+ pax_force_retaddr
14567 ret;
14568 ENDPROC(twofish_dec_blk_3way)
14569diff --git a/arch/x86/crypto/twofish-x86_64-asm_64.S b/arch/x86/crypto/twofish-x86_64-asm_64.S
14570index a039d21..524b8b2 100644
14571--- a/arch/x86/crypto/twofish-x86_64-asm_64.S
14572+++ b/arch/x86/crypto/twofish-x86_64-asm_64.S
14573@@ -22,6 +22,7 @@
14574
14575 #include <linux/linkage.h>
14576 #include <asm/asm-offsets.h>
14577+#include <asm/alternative-asm.h>
14578
14579 #define a_offset 0
14580 #define b_offset 4
14581@@ -265,6 +266,7 @@ ENTRY(twofish_enc_blk)
14582
14583 popq R1
14584 movq $1,%rax
14585+ pax_force_retaddr
14586 ret
14587 ENDPROC(twofish_enc_blk)
14588
14589@@ -317,5 +319,6 @@ ENTRY(twofish_dec_blk)
14590
14591 popq R1
14592 movq $1,%rax
14593+ pax_force_retaddr
14594 ret
14595 ENDPROC(twofish_dec_blk)
14596diff --git a/arch/x86/ia32/ia32_aout.c b/arch/x86/ia32/ia32_aout.c
14597index ae6aad1..719d6d9 100644
14598--- a/arch/x86/ia32/ia32_aout.c
14599+++ b/arch/x86/ia32/ia32_aout.c
14600@@ -153,6 +153,8 @@ static int aout_core_dump(struct coredump_params *cprm)
14601 unsigned long dump_start, dump_size;
14602 struct user32 dump;
14603
14604+ memset(&dump, 0, sizeof(dump));
14605+
14606 fs = get_fs();
14607 set_fs(KERNEL_DS);
14608 has_dumped = 1;
14609diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c
14610index d0165c9..0d5639b 100644
14611--- a/arch/x86/ia32/ia32_signal.c
14612+++ b/arch/x86/ia32/ia32_signal.c
14613@@ -218,7 +218,7 @@ asmlinkage long sys32_sigreturn(void)
14614 if (__get_user(set.sig[0], &frame->sc.oldmask)
14615 || (_COMPAT_NSIG_WORDS > 1
14616 && __copy_from_user((((char *) &set.sig) + 4),
14617- &frame->extramask,
14618+ frame->extramask,
14619 sizeof(frame->extramask))))
14620 goto badframe;
14621
14622@@ -338,7 +338,7 @@ static void __user *get_sigframe(struct ksignal *ksig, struct pt_regs *regs,
14623 sp -= frame_size;
14624 /* Align the stack pointer according to the i386 ABI,
14625 * i.e. so that on function entry ((sp + 4) & 15) == 0. */
14626- sp = ((sp + 4) & -16ul) - 4;
14627+ sp = ((sp - 12) & -16ul) - 4;
14628 return (void __user *) sp;
14629 }
14630
14631@@ -383,10 +383,10 @@ int ia32_setup_frame(int sig, struct ksignal *ksig,
14632 } else {
14633 /* Return stub is in 32bit vsyscall page */
14634 if (current->mm->context.vdso)
14635- restorer = current->mm->context.vdso +
14636- selected_vdso32->sym___kernel_sigreturn;
14637+ restorer = (void __force_user *)(current->mm->context.vdso +
14638+ selected_vdso32->sym___kernel_sigreturn);
14639 else
14640- restorer = &frame->retcode;
14641+ restorer = frame->retcode;
14642 }
14643
14644 put_user_try {
14645@@ -396,7 +396,7 @@ int ia32_setup_frame(int sig, struct ksignal *ksig,
14646 * These are actually not used anymore, but left because some
14647 * gdb versions depend on them as a marker.
14648 */
14649- put_user_ex(*((u64 *)&code), (u64 __user *)frame->retcode);
14650+ put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
14651 } put_user_catch(err);
14652
14653 if (err)
14654@@ -438,7 +438,7 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig,
14655 0xb8,
14656 __NR_ia32_rt_sigreturn,
14657 0x80cd,
14658- 0,
14659+ 0
14660 };
14661
14662 frame = get_sigframe(ksig, regs, sizeof(*frame), &fpstate);
14663@@ -461,16 +461,19 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig,
14664
14665 if (ksig->ka.sa.sa_flags & SA_RESTORER)
14666 restorer = ksig->ka.sa.sa_restorer;
14667+ else if (current->mm->context.vdso)
14668+ /* Return stub is in 32bit vsyscall page */
14669+ restorer = (void __force_user *)(current->mm->context.vdso +
14670+ selected_vdso32->sym___kernel_rt_sigreturn);
14671 else
14672- restorer = current->mm->context.vdso +
14673- selected_vdso32->sym___kernel_rt_sigreturn;
14674+ restorer = frame->retcode;
14675 put_user_ex(ptr_to_compat(restorer), &frame->pretcode);
14676
14677 /*
14678 * Not actually used anymore, but left because some gdb
14679 * versions need it.
14680 */
14681- put_user_ex(*((u64 *)&code), (u64 __user *)frame->retcode);
14682+ put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
14683 } put_user_catch(err);
14684
14685 err |= copy_siginfo_to_user32(&frame->info, &ksig->info);
14686diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S
14687index 156ebca..9591cf0 100644
14688--- a/arch/x86/ia32/ia32entry.S
14689+++ b/arch/x86/ia32/ia32entry.S
14690@@ -15,8 +15,10 @@
14691 #include <asm/irqflags.h>
14692 #include <asm/asm.h>
14693 #include <asm/smap.h>
14694+#include <asm/pgtable.h>
14695 #include <linux/linkage.h>
14696 #include <linux/err.h>
14697+#include <asm/alternative-asm.h>
14698
14699 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
14700 #include <linux/elf-em.h>
14701@@ -62,12 +64,12 @@
14702 */
14703 .macro LOAD_ARGS32 offset, _r9=0
14704 .if \_r9
14705- movl \offset+16(%rsp),%r9d
14706+ movl \offset+R9(%rsp),%r9d
14707 .endif
14708- movl \offset+40(%rsp),%ecx
14709- movl \offset+48(%rsp),%edx
14710- movl \offset+56(%rsp),%esi
14711- movl \offset+64(%rsp),%edi
14712+ movl \offset+RCX(%rsp),%ecx
14713+ movl \offset+RDX(%rsp),%edx
14714+ movl \offset+RSI(%rsp),%esi
14715+ movl \offset+RDI(%rsp),%edi
14716 movl %eax,%eax /* zero extension */
14717 .endm
14718
14719@@ -96,6 +98,32 @@ ENTRY(native_irq_enable_sysexit)
14720 ENDPROC(native_irq_enable_sysexit)
14721 #endif
14722
14723+ .macro pax_enter_kernel_user
14724+ pax_set_fptr_mask
14725+#ifdef CONFIG_PAX_MEMORY_UDEREF
14726+ call pax_enter_kernel_user
14727+#endif
14728+ .endm
14729+
14730+ .macro pax_exit_kernel_user
14731+#ifdef CONFIG_PAX_MEMORY_UDEREF
14732+ call pax_exit_kernel_user
14733+#endif
14734+#ifdef CONFIG_PAX_RANDKSTACK
14735+ pushq %rax
14736+ pushq %r11
14737+ call pax_randomize_kstack
14738+ popq %r11
14739+ popq %rax
14740+#endif
14741+ .endm
14742+
14743+ .macro pax_erase_kstack
14744+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
14745+ call pax_erase_kstack
14746+#endif
14747+ .endm
14748+
14749 /*
14750 * 32bit SYSENTER instruction entry.
14751 *
14752@@ -122,12 +150,6 @@ ENTRY(ia32_sysenter_target)
14753 CFI_REGISTER rsp,rbp
14754 SWAPGS_UNSAFE_STACK
14755 movq PER_CPU_VAR(kernel_stack), %rsp
14756- addq $(KERNEL_STACK_OFFSET),%rsp
14757- /*
14758- * No need to follow this irqs on/off section: the syscall
14759- * disabled irqs, here we enable it straight after entry:
14760- */
14761- ENABLE_INTERRUPTS(CLBR_NONE)
14762 movl %ebp,%ebp /* zero extension */
14763 pushq_cfi $__USER32_DS
14764 /*CFI_REL_OFFSET ss,0*/
14765@@ -135,23 +157,46 @@ ENTRY(ia32_sysenter_target)
14766 CFI_REL_OFFSET rsp,0
14767 pushfq_cfi
14768 /*CFI_REL_OFFSET rflags,0*/
14769- movl TI_sysenter_return+THREAD_INFO(%rsp,3*8-KERNEL_STACK_OFFSET),%r10d
14770- CFI_REGISTER rip,r10
14771+ orl $X86_EFLAGS_IF,(%rsp)
14772+ GET_THREAD_INFO(%r11)
14773+ movl TI_sysenter_return(%r11), %r11d
14774+ CFI_REGISTER rip,r11
14775 pushq_cfi $__USER32_CS
14776 /*CFI_REL_OFFSET cs,0*/
14777 movl %eax, %eax
14778- pushq_cfi %r10
14779+ pushq_cfi %r11
14780 CFI_REL_OFFSET rip,0
14781 pushq_cfi %rax
14782 cld
14783 SAVE_ARGS 0,1,0
14784+ pax_enter_kernel_user
14785+
14786+#ifdef CONFIG_PAX_RANDKSTACK
14787+ pax_erase_kstack
14788+#endif
14789+
14790+ /*
14791+ * No need to follow this irqs on/off section: the syscall
14792+ * disabled irqs, here we enable it straight after entry:
14793+ */
14794+ ENABLE_INTERRUPTS(CLBR_NONE)
14795 /* no need to do an access_ok check here because rbp has been
14796 32bit zero extended */
14797+
14798+#ifdef CONFIG_PAX_MEMORY_UDEREF
14799+ addq pax_user_shadow_base,%rbp
14800+ ASM_PAX_OPEN_USERLAND
14801+#endif
14802+
14803 ASM_STAC
14804 1: movl (%rbp),%ebp
14805 _ASM_EXTABLE(1b,ia32_badarg)
14806 ASM_CLAC
14807
14808+#ifdef CONFIG_PAX_MEMORY_UDEREF
14809+ ASM_PAX_CLOSE_USERLAND
14810+#endif
14811+
14812 /*
14813 * Sysenter doesn't filter flags, so we need to clear NT
14814 * ourselves. To save a few cycles, we can check whether
14815@@ -161,8 +206,9 @@ ENTRY(ia32_sysenter_target)
14816 jnz sysenter_fix_flags
14817 sysenter_flags_fixed:
14818
14819- orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14820- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14821+ GET_THREAD_INFO(%r11)
14822+ orl $TS_COMPAT,TI_status(%r11)
14823+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
14824 CFI_REMEMBER_STATE
14825 jnz sysenter_tracesys
14826 cmpq $(IA32_NR_syscalls-1),%rax
14827@@ -172,14 +218,17 @@ sysenter_do_call:
14828 sysenter_dispatch:
14829 call *ia32_sys_call_table(,%rax,8)
14830 movq %rax,RAX-ARGOFFSET(%rsp)
14831+ GET_THREAD_INFO(%r11)
14832 DISABLE_INTERRUPTS(CLBR_NONE)
14833 TRACE_IRQS_OFF
14834- testl $_TIF_ALLWORK_MASK,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14835+ testl $_TIF_ALLWORK_MASK,TI_flags(%r11)
14836 jnz sysexit_audit
14837 sysexit_from_sys_call:
14838- andl $~TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14839+ pax_exit_kernel_user
14840+ pax_erase_kstack
14841+ andl $~TS_COMPAT,TI_status(%r11)
14842 /* clear IF, that popfq doesn't enable interrupts early */
14843- andl $~0x200,EFLAGS-ARGOFFSET(%rsp)
14844+ andl $~X86_EFLAGS_IF,EFLAGS-ARGOFFSET(%rsp)
14845 movl RIP-ARGOFFSET(%rsp),%edx /* User %eip */
14846 CFI_REGISTER rip,rdx
14847 RESTORE_ARGS 0,24,0,0,0,0
14848@@ -205,6 +254,9 @@ sysexit_from_sys_call:
14849 movl %ebx,%esi /* 2nd arg: 1st syscall arg */
14850 movl %eax,%edi /* 1st arg: syscall number */
14851 call __audit_syscall_entry
14852+
14853+ pax_erase_kstack
14854+
14855 movl RAX-ARGOFFSET(%rsp),%eax /* reload syscall number */
14856 cmpq $(IA32_NR_syscalls-1),%rax
14857 ja ia32_badsys
14858@@ -216,7 +268,7 @@ sysexit_from_sys_call:
14859 .endm
14860
14861 .macro auditsys_exit exit
14862- testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14863+ testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
14864 jnz ia32_ret_from_sys_call
14865 TRACE_IRQS_ON
14866 ENABLE_INTERRUPTS(CLBR_NONE)
14867@@ -227,11 +279,12 @@ sysexit_from_sys_call:
14868 1: setbe %al /* 1 if error, 0 if not */
14869 movzbl %al,%edi /* zero-extend that into %edi */
14870 call __audit_syscall_exit
14871+ GET_THREAD_INFO(%r11)
14872 movq RAX-ARGOFFSET(%rsp),%rax /* reload syscall return value */
14873 movl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),%edi
14874 DISABLE_INTERRUPTS(CLBR_NONE)
14875 TRACE_IRQS_OFF
14876- testl %edi,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14877+ testl %edi,TI_flags(%r11)
14878 jz \exit
14879 CLEAR_RREGS -ARGOFFSET
14880 jmp int_with_check
14881@@ -253,7 +306,7 @@ sysenter_fix_flags:
14882
14883 sysenter_tracesys:
14884 #ifdef CONFIG_AUDITSYSCALL
14885- testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14886+ testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
14887 jz sysenter_auditsys
14888 #endif
14889 SAVE_REST
14890@@ -265,6 +318,9 @@ sysenter_tracesys:
14891 RESTORE_REST
14892 cmpq $(IA32_NR_syscalls-1),%rax
14893 ja int_ret_from_sys_call /* sysenter_tracesys has set RAX(%rsp) */
14894+
14895+ pax_erase_kstack
14896+
14897 jmp sysenter_do_call
14898 CFI_ENDPROC
14899 ENDPROC(ia32_sysenter_target)
14900@@ -292,19 +348,25 @@ ENDPROC(ia32_sysenter_target)
14901 ENTRY(ia32_cstar_target)
14902 CFI_STARTPROC32 simple
14903 CFI_SIGNAL_FRAME
14904- CFI_DEF_CFA rsp,KERNEL_STACK_OFFSET
14905+ CFI_DEF_CFA rsp,0
14906 CFI_REGISTER rip,rcx
14907 /*CFI_REGISTER rflags,r11*/
14908 SWAPGS_UNSAFE_STACK
14909 movl %esp,%r8d
14910 CFI_REGISTER rsp,r8
14911 movq PER_CPU_VAR(kernel_stack),%rsp
14912+ SAVE_ARGS 8*6,0,0
14913+ pax_enter_kernel_user
14914+
14915+#ifdef CONFIG_PAX_RANDKSTACK
14916+ pax_erase_kstack
14917+#endif
14918+
14919 /*
14920 * No need to follow this irqs on/off section: the syscall
14921 * disabled irqs and here we enable it straight after entry:
14922 */
14923 ENABLE_INTERRUPTS(CLBR_NONE)
14924- SAVE_ARGS 8,0,0
14925 movl %eax,%eax /* zero extension */
14926 movq %rax,ORIG_RAX-ARGOFFSET(%rsp)
14927 movq %rcx,RIP-ARGOFFSET(%rsp)
14928@@ -320,12 +382,25 @@ ENTRY(ia32_cstar_target)
14929 /* no need to do an access_ok check here because r8 has been
14930 32bit zero extended */
14931 /* hardware stack frame is complete now */
14932+
14933+#ifdef CONFIG_PAX_MEMORY_UDEREF
14934+ ASM_PAX_OPEN_USERLAND
14935+ movq pax_user_shadow_base,%r8
14936+ addq RSP-ARGOFFSET(%rsp),%r8
14937+#endif
14938+
14939 ASM_STAC
14940 1: movl (%r8),%r9d
14941 _ASM_EXTABLE(1b,ia32_badarg)
14942 ASM_CLAC
14943- orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14944- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14945+
14946+#ifdef CONFIG_PAX_MEMORY_UDEREF
14947+ ASM_PAX_CLOSE_USERLAND
14948+#endif
14949+
14950+ GET_THREAD_INFO(%r11)
14951+ orl $TS_COMPAT,TI_status(%r11)
14952+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
14953 CFI_REMEMBER_STATE
14954 jnz cstar_tracesys
14955 cmpq $IA32_NR_syscalls-1,%rax
14956@@ -335,13 +410,16 @@ cstar_do_call:
14957 cstar_dispatch:
14958 call *ia32_sys_call_table(,%rax,8)
14959 movq %rax,RAX-ARGOFFSET(%rsp)
14960+ GET_THREAD_INFO(%r11)
14961 DISABLE_INTERRUPTS(CLBR_NONE)
14962 TRACE_IRQS_OFF
14963- testl $_TIF_ALLWORK_MASK,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14964+ testl $_TIF_ALLWORK_MASK,TI_flags(%r11)
14965 jnz sysretl_audit
14966 sysretl_from_sys_call:
14967- andl $~TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14968- RESTORE_ARGS 0,-ARG_SKIP,0,0,0
14969+ pax_exit_kernel_user
14970+ pax_erase_kstack
14971+ andl $~TS_COMPAT,TI_status(%r11)
14972+ RESTORE_ARGS 0,-ORIG_RAX,0,0,0
14973 movl RIP-ARGOFFSET(%rsp),%ecx
14974 CFI_REGISTER rip,rcx
14975 movl EFLAGS-ARGOFFSET(%rsp),%r11d
14976@@ -368,7 +446,7 @@ sysretl_audit:
14977
14978 cstar_tracesys:
14979 #ifdef CONFIG_AUDITSYSCALL
14980- testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14981+ testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
14982 jz cstar_auditsys
14983 #endif
14984 xchgl %r9d,%ebp
14985@@ -382,11 +460,19 @@ cstar_tracesys:
14986 xchgl %ebp,%r9d
14987 cmpq $(IA32_NR_syscalls-1),%rax
14988 ja int_ret_from_sys_call /* cstar_tracesys has set RAX(%rsp) */
14989+
14990+ pax_erase_kstack
14991+
14992 jmp cstar_do_call
14993 END(ia32_cstar_target)
14994
14995 ia32_badarg:
14996 ASM_CLAC
14997+
14998+#ifdef CONFIG_PAX_MEMORY_UDEREF
14999+ ASM_PAX_CLOSE_USERLAND
15000+#endif
15001+
15002 movq $-EFAULT,%rax
15003 jmp ia32_sysret
15004 CFI_ENDPROC
15005@@ -423,19 +509,26 @@ ENTRY(ia32_syscall)
15006 CFI_REL_OFFSET rip,RIP-RIP
15007 PARAVIRT_ADJUST_EXCEPTION_FRAME
15008 SWAPGS
15009- /*
15010- * No need to follow this irqs on/off section: the syscall
15011- * disabled irqs and here we enable it straight after entry:
15012- */
15013- ENABLE_INTERRUPTS(CLBR_NONE)
15014 movl %eax,%eax
15015 pushq_cfi %rax
15016 cld
15017 /* note the registers are not zero extended to the sf.
15018 this could be a problem. */
15019 SAVE_ARGS 0,1,0
15020- orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
15021- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
15022+ pax_enter_kernel_user
15023+
15024+#ifdef CONFIG_PAX_RANDKSTACK
15025+ pax_erase_kstack
15026+#endif
15027+
15028+ /*
15029+ * No need to follow this irqs on/off section: the syscall
15030+ * disabled irqs and here we enable it straight after entry:
15031+ */
15032+ ENABLE_INTERRUPTS(CLBR_NONE)
15033+ GET_THREAD_INFO(%r11)
15034+ orl $TS_COMPAT,TI_status(%r11)
15035+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
15036 jnz ia32_tracesys
15037 cmpq $(IA32_NR_syscalls-1),%rax
15038 ja ia32_badsys
15039@@ -458,6 +551,9 @@ ia32_tracesys:
15040 RESTORE_REST
15041 cmpq $(IA32_NR_syscalls-1),%rax
15042 ja int_ret_from_sys_call /* ia32_tracesys has set RAX(%rsp) */
15043+
15044+ pax_erase_kstack
15045+
15046 jmp ia32_do_call
15047 END(ia32_syscall)
15048
15049diff --git a/arch/x86/ia32/sys_ia32.c b/arch/x86/ia32/sys_ia32.c
15050index 8e0ceec..af13504 100644
15051--- a/arch/x86/ia32/sys_ia32.c
15052+++ b/arch/x86/ia32/sys_ia32.c
15053@@ -69,8 +69,8 @@ asmlinkage long sys32_ftruncate64(unsigned int fd, unsigned long offset_low,
15054 */
15055 static int cp_stat64(struct stat64 __user *ubuf, struct kstat *stat)
15056 {
15057- typeof(ubuf->st_uid) uid = 0;
15058- typeof(ubuf->st_gid) gid = 0;
15059+ typeof(((struct stat64 *)0)->st_uid) uid = 0;
15060+ typeof(((struct stat64 *)0)->st_gid) gid = 0;
15061 SET_UID(uid, from_kuid_munged(current_user_ns(), stat->uid));
15062 SET_GID(gid, from_kgid_munged(current_user_ns(), stat->gid));
15063 if (!access_ok(VERIFY_WRITE, ubuf, sizeof(struct stat64)) ||
15064diff --git a/arch/x86/include/asm/alternative-asm.h b/arch/x86/include/asm/alternative-asm.h
15065index 372231c..51b537d 100644
15066--- a/arch/x86/include/asm/alternative-asm.h
15067+++ b/arch/x86/include/asm/alternative-asm.h
15068@@ -18,6 +18,45 @@
15069 .endm
15070 #endif
15071
15072+#ifdef KERNEXEC_PLUGIN
15073+ .macro pax_force_retaddr_bts rip=0
15074+ btsq $63,\rip(%rsp)
15075+ .endm
15076+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS
15077+ .macro pax_force_retaddr rip=0, reload=0
15078+ btsq $63,\rip(%rsp)
15079+ .endm
15080+ .macro pax_force_fptr ptr
15081+ btsq $63,\ptr
15082+ .endm
15083+ .macro pax_set_fptr_mask
15084+ .endm
15085+#endif
15086+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
15087+ .macro pax_force_retaddr rip=0, reload=0
15088+ .if \reload
15089+ pax_set_fptr_mask
15090+ .endif
15091+ orq %r12,\rip(%rsp)
15092+ .endm
15093+ .macro pax_force_fptr ptr
15094+ orq %r12,\ptr
15095+ .endm
15096+ .macro pax_set_fptr_mask
15097+ movabs $0x8000000000000000,%r12
15098+ .endm
15099+#endif
15100+#else
15101+ .macro pax_force_retaddr rip=0, reload=0
15102+ .endm
15103+ .macro pax_force_fptr ptr
15104+ .endm
15105+ .macro pax_force_retaddr_bts rip=0
15106+ .endm
15107+ .macro pax_set_fptr_mask
15108+ .endm
15109+#endif
15110+
15111 .macro altinstruction_entry orig alt feature orig_len alt_len
15112 .long \orig - .
15113 .long \alt - .
15114diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h
15115index 473bdbe..b1e3377 100644
15116--- a/arch/x86/include/asm/alternative.h
15117+++ b/arch/x86/include/asm/alternative.h
15118@@ -106,7 +106,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
15119 ".pushsection .discard,\"aw\",@progbits\n" \
15120 DISCARD_ENTRY(1) \
15121 ".popsection\n" \
15122- ".pushsection .altinstr_replacement, \"ax\"\n" \
15123+ ".pushsection .altinstr_replacement, \"a\"\n" \
15124 ALTINSTR_REPLACEMENT(newinstr, feature, 1) \
15125 ".popsection"
15126
15127@@ -120,7 +120,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
15128 DISCARD_ENTRY(1) \
15129 DISCARD_ENTRY(2) \
15130 ".popsection\n" \
15131- ".pushsection .altinstr_replacement, \"ax\"\n" \
15132+ ".pushsection .altinstr_replacement, \"a\"\n" \
15133 ALTINSTR_REPLACEMENT(newinstr1, feature1, 1) \
15134 ALTINSTR_REPLACEMENT(newinstr2, feature2, 2) \
15135 ".popsection"
15136diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
15137index efc3b22..85c4f3a 100644
15138--- a/arch/x86/include/asm/apic.h
15139+++ b/arch/x86/include/asm/apic.h
15140@@ -45,7 +45,7 @@ static inline void generic_apic_probe(void)
15141
15142 #ifdef CONFIG_X86_LOCAL_APIC
15143
15144-extern unsigned int apic_verbosity;
15145+extern int apic_verbosity;
15146 extern int local_apic_timer_c2_ok;
15147
15148 extern int disable_apic;
15149diff --git a/arch/x86/include/asm/apm.h b/arch/x86/include/asm/apm.h
15150index 20370c6..a2eb9b0 100644
15151--- a/arch/x86/include/asm/apm.h
15152+++ b/arch/x86/include/asm/apm.h
15153@@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32 func, u32 ebx_in, u32 ecx_in,
15154 __asm__ __volatile__(APM_DO_ZERO_SEGS
15155 "pushl %%edi\n\t"
15156 "pushl %%ebp\n\t"
15157- "lcall *%%cs:apm_bios_entry\n\t"
15158+ "lcall *%%ss:apm_bios_entry\n\t"
15159 "setc %%al\n\t"
15160 "popl %%ebp\n\t"
15161 "popl %%edi\n\t"
15162@@ -58,7 +58,7 @@ static inline u8 apm_bios_call_simple_asm(u32 func, u32 ebx_in,
15163 __asm__ __volatile__(APM_DO_ZERO_SEGS
15164 "pushl %%edi\n\t"
15165 "pushl %%ebp\n\t"
15166- "lcall *%%cs:apm_bios_entry\n\t"
15167+ "lcall *%%ss:apm_bios_entry\n\t"
15168 "setc %%bl\n\t"
15169 "popl %%ebp\n\t"
15170 "popl %%edi\n\t"
15171diff --git a/arch/x86/include/asm/atomic.h b/arch/x86/include/asm/atomic.h
15172index 5e5cd12..51cdc93 100644
15173--- a/arch/x86/include/asm/atomic.h
15174+++ b/arch/x86/include/asm/atomic.h
15175@@ -28,6 +28,17 @@ static inline int atomic_read(const atomic_t *v)
15176 }
15177
15178 /**
15179+ * atomic_read_unchecked - read atomic variable
15180+ * @v: pointer of type atomic_unchecked_t
15181+ *
15182+ * Atomically reads the value of @v.
15183+ */
15184+static inline int __intentional_overflow(-1) atomic_read_unchecked(const atomic_unchecked_t *v)
15185+{
15186+ return ACCESS_ONCE((v)->counter);
15187+}
15188+
15189+/**
15190 * atomic_set - set atomic variable
15191 * @v: pointer of type atomic_t
15192 * @i: required value
15193@@ -40,6 +51,18 @@ static inline void atomic_set(atomic_t *v, int i)
15194 }
15195
15196 /**
15197+ * atomic_set_unchecked - set atomic variable
15198+ * @v: pointer of type atomic_unchecked_t
15199+ * @i: required value
15200+ *
15201+ * Atomically sets the value of @v to @i.
15202+ */
15203+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
15204+{
15205+ v->counter = i;
15206+}
15207+
15208+/**
15209 * atomic_add - add integer to atomic variable
15210 * @i: integer value to add
15211 * @v: pointer of type atomic_t
15212@@ -48,7 +71,29 @@ static inline void atomic_set(atomic_t *v, int i)
15213 */
15214 static inline void atomic_add(int i, atomic_t *v)
15215 {
15216- asm volatile(LOCK_PREFIX "addl %1,%0"
15217+ asm volatile(LOCK_PREFIX "addl %1,%0\n"
15218+
15219+#ifdef CONFIG_PAX_REFCOUNT
15220+ "jno 0f\n"
15221+ LOCK_PREFIX "subl %1,%0\n"
15222+ "int $4\n0:\n"
15223+ _ASM_EXTABLE(0b, 0b)
15224+#endif
15225+
15226+ : "+m" (v->counter)
15227+ : "ir" (i));
15228+}
15229+
15230+/**
15231+ * atomic_add_unchecked - add integer to atomic variable
15232+ * @i: integer value to add
15233+ * @v: pointer of type atomic_unchecked_t
15234+ *
15235+ * Atomically adds @i to @v.
15236+ */
15237+static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v)
15238+{
15239+ asm volatile(LOCK_PREFIX "addl %1,%0\n"
15240 : "+m" (v->counter)
15241 : "ir" (i));
15242 }
15243@@ -62,7 +107,29 @@ static inline void atomic_add(int i, atomic_t *v)
15244 */
15245 static inline void atomic_sub(int i, atomic_t *v)
15246 {
15247- asm volatile(LOCK_PREFIX "subl %1,%0"
15248+ asm volatile(LOCK_PREFIX "subl %1,%0\n"
15249+
15250+#ifdef CONFIG_PAX_REFCOUNT
15251+ "jno 0f\n"
15252+ LOCK_PREFIX "addl %1,%0\n"
15253+ "int $4\n0:\n"
15254+ _ASM_EXTABLE(0b, 0b)
15255+#endif
15256+
15257+ : "+m" (v->counter)
15258+ : "ir" (i));
15259+}
15260+
15261+/**
15262+ * atomic_sub_unchecked - subtract integer from atomic variable
15263+ * @i: integer value to subtract
15264+ * @v: pointer of type atomic_unchecked_t
15265+ *
15266+ * Atomically subtracts @i from @v.
15267+ */
15268+static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v)
15269+{
15270+ asm volatile(LOCK_PREFIX "subl %1,%0\n"
15271 : "+m" (v->counter)
15272 : "ir" (i));
15273 }
15274@@ -78,7 +145,7 @@ static inline void atomic_sub(int i, atomic_t *v)
15275 */
15276 static inline int atomic_sub_and_test(int i, atomic_t *v)
15277 {
15278- GEN_BINARY_RMWcc(LOCK_PREFIX "subl", v->counter, "er", i, "%0", "e");
15279+ GEN_BINARY_RMWcc(LOCK_PREFIX "subl", LOCK_PREFIX "addl", v->counter, "er", i, "%0", "e");
15280 }
15281
15282 /**
15283@@ -89,7 +156,27 @@ static inline int atomic_sub_and_test(int i, atomic_t *v)
15284 */
15285 static inline void atomic_inc(atomic_t *v)
15286 {
15287- asm volatile(LOCK_PREFIX "incl %0"
15288+ asm volatile(LOCK_PREFIX "incl %0\n"
15289+
15290+#ifdef CONFIG_PAX_REFCOUNT
15291+ "jno 0f\n"
15292+ LOCK_PREFIX "decl %0\n"
15293+ "int $4\n0:\n"
15294+ _ASM_EXTABLE(0b, 0b)
15295+#endif
15296+
15297+ : "+m" (v->counter));
15298+}
15299+
15300+/**
15301+ * atomic_inc_unchecked - increment atomic variable
15302+ * @v: pointer of type atomic_unchecked_t
15303+ *
15304+ * Atomically increments @v by 1.
15305+ */
15306+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
15307+{
15308+ asm volatile(LOCK_PREFIX "incl %0\n"
15309 : "+m" (v->counter));
15310 }
15311
15312@@ -101,7 +188,27 @@ static inline void atomic_inc(atomic_t *v)
15313 */
15314 static inline void atomic_dec(atomic_t *v)
15315 {
15316- asm volatile(LOCK_PREFIX "decl %0"
15317+ asm volatile(LOCK_PREFIX "decl %0\n"
15318+
15319+#ifdef CONFIG_PAX_REFCOUNT
15320+ "jno 0f\n"
15321+ LOCK_PREFIX "incl %0\n"
15322+ "int $4\n0:\n"
15323+ _ASM_EXTABLE(0b, 0b)
15324+#endif
15325+
15326+ : "+m" (v->counter));
15327+}
15328+
15329+/**
15330+ * atomic_dec_unchecked - decrement atomic variable
15331+ * @v: pointer of type atomic_unchecked_t
15332+ *
15333+ * Atomically decrements @v by 1.
15334+ */
15335+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
15336+{
15337+ asm volatile(LOCK_PREFIX "decl %0\n"
15338 : "+m" (v->counter));
15339 }
15340
15341@@ -115,7 +222,7 @@ static inline void atomic_dec(atomic_t *v)
15342 */
15343 static inline int atomic_dec_and_test(atomic_t *v)
15344 {
15345- GEN_UNARY_RMWcc(LOCK_PREFIX "decl", v->counter, "%0", "e");
15346+ GEN_UNARY_RMWcc(LOCK_PREFIX "decl", LOCK_PREFIX "incl", v->counter, "%0", "e");
15347 }
15348
15349 /**
15350@@ -128,7 +235,20 @@ static inline int atomic_dec_and_test(atomic_t *v)
15351 */
15352 static inline int atomic_inc_and_test(atomic_t *v)
15353 {
15354- GEN_UNARY_RMWcc(LOCK_PREFIX "incl", v->counter, "%0", "e");
15355+ GEN_UNARY_RMWcc(LOCK_PREFIX "incl", LOCK_PREFIX "decl", v->counter, "%0", "e");
15356+}
15357+
15358+/**
15359+ * atomic_inc_and_test_unchecked - increment and test
15360+ * @v: pointer of type atomic_unchecked_t
15361+ *
15362+ * Atomically increments @v by 1
15363+ * and returns true if the result is zero, or false for all
15364+ * other cases.
15365+ */
15366+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
15367+{
15368+ GEN_UNARY_RMWcc_unchecked(LOCK_PREFIX "incl", v->counter, "%0", "e");
15369 }
15370
15371 /**
15372@@ -142,7 +262,7 @@ static inline int atomic_inc_and_test(atomic_t *v)
15373 */
15374 static inline int atomic_add_negative(int i, atomic_t *v)
15375 {
15376- GEN_BINARY_RMWcc(LOCK_PREFIX "addl", v->counter, "er", i, "%0", "s");
15377+ GEN_BINARY_RMWcc(LOCK_PREFIX "addl", LOCK_PREFIX "subl", v->counter, "er", i, "%0", "s");
15378 }
15379
15380 /**
15381@@ -152,7 +272,19 @@ static inline int atomic_add_negative(int i, atomic_t *v)
15382 *
15383 * Atomically adds @i to @v and returns @i + @v
15384 */
15385-static inline int atomic_add_return(int i, atomic_t *v)
15386+static inline int __intentional_overflow(-1) atomic_add_return(int i, atomic_t *v)
15387+{
15388+ return i + xadd_check_overflow(&v->counter, i);
15389+}
15390+
15391+/**
15392+ * atomic_add_return_unchecked - add integer and return
15393+ * @i: integer value to add
15394+ * @v: pointer of type atomic_unchecked_t
15395+ *
15396+ * Atomically adds @i to @v and returns @i + @v
15397+ */
15398+static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
15399 {
15400 return i + xadd(&v->counter, i);
15401 }
15402@@ -164,15 +296,24 @@ static inline int atomic_add_return(int i, atomic_t *v)
15403 *
15404 * Atomically subtracts @i from @v and returns @v - @i
15405 */
15406-static inline int atomic_sub_return(int i, atomic_t *v)
15407+static inline int __intentional_overflow(-1) atomic_sub_return(int i, atomic_t *v)
15408 {
15409 return atomic_add_return(-i, v);
15410 }
15411
15412 #define atomic_inc_return(v) (atomic_add_return(1, v))
15413+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
15414+{
15415+ return atomic_add_return_unchecked(1, v);
15416+}
15417 #define atomic_dec_return(v) (atomic_sub_return(1, v))
15418
15419-static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
15420+static inline int __intentional_overflow(-1) atomic_cmpxchg(atomic_t *v, int old, int new)
15421+{
15422+ return cmpxchg(&v->counter, old, new);
15423+}
15424+
15425+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
15426 {
15427 return cmpxchg(&v->counter, old, new);
15428 }
15429@@ -182,6 +323,11 @@ static inline int atomic_xchg(atomic_t *v, int new)
15430 return xchg(&v->counter, new);
15431 }
15432
15433+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
15434+{
15435+ return xchg(&v->counter, new);
15436+}
15437+
15438 /**
15439 * __atomic_add_unless - add unless the number is already a given value
15440 * @v: pointer of type atomic_t
15441@@ -193,12 +339,25 @@ static inline int atomic_xchg(atomic_t *v, int new)
15442 */
15443 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
15444 {
15445- int c, old;
15446+ int c, old, new;
15447 c = atomic_read(v);
15448 for (;;) {
15449- if (unlikely(c == (u)))
15450+ if (unlikely(c == u))
15451 break;
15452- old = atomic_cmpxchg((v), c, c + (a));
15453+
15454+ asm volatile("addl %2,%0\n"
15455+
15456+#ifdef CONFIG_PAX_REFCOUNT
15457+ "jno 0f\n"
15458+ "subl %2,%0\n"
15459+ "int $4\n0:\n"
15460+ _ASM_EXTABLE(0b, 0b)
15461+#endif
15462+
15463+ : "=r" (new)
15464+ : "0" (c), "ir" (a));
15465+
15466+ old = atomic_cmpxchg(v, c, new);
15467 if (likely(old == c))
15468 break;
15469 c = old;
15470@@ -207,6 +366,49 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
15471 }
15472
15473 /**
15474+ * atomic_inc_not_zero_hint - increment if not null
15475+ * @v: pointer of type atomic_t
15476+ * @hint: probable value of the atomic before the increment
15477+ *
15478+ * This version of atomic_inc_not_zero() gives a hint of probable
15479+ * value of the atomic. This helps processor to not read the memory
15480+ * before doing the atomic read/modify/write cycle, lowering
15481+ * number of bus transactions on some arches.
15482+ *
15483+ * Returns: 0 if increment was not done, 1 otherwise.
15484+ */
15485+#define atomic_inc_not_zero_hint atomic_inc_not_zero_hint
15486+static inline int atomic_inc_not_zero_hint(atomic_t *v, int hint)
15487+{
15488+ int val, c = hint, new;
15489+
15490+ /* sanity test, should be removed by compiler if hint is a constant */
15491+ if (!hint)
15492+ return __atomic_add_unless(v, 1, 0);
15493+
15494+ do {
15495+ asm volatile("incl %0\n"
15496+
15497+#ifdef CONFIG_PAX_REFCOUNT
15498+ "jno 0f\n"
15499+ "decl %0\n"
15500+ "int $4\n0:\n"
15501+ _ASM_EXTABLE(0b, 0b)
15502+#endif
15503+
15504+ : "=r" (new)
15505+ : "0" (c));
15506+
15507+ val = atomic_cmpxchg(v, c, new);
15508+ if (val == c)
15509+ return 1;
15510+ c = val;
15511+ } while (c);
15512+
15513+ return 0;
15514+}
15515+
15516+/**
15517 * atomic_inc_short - increment of a short integer
15518 * @v: pointer to type int
15519 *
15520@@ -220,14 +422,37 @@ static inline short int atomic_inc_short(short int *v)
15521 }
15522
15523 /* These are x86-specific, used by some header files */
15524-#define atomic_clear_mask(mask, addr) \
15525- asm volatile(LOCK_PREFIX "andl %0,%1" \
15526- : : "r" (~(mask)), "m" (*(addr)) : "memory")
15527+static inline void atomic_clear_mask(unsigned int mask, atomic_t *v)
15528+{
15529+ asm volatile(LOCK_PREFIX "andl %1,%0"
15530+ : "+m" (v->counter)
15531+ : "r" (~(mask))
15532+ : "memory");
15533+}
15534
15535-#define atomic_set_mask(mask, addr) \
15536- asm volatile(LOCK_PREFIX "orl %0,%1" \
15537- : : "r" ((unsigned)(mask)), "m" (*(addr)) \
15538- : "memory")
15539+static inline void atomic_clear_mask_unchecked(unsigned int mask, atomic_unchecked_t *v)
15540+{
15541+ asm volatile(LOCK_PREFIX "andl %1,%0"
15542+ : "+m" (v->counter)
15543+ : "r" (~(mask))
15544+ : "memory");
15545+}
15546+
15547+static inline void atomic_set_mask(unsigned int mask, atomic_t *v)
15548+{
15549+ asm volatile(LOCK_PREFIX "orl %1,%0"
15550+ : "+m" (v->counter)
15551+ : "r" (mask)
15552+ : "memory");
15553+}
15554+
15555+static inline void atomic_set_mask_unchecked(unsigned int mask, atomic_unchecked_t *v)
15556+{
15557+ asm volatile(LOCK_PREFIX "orl %1,%0"
15558+ : "+m" (v->counter)
15559+ : "r" (mask)
15560+ : "memory");
15561+}
15562
15563 #ifdef CONFIG_X86_32
15564 # include <asm/atomic64_32.h>
15565diff --git a/arch/x86/include/asm/atomic64_32.h b/arch/x86/include/asm/atomic64_32.h
15566index b154de7..bf18a5a 100644
15567--- a/arch/x86/include/asm/atomic64_32.h
15568+++ b/arch/x86/include/asm/atomic64_32.h
15569@@ -12,6 +12,14 @@ typedef struct {
15570 u64 __aligned(8) counter;
15571 } atomic64_t;
15572
15573+#ifdef CONFIG_PAX_REFCOUNT
15574+typedef struct {
15575+ u64 __aligned(8) counter;
15576+} atomic64_unchecked_t;
15577+#else
15578+typedef atomic64_t atomic64_unchecked_t;
15579+#endif
15580+
15581 #define ATOMIC64_INIT(val) { (val) }
15582
15583 #define __ATOMIC64_DECL(sym) void atomic64_##sym(atomic64_t *, ...)
15584@@ -37,21 +45,31 @@ typedef struct {
15585 ATOMIC64_DECL_ONE(sym##_386)
15586
15587 ATOMIC64_DECL_ONE(add_386);
15588+ATOMIC64_DECL_ONE(add_unchecked_386);
15589 ATOMIC64_DECL_ONE(sub_386);
15590+ATOMIC64_DECL_ONE(sub_unchecked_386);
15591 ATOMIC64_DECL_ONE(inc_386);
15592+ATOMIC64_DECL_ONE(inc_unchecked_386);
15593 ATOMIC64_DECL_ONE(dec_386);
15594+ATOMIC64_DECL_ONE(dec_unchecked_386);
15595 #endif
15596
15597 #define alternative_atomic64(f, out, in...) \
15598 __alternative_atomic64(f, f, ASM_OUTPUT2(out), ## in)
15599
15600 ATOMIC64_DECL(read);
15601+ATOMIC64_DECL(read_unchecked);
15602 ATOMIC64_DECL(set);
15603+ATOMIC64_DECL(set_unchecked);
15604 ATOMIC64_DECL(xchg);
15605 ATOMIC64_DECL(add_return);
15606+ATOMIC64_DECL(add_return_unchecked);
15607 ATOMIC64_DECL(sub_return);
15608+ATOMIC64_DECL(sub_return_unchecked);
15609 ATOMIC64_DECL(inc_return);
15610+ATOMIC64_DECL(inc_return_unchecked);
15611 ATOMIC64_DECL(dec_return);
15612+ATOMIC64_DECL(dec_return_unchecked);
15613 ATOMIC64_DECL(dec_if_positive);
15614 ATOMIC64_DECL(inc_not_zero);
15615 ATOMIC64_DECL(add_unless);
15616@@ -77,6 +95,21 @@ static inline long long atomic64_cmpxchg(atomic64_t *v, long long o, long long n
15617 }
15618
15619 /**
15620+ * atomic64_cmpxchg_unchecked - cmpxchg atomic64 variable
15621+ * @p: pointer to type atomic64_unchecked_t
15622+ * @o: expected value
15623+ * @n: new value
15624+ *
15625+ * Atomically sets @v to @n if it was equal to @o and returns
15626+ * the old value.
15627+ */
15628+
15629+static inline long long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long long o, long long n)
15630+{
15631+ return cmpxchg64(&v->counter, o, n);
15632+}
15633+
15634+/**
15635 * atomic64_xchg - xchg atomic64 variable
15636 * @v: pointer to type atomic64_t
15637 * @n: value to assign
15638@@ -112,6 +145,22 @@ static inline void atomic64_set(atomic64_t *v, long long i)
15639 }
15640
15641 /**
15642+ * atomic64_set_unchecked - set atomic64 variable
15643+ * @v: pointer to type atomic64_unchecked_t
15644+ * @n: value to assign
15645+ *
15646+ * Atomically sets the value of @v to @n.
15647+ */
15648+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long long i)
15649+{
15650+ unsigned high = (unsigned)(i >> 32);
15651+ unsigned low = (unsigned)i;
15652+ alternative_atomic64(set, /* no output */,
15653+ "S" (v), "b" (low), "c" (high)
15654+ : "eax", "edx", "memory");
15655+}
15656+
15657+/**
15658 * atomic64_read - read atomic64 variable
15659 * @v: pointer to type atomic64_t
15660 *
15661@@ -125,6 +174,19 @@ static inline long long atomic64_read(const atomic64_t *v)
15662 }
15663
15664 /**
15665+ * atomic64_read_unchecked - read atomic64 variable
15666+ * @v: pointer to type atomic64_unchecked_t
15667+ *
15668+ * Atomically reads the value of @v and returns it.
15669+ */
15670+static inline long long __intentional_overflow(-1) atomic64_read_unchecked(atomic64_unchecked_t *v)
15671+{
15672+ long long r;
15673+ alternative_atomic64(read, "=&A" (r), "c" (v) : "memory");
15674+ return r;
15675+ }
15676+
15677+/**
15678 * atomic64_add_return - add and return
15679 * @i: integer value to add
15680 * @v: pointer to type atomic64_t
15681@@ -139,6 +201,21 @@ static inline long long atomic64_add_return(long long i, atomic64_t *v)
15682 return i;
15683 }
15684
15685+/**
15686+ * atomic64_add_return_unchecked - add and return
15687+ * @i: integer value to add
15688+ * @v: pointer to type atomic64_unchecked_t
15689+ *
15690+ * Atomically adds @i to @v and returns @i + *@v
15691+ */
15692+static inline long long atomic64_add_return_unchecked(long long i, atomic64_unchecked_t *v)
15693+{
15694+ alternative_atomic64(add_return_unchecked,
15695+ ASM_OUTPUT2("+A" (i), "+c" (v)),
15696+ ASM_NO_INPUT_CLOBBER("memory"));
15697+ return i;
15698+}
15699+
15700 /*
15701 * Other variants with different arithmetic operators:
15702 */
15703@@ -158,6 +235,14 @@ static inline long long atomic64_inc_return(atomic64_t *v)
15704 return a;
15705 }
15706
15707+static inline long long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
15708+{
15709+ long long a;
15710+ alternative_atomic64(inc_return_unchecked, "=&A" (a),
15711+ "S" (v) : "memory", "ecx");
15712+ return a;
15713+}
15714+
15715 static inline long long atomic64_dec_return(atomic64_t *v)
15716 {
15717 long long a;
15718@@ -182,6 +267,21 @@ static inline long long atomic64_add(long long i, atomic64_t *v)
15719 }
15720
15721 /**
15722+ * atomic64_add_unchecked - add integer to atomic64 variable
15723+ * @i: integer value to add
15724+ * @v: pointer to type atomic64_unchecked_t
15725+ *
15726+ * Atomically adds @i to @v.
15727+ */
15728+static inline long long atomic64_add_unchecked(long long i, atomic64_unchecked_t *v)
15729+{
15730+ __alternative_atomic64(add_unchecked, add_return_unchecked,
15731+ ASM_OUTPUT2("+A" (i), "+c" (v)),
15732+ ASM_NO_INPUT_CLOBBER("memory"));
15733+ return i;
15734+}
15735+
15736+/**
15737 * atomic64_sub - subtract the atomic64 variable
15738 * @i: integer value to subtract
15739 * @v: pointer to type atomic64_t
15740diff --git a/arch/x86/include/asm/atomic64_64.h b/arch/x86/include/asm/atomic64_64.h
15741index f8d273e..02f39f3 100644
15742--- a/arch/x86/include/asm/atomic64_64.h
15743+++ b/arch/x86/include/asm/atomic64_64.h
15744@@ -22,6 +22,18 @@ static inline long atomic64_read(const atomic64_t *v)
15745 }
15746
15747 /**
15748+ * atomic64_read_unchecked - read atomic64 variable
15749+ * @v: pointer of type atomic64_unchecked_t
15750+ *
15751+ * Atomically reads the value of @v.
15752+ * Doesn't imply a read memory barrier.
15753+ */
15754+static inline long __intentional_overflow(-1) atomic64_read_unchecked(const atomic64_unchecked_t *v)
15755+{
15756+ return ACCESS_ONCE((v)->counter);
15757+}
15758+
15759+/**
15760 * atomic64_set - set atomic64 variable
15761 * @v: pointer to type atomic64_t
15762 * @i: required value
15763@@ -34,6 +46,18 @@ static inline void atomic64_set(atomic64_t *v, long i)
15764 }
15765
15766 /**
15767+ * atomic64_set_unchecked - set atomic64 variable
15768+ * @v: pointer to type atomic64_unchecked_t
15769+ * @i: required value
15770+ *
15771+ * Atomically sets the value of @v to @i.
15772+ */
15773+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
15774+{
15775+ v->counter = i;
15776+}
15777+
15778+/**
15779 * atomic64_add - add integer to atomic64 variable
15780 * @i: integer value to add
15781 * @v: pointer to type atomic64_t
15782@@ -42,6 +66,28 @@ static inline void atomic64_set(atomic64_t *v, long i)
15783 */
15784 static inline void atomic64_add(long i, atomic64_t *v)
15785 {
15786+ asm volatile(LOCK_PREFIX "addq %1,%0\n"
15787+
15788+#ifdef CONFIG_PAX_REFCOUNT
15789+ "jno 0f\n"
15790+ LOCK_PREFIX "subq %1,%0\n"
15791+ "int $4\n0:\n"
15792+ _ASM_EXTABLE(0b, 0b)
15793+#endif
15794+
15795+ : "=m" (v->counter)
15796+ : "er" (i), "m" (v->counter));
15797+}
15798+
15799+/**
15800+ * atomic64_add_unchecked - add integer to atomic64 variable
15801+ * @i: integer value to add
15802+ * @v: pointer to type atomic64_unchecked_t
15803+ *
15804+ * Atomically adds @i to @v.
15805+ */
15806+static inline void atomic64_add_unchecked(long i, atomic64_unchecked_t *v)
15807+{
15808 asm volatile(LOCK_PREFIX "addq %1,%0"
15809 : "=m" (v->counter)
15810 : "er" (i), "m" (v->counter));
15811@@ -56,7 +102,29 @@ static inline void atomic64_add(long i, atomic64_t *v)
15812 */
15813 static inline void atomic64_sub(long i, atomic64_t *v)
15814 {
15815- asm volatile(LOCK_PREFIX "subq %1,%0"
15816+ asm volatile(LOCK_PREFIX "subq %1,%0\n"
15817+
15818+#ifdef CONFIG_PAX_REFCOUNT
15819+ "jno 0f\n"
15820+ LOCK_PREFIX "addq %1,%0\n"
15821+ "int $4\n0:\n"
15822+ _ASM_EXTABLE(0b, 0b)
15823+#endif
15824+
15825+ : "=m" (v->counter)
15826+ : "er" (i), "m" (v->counter));
15827+}
15828+
15829+/**
15830+ * atomic64_sub_unchecked - subtract the atomic64 variable
15831+ * @i: integer value to subtract
15832+ * @v: pointer to type atomic64_unchecked_t
15833+ *
15834+ * Atomically subtracts @i from @v.
15835+ */
15836+static inline void atomic64_sub_unchecked(long i, atomic64_unchecked_t *v)
15837+{
15838+ asm volatile(LOCK_PREFIX "subq %1,%0\n"
15839 : "=m" (v->counter)
15840 : "er" (i), "m" (v->counter));
15841 }
15842@@ -72,7 +140,7 @@ static inline void atomic64_sub(long i, atomic64_t *v)
15843 */
15844 static inline int atomic64_sub_and_test(long i, atomic64_t *v)
15845 {
15846- GEN_BINARY_RMWcc(LOCK_PREFIX "subq", v->counter, "er", i, "%0", "e");
15847+ GEN_BINARY_RMWcc(LOCK_PREFIX "subq", LOCK_PREFIX "addq", v->counter, "er", i, "%0", "e");
15848 }
15849
15850 /**
15851@@ -83,6 +151,27 @@ static inline int atomic64_sub_and_test(long i, atomic64_t *v)
15852 */
15853 static inline void atomic64_inc(atomic64_t *v)
15854 {
15855+ asm volatile(LOCK_PREFIX "incq %0\n"
15856+
15857+#ifdef CONFIG_PAX_REFCOUNT
15858+ "jno 0f\n"
15859+ LOCK_PREFIX "decq %0\n"
15860+ "int $4\n0:\n"
15861+ _ASM_EXTABLE(0b, 0b)
15862+#endif
15863+
15864+ : "=m" (v->counter)
15865+ : "m" (v->counter));
15866+}
15867+
15868+/**
15869+ * atomic64_inc_unchecked - increment atomic64 variable
15870+ * @v: pointer to type atomic64_unchecked_t
15871+ *
15872+ * Atomically increments @v by 1.
15873+ */
15874+static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
15875+{
15876 asm volatile(LOCK_PREFIX "incq %0"
15877 : "=m" (v->counter)
15878 : "m" (v->counter));
15879@@ -96,7 +185,28 @@ static inline void atomic64_inc(atomic64_t *v)
15880 */
15881 static inline void atomic64_dec(atomic64_t *v)
15882 {
15883- asm volatile(LOCK_PREFIX "decq %0"
15884+ asm volatile(LOCK_PREFIX "decq %0\n"
15885+
15886+#ifdef CONFIG_PAX_REFCOUNT
15887+ "jno 0f\n"
15888+ LOCK_PREFIX "incq %0\n"
15889+ "int $4\n0:\n"
15890+ _ASM_EXTABLE(0b, 0b)
15891+#endif
15892+
15893+ : "=m" (v->counter)
15894+ : "m" (v->counter));
15895+}
15896+
15897+/**
15898+ * atomic64_dec_unchecked - decrement atomic64 variable
15899+ * @v: pointer to type atomic64_t
15900+ *
15901+ * Atomically decrements @v by 1.
15902+ */
15903+static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
15904+{
15905+ asm volatile(LOCK_PREFIX "decq %0\n"
15906 : "=m" (v->counter)
15907 : "m" (v->counter));
15908 }
15909@@ -111,7 +221,7 @@ static inline void atomic64_dec(atomic64_t *v)
15910 */
15911 static inline int atomic64_dec_and_test(atomic64_t *v)
15912 {
15913- GEN_UNARY_RMWcc(LOCK_PREFIX "decq", v->counter, "%0", "e");
15914+ GEN_UNARY_RMWcc(LOCK_PREFIX "decq", LOCK_PREFIX "incq", v->counter, "%0", "e");
15915 }
15916
15917 /**
15918@@ -124,7 +234,7 @@ static inline int atomic64_dec_and_test(atomic64_t *v)
15919 */
15920 static inline int atomic64_inc_and_test(atomic64_t *v)
15921 {
15922- GEN_UNARY_RMWcc(LOCK_PREFIX "incq", v->counter, "%0", "e");
15923+ GEN_UNARY_RMWcc(LOCK_PREFIX "incq", LOCK_PREFIX "decq", v->counter, "%0", "e");
15924 }
15925
15926 /**
15927@@ -138,7 +248,7 @@ static inline int atomic64_inc_and_test(atomic64_t *v)
15928 */
15929 static inline int atomic64_add_negative(long i, atomic64_t *v)
15930 {
15931- GEN_BINARY_RMWcc(LOCK_PREFIX "addq", v->counter, "er", i, "%0", "s");
15932+ GEN_BINARY_RMWcc(LOCK_PREFIX "addq", LOCK_PREFIX "subq", v->counter, "er", i, "%0", "s");
15933 }
15934
15935 /**
15936@@ -150,6 +260,18 @@ static inline int atomic64_add_negative(long i, atomic64_t *v)
15937 */
15938 static inline long atomic64_add_return(long i, atomic64_t *v)
15939 {
15940+ return i + xadd_check_overflow(&v->counter, i);
15941+}
15942+
15943+/**
15944+ * atomic64_add_return_unchecked - add and return
15945+ * @i: integer value to add
15946+ * @v: pointer to type atomic64_unchecked_t
15947+ *
15948+ * Atomically adds @i to @v and returns @i + @v
15949+ */
15950+static inline long atomic64_add_return_unchecked(long i, atomic64_unchecked_t *v)
15951+{
15952 return i + xadd(&v->counter, i);
15953 }
15954
15955@@ -159,6 +281,10 @@ static inline long atomic64_sub_return(long i, atomic64_t *v)
15956 }
15957
15958 #define atomic64_inc_return(v) (atomic64_add_return(1, (v)))
15959+static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
15960+{
15961+ return atomic64_add_return_unchecked(1, v);
15962+}
15963 #define atomic64_dec_return(v) (atomic64_sub_return(1, (v)))
15964
15965 static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
15966@@ -166,6 +292,11 @@ static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
15967 return cmpxchg(&v->counter, old, new);
15968 }
15969
15970+static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old, long new)
15971+{
15972+ return cmpxchg(&v->counter, old, new);
15973+}
15974+
15975 static inline long atomic64_xchg(atomic64_t *v, long new)
15976 {
15977 return xchg(&v->counter, new);
15978@@ -182,17 +313,30 @@ static inline long atomic64_xchg(atomic64_t *v, long new)
15979 */
15980 static inline int atomic64_add_unless(atomic64_t *v, long a, long u)
15981 {
15982- long c, old;
15983+ long c, old, new;
15984 c = atomic64_read(v);
15985 for (;;) {
15986- if (unlikely(c == (u)))
15987+ if (unlikely(c == u))
15988 break;
15989- old = atomic64_cmpxchg((v), c, c + (a));
15990+
15991+ asm volatile("add %2,%0\n"
15992+
15993+#ifdef CONFIG_PAX_REFCOUNT
15994+ "jno 0f\n"
15995+ "sub %2,%0\n"
15996+ "int $4\n0:\n"
15997+ _ASM_EXTABLE(0b, 0b)
15998+#endif
15999+
16000+ : "=r" (new)
16001+ : "0" (c), "ir" (a));
16002+
16003+ old = atomic64_cmpxchg(v, c, new);
16004 if (likely(old == c))
16005 break;
16006 c = old;
16007 }
16008- return c != (u);
16009+ return c != u;
16010 }
16011
16012 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
16013diff --git a/arch/x86/include/asm/barrier.h b/arch/x86/include/asm/barrier.h
16014index 2ab1eb3..1e8cc5d 100644
16015--- a/arch/x86/include/asm/barrier.h
16016+++ b/arch/x86/include/asm/barrier.h
16017@@ -57,7 +57,7 @@
16018 do { \
16019 compiletime_assert_atomic_type(*p); \
16020 smp_mb(); \
16021- ACCESS_ONCE(*p) = (v); \
16022+ ACCESS_ONCE_RW(*p) = (v); \
16023 } while (0)
16024
16025 #define smp_load_acquire(p) \
16026@@ -74,7 +74,7 @@ do { \
16027 do { \
16028 compiletime_assert_atomic_type(*p); \
16029 barrier(); \
16030- ACCESS_ONCE(*p) = (v); \
16031+ ACCESS_ONCE_RW(*p) = (v); \
16032 } while (0)
16033
16034 #define smp_load_acquire(p) \
16035diff --git a/arch/x86/include/asm/bitops.h b/arch/x86/include/asm/bitops.h
16036index cfe3b95..d01b118 100644
16037--- a/arch/x86/include/asm/bitops.h
16038+++ b/arch/x86/include/asm/bitops.h
16039@@ -50,7 +50,7 @@
16040 * a mask operation on a byte.
16041 */
16042 #define IS_IMMEDIATE(nr) (__builtin_constant_p(nr))
16043-#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((void *)(addr) + ((nr)>>3))
16044+#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((volatile void *)(addr) + ((nr)>>3))
16045 #define CONST_MASK(nr) (1 << ((nr) & 7))
16046
16047 /**
16048@@ -203,7 +203,7 @@ static inline void change_bit(long nr, volatile unsigned long *addr)
16049 */
16050 static inline int test_and_set_bit(long nr, volatile unsigned long *addr)
16051 {
16052- GEN_BINARY_RMWcc(LOCK_PREFIX "bts", *addr, "Ir", nr, "%0", "c");
16053+ GEN_BINARY_RMWcc_unchecked(LOCK_PREFIX "bts", *addr, "Ir", nr, "%0", "c");
16054 }
16055
16056 /**
16057@@ -249,7 +249,7 @@ static inline int __test_and_set_bit(long nr, volatile unsigned long *addr)
16058 */
16059 static inline int test_and_clear_bit(long nr, volatile unsigned long *addr)
16060 {
16061- GEN_BINARY_RMWcc(LOCK_PREFIX "btr", *addr, "Ir", nr, "%0", "c");
16062+ GEN_BINARY_RMWcc_unchecked(LOCK_PREFIX "btr", *addr, "Ir", nr, "%0", "c");
16063 }
16064
16065 /**
16066@@ -302,7 +302,7 @@ static inline int __test_and_change_bit(long nr, volatile unsigned long *addr)
16067 */
16068 static inline int test_and_change_bit(long nr, volatile unsigned long *addr)
16069 {
16070- GEN_BINARY_RMWcc(LOCK_PREFIX "btc", *addr, "Ir", nr, "%0", "c");
16071+ GEN_BINARY_RMWcc_unchecked(LOCK_PREFIX "btc", *addr, "Ir", nr, "%0", "c");
16072 }
16073
16074 static __always_inline int constant_test_bit(long nr, const volatile unsigned long *addr)
16075@@ -343,7 +343,7 @@ static int test_bit(int nr, const volatile unsigned long *addr);
16076 *
16077 * Undefined if no bit exists, so code should check against 0 first.
16078 */
16079-static inline unsigned long __ffs(unsigned long word)
16080+static inline unsigned long __intentional_overflow(-1) __ffs(unsigned long word)
16081 {
16082 asm("rep; bsf %1,%0"
16083 : "=r" (word)
16084@@ -357,7 +357,7 @@ static inline unsigned long __ffs(unsigned long word)
16085 *
16086 * Undefined if no zero exists, so code should check against ~0UL first.
16087 */
16088-static inline unsigned long ffz(unsigned long word)
16089+static inline unsigned long __intentional_overflow(-1) ffz(unsigned long word)
16090 {
16091 asm("rep; bsf %1,%0"
16092 : "=r" (word)
16093@@ -371,7 +371,7 @@ static inline unsigned long ffz(unsigned long word)
16094 *
16095 * Undefined if no set bit exists, so code should check against 0 first.
16096 */
16097-static inline unsigned long __fls(unsigned long word)
16098+static inline unsigned long __intentional_overflow(-1) __fls(unsigned long word)
16099 {
16100 asm("bsr %1,%0"
16101 : "=r" (word)
16102@@ -434,7 +434,7 @@ static inline int ffs(int x)
16103 * set bit if value is nonzero. The last (most significant) bit is
16104 * at position 32.
16105 */
16106-static inline int fls(int x)
16107+static inline int __intentional_overflow(-1) fls(int x)
16108 {
16109 int r;
16110
16111@@ -476,7 +476,7 @@ static inline int fls(int x)
16112 * at position 64.
16113 */
16114 #ifdef CONFIG_X86_64
16115-static __always_inline int fls64(__u64 x)
16116+static __always_inline __intentional_overflow(-1) int fls64(__u64 x)
16117 {
16118 int bitpos = -1;
16119 /*
16120diff --git a/arch/x86/include/asm/boot.h b/arch/x86/include/asm/boot.h
16121index 4fa687a..60f2d39 100644
16122--- a/arch/x86/include/asm/boot.h
16123+++ b/arch/x86/include/asm/boot.h
16124@@ -6,10 +6,15 @@
16125 #include <uapi/asm/boot.h>
16126
16127 /* Physical address where kernel should be loaded. */
16128-#define LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
16129+#define ____LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
16130 + (CONFIG_PHYSICAL_ALIGN - 1)) \
16131 & ~(CONFIG_PHYSICAL_ALIGN - 1))
16132
16133+#ifndef __ASSEMBLY__
16134+extern unsigned char __LOAD_PHYSICAL_ADDR[];
16135+#define LOAD_PHYSICAL_ADDR ((unsigned long)__LOAD_PHYSICAL_ADDR)
16136+#endif
16137+
16138 /* Minimum kernel alignment, as a power of two */
16139 #ifdef CONFIG_X86_64
16140 #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT
16141diff --git a/arch/x86/include/asm/cache.h b/arch/x86/include/asm/cache.h
16142index 48f99f1..d78ebf9 100644
16143--- a/arch/x86/include/asm/cache.h
16144+++ b/arch/x86/include/asm/cache.h
16145@@ -5,12 +5,13 @@
16146
16147 /* L1 cache line size */
16148 #define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT)
16149-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
16150+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
16151
16152 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
16153+#define __read_only __attribute__((__section__(".data..read_only")))
16154
16155 #define INTERNODE_CACHE_SHIFT CONFIG_X86_INTERNODE_CACHE_SHIFT
16156-#define INTERNODE_CACHE_BYTES (1 << INTERNODE_CACHE_SHIFT)
16157+#define INTERNODE_CACHE_BYTES (_AC(1,UL) << INTERNODE_CACHE_SHIFT)
16158
16159 #ifdef CONFIG_X86_VSMP
16160 #ifdef CONFIG_SMP
16161diff --git a/arch/x86/include/asm/calling.h b/arch/x86/include/asm/calling.h
16162index 1f1297b..72b8439 100644
16163--- a/arch/x86/include/asm/calling.h
16164+++ b/arch/x86/include/asm/calling.h
16165@@ -82,106 +82,117 @@ For 32-bit we have the following conventions - kernel is built with
16166 #define RSP 152
16167 #define SS 160
16168
16169-#define ARGOFFSET R11
16170+#define ARGOFFSET R15
16171
16172 .macro SAVE_ARGS addskip=0, save_rcx=1, save_r891011=1, rax_enosys=0
16173- subq $9*8+\addskip, %rsp
16174- CFI_ADJUST_CFA_OFFSET 9*8+\addskip
16175- movq_cfi rdi, 8*8
16176- movq_cfi rsi, 7*8
16177- movq_cfi rdx, 6*8
16178+ subq $ORIG_RAX-ARGOFFSET+\addskip, %rsp
16179+ CFI_ADJUST_CFA_OFFSET ORIG_RAX-ARGOFFSET+\addskip
16180+ movq_cfi rdi, RDI
16181+ movq_cfi rsi, RSI
16182+ movq_cfi rdx, RDX
16183
16184 .if \save_rcx
16185- movq_cfi rcx, 5*8
16186+ movq_cfi rcx, RCX
16187 .endif
16188
16189 .if \rax_enosys
16190- movq $-ENOSYS, 4*8(%rsp)
16191+ movq $-ENOSYS, RAX(%rsp)
16192 .else
16193- movq_cfi rax, 4*8
16194+ movq_cfi rax, RAX
16195 .endif
16196
16197 .if \save_r891011
16198- movq_cfi r8, 3*8
16199- movq_cfi r9, 2*8
16200- movq_cfi r10, 1*8
16201- movq_cfi r11, 0*8
16202+ movq_cfi r8, R8
16203+ movq_cfi r9, R9
16204+ movq_cfi r10, R10
16205+ movq_cfi r11, R11
16206 .endif
16207
16208+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16209+ movq_cfi r12, R12
16210+#endif
16211+
16212 .endm
16213
16214-#define ARG_SKIP (9*8)
16215+#define ARG_SKIP ORIG_RAX
16216
16217 .macro RESTORE_ARGS rstor_rax=1, addskip=0, rstor_rcx=1, rstor_r11=1, \
16218 rstor_r8910=1, rstor_rdx=1
16219+
16220+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16221+ movq_cfi_restore R12, r12
16222+#endif
16223+
16224 .if \rstor_r11
16225- movq_cfi_restore 0*8, r11
16226+ movq_cfi_restore R11, r11
16227 .endif
16228
16229 .if \rstor_r8910
16230- movq_cfi_restore 1*8, r10
16231- movq_cfi_restore 2*8, r9
16232- movq_cfi_restore 3*8, r8
16233+ movq_cfi_restore R10, r10
16234+ movq_cfi_restore R9, r9
16235+ movq_cfi_restore R8, r8
16236 .endif
16237
16238 .if \rstor_rax
16239- movq_cfi_restore 4*8, rax
16240+ movq_cfi_restore RAX, rax
16241 .endif
16242
16243 .if \rstor_rcx
16244- movq_cfi_restore 5*8, rcx
16245+ movq_cfi_restore RCX, rcx
16246 .endif
16247
16248 .if \rstor_rdx
16249- movq_cfi_restore 6*8, rdx
16250+ movq_cfi_restore RDX, rdx
16251 .endif
16252
16253- movq_cfi_restore 7*8, rsi
16254- movq_cfi_restore 8*8, rdi
16255+ movq_cfi_restore RSI, rsi
16256+ movq_cfi_restore RDI, rdi
16257
16258- .if ARG_SKIP+\addskip > 0
16259- addq $ARG_SKIP+\addskip, %rsp
16260- CFI_ADJUST_CFA_OFFSET -(ARG_SKIP+\addskip)
16261+ .if ORIG_RAX+\addskip > 0
16262+ addq $ORIG_RAX+\addskip, %rsp
16263+ CFI_ADJUST_CFA_OFFSET -(ORIG_RAX+\addskip)
16264 .endif
16265 .endm
16266
16267- .macro LOAD_ARGS offset, skiprax=0
16268- movq \offset(%rsp), %r11
16269- movq \offset+8(%rsp), %r10
16270- movq \offset+16(%rsp), %r9
16271- movq \offset+24(%rsp), %r8
16272- movq \offset+40(%rsp), %rcx
16273- movq \offset+48(%rsp), %rdx
16274- movq \offset+56(%rsp), %rsi
16275- movq \offset+64(%rsp), %rdi
16276+ .macro LOAD_ARGS skiprax=0
16277+ movq R11(%rsp), %r11
16278+ movq R10(%rsp), %r10
16279+ movq R9(%rsp), %r9
16280+ movq R8(%rsp), %r8
16281+ movq RCX(%rsp), %rcx
16282+ movq RDX(%rsp), %rdx
16283+ movq RSI(%rsp), %rsi
16284+ movq RDI(%rsp), %rdi
16285 .if \skiprax
16286 .else
16287- movq \offset+72(%rsp), %rax
16288+ movq ORIG_RAX(%rsp), %rax
16289 .endif
16290 .endm
16291
16292-#define REST_SKIP (6*8)
16293-
16294 .macro SAVE_REST
16295- subq $REST_SKIP, %rsp
16296- CFI_ADJUST_CFA_OFFSET REST_SKIP
16297- movq_cfi rbx, 5*8
16298- movq_cfi rbp, 4*8
16299- movq_cfi r12, 3*8
16300- movq_cfi r13, 2*8
16301- movq_cfi r14, 1*8
16302- movq_cfi r15, 0*8
16303+ movq_cfi rbx, RBX
16304+ movq_cfi rbp, RBP
16305+
16306+#ifndef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16307+ movq_cfi r12, R12
16308+#endif
16309+
16310+ movq_cfi r13, R13
16311+ movq_cfi r14, R14
16312+ movq_cfi r15, R15
16313 .endm
16314
16315 .macro RESTORE_REST
16316- movq_cfi_restore 0*8, r15
16317- movq_cfi_restore 1*8, r14
16318- movq_cfi_restore 2*8, r13
16319- movq_cfi_restore 3*8, r12
16320- movq_cfi_restore 4*8, rbp
16321- movq_cfi_restore 5*8, rbx
16322- addq $REST_SKIP, %rsp
16323- CFI_ADJUST_CFA_OFFSET -(REST_SKIP)
16324+ movq_cfi_restore R15, r15
16325+ movq_cfi_restore R14, r14
16326+ movq_cfi_restore R13, r13
16327+
16328+#ifndef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16329+ movq_cfi_restore R12, r12
16330+#endif
16331+
16332+ movq_cfi_restore RBP, rbp
16333+ movq_cfi_restore RBX, rbx
16334 .endm
16335
16336 .macro SAVE_ALL
16337diff --git a/arch/x86/include/asm/checksum_32.h b/arch/x86/include/asm/checksum_32.h
16338index f50de69..2b0a458 100644
16339--- a/arch/x86/include/asm/checksum_32.h
16340+++ b/arch/x86/include/asm/checksum_32.h
16341@@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_generic(const void *src, void *dst,
16342 int len, __wsum sum,
16343 int *src_err_ptr, int *dst_err_ptr);
16344
16345+asmlinkage __wsum csum_partial_copy_generic_to_user(const void *src, void *dst,
16346+ int len, __wsum sum,
16347+ int *src_err_ptr, int *dst_err_ptr);
16348+
16349+asmlinkage __wsum csum_partial_copy_generic_from_user(const void *src, void *dst,
16350+ int len, __wsum sum,
16351+ int *src_err_ptr, int *dst_err_ptr);
16352+
16353 /*
16354 * Note: when you get a NULL pointer exception here this means someone
16355 * passed in an incorrect kernel address to one of these functions.
16356@@ -53,7 +61,7 @@ static inline __wsum csum_partial_copy_from_user(const void __user *src,
16357
16358 might_sleep();
16359 stac();
16360- ret = csum_partial_copy_generic((__force void *)src, dst,
16361+ ret = csum_partial_copy_generic_from_user((__force void *)src, dst,
16362 len, sum, err_ptr, NULL);
16363 clac();
16364
16365@@ -187,7 +195,7 @@ static inline __wsum csum_and_copy_to_user(const void *src,
16366 might_sleep();
16367 if (access_ok(VERIFY_WRITE, dst, len)) {
16368 stac();
16369- ret = csum_partial_copy_generic(src, (__force void *)dst,
16370+ ret = csum_partial_copy_generic_to_user(src, (__force void *)dst,
16371 len, sum, NULL, err_ptr);
16372 clac();
16373 return ret;
16374diff --git a/arch/x86/include/asm/cmpxchg.h b/arch/x86/include/asm/cmpxchg.h
16375index 99c105d7..2f667ac 100644
16376--- a/arch/x86/include/asm/cmpxchg.h
16377+++ b/arch/x86/include/asm/cmpxchg.h
16378@@ -16,8 +16,12 @@ extern void __cmpxchg_wrong_size(void)
16379 __compiletime_error("Bad argument size for cmpxchg");
16380 extern void __xadd_wrong_size(void)
16381 __compiletime_error("Bad argument size for xadd");
16382+extern void __xadd_check_overflow_wrong_size(void)
16383+ __compiletime_error("Bad argument size for xadd_check_overflow");
16384 extern void __add_wrong_size(void)
16385 __compiletime_error("Bad argument size for add");
16386+extern void __add_check_overflow_wrong_size(void)
16387+ __compiletime_error("Bad argument size for add_check_overflow");
16388
16389 /*
16390 * Constants for operation sizes. On 32-bit, the 64-bit size it set to
16391@@ -69,6 +73,38 @@ extern void __add_wrong_size(void)
16392 __ret; \
16393 })
16394
16395+#ifdef CONFIG_PAX_REFCOUNT
16396+#define __xchg_op_check_overflow(ptr, arg, op, lock) \
16397+ ({ \
16398+ __typeof__ (*(ptr)) __ret = (arg); \
16399+ switch (sizeof(*(ptr))) { \
16400+ case __X86_CASE_L: \
16401+ asm volatile (lock #op "l %0, %1\n" \
16402+ "jno 0f\n" \
16403+ "mov %0,%1\n" \
16404+ "int $4\n0:\n" \
16405+ _ASM_EXTABLE(0b, 0b) \
16406+ : "+r" (__ret), "+m" (*(ptr)) \
16407+ : : "memory", "cc"); \
16408+ break; \
16409+ case __X86_CASE_Q: \
16410+ asm volatile (lock #op "q %q0, %1\n" \
16411+ "jno 0f\n" \
16412+ "mov %0,%1\n" \
16413+ "int $4\n0:\n" \
16414+ _ASM_EXTABLE(0b, 0b) \
16415+ : "+r" (__ret), "+m" (*(ptr)) \
16416+ : : "memory", "cc"); \
16417+ break; \
16418+ default: \
16419+ __ ## op ## _check_overflow_wrong_size(); \
16420+ } \
16421+ __ret; \
16422+ })
16423+#else
16424+#define __xchg_op_check_overflow(ptr, arg, op, lock) __xchg_op(ptr, arg, op, lock)
16425+#endif
16426+
16427 /*
16428 * Note: no "lock" prefix even on SMP: xchg always implies lock anyway.
16429 * Since this is generally used to protect other memory information, we
16430@@ -167,6 +203,9 @@ extern void __add_wrong_size(void)
16431 #define xadd_sync(ptr, inc) __xadd((ptr), (inc), "lock; ")
16432 #define xadd_local(ptr, inc) __xadd((ptr), (inc), "")
16433
16434+#define __xadd_check_overflow(ptr, inc, lock) __xchg_op_check_overflow((ptr), (inc), xadd, lock)
16435+#define xadd_check_overflow(ptr, inc) __xadd_check_overflow((ptr), (inc), LOCK_PREFIX)
16436+
16437 #define __add(ptr, inc, lock) \
16438 ({ \
16439 __typeof__ (*(ptr)) __ret = (inc); \
16440diff --git a/arch/x86/include/asm/compat.h b/arch/x86/include/asm/compat.h
16441index 59c6c40..5e0b22c 100644
16442--- a/arch/x86/include/asm/compat.h
16443+++ b/arch/x86/include/asm/compat.h
16444@@ -41,7 +41,7 @@ typedef s64 __attribute__((aligned(4))) compat_s64;
16445 typedef u32 compat_uint_t;
16446 typedef u32 compat_ulong_t;
16447 typedef u64 __attribute__((aligned(4))) compat_u64;
16448-typedef u32 compat_uptr_t;
16449+typedef u32 __user compat_uptr_t;
16450
16451 struct compat_timespec {
16452 compat_time_t tv_sec;
16453diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h
16454index 90a5485..43b6211 100644
16455--- a/arch/x86/include/asm/cpufeature.h
16456+++ b/arch/x86/include/asm/cpufeature.h
16457@@ -213,7 +213,7 @@
16458 #define X86_FEATURE_PAUSEFILTER ( 8*32+13) /* AMD filtered pause intercept */
16459 #define X86_FEATURE_PFTHRESHOLD ( 8*32+14) /* AMD pause filter threshold */
16460 #define X86_FEATURE_VMMCALL ( 8*32+15) /* Prefer vmmcall to vmcall */
16461-
16462+#define X86_FEATURE_STRONGUDEREF (8*32+31) /* PaX PCID based strong UDEREF */
16463
16464 /* Intel-defined CPU features, CPUID level 0x00000007:0 (ebx), word 9 */
16465 #define X86_FEATURE_FSGSBASE ( 9*32+ 0) /* {RD/WR}{FS/GS}BASE instructions*/
16466@@ -221,7 +221,7 @@
16467 #define X86_FEATURE_BMI1 ( 9*32+ 3) /* 1st group bit manipulation extensions */
16468 #define X86_FEATURE_HLE ( 9*32+ 4) /* Hardware Lock Elision */
16469 #define X86_FEATURE_AVX2 ( 9*32+ 5) /* AVX2 instructions */
16470-#define X86_FEATURE_SMEP ( 9*32+ 7) /* Supervisor Mode Execution Protection */
16471+#define X86_FEATURE_SMEP ( 9*32+ 7) /* Supervisor Mode Execution Prevention */
16472 #define X86_FEATURE_BMI2 ( 9*32+ 8) /* 2nd group bit manipulation extensions */
16473 #define X86_FEATURE_ERMS ( 9*32+ 9) /* Enhanced REP MOVSB/STOSB */
16474 #define X86_FEATURE_INVPCID ( 9*32+10) /* Invalidate Processor Context ID */
16475@@ -390,6 +390,7 @@ extern const char * const x86_bug_flags[NBUGINTS*32];
16476 #define cpu_has_eager_fpu boot_cpu_has(X86_FEATURE_EAGER_FPU)
16477 #define cpu_has_topoext boot_cpu_has(X86_FEATURE_TOPOEXT)
16478 #define cpu_has_bpext boot_cpu_has(X86_FEATURE_BPEXT)
16479+#define cpu_has_pcid boot_cpu_has(X86_FEATURE_PCID)
16480
16481 #if __GNUC__ >= 4
16482 extern void warn_pre_alternatives(void);
16483@@ -441,7 +442,8 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
16484
16485 #ifdef CONFIG_X86_DEBUG_STATIC_CPU_HAS
16486 t_warn:
16487- warn_pre_alternatives();
16488+ if (bit != X86_FEATURE_PCID && bit != X86_FEATURE_INVPCID)
16489+ warn_pre_alternatives();
16490 return false;
16491 #endif
16492
16493@@ -461,7 +463,7 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
16494 ".section .discard,\"aw\",@progbits\n"
16495 " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
16496 ".previous\n"
16497- ".section .altinstr_replacement,\"ax\"\n"
16498+ ".section .altinstr_replacement,\"a\"\n"
16499 "3: movb $1,%0\n"
16500 "4:\n"
16501 ".previous\n"
16502@@ -498,7 +500,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
16503 " .byte 2b - 1b\n" /* src len */
16504 " .byte 4f - 3f\n" /* repl len */
16505 ".previous\n"
16506- ".section .altinstr_replacement,\"ax\"\n"
16507+ ".section .altinstr_replacement,\"a\"\n"
16508 "3: .byte 0xe9\n .long %l[t_no] - 2b\n"
16509 "4:\n"
16510 ".previous\n"
16511@@ -531,7 +533,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
16512 ".section .discard,\"aw\",@progbits\n"
16513 " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
16514 ".previous\n"
16515- ".section .altinstr_replacement,\"ax\"\n"
16516+ ".section .altinstr_replacement,\"a\"\n"
16517 "3: movb $0,%0\n"
16518 "4:\n"
16519 ".previous\n"
16520@@ -545,7 +547,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
16521 ".section .discard,\"aw\",@progbits\n"
16522 " .byte 0xff + (6f-5f) - (4b-3b)\n" /* size check */
16523 ".previous\n"
16524- ".section .altinstr_replacement,\"ax\"\n"
16525+ ".section .altinstr_replacement,\"a\"\n"
16526 "5: movb $1,%0\n"
16527 "6:\n"
16528 ".previous\n"
16529diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h
16530index a94b82e..59ecefa 100644
16531--- a/arch/x86/include/asm/desc.h
16532+++ b/arch/x86/include/asm/desc.h
16533@@ -4,6 +4,7 @@
16534 #include <asm/desc_defs.h>
16535 #include <asm/ldt.h>
16536 #include <asm/mmu.h>
16537+#include <asm/pgtable.h>
16538
16539 #include <linux/smp.h>
16540 #include <linux/percpu.h>
16541@@ -17,6 +18,7 @@ static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *in
16542
16543 desc->type = (info->read_exec_only ^ 1) << 1;
16544 desc->type |= info->contents << 2;
16545+ desc->type |= info->seg_not_present ^ 1;
16546
16547 desc->s = 1;
16548 desc->dpl = 0x3;
16549@@ -35,19 +37,14 @@ static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *in
16550 }
16551
16552 extern struct desc_ptr idt_descr;
16553-extern gate_desc idt_table[];
16554-extern struct desc_ptr debug_idt_descr;
16555-extern gate_desc debug_idt_table[];
16556-
16557-struct gdt_page {
16558- struct desc_struct gdt[GDT_ENTRIES];
16559-} __attribute__((aligned(PAGE_SIZE)));
16560-
16561-DECLARE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page);
16562+extern gate_desc idt_table[IDT_ENTRIES];
16563+extern const struct desc_ptr debug_idt_descr;
16564+extern gate_desc debug_idt_table[IDT_ENTRIES];
16565
16566+extern struct desc_struct cpu_gdt_table[NR_CPUS][PAGE_SIZE / sizeof(struct desc_struct)];
16567 static inline struct desc_struct *get_cpu_gdt_table(unsigned int cpu)
16568 {
16569- return per_cpu(gdt_page, cpu).gdt;
16570+ return cpu_gdt_table[cpu];
16571 }
16572
16573 #ifdef CONFIG_X86_64
16574@@ -72,8 +69,14 @@ static inline void pack_gate(gate_desc *gate, unsigned char type,
16575 unsigned long base, unsigned dpl, unsigned flags,
16576 unsigned short seg)
16577 {
16578- gate->a = (seg << 16) | (base & 0xffff);
16579- gate->b = (base & 0xffff0000) | (((0x80 | type | (dpl << 5)) & 0xff) << 8);
16580+ gate->gate.offset_low = base;
16581+ gate->gate.seg = seg;
16582+ gate->gate.reserved = 0;
16583+ gate->gate.type = type;
16584+ gate->gate.s = 0;
16585+ gate->gate.dpl = dpl;
16586+ gate->gate.p = 1;
16587+ gate->gate.offset_high = base >> 16;
16588 }
16589
16590 #endif
16591@@ -118,12 +121,16 @@ static inline void paravirt_free_ldt(struct desc_struct *ldt, unsigned entries)
16592
16593 static inline void native_write_idt_entry(gate_desc *idt, int entry, const gate_desc *gate)
16594 {
16595+ pax_open_kernel();
16596 memcpy(&idt[entry], gate, sizeof(*gate));
16597+ pax_close_kernel();
16598 }
16599
16600 static inline void native_write_ldt_entry(struct desc_struct *ldt, int entry, const void *desc)
16601 {
16602+ pax_open_kernel();
16603 memcpy(&ldt[entry], desc, 8);
16604+ pax_close_kernel();
16605 }
16606
16607 static inline void
16608@@ -137,7 +144,9 @@ native_write_gdt_entry(struct desc_struct *gdt, int entry, const void *desc, int
16609 default: size = sizeof(*gdt); break;
16610 }
16611
16612+ pax_open_kernel();
16613 memcpy(&gdt[entry], desc, size);
16614+ pax_close_kernel();
16615 }
16616
16617 static inline void pack_descriptor(struct desc_struct *desc, unsigned long base,
16618@@ -210,7 +219,9 @@ static inline void native_set_ldt(const void *addr, unsigned int entries)
16619
16620 static inline void native_load_tr_desc(void)
16621 {
16622+ pax_open_kernel();
16623 asm volatile("ltr %w0"::"q" (GDT_ENTRY_TSS*8));
16624+ pax_close_kernel();
16625 }
16626
16627 static inline void native_load_gdt(const struct desc_ptr *dtr)
16628@@ -247,8 +258,10 @@ static inline void native_load_tls(struct thread_struct *t, unsigned int cpu)
16629 struct desc_struct *gdt = get_cpu_gdt_table(cpu);
16630 unsigned int i;
16631
16632+ pax_open_kernel();
16633 for (i = 0; i < GDT_ENTRY_TLS_ENTRIES; i++)
16634 gdt[GDT_ENTRY_TLS_MIN + i] = t->tls_array[i];
16635+ pax_close_kernel();
16636 }
16637
16638 /* This intentionally ignores lm, since 32-bit apps don't have that field. */
16639@@ -295,7 +308,7 @@ static inline void load_LDT(mm_context_t *pc)
16640 preempt_enable();
16641 }
16642
16643-static inline unsigned long get_desc_base(const struct desc_struct *desc)
16644+static inline unsigned long __intentional_overflow(-1) get_desc_base(const struct desc_struct *desc)
16645 {
16646 return (unsigned)(desc->base0 | ((desc->base1) << 16) | ((desc->base2) << 24));
16647 }
16648@@ -319,7 +332,7 @@ static inline void set_desc_limit(struct desc_struct *desc, unsigned long limit)
16649 }
16650
16651 #ifdef CONFIG_X86_64
16652-static inline void set_nmi_gate(int gate, void *addr)
16653+static inline void set_nmi_gate(int gate, const void *addr)
16654 {
16655 gate_desc s;
16656
16657@@ -329,14 +342,14 @@ static inline void set_nmi_gate(int gate, void *addr)
16658 #endif
16659
16660 #ifdef CONFIG_TRACING
16661-extern struct desc_ptr trace_idt_descr;
16662-extern gate_desc trace_idt_table[];
16663+extern const struct desc_ptr trace_idt_descr;
16664+extern gate_desc trace_idt_table[IDT_ENTRIES];
16665 static inline void write_trace_idt_entry(int entry, const gate_desc *gate)
16666 {
16667 write_idt_entry(trace_idt_table, entry, gate);
16668 }
16669
16670-static inline void _trace_set_gate(int gate, unsigned type, void *addr,
16671+static inline void _trace_set_gate(int gate, unsigned type, const void *addr,
16672 unsigned dpl, unsigned ist, unsigned seg)
16673 {
16674 gate_desc s;
16675@@ -356,7 +369,7 @@ static inline void write_trace_idt_entry(int entry, const gate_desc *gate)
16676 #define _trace_set_gate(gate, type, addr, dpl, ist, seg)
16677 #endif
16678
16679-static inline void _set_gate(int gate, unsigned type, void *addr,
16680+static inline void _set_gate(int gate, unsigned type, const void *addr,
16681 unsigned dpl, unsigned ist, unsigned seg)
16682 {
16683 gate_desc s;
16684@@ -379,9 +392,9 @@ static inline void _set_gate(int gate, unsigned type, void *addr,
16685 #define set_intr_gate(n, addr) \
16686 do { \
16687 BUG_ON((unsigned)n > 0xFF); \
16688- _set_gate(n, GATE_INTERRUPT, (void *)addr, 0, 0, \
16689+ _set_gate(n, GATE_INTERRUPT, (const void *)addr, 0, 0, \
16690 __KERNEL_CS); \
16691- _trace_set_gate(n, GATE_INTERRUPT, (void *)trace_##addr,\
16692+ _trace_set_gate(n, GATE_INTERRUPT, (const void *)trace_##addr,\
16693 0, 0, __KERNEL_CS); \
16694 } while (0)
16695
16696@@ -409,19 +422,19 @@ static inline void alloc_system_vector(int vector)
16697 /*
16698 * This routine sets up an interrupt gate at directory privilege level 3.
16699 */
16700-static inline void set_system_intr_gate(unsigned int n, void *addr)
16701+static inline void set_system_intr_gate(unsigned int n, const void *addr)
16702 {
16703 BUG_ON((unsigned)n > 0xFF);
16704 _set_gate(n, GATE_INTERRUPT, addr, 0x3, 0, __KERNEL_CS);
16705 }
16706
16707-static inline void set_system_trap_gate(unsigned int n, void *addr)
16708+static inline void set_system_trap_gate(unsigned int n, const void *addr)
16709 {
16710 BUG_ON((unsigned)n > 0xFF);
16711 _set_gate(n, GATE_TRAP, addr, 0x3, 0, __KERNEL_CS);
16712 }
16713
16714-static inline void set_trap_gate(unsigned int n, void *addr)
16715+static inline void set_trap_gate(unsigned int n, const void *addr)
16716 {
16717 BUG_ON((unsigned)n > 0xFF);
16718 _set_gate(n, GATE_TRAP, addr, 0, 0, __KERNEL_CS);
16719@@ -430,16 +443,16 @@ static inline void set_trap_gate(unsigned int n, void *addr)
16720 static inline void set_task_gate(unsigned int n, unsigned int gdt_entry)
16721 {
16722 BUG_ON((unsigned)n > 0xFF);
16723- _set_gate(n, GATE_TASK, (void *)0, 0, 0, (gdt_entry<<3));
16724+ _set_gate(n, GATE_TASK, (const void *)0, 0, 0, (gdt_entry<<3));
16725 }
16726
16727-static inline void set_intr_gate_ist(int n, void *addr, unsigned ist)
16728+static inline void set_intr_gate_ist(int n, const void *addr, unsigned ist)
16729 {
16730 BUG_ON((unsigned)n > 0xFF);
16731 _set_gate(n, GATE_INTERRUPT, addr, 0, ist, __KERNEL_CS);
16732 }
16733
16734-static inline void set_system_intr_gate_ist(int n, void *addr, unsigned ist)
16735+static inline void set_system_intr_gate_ist(int n, const void *addr, unsigned ist)
16736 {
16737 BUG_ON((unsigned)n > 0xFF);
16738 _set_gate(n, GATE_INTERRUPT, addr, 0x3, ist, __KERNEL_CS);
16739@@ -511,4 +524,17 @@ static inline void load_current_idt(void)
16740 else
16741 load_idt((const struct desc_ptr *)&idt_descr);
16742 }
16743+
16744+#ifdef CONFIG_X86_32
16745+static inline void set_user_cs(unsigned long base, unsigned long limit, int cpu)
16746+{
16747+ struct desc_struct d;
16748+
16749+ if (likely(limit))
16750+ limit = (limit - 1UL) >> PAGE_SHIFT;
16751+ pack_descriptor(&d, base, limit, 0xFB, 0xC);
16752+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_DEFAULT_USER_CS, &d, DESCTYPE_S);
16753+}
16754+#endif
16755+
16756 #endif /* _ASM_X86_DESC_H */
16757diff --git a/arch/x86/include/asm/desc_defs.h b/arch/x86/include/asm/desc_defs.h
16758index 278441f..b95a174 100644
16759--- a/arch/x86/include/asm/desc_defs.h
16760+++ b/arch/x86/include/asm/desc_defs.h
16761@@ -31,6 +31,12 @@ struct desc_struct {
16762 unsigned base1: 8, type: 4, s: 1, dpl: 2, p: 1;
16763 unsigned limit: 4, avl: 1, l: 1, d: 1, g: 1, base2: 8;
16764 };
16765+ struct {
16766+ u16 offset_low;
16767+ u16 seg;
16768+ unsigned reserved: 8, type: 4, s: 1, dpl: 2, p: 1;
16769+ unsigned offset_high: 16;
16770+ } gate;
16771 };
16772 } __attribute__((packed));
16773
16774diff --git a/arch/x86/include/asm/div64.h b/arch/x86/include/asm/div64.h
16775index ced283a..ffe04cc 100644
16776--- a/arch/x86/include/asm/div64.h
16777+++ b/arch/x86/include/asm/div64.h
16778@@ -39,7 +39,7 @@
16779 __mod; \
16780 })
16781
16782-static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
16783+static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
16784 {
16785 union {
16786 u64 v64;
16787diff --git a/arch/x86/include/asm/elf.h b/arch/x86/include/asm/elf.h
16788index ca3347a..1a5082a 100644
16789--- a/arch/x86/include/asm/elf.h
16790+++ b/arch/x86/include/asm/elf.h
16791@@ -75,9 +75,6 @@ typedef struct user_fxsr_struct elf_fpxregset_t;
16792
16793 #include <asm/vdso.h>
16794
16795-#ifdef CONFIG_X86_64
16796-extern unsigned int vdso64_enabled;
16797-#endif
16798 #if defined(CONFIG_X86_32) || defined(CONFIG_COMPAT)
16799 extern unsigned int vdso32_enabled;
16800 #endif
16801@@ -249,7 +246,25 @@ extern int force_personality32;
16802 the loader. We need to make sure that it is out of the way of the program
16803 that it will "exec", and that there is sufficient room for the brk. */
16804
16805+#ifdef CONFIG_PAX_SEGMEXEC
16806+#define ELF_ET_DYN_BASE ((current->mm->pax_flags & MF_PAX_SEGMEXEC) ? SEGMEXEC_TASK_SIZE/3*2 : TASK_SIZE/3*2)
16807+#else
16808 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
16809+#endif
16810+
16811+#ifdef CONFIG_PAX_ASLR
16812+#ifdef CONFIG_X86_32
16813+#define PAX_ELF_ET_DYN_BASE 0x10000000UL
16814+
16815+#define PAX_DELTA_MMAP_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? 15 : 16)
16816+#define PAX_DELTA_STACK_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? 15 : 16)
16817+#else
16818+#define PAX_ELF_ET_DYN_BASE 0x400000UL
16819+
16820+#define PAX_DELTA_MMAP_LEN ((test_thread_flag(TIF_ADDR32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
16821+#define PAX_DELTA_STACK_LEN ((test_thread_flag(TIF_ADDR32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
16822+#endif
16823+#endif
16824
16825 /* This yields a mask that user programs can use to figure out what
16826 instruction set this CPU supports. This could be done in user space,
16827@@ -298,17 +313,13 @@ do { \
16828
16829 #define ARCH_DLINFO \
16830 do { \
16831- if (vdso64_enabled) \
16832- NEW_AUX_ENT(AT_SYSINFO_EHDR, \
16833- (unsigned long __force)current->mm->context.vdso); \
16834+ NEW_AUX_ENT(AT_SYSINFO_EHDR, current->mm->context.vdso); \
16835 } while (0)
16836
16837 /* As a historical oddity, the x32 and x86_64 vDSOs are controlled together. */
16838 #define ARCH_DLINFO_X32 \
16839 do { \
16840- if (vdso64_enabled) \
16841- NEW_AUX_ENT(AT_SYSINFO_EHDR, \
16842- (unsigned long __force)current->mm->context.vdso); \
16843+ NEW_AUX_ENT(AT_SYSINFO_EHDR, current->mm->context.vdso); \
16844 } while (0)
16845
16846 #define AT_SYSINFO 32
16847@@ -323,10 +334,10 @@ else \
16848
16849 #endif /* !CONFIG_X86_32 */
16850
16851-#define VDSO_CURRENT_BASE ((unsigned long)current->mm->context.vdso)
16852+#define VDSO_CURRENT_BASE (current->mm->context.vdso)
16853
16854 #define VDSO_ENTRY \
16855- ((unsigned long)current->mm->context.vdso + \
16856+ (current->mm->context.vdso + \
16857 selected_vdso32->sym___kernel_vsyscall)
16858
16859 struct linux_binprm;
16860@@ -338,9 +349,6 @@ extern int compat_arch_setup_additional_pages(struct linux_binprm *bprm,
16861 int uses_interp);
16862 #define compat_arch_setup_additional_pages compat_arch_setup_additional_pages
16863
16864-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
16865-#define arch_randomize_brk arch_randomize_brk
16866-
16867 /*
16868 * True on X86_32 or when emulating IA32 on X86_64
16869 */
16870diff --git a/arch/x86/include/asm/emergency-restart.h b/arch/x86/include/asm/emergency-restart.h
16871index 77a99ac..39ff7f5 100644
16872--- a/arch/x86/include/asm/emergency-restart.h
16873+++ b/arch/x86/include/asm/emergency-restart.h
16874@@ -1,6 +1,6 @@
16875 #ifndef _ASM_X86_EMERGENCY_RESTART_H
16876 #define _ASM_X86_EMERGENCY_RESTART_H
16877
16878-extern void machine_emergency_restart(void);
16879+extern void machine_emergency_restart(void) __noreturn;
16880
16881 #endif /* _ASM_X86_EMERGENCY_RESTART_H */
16882diff --git a/arch/x86/include/asm/floppy.h b/arch/x86/include/asm/floppy.h
16883index 1c7eefe..d0e4702 100644
16884--- a/arch/x86/include/asm/floppy.h
16885+++ b/arch/x86/include/asm/floppy.h
16886@@ -229,18 +229,18 @@ static struct fd_routine_l {
16887 int (*_dma_setup)(char *addr, unsigned long size, int mode, int io);
16888 } fd_routine[] = {
16889 {
16890- request_dma,
16891- free_dma,
16892- get_dma_residue,
16893- dma_mem_alloc,
16894- hard_dma_setup
16895+ ._request_dma = request_dma,
16896+ ._free_dma = free_dma,
16897+ ._get_dma_residue = get_dma_residue,
16898+ ._dma_mem_alloc = dma_mem_alloc,
16899+ ._dma_setup = hard_dma_setup
16900 },
16901 {
16902- vdma_request_dma,
16903- vdma_nop,
16904- vdma_get_dma_residue,
16905- vdma_mem_alloc,
16906- vdma_dma_setup
16907+ ._request_dma = vdma_request_dma,
16908+ ._free_dma = vdma_nop,
16909+ ._get_dma_residue = vdma_get_dma_residue,
16910+ ._dma_mem_alloc = vdma_mem_alloc,
16911+ ._dma_setup = vdma_dma_setup
16912 }
16913 };
16914
16915diff --git a/arch/x86/include/asm/fpu-internal.h b/arch/x86/include/asm/fpu-internal.h
16916index 72ba21a..79f3f66 100644
16917--- a/arch/x86/include/asm/fpu-internal.h
16918+++ b/arch/x86/include/asm/fpu-internal.h
16919@@ -124,8 +124,11 @@ static inline void sanitize_i387_state(struct task_struct *tsk)
16920 #define user_insn(insn, output, input...) \
16921 ({ \
16922 int err; \
16923+ pax_open_userland(); \
16924 asm volatile(ASM_STAC "\n" \
16925- "1:" #insn "\n\t" \
16926+ "1:" \
16927+ __copyuser_seg \
16928+ #insn "\n\t" \
16929 "2: " ASM_CLAC "\n" \
16930 ".section .fixup,\"ax\"\n" \
16931 "3: movl $-1,%[err]\n" \
16932@@ -134,6 +137,7 @@ static inline void sanitize_i387_state(struct task_struct *tsk)
16933 _ASM_EXTABLE(1b, 3b) \
16934 : [err] "=r" (err), output \
16935 : "0"(0), input); \
16936+ pax_close_userland(); \
16937 err; \
16938 })
16939
16940@@ -300,7 +304,7 @@ static inline int restore_fpu_checking(struct task_struct *tsk)
16941 "fnclex\n\t"
16942 "emms\n\t"
16943 "fildl %P[addr]" /* set F?P to defined value */
16944- : : [addr] "m" (tsk->thread.fpu.has_fpu));
16945+ : : [addr] "m" (init_tss[raw_smp_processor_id()].x86_tss.sp0));
16946 }
16947
16948 return fpu_restore_checking(&tsk->thread.fpu);
16949diff --git a/arch/x86/include/asm/futex.h b/arch/x86/include/asm/futex.h
16950index b4c1f54..e290c08 100644
16951--- a/arch/x86/include/asm/futex.h
16952+++ b/arch/x86/include/asm/futex.h
16953@@ -12,6 +12,7 @@
16954 #include <asm/smap.h>
16955
16956 #define __futex_atomic_op1(insn, ret, oldval, uaddr, oparg) \
16957+ typecheck(u32 __user *, uaddr); \
16958 asm volatile("\t" ASM_STAC "\n" \
16959 "1:\t" insn "\n" \
16960 "2:\t" ASM_CLAC "\n" \
16961@@ -20,15 +21,16 @@
16962 "\tjmp\t2b\n" \
16963 "\t.previous\n" \
16964 _ASM_EXTABLE(1b, 3b) \
16965- : "=r" (oldval), "=r" (ret), "+m" (*uaddr) \
16966+ : "=r" (oldval), "=r" (ret), "+m" (*(u32 __user *)____m(uaddr)) \
16967 : "i" (-EFAULT), "0" (oparg), "1" (0))
16968
16969 #define __futex_atomic_op2(insn, ret, oldval, uaddr, oparg) \
16970+ typecheck(u32 __user *, uaddr); \
16971 asm volatile("\t" ASM_STAC "\n" \
16972 "1:\tmovl %2, %0\n" \
16973 "\tmovl\t%0, %3\n" \
16974 "\t" insn "\n" \
16975- "2:\t" LOCK_PREFIX "cmpxchgl %3, %2\n" \
16976+ "2:\t" LOCK_PREFIX __copyuser_seg"cmpxchgl %3, %2\n" \
16977 "\tjnz\t1b\n" \
16978 "3:\t" ASM_CLAC "\n" \
16979 "\t.section .fixup,\"ax\"\n" \
16980@@ -38,7 +40,7 @@
16981 _ASM_EXTABLE(1b, 4b) \
16982 _ASM_EXTABLE(2b, 4b) \
16983 : "=&a" (oldval), "=&r" (ret), \
16984- "+m" (*uaddr), "=&r" (tem) \
16985+ "+m" (*(u32 __user *)____m(uaddr)), "=&r" (tem) \
16986 : "r" (oparg), "i" (-EFAULT), "1" (0))
16987
16988 static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
16989@@ -57,12 +59,13 @@ static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
16990
16991 pagefault_disable();
16992
16993+ pax_open_userland();
16994 switch (op) {
16995 case FUTEX_OP_SET:
16996- __futex_atomic_op1("xchgl %0, %2", ret, oldval, uaddr, oparg);
16997+ __futex_atomic_op1(__copyuser_seg"xchgl %0, %2", ret, oldval, uaddr, oparg);
16998 break;
16999 case FUTEX_OP_ADD:
17000- __futex_atomic_op1(LOCK_PREFIX "xaddl %0, %2", ret, oldval,
17001+ __futex_atomic_op1(LOCK_PREFIX __copyuser_seg"xaddl %0, %2", ret, oldval,
17002 uaddr, oparg);
17003 break;
17004 case FUTEX_OP_OR:
17005@@ -77,6 +80,7 @@ static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
17006 default:
17007 ret = -ENOSYS;
17008 }
17009+ pax_close_userland();
17010
17011 pagefault_enable();
17012
17013diff --git a/arch/x86/include/asm/hw_irq.h b/arch/x86/include/asm/hw_irq.h
17014index 9662290..49ca5e5 100644
17015--- a/arch/x86/include/asm/hw_irq.h
17016+++ b/arch/x86/include/asm/hw_irq.h
17017@@ -160,8 +160,8 @@ static inline void unlock_vector_lock(void) {}
17018 #endif /* CONFIG_X86_LOCAL_APIC */
17019
17020 /* Statistics */
17021-extern atomic_t irq_err_count;
17022-extern atomic_t irq_mis_count;
17023+extern atomic_unchecked_t irq_err_count;
17024+extern atomic_unchecked_t irq_mis_count;
17025
17026 /* EISA */
17027 extern void eisa_set_level_irq(unsigned int irq);
17028diff --git a/arch/x86/include/asm/i8259.h b/arch/x86/include/asm/i8259.h
17029index ccffa53..3c90c87 100644
17030--- a/arch/x86/include/asm/i8259.h
17031+++ b/arch/x86/include/asm/i8259.h
17032@@ -62,7 +62,7 @@ struct legacy_pic {
17033 void (*init)(int auto_eoi);
17034 int (*irq_pending)(unsigned int irq);
17035 void (*make_irq)(unsigned int irq);
17036-};
17037+} __do_const;
17038
17039 extern struct legacy_pic *legacy_pic;
17040 extern struct legacy_pic null_legacy_pic;
17041diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
17042index 34a5b93..27e40a6 100644
17043--- a/arch/x86/include/asm/io.h
17044+++ b/arch/x86/include/asm/io.h
17045@@ -52,12 +52,12 @@ static inline void name(type val, volatile void __iomem *addr) \
17046 "m" (*(volatile type __force *)addr) barrier); }
17047
17048 build_mmio_read(readb, "b", unsigned char, "=q", :"memory")
17049-build_mmio_read(readw, "w", unsigned short, "=r", :"memory")
17050-build_mmio_read(readl, "l", unsigned int, "=r", :"memory")
17051+build_mmio_read(__intentional_overflow(-1) readw, "w", unsigned short, "=r", :"memory")
17052+build_mmio_read(__intentional_overflow(-1) readl, "l", unsigned int, "=r", :"memory")
17053
17054 build_mmio_read(__readb, "b", unsigned char, "=q", )
17055-build_mmio_read(__readw, "w", unsigned short, "=r", )
17056-build_mmio_read(__readl, "l", unsigned int, "=r", )
17057+build_mmio_read(__intentional_overflow(-1) __readw, "w", unsigned short, "=r", )
17058+build_mmio_read(__intentional_overflow(-1) __readl, "l", unsigned int, "=r", )
17059
17060 build_mmio_write(writeb, "b", unsigned char, "q", :"memory")
17061 build_mmio_write(writew, "w", unsigned short, "r", :"memory")
17062@@ -113,7 +113,7 @@ build_mmio_write(writeq, "q", unsigned long, "r", :"memory")
17063 * this function
17064 */
17065
17066-static inline phys_addr_t virt_to_phys(volatile void *address)
17067+static inline phys_addr_t __intentional_overflow(-1) virt_to_phys(volatile void *address)
17068 {
17069 return __pa(address);
17070 }
17071@@ -189,7 +189,7 @@ static inline void __iomem *ioremap(resource_size_t offset, unsigned long size)
17072 return ioremap_nocache(offset, size);
17073 }
17074
17075-extern void iounmap(volatile void __iomem *addr);
17076+extern void iounmap(const volatile void __iomem *addr);
17077
17078 extern void set_iounmap_nonlazy(void);
17079
17080@@ -199,6 +199,17 @@ extern void set_iounmap_nonlazy(void);
17081
17082 #include <linux/vmalloc.h>
17083
17084+#define ARCH_HAS_VALID_PHYS_ADDR_RANGE
17085+static inline int valid_phys_addr_range(unsigned long addr, size_t count)
17086+{
17087+ return ((addr + count + PAGE_SIZE - 1) >> PAGE_SHIFT) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
17088+}
17089+
17090+static inline int valid_mmap_phys_addr_range(unsigned long pfn, size_t count)
17091+{
17092+ return (pfn + (count >> PAGE_SHIFT)) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
17093+}
17094+
17095 /*
17096 * Convert a virtual cached pointer to an uncached pointer
17097 */
17098diff --git a/arch/x86/include/asm/irqflags.h b/arch/x86/include/asm/irqflags.h
17099index 0a8b519..80e7d5b 100644
17100--- a/arch/x86/include/asm/irqflags.h
17101+++ b/arch/x86/include/asm/irqflags.h
17102@@ -141,6 +141,11 @@ static inline notrace unsigned long arch_local_irq_save(void)
17103 sti; \
17104 sysexit
17105
17106+#define GET_CR0_INTO_RDI mov %cr0, %rdi
17107+#define SET_RDI_INTO_CR0 mov %rdi, %cr0
17108+#define GET_CR3_INTO_RDI mov %cr3, %rdi
17109+#define SET_RDI_INTO_CR3 mov %rdi, %cr3
17110+
17111 #else
17112 #define INTERRUPT_RETURN iret
17113 #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit
17114diff --git a/arch/x86/include/asm/kprobes.h b/arch/x86/include/asm/kprobes.h
17115index 4421b5d..8543006 100644
17116--- a/arch/x86/include/asm/kprobes.h
17117+++ b/arch/x86/include/asm/kprobes.h
17118@@ -37,13 +37,8 @@ typedef u8 kprobe_opcode_t;
17119 #define RELATIVEJUMP_SIZE 5
17120 #define RELATIVECALL_OPCODE 0xe8
17121 #define RELATIVE_ADDR_SIZE 4
17122-#define MAX_STACK_SIZE 64
17123-#define MIN_STACK_SIZE(ADDR) \
17124- (((MAX_STACK_SIZE) < (((unsigned long)current_thread_info()) + \
17125- THREAD_SIZE - (unsigned long)(ADDR))) \
17126- ? (MAX_STACK_SIZE) \
17127- : (((unsigned long)current_thread_info()) + \
17128- THREAD_SIZE - (unsigned long)(ADDR)))
17129+#define MAX_STACK_SIZE 64UL
17130+#define MIN_STACK_SIZE(ADDR) min(MAX_STACK_SIZE, current->thread.sp0 - (unsigned long)(ADDR))
17131
17132 #define flush_insn_slot(p) do { } while (0)
17133
17134diff --git a/arch/x86/include/asm/local.h b/arch/x86/include/asm/local.h
17135index 4ad6560..75c7bdd 100644
17136--- a/arch/x86/include/asm/local.h
17137+++ b/arch/x86/include/asm/local.h
17138@@ -10,33 +10,97 @@ typedef struct {
17139 atomic_long_t a;
17140 } local_t;
17141
17142+typedef struct {
17143+ atomic_long_unchecked_t a;
17144+} local_unchecked_t;
17145+
17146 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
17147
17148 #define local_read(l) atomic_long_read(&(l)->a)
17149+#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
17150 #define local_set(l, i) atomic_long_set(&(l)->a, (i))
17151+#define local_set_unchecked(l, i) atomic_long_set_unchecked(&(l)->a, (i))
17152
17153 static inline void local_inc(local_t *l)
17154 {
17155- asm volatile(_ASM_INC "%0"
17156+ asm volatile(_ASM_INC "%0\n"
17157+
17158+#ifdef CONFIG_PAX_REFCOUNT
17159+ "jno 0f\n"
17160+ _ASM_DEC "%0\n"
17161+ "int $4\n0:\n"
17162+ _ASM_EXTABLE(0b, 0b)
17163+#endif
17164+
17165+ : "+m" (l->a.counter));
17166+}
17167+
17168+static inline void local_inc_unchecked(local_unchecked_t *l)
17169+{
17170+ asm volatile(_ASM_INC "%0\n"
17171 : "+m" (l->a.counter));
17172 }
17173
17174 static inline void local_dec(local_t *l)
17175 {
17176- asm volatile(_ASM_DEC "%0"
17177+ asm volatile(_ASM_DEC "%0\n"
17178+
17179+#ifdef CONFIG_PAX_REFCOUNT
17180+ "jno 0f\n"
17181+ _ASM_INC "%0\n"
17182+ "int $4\n0:\n"
17183+ _ASM_EXTABLE(0b, 0b)
17184+#endif
17185+
17186+ : "+m" (l->a.counter));
17187+}
17188+
17189+static inline void local_dec_unchecked(local_unchecked_t *l)
17190+{
17191+ asm volatile(_ASM_DEC "%0\n"
17192 : "+m" (l->a.counter));
17193 }
17194
17195 static inline void local_add(long i, local_t *l)
17196 {
17197- asm volatile(_ASM_ADD "%1,%0"
17198+ asm volatile(_ASM_ADD "%1,%0\n"
17199+
17200+#ifdef CONFIG_PAX_REFCOUNT
17201+ "jno 0f\n"
17202+ _ASM_SUB "%1,%0\n"
17203+ "int $4\n0:\n"
17204+ _ASM_EXTABLE(0b, 0b)
17205+#endif
17206+
17207+ : "+m" (l->a.counter)
17208+ : "ir" (i));
17209+}
17210+
17211+static inline void local_add_unchecked(long i, local_unchecked_t *l)
17212+{
17213+ asm volatile(_ASM_ADD "%1,%0\n"
17214 : "+m" (l->a.counter)
17215 : "ir" (i));
17216 }
17217
17218 static inline void local_sub(long i, local_t *l)
17219 {
17220- asm volatile(_ASM_SUB "%1,%0"
17221+ asm volatile(_ASM_SUB "%1,%0\n"
17222+
17223+#ifdef CONFIG_PAX_REFCOUNT
17224+ "jno 0f\n"
17225+ _ASM_ADD "%1,%0\n"
17226+ "int $4\n0:\n"
17227+ _ASM_EXTABLE(0b, 0b)
17228+#endif
17229+
17230+ : "+m" (l->a.counter)
17231+ : "ir" (i));
17232+}
17233+
17234+static inline void local_sub_unchecked(long i, local_unchecked_t *l)
17235+{
17236+ asm volatile(_ASM_SUB "%1,%0\n"
17237 : "+m" (l->a.counter)
17238 : "ir" (i));
17239 }
17240@@ -52,7 +116,7 @@ static inline void local_sub(long i, local_t *l)
17241 */
17242 static inline int local_sub_and_test(long i, local_t *l)
17243 {
17244- GEN_BINARY_RMWcc(_ASM_SUB, l->a.counter, "er", i, "%0", "e");
17245+ GEN_BINARY_RMWcc(_ASM_SUB, _ASM_ADD, l->a.counter, "er", i, "%0", "e");
17246 }
17247
17248 /**
17249@@ -65,7 +129,7 @@ static inline int local_sub_and_test(long i, local_t *l)
17250 */
17251 static inline int local_dec_and_test(local_t *l)
17252 {
17253- GEN_UNARY_RMWcc(_ASM_DEC, l->a.counter, "%0", "e");
17254+ GEN_UNARY_RMWcc(_ASM_DEC, _ASM_INC, l->a.counter, "%0", "e");
17255 }
17256
17257 /**
17258@@ -78,7 +142,7 @@ static inline int local_dec_and_test(local_t *l)
17259 */
17260 static inline int local_inc_and_test(local_t *l)
17261 {
17262- GEN_UNARY_RMWcc(_ASM_INC, l->a.counter, "%0", "e");
17263+ GEN_UNARY_RMWcc(_ASM_INC, _ASM_DEC, l->a.counter, "%0", "e");
17264 }
17265
17266 /**
17267@@ -92,7 +156,7 @@ static inline int local_inc_and_test(local_t *l)
17268 */
17269 static inline int local_add_negative(long i, local_t *l)
17270 {
17271- GEN_BINARY_RMWcc(_ASM_ADD, l->a.counter, "er", i, "%0", "s");
17272+ GEN_BINARY_RMWcc(_ASM_ADD, _ASM_SUB, l->a.counter, "er", i, "%0", "s");
17273 }
17274
17275 /**
17276@@ -105,6 +169,30 @@ static inline int local_add_negative(long i, local_t *l)
17277 static inline long local_add_return(long i, local_t *l)
17278 {
17279 long __i = i;
17280+ asm volatile(_ASM_XADD "%0, %1\n"
17281+
17282+#ifdef CONFIG_PAX_REFCOUNT
17283+ "jno 0f\n"
17284+ _ASM_MOV "%0,%1\n"
17285+ "int $4\n0:\n"
17286+ _ASM_EXTABLE(0b, 0b)
17287+#endif
17288+
17289+ : "+r" (i), "+m" (l->a.counter)
17290+ : : "memory");
17291+ return i + __i;
17292+}
17293+
17294+/**
17295+ * local_add_return_unchecked - add and return
17296+ * @i: integer value to add
17297+ * @l: pointer to type local_unchecked_t
17298+ *
17299+ * Atomically adds @i to @l and returns @i + @l
17300+ */
17301+static inline long local_add_return_unchecked(long i, local_unchecked_t *l)
17302+{
17303+ long __i = i;
17304 asm volatile(_ASM_XADD "%0, %1;"
17305 : "+r" (i), "+m" (l->a.counter)
17306 : : "memory");
17307@@ -121,6 +209,8 @@ static inline long local_sub_return(long i, local_t *l)
17308
17309 #define local_cmpxchg(l, o, n) \
17310 (cmpxchg_local(&((l)->a.counter), (o), (n)))
17311+#define local_cmpxchg_unchecked(l, o, n) \
17312+ (cmpxchg_local(&((l)->a.counter), (o), (n)))
17313 /* Always has a lock prefix */
17314 #define local_xchg(l, n) (xchg(&((l)->a.counter), (n)))
17315
17316diff --git a/arch/x86/include/asm/mman.h b/arch/x86/include/asm/mman.h
17317new file mode 100644
17318index 0000000..2bfd3ba
17319--- /dev/null
17320+++ b/arch/x86/include/asm/mman.h
17321@@ -0,0 +1,15 @@
17322+#ifndef _X86_MMAN_H
17323+#define _X86_MMAN_H
17324+
17325+#include <uapi/asm/mman.h>
17326+
17327+#ifdef __KERNEL__
17328+#ifndef __ASSEMBLY__
17329+#ifdef CONFIG_X86_32
17330+#define arch_mmap_check i386_mmap_check
17331+int i386_mmap_check(unsigned long addr, unsigned long len, unsigned long flags);
17332+#endif
17333+#endif
17334+#endif
17335+
17336+#endif /* X86_MMAN_H */
17337diff --git a/arch/x86/include/asm/mmu.h b/arch/x86/include/asm/mmu.h
17338index 09b9620..923aecd 100644
17339--- a/arch/x86/include/asm/mmu.h
17340+++ b/arch/x86/include/asm/mmu.h
17341@@ -9,7 +9,7 @@
17342 * we put the segment information here.
17343 */
17344 typedef struct {
17345- void *ldt;
17346+ struct desc_struct *ldt;
17347 int size;
17348
17349 #ifdef CONFIG_X86_64
17350@@ -18,7 +18,19 @@ typedef struct {
17351 #endif
17352
17353 struct mutex lock;
17354- void __user *vdso;
17355+ unsigned long vdso;
17356+
17357+#ifdef CONFIG_X86_32
17358+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
17359+ unsigned long user_cs_base;
17360+ unsigned long user_cs_limit;
17361+
17362+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
17363+ cpumask_t cpu_user_cs_mask;
17364+#endif
17365+
17366+#endif
17367+#endif
17368
17369 atomic_t perf_rdpmc_allowed; /* nonzero if rdpmc is allowed */
17370 } mm_context_t;
17371diff --git a/arch/x86/include/asm/mmu_context.h b/arch/x86/include/asm/mmu_context.h
17372index 883f6b93..6869d96 100644
17373--- a/arch/x86/include/asm/mmu_context.h
17374+++ b/arch/x86/include/asm/mmu_context.h
17375@@ -42,6 +42,20 @@ void destroy_context(struct mm_struct *mm);
17376
17377 static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
17378 {
17379+
17380+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17381+ if (!(static_cpu_has(X86_FEATURE_PCID))) {
17382+ unsigned int i;
17383+ pgd_t *pgd;
17384+
17385+ pax_open_kernel();
17386+ pgd = get_cpu_pgd(smp_processor_id(), kernel);
17387+ for (i = USER_PGD_PTRS; i < 2 * USER_PGD_PTRS; ++i)
17388+ set_pgd_batched(pgd+i, native_make_pgd(0));
17389+ pax_close_kernel();
17390+ }
17391+#endif
17392+
17393 #ifdef CONFIG_SMP
17394 if (this_cpu_read(cpu_tlbstate.state) == TLBSTATE_OK)
17395 this_cpu_write(cpu_tlbstate.state, TLBSTATE_LAZY);
17396@@ -52,16 +66,59 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
17397 struct task_struct *tsk)
17398 {
17399 unsigned cpu = smp_processor_id();
17400+#if defined(CONFIG_X86_32) && defined(CONFIG_SMP) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17401+ int tlbstate = TLBSTATE_OK;
17402+#endif
17403
17404 if (likely(prev != next)) {
17405 #ifdef CONFIG_SMP
17406+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17407+ tlbstate = this_cpu_read(cpu_tlbstate.state);
17408+#endif
17409 this_cpu_write(cpu_tlbstate.state, TLBSTATE_OK);
17410 this_cpu_write(cpu_tlbstate.active_mm, next);
17411 #endif
17412 cpumask_set_cpu(cpu, mm_cpumask(next));
17413
17414 /* Re-load page tables */
17415+#ifdef CONFIG_PAX_PER_CPU_PGD
17416+ pax_open_kernel();
17417+
17418+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17419+ if (static_cpu_has(X86_FEATURE_PCID))
17420+ __clone_user_pgds(get_cpu_pgd(cpu, user), next->pgd);
17421+ else
17422+#endif
17423+
17424+ __clone_user_pgds(get_cpu_pgd(cpu, kernel), next->pgd);
17425+ __shadow_user_pgds(get_cpu_pgd(cpu, kernel) + USER_PGD_PTRS, next->pgd);
17426+ pax_close_kernel();
17427+ BUG_ON((__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL) != (read_cr3() & __PHYSICAL_MASK) && (__pa(get_cpu_pgd(cpu, user)) | PCID_USER) != (read_cr3() & __PHYSICAL_MASK));
17428+
17429+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17430+ if (static_cpu_has(X86_FEATURE_PCID)) {
17431+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
17432+ u64 descriptor[2];
17433+ descriptor[0] = PCID_USER;
17434+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17435+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF)) {
17436+ descriptor[0] = PCID_KERNEL;
17437+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17438+ }
17439+ } else {
17440+ write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
17441+ if (static_cpu_has(X86_FEATURE_STRONGUDEREF))
17442+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
17443+ else
17444+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
17445+ }
17446+ } else
17447+#endif
17448+
17449+ load_cr3(get_cpu_pgd(cpu, kernel));
17450+#else
17451 load_cr3(next->pgd);
17452+#endif
17453 trace_tlb_flush(TLB_FLUSH_ON_TASK_SWITCH, TLB_FLUSH_ALL);
17454
17455 /* Stop flush ipis for the previous mm */
17456@@ -84,9 +141,67 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
17457 */
17458 if (unlikely(prev->context.ldt != next->context.ldt))
17459 load_LDT_nolock(&next->context);
17460+
17461+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
17462+ if (!(__supported_pte_mask & _PAGE_NX)) {
17463+ smp_mb__before_atomic();
17464+ cpu_clear(cpu, prev->context.cpu_user_cs_mask);
17465+ smp_mb__after_atomic();
17466+ cpu_set(cpu, next->context.cpu_user_cs_mask);
17467+ }
17468+#endif
17469+
17470+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17471+ if (unlikely(prev->context.user_cs_base != next->context.user_cs_base ||
17472+ prev->context.user_cs_limit != next->context.user_cs_limit))
17473+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
17474+#ifdef CONFIG_SMP
17475+ else if (unlikely(tlbstate != TLBSTATE_OK))
17476+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
17477+#endif
17478+#endif
17479+
17480 }
17481+ else {
17482+
17483+#ifdef CONFIG_PAX_PER_CPU_PGD
17484+ pax_open_kernel();
17485+
17486+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17487+ if (static_cpu_has(X86_FEATURE_PCID))
17488+ __clone_user_pgds(get_cpu_pgd(cpu, user), next->pgd);
17489+ else
17490+#endif
17491+
17492+ __clone_user_pgds(get_cpu_pgd(cpu, kernel), next->pgd);
17493+ __shadow_user_pgds(get_cpu_pgd(cpu, kernel) + USER_PGD_PTRS, next->pgd);
17494+ pax_close_kernel();
17495+ BUG_ON((__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL) != (read_cr3() & __PHYSICAL_MASK) && (__pa(get_cpu_pgd(cpu, user)) | PCID_USER) != (read_cr3() & __PHYSICAL_MASK));
17496+
17497+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17498+ if (static_cpu_has(X86_FEATURE_PCID)) {
17499+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
17500+ u64 descriptor[2];
17501+ descriptor[0] = PCID_USER;
17502+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17503+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF)) {
17504+ descriptor[0] = PCID_KERNEL;
17505+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17506+ }
17507+ } else {
17508+ write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
17509+ if (static_cpu_has(X86_FEATURE_STRONGUDEREF))
17510+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
17511+ else
17512+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
17513+ }
17514+ } else
17515+#endif
17516+
17517+ load_cr3(get_cpu_pgd(cpu, kernel));
17518+#endif
17519+
17520 #ifdef CONFIG_SMP
17521- else {
17522 this_cpu_write(cpu_tlbstate.state, TLBSTATE_OK);
17523 BUG_ON(this_cpu_read(cpu_tlbstate.active_mm) != next);
17524
17525@@ -103,13 +218,30 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
17526 * tlb flush IPI delivery. We must reload CR3
17527 * to make sure to use no freed page tables.
17528 */
17529+
17530+#ifndef CONFIG_PAX_PER_CPU_PGD
17531 load_cr3(next->pgd);
17532 trace_tlb_flush(TLB_FLUSH_ON_TASK_SWITCH, TLB_FLUSH_ALL);
17533+#endif
17534+
17535 load_mm_cr4(next);
17536 load_LDT_nolock(&next->context);
17537+
17538+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
17539+ if (!(__supported_pte_mask & _PAGE_NX))
17540+ cpu_set(cpu, next->context.cpu_user_cs_mask);
17541+#endif
17542+
17543+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17544+#ifdef CONFIG_PAX_PAGEEXEC
17545+ if (!((next->pax_flags & MF_PAX_PAGEEXEC) && (__supported_pte_mask & _PAGE_NX)))
17546+#endif
17547+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
17548+#endif
17549+
17550 }
17551+#endif
17552 }
17553-#endif
17554 }
17555
17556 #define activate_mm(prev, next) \
17557diff --git a/arch/x86/include/asm/module.h b/arch/x86/include/asm/module.h
17558index e3b7819..b257c64 100644
17559--- a/arch/x86/include/asm/module.h
17560+++ b/arch/x86/include/asm/module.h
17561@@ -5,6 +5,7 @@
17562
17563 #ifdef CONFIG_X86_64
17564 /* X86_64 does not define MODULE_PROC_FAMILY */
17565+#define MODULE_PROC_FAMILY ""
17566 #elif defined CONFIG_M486
17567 #define MODULE_PROC_FAMILY "486 "
17568 #elif defined CONFIG_M586
17569@@ -57,8 +58,20 @@
17570 #error unknown processor family
17571 #endif
17572
17573-#ifdef CONFIG_X86_32
17574-# define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY
17575+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS
17576+#define MODULE_PAX_KERNEXEC "KERNEXEC_BTS "
17577+#elif defined(CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR)
17578+#define MODULE_PAX_KERNEXEC "KERNEXEC_OR "
17579+#else
17580+#define MODULE_PAX_KERNEXEC ""
17581 #endif
17582
17583+#ifdef CONFIG_PAX_MEMORY_UDEREF
17584+#define MODULE_PAX_UDEREF "UDEREF "
17585+#else
17586+#define MODULE_PAX_UDEREF ""
17587+#endif
17588+
17589+#define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_PAX_KERNEXEC MODULE_PAX_UDEREF
17590+
17591 #endif /* _ASM_X86_MODULE_H */
17592diff --git a/arch/x86/include/asm/nmi.h b/arch/x86/include/asm/nmi.h
17593index 5f2fc44..106caa6 100644
17594--- a/arch/x86/include/asm/nmi.h
17595+++ b/arch/x86/include/asm/nmi.h
17596@@ -36,26 +36,35 @@ enum {
17597
17598 typedef int (*nmi_handler_t)(unsigned int, struct pt_regs *);
17599
17600+struct nmiaction;
17601+
17602+struct nmiwork {
17603+ const struct nmiaction *action;
17604+ u64 max_duration;
17605+ struct irq_work irq_work;
17606+};
17607+
17608 struct nmiaction {
17609 struct list_head list;
17610 nmi_handler_t handler;
17611- u64 max_duration;
17612- struct irq_work irq_work;
17613 unsigned long flags;
17614 const char *name;
17615-};
17616+ struct nmiwork *work;
17617+} __do_const;
17618
17619 #define register_nmi_handler(t, fn, fg, n, init...) \
17620 ({ \
17621- static struct nmiaction init fn##_na = { \
17622+ static struct nmiwork fn##_nw; \
17623+ static const struct nmiaction init fn##_na = { \
17624 .handler = (fn), \
17625 .name = (n), \
17626 .flags = (fg), \
17627+ .work = &fn##_nw, \
17628 }; \
17629 __register_nmi_handler((t), &fn##_na); \
17630 })
17631
17632-int __register_nmi_handler(unsigned int, struct nmiaction *);
17633+int __register_nmi_handler(unsigned int, const struct nmiaction *);
17634
17635 void unregister_nmi_handler(unsigned int, const char *);
17636
17637diff --git a/arch/x86/include/asm/page.h b/arch/x86/include/asm/page.h
17638index 802dde3..9183e68 100644
17639--- a/arch/x86/include/asm/page.h
17640+++ b/arch/x86/include/asm/page.h
17641@@ -52,6 +52,7 @@ static inline void copy_user_page(void *to, void *from, unsigned long vaddr,
17642 __phys_addr_symbol(__phys_reloc_hide((unsigned long)(x)))
17643
17644 #define __va(x) ((void *)((unsigned long)(x)+PAGE_OFFSET))
17645+#define __early_va(x) ((void *)((unsigned long)(x)+__START_KERNEL_map - phys_base))
17646
17647 #define __boot_va(x) __va(x)
17648 #define __boot_pa(x) __pa(x)
17649@@ -60,11 +61,21 @@ static inline void copy_user_page(void *to, void *from, unsigned long vaddr,
17650 * virt_to_page(kaddr) returns a valid pointer if and only if
17651 * virt_addr_valid(kaddr) returns true.
17652 */
17653-#define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
17654 #define pfn_to_kaddr(pfn) __va((pfn) << PAGE_SHIFT)
17655 extern bool __virt_addr_valid(unsigned long kaddr);
17656 #define virt_addr_valid(kaddr) __virt_addr_valid((unsigned long) (kaddr))
17657
17658+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
17659+#define virt_to_page(kaddr) \
17660+ ({ \
17661+ const void *__kaddr = (const void *)(kaddr); \
17662+ BUG_ON(!virt_addr_valid(__kaddr)); \
17663+ pfn_to_page(__pa(__kaddr) >> PAGE_SHIFT); \
17664+ })
17665+#else
17666+#define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
17667+#endif
17668+
17669 #endif /* __ASSEMBLY__ */
17670
17671 #include <asm-generic/memory_model.h>
17672diff --git a/arch/x86/include/asm/page_64.h b/arch/x86/include/asm/page_64.h
17673index b3bebf9..13ac22e 100644
17674--- a/arch/x86/include/asm/page_64.h
17675+++ b/arch/x86/include/asm/page_64.h
17676@@ -7,9 +7,9 @@
17677
17678 /* duplicated to the one in bootmem.h */
17679 extern unsigned long max_pfn;
17680-extern unsigned long phys_base;
17681+extern const unsigned long phys_base;
17682
17683-static inline unsigned long __phys_addr_nodebug(unsigned long x)
17684+static inline unsigned long __intentional_overflow(-1) __phys_addr_nodebug(unsigned long x)
17685 {
17686 unsigned long y = x - __START_KERNEL_map;
17687
17688@@ -20,8 +20,8 @@ static inline unsigned long __phys_addr_nodebug(unsigned long x)
17689 }
17690
17691 #ifdef CONFIG_DEBUG_VIRTUAL
17692-extern unsigned long __phys_addr(unsigned long);
17693-extern unsigned long __phys_addr_symbol(unsigned long);
17694+extern unsigned long __intentional_overflow(-1) __phys_addr(unsigned long);
17695+extern unsigned long __intentional_overflow(-1) __phys_addr_symbol(unsigned long);
17696 #else
17697 #define __phys_addr(x) __phys_addr_nodebug(x)
17698 #define __phys_addr_symbol(x) \
17699diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
17700index 965c47d..ffe0af8 100644
17701--- a/arch/x86/include/asm/paravirt.h
17702+++ b/arch/x86/include/asm/paravirt.h
17703@@ -560,7 +560,7 @@ static inline pmd_t __pmd(pmdval_t val)
17704 return (pmd_t) { ret };
17705 }
17706
17707-static inline pmdval_t pmd_val(pmd_t pmd)
17708+static inline __intentional_overflow(-1) pmdval_t pmd_val(pmd_t pmd)
17709 {
17710 pmdval_t ret;
17711
17712@@ -626,6 +626,18 @@ static inline void set_pgd(pgd_t *pgdp, pgd_t pgd)
17713 val);
17714 }
17715
17716+static inline void set_pgd_batched(pgd_t *pgdp, pgd_t pgd)
17717+{
17718+ pgdval_t val = native_pgd_val(pgd);
17719+
17720+ if (sizeof(pgdval_t) > sizeof(long))
17721+ PVOP_VCALL3(pv_mmu_ops.set_pgd_batched, pgdp,
17722+ val, (u64)val >> 32);
17723+ else
17724+ PVOP_VCALL2(pv_mmu_ops.set_pgd_batched, pgdp,
17725+ val);
17726+}
17727+
17728 static inline void pgd_clear(pgd_t *pgdp)
17729 {
17730 set_pgd(pgdp, __pgd(0));
17731@@ -710,6 +722,21 @@ static inline void __set_fixmap(unsigned /* enum fixed_addresses */ idx,
17732 pv_mmu_ops.set_fixmap(idx, phys, flags);
17733 }
17734
17735+#ifdef CONFIG_PAX_KERNEXEC
17736+static inline unsigned long pax_open_kernel(void)
17737+{
17738+ return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_open_kernel);
17739+}
17740+
17741+static inline unsigned long pax_close_kernel(void)
17742+{
17743+ return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_close_kernel);
17744+}
17745+#else
17746+static inline unsigned long pax_open_kernel(void) { return 0; }
17747+static inline unsigned long pax_close_kernel(void) { return 0; }
17748+#endif
17749+
17750 #if defined(CONFIG_SMP) && defined(CONFIG_PARAVIRT_SPINLOCKS)
17751
17752 static __always_inline void __ticket_lock_spinning(struct arch_spinlock *lock,
17753@@ -906,7 +933,7 @@ extern void default_banner(void);
17754
17755 #define PARA_PATCH(struct, off) ((PARAVIRT_PATCH_##struct + (off)) / 4)
17756 #define PARA_SITE(ptype, clobbers, ops) _PVSITE(ptype, clobbers, ops, .long, 4)
17757-#define PARA_INDIRECT(addr) *%cs:addr
17758+#define PARA_INDIRECT(addr) *%ss:addr
17759 #endif
17760
17761 #define INTERRUPT_RETURN \
17762@@ -981,6 +1008,21 @@ extern void default_banner(void);
17763 PARA_SITE(PARA_PATCH(pv_cpu_ops, PV_CPU_irq_enable_sysexit), \
17764 CLBR_NONE, \
17765 jmp PARA_INDIRECT(pv_cpu_ops+PV_CPU_irq_enable_sysexit))
17766+
17767+#define GET_CR0_INTO_RDI \
17768+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0); \
17769+ mov %rax,%rdi
17770+
17771+#define SET_RDI_INTO_CR0 \
17772+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
17773+
17774+#define GET_CR3_INTO_RDI \
17775+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_read_cr3); \
17776+ mov %rax,%rdi
17777+
17778+#define SET_RDI_INTO_CR3 \
17779+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_write_cr3)
17780+
17781 #endif /* CONFIG_X86_32 */
17782
17783 #endif /* __ASSEMBLY__ */
17784diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h
17785index 7549b8b..f0edfda 100644
17786--- a/arch/x86/include/asm/paravirt_types.h
17787+++ b/arch/x86/include/asm/paravirt_types.h
17788@@ -84,7 +84,7 @@ struct pv_init_ops {
17789 */
17790 unsigned (*patch)(u8 type, u16 clobber, void *insnbuf,
17791 unsigned long addr, unsigned len);
17792-};
17793+} __no_const __no_randomize_layout;
17794
17795
17796 struct pv_lazy_ops {
17797@@ -92,13 +92,13 @@ struct pv_lazy_ops {
17798 void (*enter)(void);
17799 void (*leave)(void);
17800 void (*flush)(void);
17801-};
17802+} __no_randomize_layout;
17803
17804 struct pv_time_ops {
17805 unsigned long long (*sched_clock)(void);
17806 unsigned long long (*steal_clock)(int cpu);
17807 unsigned long (*get_tsc_khz)(void);
17808-};
17809+} __no_const __no_randomize_layout;
17810
17811 struct pv_cpu_ops {
17812 /* hooks for various privileged instructions */
17813@@ -192,7 +192,7 @@ struct pv_cpu_ops {
17814
17815 void (*start_context_switch)(struct task_struct *prev);
17816 void (*end_context_switch)(struct task_struct *next);
17817-};
17818+} __no_const __no_randomize_layout;
17819
17820 struct pv_irq_ops {
17821 /*
17822@@ -215,7 +215,7 @@ struct pv_irq_ops {
17823 #ifdef CONFIG_X86_64
17824 void (*adjust_exception_frame)(void);
17825 #endif
17826-};
17827+} __no_randomize_layout;
17828
17829 struct pv_apic_ops {
17830 #ifdef CONFIG_X86_LOCAL_APIC
17831@@ -223,7 +223,7 @@ struct pv_apic_ops {
17832 unsigned long start_eip,
17833 unsigned long start_esp);
17834 #endif
17835-};
17836+} __no_const __no_randomize_layout;
17837
17838 struct pv_mmu_ops {
17839 unsigned long (*read_cr2)(void);
17840@@ -313,6 +313,7 @@ struct pv_mmu_ops {
17841 struct paravirt_callee_save make_pud;
17842
17843 void (*set_pgd)(pgd_t *pudp, pgd_t pgdval);
17844+ void (*set_pgd_batched)(pgd_t *pudp, pgd_t pgdval);
17845 #endif /* PAGETABLE_LEVELS == 4 */
17846 #endif /* PAGETABLE_LEVELS >= 3 */
17847
17848@@ -324,7 +325,13 @@ struct pv_mmu_ops {
17849 an mfn. We can tell which is which from the index. */
17850 void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx,
17851 phys_addr_t phys, pgprot_t flags);
17852-};
17853+
17854+#ifdef CONFIG_PAX_KERNEXEC
17855+ unsigned long (*pax_open_kernel)(void);
17856+ unsigned long (*pax_close_kernel)(void);
17857+#endif
17858+
17859+} __no_randomize_layout;
17860
17861 struct arch_spinlock;
17862 #ifdef CONFIG_SMP
17863@@ -336,11 +343,14 @@ typedef u16 __ticket_t;
17864 struct pv_lock_ops {
17865 struct paravirt_callee_save lock_spinning;
17866 void (*unlock_kick)(struct arch_spinlock *lock, __ticket_t ticket);
17867-};
17868+} __no_randomize_layout;
17869
17870 /* This contains all the paravirt structures: we get a convenient
17871 * number for each function using the offset which we use to indicate
17872- * what to patch. */
17873+ * what to patch.
17874+ * shouldn't be randomized due to the "NEAT TRICK" in paravirt.c
17875+ */
17876+
17877 struct paravirt_patch_template {
17878 struct pv_init_ops pv_init_ops;
17879 struct pv_time_ops pv_time_ops;
17880@@ -349,7 +359,7 @@ struct paravirt_patch_template {
17881 struct pv_apic_ops pv_apic_ops;
17882 struct pv_mmu_ops pv_mmu_ops;
17883 struct pv_lock_ops pv_lock_ops;
17884-};
17885+} __no_randomize_layout;
17886
17887 extern struct pv_info pv_info;
17888 extern struct pv_init_ops pv_init_ops;
17889diff --git a/arch/x86/include/asm/pgalloc.h b/arch/x86/include/asm/pgalloc.h
17890index c4412e9..90e88c5 100644
17891--- a/arch/x86/include/asm/pgalloc.h
17892+++ b/arch/x86/include/asm/pgalloc.h
17893@@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(struct mm_struct *mm,
17894 pmd_t *pmd, pte_t *pte)
17895 {
17896 paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
17897+ set_pmd(pmd, __pmd(__pa(pte) | _KERNPG_TABLE));
17898+}
17899+
17900+static inline void pmd_populate_user(struct mm_struct *mm,
17901+ pmd_t *pmd, pte_t *pte)
17902+{
17903+ paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
17904 set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE));
17905 }
17906
17907@@ -108,12 +115,22 @@ static inline void __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd,
17908
17909 #ifdef CONFIG_X86_PAE
17910 extern void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd);
17911+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
17912+{
17913+ pud_populate(mm, pudp, pmd);
17914+}
17915 #else /* !CONFIG_X86_PAE */
17916 static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
17917 {
17918 paravirt_alloc_pmd(mm, __pa(pmd) >> PAGE_SHIFT);
17919 set_pud(pud, __pud(_PAGE_TABLE | __pa(pmd)));
17920 }
17921+
17922+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
17923+{
17924+ paravirt_alloc_pmd(mm, __pa(pmd) >> PAGE_SHIFT);
17925+ set_pud(pud, __pud(_KERNPG_TABLE | __pa(pmd)));
17926+}
17927 #endif /* CONFIG_X86_PAE */
17928
17929 #if PAGETABLE_LEVELS > 3
17930@@ -123,6 +140,12 @@ static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, pud_t *pud)
17931 set_pgd(pgd, __pgd(_PAGE_TABLE | __pa(pud)));
17932 }
17933
17934+static inline void pgd_populate_kernel(struct mm_struct *mm, pgd_t *pgd, pud_t *pud)
17935+{
17936+ paravirt_alloc_pud(mm, __pa(pud) >> PAGE_SHIFT);
17937+ set_pgd(pgd, __pgd(_KERNPG_TABLE | __pa(pud)));
17938+}
17939+
17940 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
17941 {
17942 return (pud_t *)get_zeroed_page(GFP_KERNEL|__GFP_REPEAT);
17943diff --git a/arch/x86/include/asm/pgtable-2level.h b/arch/x86/include/asm/pgtable-2level.h
17944index fd74a11..35fd5af 100644
17945--- a/arch/x86/include/asm/pgtable-2level.h
17946+++ b/arch/x86/include/asm/pgtable-2level.h
17947@@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t *ptep , pte_t pte)
17948
17949 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
17950 {
17951+ pax_open_kernel();
17952 *pmdp = pmd;
17953+ pax_close_kernel();
17954 }
17955
17956 static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
17957diff --git a/arch/x86/include/asm/pgtable-3level.h b/arch/x86/include/asm/pgtable-3level.h
17958index cdaa58c..e61122b 100644
17959--- a/arch/x86/include/asm/pgtable-3level.h
17960+++ b/arch/x86/include/asm/pgtable-3level.h
17961@@ -92,12 +92,16 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
17962
17963 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
17964 {
17965+ pax_open_kernel();
17966 set_64bit((unsigned long long *)(pmdp), native_pmd_val(pmd));
17967+ pax_close_kernel();
17968 }
17969
17970 static inline void native_set_pud(pud_t *pudp, pud_t pud)
17971 {
17972+ pax_open_kernel();
17973 set_64bit((unsigned long long *)(pudp), native_pud_val(pud));
17974+ pax_close_kernel();
17975 }
17976
17977 /*
17978diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
17979index a0c35bf..7045c6a 100644
17980--- a/arch/x86/include/asm/pgtable.h
17981+++ b/arch/x86/include/asm/pgtable.h
17982@@ -47,6 +47,7 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
17983
17984 #ifndef __PAGETABLE_PUD_FOLDED
17985 #define set_pgd(pgdp, pgd) native_set_pgd(pgdp, pgd)
17986+#define set_pgd_batched(pgdp, pgd) native_set_pgd_batched(pgdp, pgd)
17987 #define pgd_clear(pgd) native_pgd_clear(pgd)
17988 #endif
17989
17990@@ -84,12 +85,53 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
17991
17992 #define arch_end_context_switch(prev) do {} while(0)
17993
17994+#define pax_open_kernel() native_pax_open_kernel()
17995+#define pax_close_kernel() native_pax_close_kernel()
17996 #endif /* CONFIG_PARAVIRT */
17997
17998+#define __HAVE_ARCH_PAX_OPEN_KERNEL
17999+#define __HAVE_ARCH_PAX_CLOSE_KERNEL
18000+
18001+#ifdef CONFIG_PAX_KERNEXEC
18002+static inline unsigned long native_pax_open_kernel(void)
18003+{
18004+ unsigned long cr0;
18005+
18006+ preempt_disable();
18007+ barrier();
18008+ cr0 = read_cr0() ^ X86_CR0_WP;
18009+ BUG_ON(cr0 & X86_CR0_WP);
18010+ write_cr0(cr0);
18011+ barrier();
18012+ return cr0 ^ X86_CR0_WP;
18013+}
18014+
18015+static inline unsigned long native_pax_close_kernel(void)
18016+{
18017+ unsigned long cr0;
18018+
18019+ barrier();
18020+ cr0 = read_cr0() ^ X86_CR0_WP;
18021+ BUG_ON(!(cr0 & X86_CR0_WP));
18022+ write_cr0(cr0);
18023+ barrier();
18024+ preempt_enable_no_resched();
18025+ return cr0 ^ X86_CR0_WP;
18026+}
18027+#else
18028+static inline unsigned long native_pax_open_kernel(void) { return 0; }
18029+static inline unsigned long native_pax_close_kernel(void) { return 0; }
18030+#endif
18031+
18032 /*
18033 * The following only work if pte_present() is true.
18034 * Undefined behaviour if not..
18035 */
18036+static inline int pte_user(pte_t pte)
18037+{
18038+ return pte_val(pte) & _PAGE_USER;
18039+}
18040+
18041 static inline int pte_dirty(pte_t pte)
18042 {
18043 return pte_flags(pte) & _PAGE_DIRTY;
18044@@ -150,6 +192,11 @@ static inline unsigned long pud_pfn(pud_t pud)
18045 return (pud_val(pud) & PTE_PFN_MASK) >> PAGE_SHIFT;
18046 }
18047
18048+static inline unsigned long pgd_pfn(pgd_t pgd)
18049+{
18050+ return (pgd_val(pgd) & PTE_PFN_MASK) >> PAGE_SHIFT;
18051+}
18052+
18053 #define pte_page(pte) pfn_to_page(pte_pfn(pte))
18054
18055 static inline int pmd_large(pmd_t pte)
18056@@ -203,9 +250,29 @@ static inline pte_t pte_wrprotect(pte_t pte)
18057 return pte_clear_flags(pte, _PAGE_RW);
18058 }
18059
18060+static inline pte_t pte_mkread(pte_t pte)
18061+{
18062+ return __pte(pte_val(pte) | _PAGE_USER);
18063+}
18064+
18065 static inline pte_t pte_mkexec(pte_t pte)
18066 {
18067- return pte_clear_flags(pte, _PAGE_NX);
18068+#ifdef CONFIG_X86_PAE
18069+ if (__supported_pte_mask & _PAGE_NX)
18070+ return pte_clear_flags(pte, _PAGE_NX);
18071+ else
18072+#endif
18073+ return pte_set_flags(pte, _PAGE_USER);
18074+}
18075+
18076+static inline pte_t pte_exprotect(pte_t pte)
18077+{
18078+#ifdef CONFIG_X86_PAE
18079+ if (__supported_pte_mask & _PAGE_NX)
18080+ return pte_set_flags(pte, _PAGE_NX);
18081+ else
18082+#endif
18083+ return pte_clear_flags(pte, _PAGE_USER);
18084 }
18085
18086 static inline pte_t pte_mkdirty(pte_t pte)
18087@@ -420,6 +487,16 @@ pte_t *populate_extra_pte(unsigned long vaddr);
18088 #endif
18089
18090 #ifndef __ASSEMBLY__
18091+
18092+#ifdef CONFIG_PAX_PER_CPU_PGD
18093+extern pgd_t cpu_pgd[NR_CPUS][2][PTRS_PER_PGD];
18094+enum cpu_pgd_type {kernel = 0, user = 1};
18095+static inline pgd_t *get_cpu_pgd(unsigned int cpu, enum cpu_pgd_type type)
18096+{
18097+ return cpu_pgd[cpu][type];
18098+}
18099+#endif
18100+
18101 #include <linux/mm_types.h>
18102 #include <linux/mmdebug.h>
18103 #include <linux/log2.h>
18104@@ -571,7 +648,7 @@ static inline unsigned long pud_page_vaddr(pud_t pud)
18105 * Currently stuck as a macro due to indirect forward reference to
18106 * linux/mmzone.h's __section_mem_map_addr() definition:
18107 */
18108-#define pud_page(pud) pfn_to_page(pud_val(pud) >> PAGE_SHIFT)
18109+#define pud_page(pud) pfn_to_page((pud_val(pud) & PTE_PFN_MASK) >> PAGE_SHIFT)
18110
18111 /* Find an entry in the second-level page table.. */
18112 static inline pmd_t *pmd_offset(pud_t *pud, unsigned long address)
18113@@ -611,7 +688,7 @@ static inline unsigned long pgd_page_vaddr(pgd_t pgd)
18114 * Currently stuck as a macro due to indirect forward reference to
18115 * linux/mmzone.h's __section_mem_map_addr() definition:
18116 */
18117-#define pgd_page(pgd) pfn_to_page(pgd_val(pgd) >> PAGE_SHIFT)
18118+#define pgd_page(pgd) pfn_to_page((pgd_val(pgd) & PTE_PFN_MASK) >> PAGE_SHIFT)
18119
18120 /* to find an entry in a page-table-directory. */
18121 static inline unsigned long pud_index(unsigned long address)
18122@@ -626,7 +703,7 @@ static inline pud_t *pud_offset(pgd_t *pgd, unsigned long address)
18123
18124 static inline int pgd_bad(pgd_t pgd)
18125 {
18126- return (pgd_flags(pgd) & ~_PAGE_USER) != _KERNPG_TABLE;
18127+ return (pgd_flags(pgd) & ~(_PAGE_USER | _PAGE_NX)) != _KERNPG_TABLE;
18128 }
18129
18130 static inline int pgd_none(pgd_t pgd)
18131@@ -649,7 +726,12 @@ static inline int pgd_none(pgd_t pgd)
18132 * pgd_offset() returns a (pgd_t *)
18133 * pgd_index() is used get the offset into the pgd page's array of pgd_t's;
18134 */
18135-#define pgd_offset(mm, address) ((mm)->pgd + pgd_index((address)))
18136+#define pgd_offset(mm, address) ((mm)->pgd + pgd_index(address))
18137+
18138+#ifdef CONFIG_PAX_PER_CPU_PGD
18139+#define pgd_offset_cpu(cpu, type, address) (get_cpu_pgd(cpu, type) + pgd_index(address))
18140+#endif
18141+
18142 /*
18143 * a shortcut which implies the use of the kernel's pgd, instead
18144 * of a process's
18145@@ -660,6 +742,25 @@ static inline int pgd_none(pgd_t pgd)
18146 #define KERNEL_PGD_BOUNDARY pgd_index(PAGE_OFFSET)
18147 #define KERNEL_PGD_PTRS (PTRS_PER_PGD - KERNEL_PGD_BOUNDARY)
18148
18149+#ifdef CONFIG_X86_32
18150+#define USER_PGD_PTRS KERNEL_PGD_BOUNDARY
18151+#else
18152+#define TASK_SIZE_MAX_SHIFT CONFIG_TASK_SIZE_MAX_SHIFT
18153+#define USER_PGD_PTRS (_AC(1,UL) << (TASK_SIZE_MAX_SHIFT - PGDIR_SHIFT))
18154+
18155+#ifdef CONFIG_PAX_MEMORY_UDEREF
18156+#ifdef __ASSEMBLY__
18157+#define pax_user_shadow_base pax_user_shadow_base(%rip)
18158+#else
18159+extern unsigned long pax_user_shadow_base;
18160+extern pgdval_t clone_pgd_mask;
18161+#endif
18162+#else
18163+#define pax_user_shadow_base (0UL)
18164+#endif
18165+
18166+#endif
18167+
18168 #ifndef __ASSEMBLY__
18169
18170 extern int direct_gbpages;
18171@@ -826,11 +927,24 @@ static inline void pmdp_set_wrprotect(struct mm_struct *mm,
18172 * dst and src can be on the same page, but the range must not overlap,
18173 * and must not cross a page boundary.
18174 */
18175-static inline void clone_pgd_range(pgd_t *dst, pgd_t *src, int count)
18176+static inline void clone_pgd_range(pgd_t *dst, const pgd_t *src, int count)
18177 {
18178- memcpy(dst, src, count * sizeof(pgd_t));
18179+ pax_open_kernel();
18180+ while (count--)
18181+ *dst++ = *src++;
18182+ pax_close_kernel();
18183 }
18184
18185+#ifdef CONFIG_PAX_PER_CPU_PGD
18186+extern void __clone_user_pgds(pgd_t *dst, const pgd_t *src);
18187+#endif
18188+
18189+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
18190+extern void __shadow_user_pgds(pgd_t *dst, const pgd_t *src);
18191+#else
18192+static inline void __shadow_user_pgds(pgd_t *dst, const pgd_t *src) {}
18193+#endif
18194+
18195 #define PTE_SHIFT ilog2(PTRS_PER_PTE)
18196 static inline int page_level_shift(enum pg_level level)
18197 {
18198diff --git a/arch/x86/include/asm/pgtable_32.h b/arch/x86/include/asm/pgtable_32.h
18199index b6c0b40..3535d47 100644
18200--- a/arch/x86/include/asm/pgtable_32.h
18201+++ b/arch/x86/include/asm/pgtable_32.h
18202@@ -25,9 +25,6 @@
18203 struct mm_struct;
18204 struct vm_area_struct;
18205
18206-extern pgd_t swapper_pg_dir[1024];
18207-extern pgd_t initial_page_table[1024];
18208-
18209 static inline void pgtable_cache_init(void) { }
18210 static inline void check_pgt_cache(void) { }
18211 void paging_init(void);
18212@@ -45,6 +42,12 @@ void paging_init(void);
18213 # include <asm/pgtable-2level.h>
18214 #endif
18215
18216+extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
18217+extern pgd_t initial_page_table[PTRS_PER_PGD];
18218+#ifdef CONFIG_X86_PAE
18219+extern pmd_t swapper_pm_dir[PTRS_PER_PGD][PTRS_PER_PMD];
18220+#endif
18221+
18222 #if defined(CONFIG_HIGHPTE)
18223 #define pte_offset_map(dir, address) \
18224 ((pte_t *)kmap_atomic(pmd_page(*(dir))) + \
18225@@ -59,12 +62,17 @@ void paging_init(void);
18226 /* Clear a kernel PTE and flush it from the TLB */
18227 #define kpte_clear_flush(ptep, vaddr) \
18228 do { \
18229+ pax_open_kernel(); \
18230 pte_clear(&init_mm, (vaddr), (ptep)); \
18231+ pax_close_kernel(); \
18232 __flush_tlb_one((vaddr)); \
18233 } while (0)
18234
18235 #endif /* !__ASSEMBLY__ */
18236
18237+#define HAVE_ARCH_UNMAPPED_AREA
18238+#define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN
18239+
18240 /*
18241 * kern_addr_valid() is (1) for FLATMEM and (0) for
18242 * SPARSEMEM and DISCONTIGMEM
18243diff --git a/arch/x86/include/asm/pgtable_32_types.h b/arch/x86/include/asm/pgtable_32_types.h
18244index 9fb2f2b..b04b4bf 100644
18245--- a/arch/x86/include/asm/pgtable_32_types.h
18246+++ b/arch/x86/include/asm/pgtable_32_types.h
18247@@ -8,7 +8,7 @@
18248 */
18249 #ifdef CONFIG_X86_PAE
18250 # include <asm/pgtable-3level_types.h>
18251-# define PMD_SIZE (1UL << PMD_SHIFT)
18252+# define PMD_SIZE (_AC(1, UL) << PMD_SHIFT)
18253 # define PMD_MASK (~(PMD_SIZE - 1))
18254 #else
18255 # include <asm/pgtable-2level_types.h>
18256@@ -46,6 +46,19 @@ extern bool __vmalloc_start_set; /* set once high_memory is set */
18257 # define VMALLOC_END (FIXADDR_START - 2 * PAGE_SIZE)
18258 #endif
18259
18260+#ifdef CONFIG_PAX_KERNEXEC
18261+#ifndef __ASSEMBLY__
18262+extern unsigned char MODULES_EXEC_VADDR[];
18263+extern unsigned char MODULES_EXEC_END[];
18264+#endif
18265+#include <asm/boot.h>
18266+#define ktla_ktva(addr) (addr + LOAD_PHYSICAL_ADDR + PAGE_OFFSET)
18267+#define ktva_ktla(addr) (addr - LOAD_PHYSICAL_ADDR - PAGE_OFFSET)
18268+#else
18269+#define ktla_ktva(addr) (addr)
18270+#define ktva_ktla(addr) (addr)
18271+#endif
18272+
18273 #define MODULES_VADDR VMALLOC_START
18274 #define MODULES_END VMALLOC_END
18275 #define MODULES_LEN (MODULES_VADDR - MODULES_END)
18276diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h
18277index 2ee7811..55aca24 100644
18278--- a/arch/x86/include/asm/pgtable_64.h
18279+++ b/arch/x86/include/asm/pgtable_64.h
18280@@ -16,11 +16,16 @@
18281
18282 extern pud_t level3_kernel_pgt[512];
18283 extern pud_t level3_ident_pgt[512];
18284+extern pud_t level3_vmalloc_start_pgt[512];
18285+extern pud_t level3_vmalloc_end_pgt[512];
18286+extern pud_t level3_vmemmap_pgt[512];
18287+extern pud_t level2_vmemmap_pgt[512];
18288 extern pmd_t level2_kernel_pgt[512];
18289 extern pmd_t level2_fixmap_pgt[512];
18290-extern pmd_t level2_ident_pgt[512];
18291-extern pte_t level1_fixmap_pgt[512];
18292-extern pgd_t init_level4_pgt[];
18293+extern pmd_t level2_ident_pgt[2][512];
18294+extern pte_t level1_fixmap_pgt[3][512];
18295+extern pte_t level1_vsyscall_pgt[512];
18296+extern pgd_t init_level4_pgt[512];
18297
18298 #define swapper_pg_dir init_level4_pgt
18299
18300@@ -62,7 +67,9 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
18301
18302 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
18303 {
18304+ pax_open_kernel();
18305 *pmdp = pmd;
18306+ pax_close_kernel();
18307 }
18308
18309 static inline void native_pmd_clear(pmd_t *pmd)
18310@@ -98,7 +105,9 @@ static inline pmd_t native_pmdp_get_and_clear(pmd_t *xp)
18311
18312 static inline void native_set_pud(pud_t *pudp, pud_t pud)
18313 {
18314+ pax_open_kernel();
18315 *pudp = pud;
18316+ pax_close_kernel();
18317 }
18318
18319 static inline void native_pud_clear(pud_t *pud)
18320@@ -108,6 +117,13 @@ static inline void native_pud_clear(pud_t *pud)
18321
18322 static inline void native_set_pgd(pgd_t *pgdp, pgd_t pgd)
18323 {
18324+ pax_open_kernel();
18325+ *pgdp = pgd;
18326+ pax_close_kernel();
18327+}
18328+
18329+static inline void native_set_pgd_batched(pgd_t *pgdp, pgd_t pgd)
18330+{
18331 *pgdp = pgd;
18332 }
18333
18334diff --git a/arch/x86/include/asm/pgtable_64_types.h b/arch/x86/include/asm/pgtable_64_types.h
18335index 602b602..acb53ed 100644
18336--- a/arch/x86/include/asm/pgtable_64_types.h
18337+++ b/arch/x86/include/asm/pgtable_64_types.h
18338@@ -61,11 +61,16 @@ typedef struct { pteval_t pte; } pte_t;
18339 #define MODULES_VADDR (__START_KERNEL_map + KERNEL_IMAGE_SIZE)
18340 #define MODULES_END _AC(0xffffffffff000000, UL)
18341 #define MODULES_LEN (MODULES_END - MODULES_VADDR)
18342+#define MODULES_EXEC_VADDR MODULES_VADDR
18343+#define MODULES_EXEC_END MODULES_END
18344 #define ESPFIX_PGD_ENTRY _AC(-2, UL)
18345 #define ESPFIX_BASE_ADDR (ESPFIX_PGD_ENTRY << PGDIR_SHIFT)
18346 #define EFI_VA_START ( -4 * (_AC(1, UL) << 30))
18347 #define EFI_VA_END (-68 * (_AC(1, UL) << 30))
18348
18349+#define ktla_ktva(addr) (addr)
18350+#define ktva_ktla(addr) (addr)
18351+
18352 #define EARLY_DYNAMIC_PAGE_TABLES 64
18353
18354 #endif /* _ASM_X86_PGTABLE_64_DEFS_H */
18355diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h
18356index 8c7c108..1c1b77f 100644
18357--- a/arch/x86/include/asm/pgtable_types.h
18358+++ b/arch/x86/include/asm/pgtable_types.h
18359@@ -85,8 +85,10 @@
18360
18361 #if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
18362 #define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_NX)
18363-#else
18364+#elif defined(CONFIG_KMEMCHECK) || defined(CONFIG_MEM_SOFT_DIRTY)
18365 #define _PAGE_NX (_AT(pteval_t, 0))
18366+#else
18367+#define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_HIDDEN)
18368 #endif
18369
18370 #define _PAGE_PROTNONE (_AT(pteval_t, 1) << _PAGE_BIT_PROTNONE)
18371@@ -141,6 +143,9 @@ enum page_cache_mode {
18372 #define PAGE_READONLY_EXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | \
18373 _PAGE_ACCESSED)
18374
18375+#define PAGE_READONLY_NOEXEC PAGE_READONLY
18376+#define PAGE_SHARED_NOEXEC PAGE_SHARED
18377+
18378 #define __PAGE_KERNEL_EXEC \
18379 (_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_GLOBAL)
18380 #define __PAGE_KERNEL (__PAGE_KERNEL_EXEC | _PAGE_NX)
18381@@ -148,7 +153,7 @@ enum page_cache_mode {
18382 #define __PAGE_KERNEL_RO (__PAGE_KERNEL & ~_PAGE_RW)
18383 #define __PAGE_KERNEL_RX (__PAGE_KERNEL_EXEC & ~_PAGE_RW)
18384 #define __PAGE_KERNEL_NOCACHE (__PAGE_KERNEL | _PAGE_NOCACHE)
18385-#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RX | _PAGE_USER)
18386+#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RO | _PAGE_USER)
18387 #define __PAGE_KERNEL_VVAR (__PAGE_KERNEL_RO | _PAGE_USER)
18388 #define __PAGE_KERNEL_LARGE (__PAGE_KERNEL | _PAGE_PSE)
18389 #define __PAGE_KERNEL_LARGE_EXEC (__PAGE_KERNEL_EXEC | _PAGE_PSE)
18390@@ -194,7 +199,7 @@ enum page_cache_mode {
18391 #ifdef CONFIG_X86_64
18392 #define __PAGE_KERNEL_IDENT_LARGE_EXEC __PAGE_KERNEL_LARGE_EXEC
18393 #else
18394-#define PTE_IDENT_ATTR 0x003 /* PRESENT+RW */
18395+#define PTE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
18396 #define PDE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
18397 #define PGD_IDENT_ATTR 0x001 /* PRESENT (no other attributes) */
18398 #endif
18399@@ -233,7 +238,17 @@ static inline pgdval_t pgd_flags(pgd_t pgd)
18400 {
18401 return native_pgd_val(pgd) & PTE_FLAGS_MASK;
18402 }
18403+#endif
18404
18405+#if PAGETABLE_LEVELS == 3
18406+#include <asm-generic/pgtable-nopud.h>
18407+#endif
18408+
18409+#if PAGETABLE_LEVELS == 2
18410+#include <asm-generic/pgtable-nopmd.h>
18411+#endif
18412+
18413+#ifndef __ASSEMBLY__
18414 #if PAGETABLE_LEVELS > 3
18415 typedef struct { pudval_t pud; } pud_t;
18416
18417@@ -247,8 +262,6 @@ static inline pudval_t native_pud_val(pud_t pud)
18418 return pud.pud;
18419 }
18420 #else
18421-#include <asm-generic/pgtable-nopud.h>
18422-
18423 static inline pudval_t native_pud_val(pud_t pud)
18424 {
18425 return native_pgd_val(pud.pgd);
18426@@ -268,8 +281,6 @@ static inline pmdval_t native_pmd_val(pmd_t pmd)
18427 return pmd.pmd;
18428 }
18429 #else
18430-#include <asm-generic/pgtable-nopmd.h>
18431-
18432 static inline pmdval_t native_pmd_val(pmd_t pmd)
18433 {
18434 return native_pgd_val(pmd.pud.pgd);
18435@@ -362,7 +373,6 @@ typedef struct page *pgtable_t;
18436
18437 extern pteval_t __supported_pte_mask;
18438 extern void set_nx(void);
18439-extern int nx_enabled;
18440
18441 #define pgprot_writecombine pgprot_writecombine
18442 extern pgprot_t pgprot_writecombine(pgprot_t prot);
18443diff --git a/arch/x86/include/asm/preempt.h b/arch/x86/include/asm/preempt.h
18444index 8f327184..368fb29 100644
18445--- a/arch/x86/include/asm/preempt.h
18446+++ b/arch/x86/include/asm/preempt.h
18447@@ -84,7 +84,7 @@ static __always_inline void __preempt_count_sub(int val)
18448 */
18449 static __always_inline bool __preempt_count_dec_and_test(void)
18450 {
18451- GEN_UNARY_RMWcc("decl", __preempt_count, __percpu_arg(0), "e");
18452+ GEN_UNARY_RMWcc("decl", "incl", __preempt_count, __percpu_arg(0), "e");
18453 }
18454
18455 /*
18456diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
18457index ec1c935..5cc6023 100644
18458--- a/arch/x86/include/asm/processor.h
18459+++ b/arch/x86/include/asm/processor.h
18460@@ -127,7 +127,7 @@ struct cpuinfo_x86 {
18461 /* Index into per_cpu list: */
18462 u16 cpu_index;
18463 u32 microcode;
18464-};
18465+} __randomize_layout;
18466
18467 #define X86_VENDOR_INTEL 0
18468 #define X86_VENDOR_CYRIX 1
18469@@ -198,9 +198,21 @@ static inline void native_cpuid(unsigned int *eax, unsigned int *ebx,
18470 : "memory");
18471 }
18472
18473+/* invpcid (%rdx),%rax */
18474+#define __ASM_INVPCID ".byte 0x66,0x0f,0x38,0x82,0x02"
18475+
18476+#define INVPCID_SINGLE_ADDRESS 0UL
18477+#define INVPCID_SINGLE_CONTEXT 1UL
18478+#define INVPCID_ALL_GLOBAL 2UL
18479+#define INVPCID_ALL_NONGLOBAL 3UL
18480+
18481+#define PCID_KERNEL 0UL
18482+#define PCID_USER 1UL
18483+#define PCID_NOFLUSH (1UL << 63)
18484+
18485 static inline void load_cr3(pgd_t *pgdir)
18486 {
18487- write_cr3(__pa(pgdir));
18488+ write_cr3(__pa(pgdir) | PCID_KERNEL);
18489 }
18490
18491 #ifdef CONFIG_X86_32
18492@@ -282,7 +294,7 @@ struct tss_struct {
18493
18494 } ____cacheline_aligned;
18495
18496-DECLARE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss);
18497+extern struct tss_struct init_tss[NR_CPUS];
18498
18499 /*
18500 * Save the original ist values for checking stack pointers during debugging
18501@@ -479,6 +491,7 @@ struct thread_struct {
18502 unsigned short ds;
18503 unsigned short fsindex;
18504 unsigned short gsindex;
18505+ unsigned short ss;
18506 #endif
18507 #ifdef CONFIG_X86_32
18508 unsigned long ip;
18509@@ -805,11 +818,18 @@ static inline void spin_lock_prefetch(const void *x)
18510 */
18511 #define TASK_SIZE PAGE_OFFSET
18512 #define TASK_SIZE_MAX TASK_SIZE
18513+
18514+#ifdef CONFIG_PAX_SEGMEXEC
18515+#define SEGMEXEC_TASK_SIZE (TASK_SIZE / 2)
18516+#define STACK_TOP ((current->mm->pax_flags & MF_PAX_SEGMEXEC)?SEGMEXEC_TASK_SIZE:TASK_SIZE)
18517+#else
18518 #define STACK_TOP TASK_SIZE
18519-#define STACK_TOP_MAX STACK_TOP
18520+#endif
18521+
18522+#define STACK_TOP_MAX TASK_SIZE
18523
18524 #define INIT_THREAD { \
18525- .sp0 = sizeof(init_stack) + (long)&init_stack, \
18526+ .sp0 = sizeof(init_stack) + (long)&init_stack - 8, \
18527 .vm86_info = NULL, \
18528 .sysenter_cs = __KERNEL_CS, \
18529 .io_bitmap_ptr = NULL, \
18530@@ -823,7 +843,7 @@ static inline void spin_lock_prefetch(const void *x)
18531 */
18532 #define INIT_TSS { \
18533 .x86_tss = { \
18534- .sp0 = sizeof(init_stack) + (long)&init_stack, \
18535+ .sp0 = sizeof(init_stack) + (long)&init_stack - 8, \
18536 .ss0 = __KERNEL_DS, \
18537 .ss1 = __KERNEL_CS, \
18538 .io_bitmap_base = INVALID_IO_BITMAP_OFFSET, \
18539@@ -834,11 +854,7 @@ static inline void spin_lock_prefetch(const void *x)
18540 extern unsigned long thread_saved_pc(struct task_struct *tsk);
18541
18542 #define THREAD_SIZE_LONGS (THREAD_SIZE/sizeof(unsigned long))
18543-#define KSTK_TOP(info) \
18544-({ \
18545- unsigned long *__ptr = (unsigned long *)(info); \
18546- (unsigned long)(&__ptr[THREAD_SIZE_LONGS]); \
18547-})
18548+#define KSTK_TOP(info) ((container_of(info, struct task_struct, tinfo))->thread.sp0)
18549
18550 /*
18551 * The below -8 is to reserve 8 bytes on top of the ring0 stack.
18552@@ -853,7 +869,7 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
18553 #define task_pt_regs(task) \
18554 ({ \
18555 struct pt_regs *__regs__; \
18556- __regs__ = (struct pt_regs *)(KSTK_TOP(task_stack_page(task))-8); \
18557+ __regs__ = (struct pt_regs *)((task)->thread.sp0); \
18558 __regs__ - 1; \
18559 })
18560
18561@@ -869,13 +885,13 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
18562 * particular problem by preventing anything from being mapped
18563 * at the maximum canonical address.
18564 */
18565-#define TASK_SIZE_MAX ((1UL << 47) - PAGE_SIZE)
18566+#define TASK_SIZE_MAX ((1UL << TASK_SIZE_MAX_SHIFT) - PAGE_SIZE)
18567
18568 /* This decides where the kernel will search for a free chunk of vm
18569 * space during mmap's.
18570 */
18571 #define IA32_PAGE_OFFSET ((current->personality & ADDR_LIMIT_3GB) ? \
18572- 0xc0000000 : 0xFFFFe000)
18573+ 0xc0000000 : 0xFFFFf000)
18574
18575 #define TASK_SIZE (test_thread_flag(TIF_ADDR32) ? \
18576 IA32_PAGE_OFFSET : TASK_SIZE_MAX)
18577@@ -886,11 +902,11 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
18578 #define STACK_TOP_MAX TASK_SIZE_MAX
18579
18580 #define INIT_THREAD { \
18581- .sp0 = (unsigned long)&init_stack + sizeof(init_stack) \
18582+ .sp0 = (unsigned long)&init_stack + sizeof(init_stack) - 16 \
18583 }
18584
18585 #define INIT_TSS { \
18586- .x86_tss.sp0 = (unsigned long)&init_stack + sizeof(init_stack) \
18587+ .x86_tss.sp0 = (unsigned long)&init_stack + sizeof(init_stack) - 16 \
18588 }
18589
18590 /*
18591@@ -918,6 +934,10 @@ extern void start_thread(struct pt_regs *regs, unsigned long new_ip,
18592 */
18593 #define TASK_UNMAPPED_BASE (PAGE_ALIGN(TASK_SIZE / 3))
18594
18595+#ifdef CONFIG_PAX_SEGMEXEC
18596+#define SEGMEXEC_TASK_UNMAPPED_BASE (PAGE_ALIGN(SEGMEXEC_TASK_SIZE / 3))
18597+#endif
18598+
18599 #define KSTK_EIP(task) (task_pt_regs(task)->ip)
18600
18601 /* Get/set a process' ability to use the timestamp counter instruction */
18602@@ -962,7 +982,7 @@ static inline uint32_t hypervisor_cpuid_base(const char *sig, uint32_t leaves)
18603 return 0;
18604 }
18605
18606-extern unsigned long arch_align_stack(unsigned long sp);
18607+#define arch_align_stack(x) ((x) & ~0xfUL)
18608 extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
18609
18610 void default_idle(void);
18611@@ -972,6 +992,6 @@ bool xen_set_default_idle(void);
18612 #define xen_set_default_idle 0
18613 #endif
18614
18615-void stop_this_cpu(void *dummy);
18616+void stop_this_cpu(void *dummy) __noreturn;
18617 void df_debug(struct pt_regs *regs, long error_code);
18618 #endif /* _ASM_X86_PROCESSOR_H */
18619diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h
18620index 86fc2bb..bd5049a 100644
18621--- a/arch/x86/include/asm/ptrace.h
18622+++ b/arch/x86/include/asm/ptrace.h
18623@@ -89,28 +89,29 @@ static inline unsigned long regs_return_value(struct pt_regs *regs)
18624 }
18625
18626 /*
18627- * user_mode_vm(regs) determines whether a register set came from user mode.
18628+ * user_mode(regs) determines whether a register set came from user mode.
18629 * This is true if V8086 mode was enabled OR if the register set was from
18630 * protected mode with RPL-3 CS value. This tricky test checks that with
18631 * one comparison. Many places in the kernel can bypass this full check
18632- * if they have already ruled out V8086 mode, so user_mode(regs) can be used.
18633+ * if they have already ruled out V8086 mode, so user_mode_novm(regs) can
18634+ * be used.
18635 */
18636-static inline int user_mode(struct pt_regs *regs)
18637+static inline int user_mode_novm(struct pt_regs *regs)
18638 {
18639 #ifdef CONFIG_X86_32
18640 return (regs->cs & SEGMENT_RPL_MASK) == USER_RPL;
18641 #else
18642- return !!(regs->cs & 3);
18643+ return !!(regs->cs & SEGMENT_RPL_MASK);
18644 #endif
18645 }
18646
18647-static inline int user_mode_vm(struct pt_regs *regs)
18648+static inline int user_mode(struct pt_regs *regs)
18649 {
18650 #ifdef CONFIG_X86_32
18651 return ((regs->cs & SEGMENT_RPL_MASK) | (regs->flags & X86_VM_MASK)) >=
18652 USER_RPL;
18653 #else
18654- return user_mode(regs);
18655+ return user_mode_novm(regs);
18656 #endif
18657 }
18658
18659@@ -126,15 +127,16 @@ static inline int v8086_mode(struct pt_regs *regs)
18660 #ifdef CONFIG_X86_64
18661 static inline bool user_64bit_mode(struct pt_regs *regs)
18662 {
18663+ unsigned long cs = regs->cs & 0xffff;
18664 #ifndef CONFIG_PARAVIRT
18665 /*
18666 * On non-paravirt systems, this is the only long mode CPL 3
18667 * selector. We do not allow long mode selectors in the LDT.
18668 */
18669- return regs->cs == __USER_CS;
18670+ return cs == __USER_CS;
18671 #else
18672 /* Headers are too twisted for this to go in paravirt.h. */
18673- return regs->cs == __USER_CS || regs->cs == pv_info.extra_user_64bit_cs;
18674+ return cs == __USER_CS || cs == pv_info.extra_user_64bit_cs;
18675 #endif
18676 }
18677
18678@@ -185,9 +187,11 @@ static inline unsigned long regs_get_register(struct pt_regs *regs,
18679 * Traps from the kernel do not save sp and ss.
18680 * Use the helper function to retrieve sp.
18681 */
18682- if (offset == offsetof(struct pt_regs, sp) &&
18683- regs->cs == __KERNEL_CS)
18684- return kernel_stack_pointer(regs);
18685+ if (offset == offsetof(struct pt_regs, sp)) {
18686+ unsigned long cs = regs->cs & 0xffff;
18687+ if (cs == __KERNEL_CS || cs == __KERNEXEC_KERNEL_CS)
18688+ return kernel_stack_pointer(regs);
18689+ }
18690 #endif
18691 return *(unsigned long *)((unsigned long)regs + offset);
18692 }
18693diff --git a/arch/x86/include/asm/qrwlock.h b/arch/x86/include/asm/qrwlock.h
18694index ae0e241..e80b10b 100644
18695--- a/arch/x86/include/asm/qrwlock.h
18696+++ b/arch/x86/include/asm/qrwlock.h
18697@@ -7,8 +7,8 @@
18698 #define queue_write_unlock queue_write_unlock
18699 static inline void queue_write_unlock(struct qrwlock *lock)
18700 {
18701- barrier();
18702- ACCESS_ONCE(*(u8 *)&lock->cnts) = 0;
18703+ barrier();
18704+ ACCESS_ONCE_RW(*(u8 *)&lock->cnts) = 0;
18705 }
18706 #endif
18707
18708diff --git a/arch/x86/include/asm/realmode.h b/arch/x86/include/asm/realmode.h
18709index 9c6b890..5305f53 100644
18710--- a/arch/x86/include/asm/realmode.h
18711+++ b/arch/x86/include/asm/realmode.h
18712@@ -22,16 +22,14 @@ struct real_mode_header {
18713 #endif
18714 /* APM/BIOS reboot */
18715 u32 machine_real_restart_asm;
18716-#ifdef CONFIG_X86_64
18717 u32 machine_real_restart_seg;
18718-#endif
18719 };
18720
18721 /* This must match data at trampoline_32/64.S */
18722 struct trampoline_header {
18723 #ifdef CONFIG_X86_32
18724 u32 start;
18725- u16 gdt_pad;
18726+ u16 boot_cs;
18727 u16 gdt_limit;
18728 u32 gdt_base;
18729 #else
18730diff --git a/arch/x86/include/asm/reboot.h b/arch/x86/include/asm/reboot.h
18731index a82c4f1..ac45053 100644
18732--- a/arch/x86/include/asm/reboot.h
18733+++ b/arch/x86/include/asm/reboot.h
18734@@ -6,13 +6,13 @@
18735 struct pt_regs;
18736
18737 struct machine_ops {
18738- void (*restart)(char *cmd);
18739- void (*halt)(void);
18740- void (*power_off)(void);
18741+ void (* __noreturn restart)(char *cmd);
18742+ void (* __noreturn halt)(void);
18743+ void (* __noreturn power_off)(void);
18744 void (*shutdown)(void);
18745 void (*crash_shutdown)(struct pt_regs *);
18746- void (*emergency_restart)(void);
18747-};
18748+ void (* __noreturn emergency_restart)(void);
18749+} __no_const;
18750
18751 extern struct machine_ops machine_ops;
18752
18753diff --git a/arch/x86/include/asm/rmwcc.h b/arch/x86/include/asm/rmwcc.h
18754index 8f7866a..e442f20 100644
18755--- a/arch/x86/include/asm/rmwcc.h
18756+++ b/arch/x86/include/asm/rmwcc.h
18757@@ -3,7 +3,34 @@
18758
18759 #ifdef CC_HAVE_ASM_GOTO
18760
18761-#define __GEN_RMWcc(fullop, var, cc, ...) \
18762+#ifdef CONFIG_PAX_REFCOUNT
18763+#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18764+do { \
18765+ asm_volatile_goto (fullop \
18766+ ";jno 0f\n" \
18767+ fullantiop \
18768+ ";int $4\n0:\n" \
18769+ _ASM_EXTABLE(0b, 0b) \
18770+ ";j" cc " %l[cc_label]" \
18771+ : : "m" (var), ## __VA_ARGS__ \
18772+ : "memory" : cc_label); \
18773+ return 0; \
18774+cc_label: \
18775+ return 1; \
18776+} while (0)
18777+#else
18778+#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18779+do { \
18780+ asm_volatile_goto (fullop ";j" cc " %l[cc_label]" \
18781+ : : "m" (var), ## __VA_ARGS__ \
18782+ : "memory" : cc_label); \
18783+ return 0; \
18784+cc_label: \
18785+ return 1; \
18786+} while (0)
18787+#endif
18788+
18789+#define __GEN_RMWcc_unchecked(fullop, var, cc, ...) \
18790 do { \
18791 asm_volatile_goto (fullop "; j" cc " %l[cc_label]" \
18792 : : "m" (var), ## __VA_ARGS__ \
18793@@ -13,15 +40,46 @@ cc_label: \
18794 return 1; \
18795 } while (0)
18796
18797-#define GEN_UNARY_RMWcc(op, var, arg0, cc) \
18798- __GEN_RMWcc(op " " arg0, var, cc)
18799+#define GEN_UNARY_RMWcc(op, antiop, var, arg0, cc) \
18800+ __GEN_RMWcc(op " " arg0, antiop " " arg0, var, cc)
18801
18802-#define GEN_BINARY_RMWcc(op, var, vcon, val, arg0, cc) \
18803- __GEN_RMWcc(op " %1, " arg0, var, cc, vcon (val))
18804+#define GEN_UNARY_RMWcc_unchecked(op, var, arg0, cc) \
18805+ __GEN_RMWcc_unchecked(op " " arg0, var, cc)
18806+
18807+#define GEN_BINARY_RMWcc(op, antiop, var, vcon, val, arg0, cc) \
18808+ __GEN_RMWcc(op " %1, " arg0, antiop " %1, " arg0, var, cc, vcon (val))
18809+
18810+#define GEN_BINARY_RMWcc_unchecked(op, var, vcon, val, arg0, cc) \
18811+ __GEN_RMWcc_unchecked(op " %1, " arg0, var, cc, vcon (val))
18812
18813 #else /* !CC_HAVE_ASM_GOTO */
18814
18815-#define __GEN_RMWcc(fullop, var, cc, ...) \
18816+#ifdef CONFIG_PAX_REFCOUNT
18817+#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18818+do { \
18819+ char c; \
18820+ asm volatile (fullop \
18821+ ";jno 0f\n" \
18822+ fullantiop \
18823+ ";int $4\n0:\n" \
18824+ _ASM_EXTABLE(0b, 0b) \
18825+ "; set" cc " %1" \
18826+ : "+m" (var), "=qm" (c) \
18827+ : __VA_ARGS__ : "memory"); \
18828+ return c != 0; \
18829+} while (0)
18830+#else
18831+#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18832+do { \
18833+ char c; \
18834+ asm volatile (fullop "; set" cc " %1" \
18835+ : "+m" (var), "=qm" (c) \
18836+ : __VA_ARGS__ : "memory"); \
18837+ return c != 0; \
18838+} while (0)
18839+#endif
18840+
18841+#define __GEN_RMWcc_unchecked(fullop, var, cc, ...) \
18842 do { \
18843 char c; \
18844 asm volatile (fullop "; set" cc " %1" \
18845@@ -30,11 +88,17 @@ do { \
18846 return c != 0; \
18847 } while (0)
18848
18849-#define GEN_UNARY_RMWcc(op, var, arg0, cc) \
18850- __GEN_RMWcc(op " " arg0, var, cc)
18851+#define GEN_UNARY_RMWcc(op, antiop, var, arg0, cc) \
18852+ __GEN_RMWcc(op " " arg0, antiop " " arg0, var, cc)
18853+
18854+#define GEN_UNARY_RMWcc_unchecked(op, var, arg0, cc) \
18855+ __GEN_RMWcc_unchecked(op " " arg0, var, cc)
18856+
18857+#define GEN_BINARY_RMWcc(op, antiop, var, vcon, val, arg0, cc) \
18858+ __GEN_RMWcc(op " %2, " arg0, antiop " %2, " arg0, var, cc, vcon (val))
18859
18860-#define GEN_BINARY_RMWcc(op, var, vcon, val, arg0, cc) \
18861- __GEN_RMWcc(op " %2, " arg0, var, cc, vcon (val))
18862+#define GEN_BINARY_RMWcc_unchecked(op, var, vcon, val, arg0, cc) \
18863+ __GEN_RMWcc_unchecked(op " %2, " arg0, var, cc, vcon (val))
18864
18865 #endif /* CC_HAVE_ASM_GOTO */
18866
18867diff --git a/arch/x86/include/asm/rwsem.h b/arch/x86/include/asm/rwsem.h
18868index cad82c9..2e5c5c1 100644
18869--- a/arch/x86/include/asm/rwsem.h
18870+++ b/arch/x86/include/asm/rwsem.h
18871@@ -64,6 +64,14 @@ static inline void __down_read(struct rw_semaphore *sem)
18872 {
18873 asm volatile("# beginning down_read\n\t"
18874 LOCK_PREFIX _ASM_INC "(%1)\n\t"
18875+
18876+#ifdef CONFIG_PAX_REFCOUNT
18877+ "jno 0f\n"
18878+ LOCK_PREFIX _ASM_DEC "(%1)\n"
18879+ "int $4\n0:\n"
18880+ _ASM_EXTABLE(0b, 0b)
18881+#endif
18882+
18883 /* adds 0x00000001 */
18884 " jns 1f\n"
18885 " call call_rwsem_down_read_failed\n"
18886@@ -85,6 +93,14 @@ static inline int __down_read_trylock(struct rw_semaphore *sem)
18887 "1:\n\t"
18888 " mov %1,%2\n\t"
18889 " add %3,%2\n\t"
18890+
18891+#ifdef CONFIG_PAX_REFCOUNT
18892+ "jno 0f\n"
18893+ "sub %3,%2\n"
18894+ "int $4\n0:\n"
18895+ _ASM_EXTABLE(0b, 0b)
18896+#endif
18897+
18898 " jle 2f\n\t"
18899 LOCK_PREFIX " cmpxchg %2,%0\n\t"
18900 " jnz 1b\n\t"
18901@@ -104,6 +120,14 @@ static inline void __down_write_nested(struct rw_semaphore *sem, int subclass)
18902 long tmp;
18903 asm volatile("# beginning down_write\n\t"
18904 LOCK_PREFIX " xadd %1,(%2)\n\t"
18905+
18906+#ifdef CONFIG_PAX_REFCOUNT
18907+ "jno 0f\n"
18908+ "mov %1,(%2)\n"
18909+ "int $4\n0:\n"
18910+ _ASM_EXTABLE(0b, 0b)
18911+#endif
18912+
18913 /* adds 0xffff0001, returns the old value */
18914 " test " __ASM_SEL(%w1,%k1) "," __ASM_SEL(%w1,%k1) "\n\t"
18915 /* was the active mask 0 before? */
18916@@ -155,6 +179,14 @@ static inline void __up_read(struct rw_semaphore *sem)
18917 long tmp;
18918 asm volatile("# beginning __up_read\n\t"
18919 LOCK_PREFIX " xadd %1,(%2)\n\t"
18920+
18921+#ifdef CONFIG_PAX_REFCOUNT
18922+ "jno 0f\n"
18923+ "mov %1,(%2)\n"
18924+ "int $4\n0:\n"
18925+ _ASM_EXTABLE(0b, 0b)
18926+#endif
18927+
18928 /* subtracts 1, returns the old value */
18929 " jns 1f\n\t"
18930 " call call_rwsem_wake\n" /* expects old value in %edx */
18931@@ -173,6 +205,14 @@ static inline void __up_write(struct rw_semaphore *sem)
18932 long tmp;
18933 asm volatile("# beginning __up_write\n\t"
18934 LOCK_PREFIX " xadd %1,(%2)\n\t"
18935+
18936+#ifdef CONFIG_PAX_REFCOUNT
18937+ "jno 0f\n"
18938+ "mov %1,(%2)\n"
18939+ "int $4\n0:\n"
18940+ _ASM_EXTABLE(0b, 0b)
18941+#endif
18942+
18943 /* subtracts 0xffff0001, returns the old value */
18944 " jns 1f\n\t"
18945 " call call_rwsem_wake\n" /* expects old value in %edx */
18946@@ -190,6 +230,14 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
18947 {
18948 asm volatile("# beginning __downgrade_write\n\t"
18949 LOCK_PREFIX _ASM_ADD "%2,(%1)\n\t"
18950+
18951+#ifdef CONFIG_PAX_REFCOUNT
18952+ "jno 0f\n"
18953+ LOCK_PREFIX _ASM_SUB "%2,(%1)\n"
18954+ "int $4\n0:\n"
18955+ _ASM_EXTABLE(0b, 0b)
18956+#endif
18957+
18958 /*
18959 * transitions 0xZZZZ0001 -> 0xYYYY0001 (i386)
18960 * 0xZZZZZZZZ00000001 -> 0xYYYYYYYY00000001 (x86_64)
18961@@ -208,7 +256,15 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
18962 */
18963 static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)
18964 {
18965- asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0"
18966+ asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0\n"
18967+
18968+#ifdef CONFIG_PAX_REFCOUNT
18969+ "jno 0f\n"
18970+ LOCK_PREFIX _ASM_SUB "%1,%0\n"
18971+ "int $4\n0:\n"
18972+ _ASM_EXTABLE(0b, 0b)
18973+#endif
18974+
18975 : "+m" (sem->count)
18976 : "er" (delta));
18977 }
18978@@ -218,7 +274,7 @@ static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)
18979 */
18980 static inline long rwsem_atomic_update(long delta, struct rw_semaphore *sem)
18981 {
18982- return delta + xadd(&sem->count, delta);
18983+ return delta + xadd_check_overflow(&sem->count, delta);
18984 }
18985
18986 #endif /* __KERNEL__ */
18987diff --git a/arch/x86/include/asm/segment.h b/arch/x86/include/asm/segment.h
18988index e657b7b..81fefb444 100644
18989--- a/arch/x86/include/asm/segment.h
18990+++ b/arch/x86/include/asm/segment.h
18991@@ -73,10 +73,15 @@
18992 * 26 - ESPFIX small SS
18993 * 27 - per-cpu [ offset to per-cpu data area ]
18994 * 28 - stack_canary-20 [ for stack protector ]
18995- * 29 - unused
18996- * 30 - unused
18997+ * 29 - PCI BIOS CS
18998+ * 30 - PCI BIOS DS
18999 * 31 - TSS for double fault handler
19000 */
19001+#define GDT_ENTRY_KERNEXEC_EFI_CS (1)
19002+#define GDT_ENTRY_KERNEXEC_EFI_DS (2)
19003+#define __KERNEXEC_EFI_CS (GDT_ENTRY_KERNEXEC_EFI_CS*8)
19004+#define __KERNEXEC_EFI_DS (GDT_ENTRY_KERNEXEC_EFI_DS*8)
19005+
19006 #define GDT_ENTRY_TLS_MIN 6
19007 #define GDT_ENTRY_TLS_MAX (GDT_ENTRY_TLS_MIN + GDT_ENTRY_TLS_ENTRIES - 1)
19008
19009@@ -88,6 +93,8 @@
19010
19011 #define GDT_ENTRY_KERNEL_CS (GDT_ENTRY_KERNEL_BASE+0)
19012
19013+#define GDT_ENTRY_KERNEXEC_KERNEL_CS (4)
19014+
19015 #define GDT_ENTRY_KERNEL_DS (GDT_ENTRY_KERNEL_BASE+1)
19016
19017 #define GDT_ENTRY_TSS (GDT_ENTRY_KERNEL_BASE+4)
19018@@ -113,6 +120,12 @@
19019 #define __KERNEL_STACK_CANARY 0
19020 #endif
19021
19022+#define GDT_ENTRY_PCIBIOS_CS (GDT_ENTRY_KERNEL_BASE+17)
19023+#define __PCIBIOS_CS (GDT_ENTRY_PCIBIOS_CS * 8)
19024+
19025+#define GDT_ENTRY_PCIBIOS_DS (GDT_ENTRY_KERNEL_BASE+18)
19026+#define __PCIBIOS_DS (GDT_ENTRY_PCIBIOS_DS * 8)
19027+
19028 #define GDT_ENTRY_DOUBLEFAULT_TSS 31
19029
19030 /*
19031@@ -140,7 +153,7 @@
19032 */
19033
19034 /* Matches PNP_CS32 and PNP_CS16 (they must be consecutive) */
19035-#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xf4) == GDT_ENTRY_PNPBIOS_BASE * 8)
19036+#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xFFFCU) == PNP_CS32 || ((x) & 0xFFFCU) == PNP_CS16)
19037
19038
19039 #else
19040@@ -164,6 +177,8 @@
19041 #define __USER32_CS (GDT_ENTRY_DEFAULT_USER32_CS*8+3)
19042 #define __USER32_DS __USER_DS
19043
19044+#define GDT_ENTRY_KERNEXEC_KERNEL_CS 7
19045+
19046 #define GDT_ENTRY_TSS 8 /* needs two entries */
19047 #define GDT_ENTRY_LDT 10 /* needs two entries */
19048 #define GDT_ENTRY_TLS_MIN 12
19049@@ -172,6 +187,8 @@
19050 #define GDT_ENTRY_PER_CPU 15 /* Abused to load per CPU data from limit */
19051 #define __PER_CPU_SEG (GDT_ENTRY_PER_CPU * 8 + 3)
19052
19053+#define GDT_ENTRY_UDEREF_KERNEL_DS 16
19054+
19055 /* TLS indexes for 64bit - hardcoded in arch_prctl */
19056 #define FS_TLS 0
19057 #define GS_TLS 1
19058@@ -179,12 +196,14 @@
19059 #define GS_TLS_SEL ((GDT_ENTRY_TLS_MIN+GS_TLS)*8 + 3)
19060 #define FS_TLS_SEL ((GDT_ENTRY_TLS_MIN+FS_TLS)*8 + 3)
19061
19062-#define GDT_ENTRIES 16
19063+#define GDT_ENTRIES 17
19064
19065 #endif
19066
19067 #define __KERNEL_CS (GDT_ENTRY_KERNEL_CS*8)
19068+#define __KERNEXEC_KERNEL_CS (GDT_ENTRY_KERNEXEC_KERNEL_CS*8)
19069 #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS*8)
19070+#define __UDEREF_KERNEL_DS (GDT_ENTRY_UDEREF_KERNEL_DS*8)
19071 #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS*8+3)
19072 #define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS*8+3)
19073 #ifndef CONFIG_PARAVIRT
19074@@ -267,7 +286,7 @@ static inline unsigned long get_limit(unsigned long segment)
19075 {
19076 unsigned long __limit;
19077 asm("lsll %1,%0" : "=r" (__limit) : "r" (segment));
19078- return __limit + 1;
19079+ return __limit;
19080 }
19081
19082 #endif /* !__ASSEMBLY__ */
19083diff --git a/arch/x86/include/asm/smap.h b/arch/x86/include/asm/smap.h
19084index 8d3120f..352b440 100644
19085--- a/arch/x86/include/asm/smap.h
19086+++ b/arch/x86/include/asm/smap.h
19087@@ -25,11 +25,40 @@
19088
19089 #include <asm/alternative-asm.h>
19090
19091+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19092+#define ASM_PAX_OPEN_USERLAND \
19093+ 661: jmp 663f; \
19094+ .pushsection .altinstr_replacement, "a" ; \
19095+ 662: pushq %rax; nop; \
19096+ .popsection ; \
19097+ .pushsection .altinstructions, "a" ; \
19098+ altinstruction_entry 661b, 662b, X86_FEATURE_STRONGUDEREF, 2, 2;\
19099+ .popsection ; \
19100+ call __pax_open_userland; \
19101+ popq %rax; \
19102+ 663:
19103+
19104+#define ASM_PAX_CLOSE_USERLAND \
19105+ 661: jmp 663f; \
19106+ .pushsection .altinstr_replacement, "a" ; \
19107+ 662: pushq %rax; nop; \
19108+ .popsection; \
19109+ .pushsection .altinstructions, "a" ; \
19110+ altinstruction_entry 661b, 662b, X86_FEATURE_STRONGUDEREF, 2, 2;\
19111+ .popsection; \
19112+ call __pax_close_userland; \
19113+ popq %rax; \
19114+ 663:
19115+#else
19116+#define ASM_PAX_OPEN_USERLAND
19117+#define ASM_PAX_CLOSE_USERLAND
19118+#endif
19119+
19120 #ifdef CONFIG_X86_SMAP
19121
19122 #define ASM_CLAC \
19123 661: ASM_NOP3 ; \
19124- .pushsection .altinstr_replacement, "ax" ; \
19125+ .pushsection .altinstr_replacement, "a" ; \
19126 662: __ASM_CLAC ; \
19127 .popsection ; \
19128 .pushsection .altinstructions, "a" ; \
19129@@ -38,7 +67,7 @@
19130
19131 #define ASM_STAC \
19132 661: ASM_NOP3 ; \
19133- .pushsection .altinstr_replacement, "ax" ; \
19134+ .pushsection .altinstr_replacement, "a" ; \
19135 662: __ASM_STAC ; \
19136 .popsection ; \
19137 .pushsection .altinstructions, "a" ; \
19138@@ -56,6 +85,37 @@
19139
19140 #include <asm/alternative.h>
19141
19142+#define __HAVE_ARCH_PAX_OPEN_USERLAND
19143+#define __HAVE_ARCH_PAX_CLOSE_USERLAND
19144+
19145+extern void __pax_open_userland(void);
19146+static __always_inline unsigned long pax_open_userland(void)
19147+{
19148+
19149+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19150+ asm volatile(ALTERNATIVE(ASM_NOP5, "call %P[open]", X86_FEATURE_STRONGUDEREF)
19151+ :
19152+ : [open] "i" (__pax_open_userland)
19153+ : "memory", "rax");
19154+#endif
19155+
19156+ return 0;
19157+}
19158+
19159+extern void __pax_close_userland(void);
19160+static __always_inline unsigned long pax_close_userland(void)
19161+{
19162+
19163+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19164+ asm volatile(ALTERNATIVE(ASM_NOP5, "call %P[close]", X86_FEATURE_STRONGUDEREF)
19165+ :
19166+ : [close] "i" (__pax_close_userland)
19167+ : "memory", "rax");
19168+#endif
19169+
19170+ return 0;
19171+}
19172+
19173 #ifdef CONFIG_X86_SMAP
19174
19175 static __always_inline void clac(void)
19176diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
19177index 8cd1cc3..827e09e 100644
19178--- a/arch/x86/include/asm/smp.h
19179+++ b/arch/x86/include/asm/smp.h
19180@@ -35,7 +35,7 @@ DECLARE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_core_map);
19181 /* cpus sharing the last level cache: */
19182 DECLARE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_llc_shared_map);
19183 DECLARE_PER_CPU_READ_MOSTLY(u16, cpu_llc_id);
19184-DECLARE_PER_CPU_READ_MOSTLY(int, cpu_number);
19185+DECLARE_PER_CPU_READ_MOSTLY(unsigned int, cpu_number);
19186
19187 static inline struct cpumask *cpu_sibling_mask(int cpu)
19188 {
19189@@ -78,7 +78,7 @@ struct smp_ops {
19190
19191 void (*send_call_func_ipi)(const struct cpumask *mask);
19192 void (*send_call_func_single_ipi)(int cpu);
19193-};
19194+} __no_const;
19195
19196 /* Globals due to paravirt */
19197 extern void set_cpu_sibling_map(int cpu);
19198@@ -191,14 +191,8 @@ extern unsigned disabled_cpus;
19199 extern int safe_smp_processor_id(void);
19200
19201 #elif defined(CONFIG_X86_64_SMP)
19202-#define raw_smp_processor_id() (this_cpu_read(cpu_number))
19203-
19204-#define stack_smp_processor_id() \
19205-({ \
19206- struct thread_info *ti; \
19207- __asm__("andq %%rsp,%0; ":"=r" (ti) : "0" (CURRENT_MASK)); \
19208- ti->cpu; \
19209-})
19210+#define raw_smp_processor_id() (this_cpu_read(cpu_number))
19211+#define stack_smp_processor_id() raw_smp_processor_id()
19212 #define safe_smp_processor_id() smp_processor_id()
19213
19214 #endif
19215diff --git a/arch/x86/include/asm/stackprotector.h b/arch/x86/include/asm/stackprotector.h
19216index 6a99859..03cb807 100644
19217--- a/arch/x86/include/asm/stackprotector.h
19218+++ b/arch/x86/include/asm/stackprotector.h
19219@@ -47,7 +47,7 @@
19220 * head_32 for boot CPU and setup_per_cpu_areas() for others.
19221 */
19222 #define GDT_STACK_CANARY_INIT \
19223- [GDT_ENTRY_STACK_CANARY] = GDT_ENTRY_INIT(0x4090, 0, 0x18),
19224+ [GDT_ENTRY_STACK_CANARY] = GDT_ENTRY_INIT(0x4090, 0, 0x17),
19225
19226 /*
19227 * Initialize the stackprotector canary value.
19228@@ -112,7 +112,7 @@ static inline void setup_stack_canary_segment(int cpu)
19229
19230 static inline void load_stack_canary_segment(void)
19231 {
19232-#ifdef CONFIG_X86_32
19233+#if defined(CONFIG_X86_32) && !defined(CONFIG_PAX_MEMORY_UDEREF)
19234 asm volatile ("mov %0, %%gs" : : "r" (0));
19235 #endif
19236 }
19237diff --git a/arch/x86/include/asm/stacktrace.h b/arch/x86/include/asm/stacktrace.h
19238index 70bbe39..4ae2bd4 100644
19239--- a/arch/x86/include/asm/stacktrace.h
19240+++ b/arch/x86/include/asm/stacktrace.h
19241@@ -11,28 +11,20 @@
19242
19243 extern int kstack_depth_to_print;
19244
19245-struct thread_info;
19246+struct task_struct;
19247 struct stacktrace_ops;
19248
19249-typedef unsigned long (*walk_stack_t)(struct thread_info *tinfo,
19250- unsigned long *stack,
19251- unsigned long bp,
19252- const struct stacktrace_ops *ops,
19253- void *data,
19254- unsigned long *end,
19255- int *graph);
19256+typedef unsigned long walk_stack_t(struct task_struct *task,
19257+ void *stack_start,
19258+ unsigned long *stack,
19259+ unsigned long bp,
19260+ const struct stacktrace_ops *ops,
19261+ void *data,
19262+ unsigned long *end,
19263+ int *graph);
19264
19265-extern unsigned long
19266-print_context_stack(struct thread_info *tinfo,
19267- unsigned long *stack, unsigned long bp,
19268- const struct stacktrace_ops *ops, void *data,
19269- unsigned long *end, int *graph);
19270-
19271-extern unsigned long
19272-print_context_stack_bp(struct thread_info *tinfo,
19273- unsigned long *stack, unsigned long bp,
19274- const struct stacktrace_ops *ops, void *data,
19275- unsigned long *end, int *graph);
19276+extern walk_stack_t print_context_stack;
19277+extern walk_stack_t print_context_stack_bp;
19278
19279 /* Generic stack tracer with callbacks */
19280
19281@@ -40,7 +32,7 @@ struct stacktrace_ops {
19282 void (*address)(void *data, unsigned long address, int reliable);
19283 /* On negative return stop dumping */
19284 int (*stack)(void *data, char *name);
19285- walk_stack_t walk_stack;
19286+ walk_stack_t *walk_stack;
19287 };
19288
19289 void dump_trace(struct task_struct *tsk, struct pt_regs *regs,
19290diff --git a/arch/x86/include/asm/switch_to.h b/arch/x86/include/asm/switch_to.h
19291index 751bf4b..a1278b5 100644
19292--- a/arch/x86/include/asm/switch_to.h
19293+++ b/arch/x86/include/asm/switch_to.h
19294@@ -112,7 +112,7 @@ do { \
19295 "call __switch_to\n\t" \
19296 "movq "__percpu_arg([current_task])",%%rsi\n\t" \
19297 __switch_canary \
19298- "movq %P[thread_info](%%rsi),%%r8\n\t" \
19299+ "movq "__percpu_arg([thread_info])",%%r8\n\t" \
19300 "movq %%rax,%%rdi\n\t" \
19301 "testl %[_tif_fork],%P[ti_flags](%%r8)\n\t" \
19302 "jnz ret_from_fork\n\t" \
19303@@ -123,7 +123,7 @@ do { \
19304 [threadrsp] "i" (offsetof(struct task_struct, thread.sp)), \
19305 [ti_flags] "i" (offsetof(struct thread_info, flags)), \
19306 [_tif_fork] "i" (_TIF_FORK), \
19307- [thread_info] "i" (offsetof(struct task_struct, stack)), \
19308+ [thread_info] "m" (current_tinfo), \
19309 [current_task] "m" (current_task) \
19310 __switch_canary_iparam \
19311 : "memory", "cc" __EXTRA_CLOBBER)
19312diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h
19313index 1d4e4f2..506db18 100644
19314--- a/arch/x86/include/asm/thread_info.h
19315+++ b/arch/x86/include/asm/thread_info.h
19316@@ -24,7 +24,6 @@ struct exec_domain;
19317 #include <linux/atomic.h>
19318
19319 struct thread_info {
19320- struct task_struct *task; /* main task structure */
19321 struct exec_domain *exec_domain; /* execution domain */
19322 __u32 flags; /* low level flags */
19323 __u32 status; /* thread synchronous flags */
19324@@ -32,13 +31,13 @@ struct thread_info {
19325 int saved_preempt_count;
19326 mm_segment_t addr_limit;
19327 void __user *sysenter_return;
19328+ unsigned long lowest_stack;
19329 unsigned int sig_on_uaccess_error:1;
19330 unsigned int uaccess_err:1; /* uaccess failed */
19331 };
19332
19333-#define INIT_THREAD_INFO(tsk) \
19334+#define INIT_THREAD_INFO \
19335 { \
19336- .task = &tsk, \
19337 .exec_domain = &default_exec_domain, \
19338 .flags = 0, \
19339 .cpu = 0, \
19340@@ -46,7 +45,7 @@ struct thread_info {
19341 .addr_limit = KERNEL_DS, \
19342 }
19343
19344-#define init_thread_info (init_thread_union.thread_info)
19345+#define init_thread_info (init_thread_union.stack)
19346 #define init_stack (init_thread_union.stack)
19347
19348 #else /* !__ASSEMBLY__ */
19349@@ -86,6 +85,7 @@ struct thread_info {
19350 #define TIF_SYSCALL_TRACEPOINT 28 /* syscall tracepoint instrumentation */
19351 #define TIF_ADDR32 29 /* 32-bit address space on 64 bits */
19352 #define TIF_X32 30 /* 32-bit native x86-64 binary */
19353+#define TIF_GRSEC_SETXID 31 /* update credentials on syscall entry/exit */
19354
19355 #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE)
19356 #define _TIF_NOTIFY_RESUME (1 << TIF_NOTIFY_RESUME)
19357@@ -109,17 +109,18 @@ struct thread_info {
19358 #define _TIF_SYSCALL_TRACEPOINT (1 << TIF_SYSCALL_TRACEPOINT)
19359 #define _TIF_ADDR32 (1 << TIF_ADDR32)
19360 #define _TIF_X32 (1 << TIF_X32)
19361+#define _TIF_GRSEC_SETXID (1 << TIF_GRSEC_SETXID)
19362
19363 /* work to do in syscall_trace_enter() */
19364 #define _TIF_WORK_SYSCALL_ENTRY \
19365 (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_EMU | _TIF_SYSCALL_AUDIT | \
19366 _TIF_SECCOMP | _TIF_SINGLESTEP | _TIF_SYSCALL_TRACEPOINT | \
19367- _TIF_NOHZ)
19368+ _TIF_NOHZ | _TIF_GRSEC_SETXID)
19369
19370 /* work to do in syscall_trace_leave() */
19371 #define _TIF_WORK_SYSCALL_EXIT \
19372 (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_SINGLESTEP | \
19373- _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ)
19374+ _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ | _TIF_GRSEC_SETXID)
19375
19376 /* work to do on interrupt/exception return */
19377 #define _TIF_WORK_MASK \
19378@@ -130,7 +131,7 @@ struct thread_info {
19379 /* work to do on any return to user space */
19380 #define _TIF_ALLWORK_MASK \
19381 ((0x0000FFFF & ~_TIF_SECCOMP) | _TIF_SYSCALL_TRACEPOINT | \
19382- _TIF_NOHZ)
19383+ _TIF_NOHZ | _TIF_GRSEC_SETXID)
19384
19385 /* Only used for 64 bit */
19386 #define _TIF_DO_NOTIFY_MASK \
19387@@ -145,7 +146,6 @@ struct thread_info {
19388 #define _TIF_WORK_CTXSW_NEXT (_TIF_WORK_CTXSW)
19389
19390 #define STACK_WARN (THREAD_SIZE/8)
19391-#define KERNEL_STACK_OFFSET (5*(BITS_PER_LONG/8))
19392
19393 /*
19394 * macros/functions for gaining access to the thread information structure
19395@@ -156,12 +156,11 @@ struct thread_info {
19396
19397 DECLARE_PER_CPU(unsigned long, kernel_stack);
19398
19399+DECLARE_PER_CPU(struct thread_info *, current_tinfo);
19400+
19401 static inline struct thread_info *current_thread_info(void)
19402 {
19403- struct thread_info *ti;
19404- ti = (void *)(this_cpu_read_stable(kernel_stack) +
19405- KERNEL_STACK_OFFSET - THREAD_SIZE);
19406- return ti;
19407+ return this_cpu_read_stable(current_tinfo);
19408 }
19409
19410 static inline unsigned long current_stack_pointer(void)
19411@@ -179,14 +178,7 @@ static inline unsigned long current_stack_pointer(void)
19412
19413 /* how to get the thread information struct from ASM */
19414 #define GET_THREAD_INFO(reg) \
19415- _ASM_MOV PER_CPU_VAR(kernel_stack),reg ; \
19416- _ASM_SUB $(THREAD_SIZE-KERNEL_STACK_OFFSET),reg ;
19417-
19418-/*
19419- * Same if PER_CPU_VAR(kernel_stack) is, perhaps with some offset, already in
19420- * a certain register (to be used in assembler memory operands).
19421- */
19422-#define THREAD_INFO(reg, off) KERNEL_STACK_OFFSET+(off)-THREAD_SIZE(reg)
19423+ _ASM_MOV PER_CPU_VAR(current_tinfo),reg ;
19424
19425 #endif
19426
19427@@ -242,5 +234,12 @@ static inline bool is_ia32_task(void)
19428 extern void arch_task_cache_init(void);
19429 extern int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src);
19430 extern void arch_release_task_struct(struct task_struct *tsk);
19431+
19432+#define __HAVE_THREAD_FUNCTIONS
19433+#define task_thread_info(task) (&(task)->tinfo)
19434+#define task_stack_page(task) ((task)->stack)
19435+#define setup_thread_stack(p, org) do {} while (0)
19436+#define end_of_stack(p) ((unsigned long *)task_stack_page(p) + 1)
19437+
19438 #endif
19439 #endif /* _ASM_X86_THREAD_INFO_H */
19440diff --git a/arch/x86/include/asm/tlbflush.h b/arch/x86/include/asm/tlbflush.h
19441index cd79194..e7a9491 100644
19442--- a/arch/x86/include/asm/tlbflush.h
19443+++ b/arch/x86/include/asm/tlbflush.h
19444@@ -86,18 +86,44 @@ static inline void cr4_set_bits_and_update_boot(unsigned long mask)
19445
19446 static inline void __native_flush_tlb(void)
19447 {
19448+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
19449+ u64 descriptor[2];
19450+
19451+ descriptor[0] = PCID_KERNEL;
19452+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_ALL_NONGLOBAL) : "memory");
19453+ return;
19454+ }
19455+
19456+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19457+ if (static_cpu_has(X86_FEATURE_PCID)) {
19458+ unsigned int cpu = raw_get_cpu();
19459+
19460+ native_write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
19461+ native_write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
19462+ raw_put_cpu_no_resched();
19463+ return;
19464+ }
19465+#endif
19466+
19467 native_write_cr3(native_read_cr3());
19468 }
19469
19470 static inline void __native_flush_tlb_global_irq_disabled(void)
19471 {
19472- unsigned long cr4;
19473+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
19474+ u64 descriptor[2];
19475
19476- cr4 = this_cpu_read(cpu_tlbstate.cr4);
19477- /* clear PGE */
19478- native_write_cr4(cr4 & ~X86_CR4_PGE);
19479- /* write old PGE again and flush TLBs */
19480- native_write_cr4(cr4);
19481+ descriptor[0] = PCID_KERNEL;
19482+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_ALL_GLOBAL) : "memory");
19483+ } else {
19484+ unsigned long cr4;
19485+
19486+ cr4 = this_cpu_read(cpu_tlbstate.cr4);
19487+ /* clear PGE */
19488+ native_write_cr4(cr4 & ~X86_CR4_PGE);
19489+ /* write old PGE again and flush TLBs */
19490+ native_write_cr4(cr4);
19491+ }
19492 }
19493
19494 static inline void __native_flush_tlb_global(void)
19495@@ -118,6 +144,41 @@ static inline void __native_flush_tlb_global(void)
19496
19497 static inline void __native_flush_tlb_single(unsigned long addr)
19498 {
19499+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
19500+ u64 descriptor[2];
19501+
19502+ descriptor[0] = PCID_KERNEL;
19503+ descriptor[1] = addr;
19504+
19505+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19506+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF) || addr >= TASK_SIZE_MAX) {
19507+ if (addr < TASK_SIZE_MAX)
19508+ descriptor[1] += pax_user_shadow_base;
19509+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_ADDRESS) : "memory");
19510+ }
19511+
19512+ descriptor[0] = PCID_USER;
19513+ descriptor[1] = addr;
19514+#endif
19515+
19516+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_ADDRESS) : "memory");
19517+ return;
19518+ }
19519+
19520+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19521+ if (static_cpu_has(X86_FEATURE_PCID)) {
19522+ unsigned int cpu = raw_get_cpu();
19523+
19524+ native_write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER | PCID_NOFLUSH);
19525+ asm volatile("invlpg (%0)" ::"r" (addr) : "memory");
19526+ native_write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
19527+ raw_put_cpu_no_resched();
19528+
19529+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF) && addr < TASK_SIZE_MAX)
19530+ addr += pax_user_shadow_base;
19531+ }
19532+#endif
19533+
19534 asm volatile("invlpg (%0)" ::"r" (addr) : "memory");
19535 }
19536
19537diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h
19538index ace9dec..3f9e253 100644
19539--- a/arch/x86/include/asm/uaccess.h
19540+++ b/arch/x86/include/asm/uaccess.h
19541@@ -7,6 +7,7 @@
19542 #include <linux/compiler.h>
19543 #include <linux/thread_info.h>
19544 #include <linux/string.h>
19545+#include <linux/spinlock.h>
19546 #include <asm/asm.h>
19547 #include <asm/page.h>
19548 #include <asm/smap.h>
19549@@ -29,7 +30,12 @@
19550
19551 #define get_ds() (KERNEL_DS)
19552 #define get_fs() (current_thread_info()->addr_limit)
19553+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
19554+void __set_fs(mm_segment_t x);
19555+void set_fs(mm_segment_t x);
19556+#else
19557 #define set_fs(x) (current_thread_info()->addr_limit = (x))
19558+#endif
19559
19560 #define segment_eq(a, b) ((a).seg == (b).seg)
19561
19562@@ -85,8 +91,36 @@ static inline bool __chk_range_not_ok(unsigned long addr, unsigned long size, un
19563 * checks that the pointer is in the user space range - after calling
19564 * this function, memory access functions may still return -EFAULT.
19565 */
19566-#define access_ok(type, addr, size) \
19567- likely(!__range_not_ok(addr, size, user_addr_max()))
19568+extern int _cond_resched(void);
19569+#define access_ok_noprefault(type, addr, size) (likely(!__range_not_ok(addr, size, user_addr_max())))
19570+#define access_ok(type, addr, size) \
19571+({ \
19572+ unsigned long __size = size; \
19573+ unsigned long __addr = (unsigned long)addr; \
19574+ bool __ret_ao = __range_not_ok(__addr, __size, user_addr_max()) == 0;\
19575+ if (__ret_ao && __size) { \
19576+ unsigned long __addr_ao = __addr & PAGE_MASK; \
19577+ unsigned long __end_ao = __addr + __size - 1; \
19578+ if (unlikely((__end_ao ^ __addr_ao) & PAGE_MASK)) { \
19579+ while (__addr_ao <= __end_ao) { \
19580+ char __c_ao; \
19581+ __addr_ao += PAGE_SIZE; \
19582+ if (__size > PAGE_SIZE) \
19583+ _cond_resched(); \
19584+ if (__get_user(__c_ao, (char __user *)__addr)) \
19585+ break; \
19586+ if (type != VERIFY_WRITE) { \
19587+ __addr = __addr_ao; \
19588+ continue; \
19589+ } \
19590+ if (__put_user(__c_ao, (char __user *)__addr)) \
19591+ break; \
19592+ __addr = __addr_ao; \
19593+ } \
19594+ } \
19595+ } \
19596+ __ret_ao; \
19597+})
19598
19599 /*
19600 * The exception table consists of pairs of addresses relative to the
19601@@ -134,11 +168,13 @@ extern int __get_user_8(void);
19602 extern int __get_user_bad(void);
19603
19604 /*
19605- * This is a type: either unsigned long, if the argument fits into
19606- * that type, or otherwise unsigned long long.
19607+ * This is a type: either (un)signed int, if the argument fits into
19608+ * that type, or otherwise (un)signed long long.
19609 */
19610 #define __inttype(x) \
19611-__typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19612+__typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0U), \
19613+ __builtin_choose_expr(__type_is_unsigned(__typeof__(x)), 0ULL, 0LL),\
19614+ __builtin_choose_expr(__type_is_unsigned(__typeof__(x)), 0U, 0)))
19615
19616 /**
19617 * get_user: - Get a simple variable from user space.
19618@@ -176,10 +212,12 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19619 register __inttype(*(ptr)) __val_gu asm("%"_ASM_DX); \
19620 __chk_user_ptr(ptr); \
19621 might_fault(); \
19622+ pax_open_userland(); \
19623 asm volatile("call __get_user_%P3" \
19624 : "=a" (__ret_gu), "=r" (__val_gu) \
19625 : "0" (ptr), "i" (sizeof(*(ptr)))); \
19626 (x) = (__force __typeof__(*(ptr))) __val_gu; \
19627+ pax_close_userland(); \
19628 __ret_gu; \
19629 })
19630
19631@@ -187,13 +225,21 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19632 asm volatile("call __put_user_" #size : "=a" (__ret_pu) \
19633 : "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx")
19634
19635-
19636+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
19637+#define __copyuser_seg "gs;"
19638+#define __COPYUSER_SET_ES "pushl %%gs; popl %%es\n"
19639+#define __COPYUSER_RESTORE_ES "pushl %%ss; popl %%es\n"
19640+#else
19641+#define __copyuser_seg
19642+#define __COPYUSER_SET_ES
19643+#define __COPYUSER_RESTORE_ES
19644+#endif
19645
19646 #ifdef CONFIG_X86_32
19647 #define __put_user_asm_u64(x, addr, err, errret) \
19648 asm volatile(ASM_STAC "\n" \
19649- "1: movl %%eax,0(%2)\n" \
19650- "2: movl %%edx,4(%2)\n" \
19651+ "1: "__copyuser_seg"movl %%eax,0(%2)\n" \
19652+ "2: "__copyuser_seg"movl %%edx,4(%2)\n" \
19653 "3: " ASM_CLAC "\n" \
19654 ".section .fixup,\"ax\"\n" \
19655 "4: movl %3,%0\n" \
19656@@ -206,8 +252,8 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19657
19658 #define __put_user_asm_ex_u64(x, addr) \
19659 asm volatile(ASM_STAC "\n" \
19660- "1: movl %%eax,0(%1)\n" \
19661- "2: movl %%edx,4(%1)\n" \
19662+ "1: "__copyuser_seg"movl %%eax,0(%1)\n" \
19663+ "2: "__copyuser_seg"movl %%edx,4(%1)\n" \
19664 "3: " ASM_CLAC "\n" \
19665 _ASM_EXTABLE_EX(1b, 2b) \
19666 _ASM_EXTABLE_EX(2b, 3b) \
19667@@ -257,7 +303,8 @@ extern void __put_user_8(void);
19668 __typeof__(*(ptr)) __pu_val; \
19669 __chk_user_ptr(ptr); \
19670 might_fault(); \
19671- __pu_val = x; \
19672+ __pu_val = (x); \
19673+ pax_open_userland(); \
19674 switch (sizeof(*(ptr))) { \
19675 case 1: \
19676 __put_user_x(1, __pu_val, ptr, __ret_pu); \
19677@@ -275,6 +322,7 @@ extern void __put_user_8(void);
19678 __put_user_x(X, __pu_val, ptr, __ret_pu); \
19679 break; \
19680 } \
19681+ pax_close_userland(); \
19682 __ret_pu; \
19683 })
19684
19685@@ -355,8 +403,10 @@ do { \
19686 } while (0)
19687
19688 #define __get_user_asm(x, addr, err, itype, rtype, ltype, errret) \
19689+do { \
19690+ pax_open_userland(); \
19691 asm volatile(ASM_STAC "\n" \
19692- "1: mov"itype" %2,%"rtype"1\n" \
19693+ "1: "__copyuser_seg"mov"itype" %2,%"rtype"1\n"\
19694 "2: " ASM_CLAC "\n" \
19695 ".section .fixup,\"ax\"\n" \
19696 "3: mov %3,%0\n" \
19697@@ -364,8 +414,10 @@ do { \
19698 " jmp 2b\n" \
19699 ".previous\n" \
19700 _ASM_EXTABLE(1b, 3b) \
19701- : "=r" (err), ltype(x) \
19702- : "m" (__m(addr)), "i" (errret), "0" (err))
19703+ : "=r" (err), ltype (x) \
19704+ : "m" (__m(addr)), "i" (errret), "0" (err)); \
19705+ pax_close_userland(); \
19706+} while (0)
19707
19708 #define __get_user_size_ex(x, ptr, size) \
19709 do { \
19710@@ -389,7 +441,7 @@ do { \
19711 } while (0)
19712
19713 #define __get_user_asm_ex(x, addr, itype, rtype, ltype) \
19714- asm volatile("1: mov"itype" %1,%"rtype"0\n" \
19715+ asm volatile("1: "__copyuser_seg"mov"itype" %1,%"rtype"0\n"\
19716 "2:\n" \
19717 _ASM_EXTABLE_EX(1b, 2b) \
19718 : ltype(x) : "m" (__m(addr)))
19719@@ -406,13 +458,24 @@ do { \
19720 int __gu_err; \
19721 unsigned long __gu_val; \
19722 __get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT); \
19723- (x) = (__force __typeof__(*(ptr)))__gu_val; \
19724+ (x) = (__typeof__(*(ptr)))__gu_val; \
19725 __gu_err; \
19726 })
19727
19728 /* FIXME: this hack is definitely wrong -AK */
19729 struct __large_struct { unsigned long buf[100]; };
19730-#define __m(x) (*(struct __large_struct __user *)(x))
19731+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19732+#define ____m(x) \
19733+({ \
19734+ unsigned long ____x = (unsigned long)(x); \
19735+ if (____x < pax_user_shadow_base) \
19736+ ____x += pax_user_shadow_base; \
19737+ (typeof(x))____x; \
19738+})
19739+#else
19740+#define ____m(x) (x)
19741+#endif
19742+#define __m(x) (*(struct __large_struct __user *)____m(x))
19743
19744 /*
19745 * Tell gcc we read from memory instead of writing: this is because
19746@@ -420,8 +483,10 @@ struct __large_struct { unsigned long buf[100]; };
19747 * aliasing issues.
19748 */
19749 #define __put_user_asm(x, addr, err, itype, rtype, ltype, errret) \
19750+do { \
19751+ pax_open_userland(); \
19752 asm volatile(ASM_STAC "\n" \
19753- "1: mov"itype" %"rtype"1,%2\n" \
19754+ "1: "__copyuser_seg"mov"itype" %"rtype"1,%2\n"\
19755 "2: " ASM_CLAC "\n" \
19756 ".section .fixup,\"ax\"\n" \
19757 "3: mov %3,%0\n" \
19758@@ -429,10 +494,12 @@ struct __large_struct { unsigned long buf[100]; };
19759 ".previous\n" \
19760 _ASM_EXTABLE(1b, 3b) \
19761 : "=r"(err) \
19762- : ltype(x), "m" (__m(addr)), "i" (errret), "0" (err))
19763+ : ltype (x), "m" (__m(addr)), "i" (errret), "0" (err));\
19764+ pax_close_userland(); \
19765+} while (0)
19766
19767 #define __put_user_asm_ex(x, addr, itype, rtype, ltype) \
19768- asm volatile("1: mov"itype" %"rtype"0,%1\n" \
19769+ asm volatile("1: "__copyuser_seg"mov"itype" %"rtype"0,%1\n"\
19770 "2:\n" \
19771 _ASM_EXTABLE_EX(1b, 2b) \
19772 : : ltype(x), "m" (__m(addr)))
19773@@ -442,11 +509,13 @@ struct __large_struct { unsigned long buf[100]; };
19774 */
19775 #define uaccess_try do { \
19776 current_thread_info()->uaccess_err = 0; \
19777+ pax_open_userland(); \
19778 stac(); \
19779 barrier();
19780
19781 #define uaccess_catch(err) \
19782 clac(); \
19783+ pax_close_userland(); \
19784 (err) |= (current_thread_info()->uaccess_err ? -EFAULT : 0); \
19785 } while (0)
19786
19787@@ -471,8 +540,12 @@ struct __large_struct { unsigned long buf[100]; };
19788 * On error, the variable @x is set to zero.
19789 */
19790
19791+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19792+#define __get_user(x, ptr) get_user((x), (ptr))
19793+#else
19794 #define __get_user(x, ptr) \
19795 __get_user_nocheck((x), (ptr), sizeof(*(ptr)))
19796+#endif
19797
19798 /**
19799 * __put_user: - Write a simple value into user space, with less checking.
19800@@ -494,8 +567,12 @@ struct __large_struct { unsigned long buf[100]; };
19801 * Returns zero on success, or -EFAULT on error.
19802 */
19803
19804+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19805+#define __put_user(x, ptr) put_user((x), (ptr))
19806+#else
19807 #define __put_user(x, ptr) \
19808 __put_user_nocheck((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr)))
19809+#endif
19810
19811 #define __get_user_unaligned __get_user
19812 #define __put_user_unaligned __put_user
19813@@ -513,7 +590,7 @@ struct __large_struct { unsigned long buf[100]; };
19814 #define get_user_ex(x, ptr) do { \
19815 unsigned long __gue_val; \
19816 __get_user_size_ex((__gue_val), (ptr), (sizeof(*(ptr)))); \
19817- (x) = (__force __typeof__(*(ptr)))__gue_val; \
19818+ (x) = (__typeof__(*(ptr)))__gue_val; \
19819 } while (0)
19820
19821 #define put_user_try uaccess_try
19822@@ -531,7 +608,7 @@ extern __must_check long strlen_user(const char __user *str);
19823 extern __must_check long strnlen_user(const char __user *str, long n);
19824
19825 unsigned long __must_check clear_user(void __user *mem, unsigned long len);
19826-unsigned long __must_check __clear_user(void __user *mem, unsigned long len);
19827+unsigned long __must_check __clear_user(void __user *mem, unsigned long len) __size_overflow(2);
19828
19829 extern void __cmpxchg_wrong_size(void)
19830 __compiletime_error("Bad argument size for cmpxchg");
19831@@ -542,18 +619,19 @@ extern void __cmpxchg_wrong_size(void)
19832 __typeof__(ptr) __uval = (uval); \
19833 __typeof__(*(ptr)) __old = (old); \
19834 __typeof__(*(ptr)) __new = (new); \
19835+ pax_open_userland(); \
19836 switch (size) { \
19837 case 1: \
19838 { \
19839 asm volatile("\t" ASM_STAC "\n" \
19840- "1:\t" LOCK_PREFIX "cmpxchgb %4, %2\n" \
19841+ "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgb %4, %2\n"\
19842 "2:\t" ASM_CLAC "\n" \
19843 "\t.section .fixup, \"ax\"\n" \
19844 "3:\tmov %3, %0\n" \
19845 "\tjmp 2b\n" \
19846 "\t.previous\n" \
19847 _ASM_EXTABLE(1b, 3b) \
19848- : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19849+ : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19850 : "i" (-EFAULT), "q" (__new), "1" (__old) \
19851 : "memory" \
19852 ); \
19853@@ -562,14 +640,14 @@ extern void __cmpxchg_wrong_size(void)
19854 case 2: \
19855 { \
19856 asm volatile("\t" ASM_STAC "\n" \
19857- "1:\t" LOCK_PREFIX "cmpxchgw %4, %2\n" \
19858+ "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgw %4, %2\n"\
19859 "2:\t" ASM_CLAC "\n" \
19860 "\t.section .fixup, \"ax\"\n" \
19861 "3:\tmov %3, %0\n" \
19862 "\tjmp 2b\n" \
19863 "\t.previous\n" \
19864 _ASM_EXTABLE(1b, 3b) \
19865- : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19866+ : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19867 : "i" (-EFAULT), "r" (__new), "1" (__old) \
19868 : "memory" \
19869 ); \
19870@@ -578,14 +656,14 @@ extern void __cmpxchg_wrong_size(void)
19871 case 4: \
19872 { \
19873 asm volatile("\t" ASM_STAC "\n" \
19874- "1:\t" LOCK_PREFIX "cmpxchgl %4, %2\n" \
19875+ "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgl %4, %2\n"\
19876 "2:\t" ASM_CLAC "\n" \
19877 "\t.section .fixup, \"ax\"\n" \
19878 "3:\tmov %3, %0\n" \
19879 "\tjmp 2b\n" \
19880 "\t.previous\n" \
19881 _ASM_EXTABLE(1b, 3b) \
19882- : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19883+ : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19884 : "i" (-EFAULT), "r" (__new), "1" (__old) \
19885 : "memory" \
19886 ); \
19887@@ -597,14 +675,14 @@ extern void __cmpxchg_wrong_size(void)
19888 __cmpxchg_wrong_size(); \
19889 \
19890 asm volatile("\t" ASM_STAC "\n" \
19891- "1:\t" LOCK_PREFIX "cmpxchgq %4, %2\n" \
19892+ "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgq %4, %2\n"\
19893 "2:\t" ASM_CLAC "\n" \
19894 "\t.section .fixup, \"ax\"\n" \
19895 "3:\tmov %3, %0\n" \
19896 "\tjmp 2b\n" \
19897 "\t.previous\n" \
19898 _ASM_EXTABLE(1b, 3b) \
19899- : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19900+ : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19901 : "i" (-EFAULT), "r" (__new), "1" (__old) \
19902 : "memory" \
19903 ); \
19904@@ -613,6 +691,7 @@ extern void __cmpxchg_wrong_size(void)
19905 default: \
19906 __cmpxchg_wrong_size(); \
19907 } \
19908+ pax_close_userland(); \
19909 *__uval = __old; \
19910 __ret; \
19911 })
19912@@ -636,17 +715,6 @@ extern struct movsl_mask {
19913
19914 #define ARCH_HAS_NOCACHE_UACCESS 1
19915
19916-#ifdef CONFIG_X86_32
19917-# include <asm/uaccess_32.h>
19918-#else
19919-# include <asm/uaccess_64.h>
19920-#endif
19921-
19922-unsigned long __must_check _copy_from_user(void *to, const void __user *from,
19923- unsigned n);
19924-unsigned long __must_check _copy_to_user(void __user *to, const void *from,
19925- unsigned n);
19926-
19927 #ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
19928 # define copy_user_diag __compiletime_error
19929 #else
19930@@ -656,7 +724,7 @@ unsigned long __must_check _copy_to_user(void __user *to, const void *from,
19931 extern void copy_user_diag("copy_from_user() buffer size is too small")
19932 copy_from_user_overflow(void);
19933 extern void copy_user_diag("copy_to_user() buffer size is too small")
19934-copy_to_user_overflow(void) __asm__("copy_from_user_overflow");
19935+copy_to_user_overflow(void);
19936
19937 #undef copy_user_diag
19938
19939@@ -669,7 +737,7 @@ __copy_from_user_overflow(void) __asm__("copy_from_user_overflow");
19940
19941 extern void
19942 __compiletime_warning("copy_to_user() buffer size is not provably correct")
19943-__copy_to_user_overflow(void) __asm__("copy_from_user_overflow");
19944+__copy_to_user_overflow(void) __asm__("copy_to_user_overflow");
19945 #define __copy_to_user_overflow(size, count) __copy_to_user_overflow()
19946
19947 #else
19948@@ -684,10 +752,16 @@ __copy_from_user_overflow(int size, unsigned long count)
19949
19950 #endif
19951
19952+#ifdef CONFIG_X86_32
19953+# include <asm/uaccess_32.h>
19954+#else
19955+# include <asm/uaccess_64.h>
19956+#endif
19957+
19958 static inline unsigned long __must_check
19959 copy_from_user(void *to, const void __user *from, unsigned long n)
19960 {
19961- int sz = __compiletime_object_size(to);
19962+ size_t sz = __compiletime_object_size(to);
19963
19964 might_fault();
19965
19966@@ -709,12 +783,15 @@ copy_from_user(void *to, const void __user *from, unsigned long n)
19967 * case, and do only runtime checking for non-constant sizes.
19968 */
19969
19970- if (likely(sz < 0 || sz >= n))
19971- n = _copy_from_user(to, from, n);
19972- else if(__builtin_constant_p(n))
19973- copy_from_user_overflow();
19974- else
19975- __copy_from_user_overflow(sz, n);
19976+ if (likely(sz != (size_t)-1 && sz < n)) {
19977+ if(__builtin_constant_p(n))
19978+ copy_from_user_overflow();
19979+ else
19980+ __copy_from_user_overflow(sz, n);
19981+ } else if (access_ok(VERIFY_READ, from, n))
19982+ n = __copy_from_user(to, from, n);
19983+ else if ((long)n > 0)
19984+ memset(to, 0, n);
19985
19986 return n;
19987 }
19988@@ -722,17 +799,18 @@ copy_from_user(void *to, const void __user *from, unsigned long n)
19989 static inline unsigned long __must_check
19990 copy_to_user(void __user *to, const void *from, unsigned long n)
19991 {
19992- int sz = __compiletime_object_size(from);
19993+ size_t sz = __compiletime_object_size(from);
19994
19995 might_fault();
19996
19997 /* See the comment in copy_from_user() above. */
19998- if (likely(sz < 0 || sz >= n))
19999- n = _copy_to_user(to, from, n);
20000- else if(__builtin_constant_p(n))
20001- copy_to_user_overflow();
20002- else
20003- __copy_to_user_overflow(sz, n);
20004+ if (likely(sz != (size_t)-1 && sz < n)) {
20005+ if(__builtin_constant_p(n))
20006+ copy_to_user_overflow();
20007+ else
20008+ __copy_to_user_overflow(sz, n);
20009+ } else if (access_ok(VERIFY_WRITE, to, n))
20010+ n = __copy_to_user(to, from, n);
20011
20012 return n;
20013 }
20014diff --git a/arch/x86/include/asm/uaccess_32.h b/arch/x86/include/asm/uaccess_32.h
20015index 3c03a5d..edb68ae 100644
20016--- a/arch/x86/include/asm/uaccess_32.h
20017+++ b/arch/x86/include/asm/uaccess_32.h
20018@@ -40,9 +40,14 @@ unsigned long __must_check __copy_from_user_ll_nocache_nozero
20019 * anything, so this is accurate.
20020 */
20021
20022-static __always_inline unsigned long __must_check
20023+static __always_inline __size_overflow(3) unsigned long __must_check
20024 __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
20025 {
20026+ if ((long)n < 0)
20027+ return n;
20028+
20029+ check_object_size(from, n, true);
20030+
20031 if (__builtin_constant_p(n)) {
20032 unsigned long ret;
20033
20034@@ -82,12 +87,16 @@ static __always_inline unsigned long __must_check
20035 __copy_to_user(void __user *to, const void *from, unsigned long n)
20036 {
20037 might_fault();
20038+
20039 return __copy_to_user_inatomic(to, from, n);
20040 }
20041
20042-static __always_inline unsigned long
20043+static __always_inline __size_overflow(3) unsigned long
20044 __copy_from_user_inatomic(void *to, const void __user *from, unsigned long n)
20045 {
20046+ if ((long)n < 0)
20047+ return n;
20048+
20049 /* Avoid zeroing the tail if the copy fails..
20050 * If 'n' is constant and 1, 2, or 4, we do still zero on a failure,
20051 * but as the zeroing behaviour is only significant when n is not
20052@@ -137,6 +146,12 @@ static __always_inline unsigned long
20053 __copy_from_user(void *to, const void __user *from, unsigned long n)
20054 {
20055 might_fault();
20056+
20057+ if ((long)n < 0)
20058+ return n;
20059+
20060+ check_object_size(to, n, false);
20061+
20062 if (__builtin_constant_p(n)) {
20063 unsigned long ret;
20064
20065@@ -159,6 +174,10 @@ static __always_inline unsigned long __copy_from_user_nocache(void *to,
20066 const void __user *from, unsigned long n)
20067 {
20068 might_fault();
20069+
20070+ if ((long)n < 0)
20071+ return n;
20072+
20073 if (__builtin_constant_p(n)) {
20074 unsigned long ret;
20075
20076@@ -181,7 +200,10 @@ static __always_inline unsigned long
20077 __copy_from_user_inatomic_nocache(void *to, const void __user *from,
20078 unsigned long n)
20079 {
20080- return __copy_from_user_ll_nocache_nozero(to, from, n);
20081+ if ((long)n < 0)
20082+ return n;
20083+
20084+ return __copy_from_user_ll_nocache_nozero(to, from, n);
20085 }
20086
20087 #endif /* _ASM_X86_UACCESS_32_H */
20088diff --git a/arch/x86/include/asm/uaccess_64.h b/arch/x86/include/asm/uaccess_64.h
20089index f2f9b39..2ae1bf8 100644
20090--- a/arch/x86/include/asm/uaccess_64.h
20091+++ b/arch/x86/include/asm/uaccess_64.h
20092@@ -10,6 +10,9 @@
20093 #include <asm/alternative.h>
20094 #include <asm/cpufeature.h>
20095 #include <asm/page.h>
20096+#include <asm/pgtable.h>
20097+
20098+#define set_fs(x) (current_thread_info()->addr_limit = (x))
20099
20100 /*
20101 * Copy To/From Userspace
20102@@ -23,8 +26,8 @@ copy_user_generic_string(void *to, const void *from, unsigned len);
20103 __must_check unsigned long
20104 copy_user_generic_unrolled(void *to, const void *from, unsigned len);
20105
20106-static __always_inline __must_check unsigned long
20107-copy_user_generic(void *to, const void *from, unsigned len)
20108+static __always_inline __must_check __size_overflow(3) unsigned long
20109+copy_user_generic(void *to, const void *from, unsigned long len)
20110 {
20111 unsigned ret;
20112
20113@@ -46,121 +49,170 @@ copy_user_generic(void *to, const void *from, unsigned len)
20114 }
20115
20116 __must_check unsigned long
20117-copy_in_user(void __user *to, const void __user *from, unsigned len);
20118+copy_in_user(void __user *to, const void __user *from, unsigned long len);
20119
20120 static __always_inline __must_check
20121-int __copy_from_user_nocheck(void *dst, const void __user *src, unsigned size)
20122+unsigned long __copy_from_user_nocheck(void *dst, const void __user *src, unsigned long size)
20123 {
20124- int ret = 0;
20125+ size_t sz = __compiletime_object_size(dst);
20126+ unsigned ret = 0;
20127+
20128+ if (size > INT_MAX)
20129+ return size;
20130+
20131+ check_object_size(dst, size, false);
20132+
20133+#ifdef CONFIG_PAX_MEMORY_UDEREF
20134+ if (!access_ok_noprefault(VERIFY_READ, src, size))
20135+ return size;
20136+#endif
20137+
20138+ if (unlikely(sz != (size_t)-1 && sz < size)) {
20139+ if(__builtin_constant_p(size))
20140+ copy_from_user_overflow();
20141+ else
20142+ __copy_from_user_overflow(sz, size);
20143+ return size;
20144+ }
20145
20146 if (!__builtin_constant_p(size))
20147- return copy_user_generic(dst, (__force void *)src, size);
20148+ return copy_user_generic(dst, (__force_kernel const void *)____m(src), size);
20149 switch (size) {
20150- case 1:__get_user_asm(*(u8 *)dst, (u8 __user *)src,
20151+ case 1:__get_user_asm(*(u8 *)dst, (const u8 __user *)src,
20152 ret, "b", "b", "=q", 1);
20153 return ret;
20154- case 2:__get_user_asm(*(u16 *)dst, (u16 __user *)src,
20155+ case 2:__get_user_asm(*(u16 *)dst, (const u16 __user *)src,
20156 ret, "w", "w", "=r", 2);
20157 return ret;
20158- case 4:__get_user_asm(*(u32 *)dst, (u32 __user *)src,
20159+ case 4:__get_user_asm(*(u32 *)dst, (const u32 __user *)src,
20160 ret, "l", "k", "=r", 4);
20161 return ret;
20162- case 8:__get_user_asm(*(u64 *)dst, (u64 __user *)src,
20163+ case 8:__get_user_asm(*(u64 *)dst, (const u64 __user *)src,
20164 ret, "q", "", "=r", 8);
20165 return ret;
20166 case 10:
20167- __get_user_asm(*(u64 *)dst, (u64 __user *)src,
20168+ __get_user_asm(*(u64 *)dst, (const u64 __user *)src,
20169 ret, "q", "", "=r", 10);
20170 if (unlikely(ret))
20171 return ret;
20172 __get_user_asm(*(u16 *)(8 + (char *)dst),
20173- (u16 __user *)(8 + (char __user *)src),
20174+ (const u16 __user *)(8 + (const char __user *)src),
20175 ret, "w", "w", "=r", 2);
20176 return ret;
20177 case 16:
20178- __get_user_asm(*(u64 *)dst, (u64 __user *)src,
20179+ __get_user_asm(*(u64 *)dst, (const u64 __user *)src,
20180 ret, "q", "", "=r", 16);
20181 if (unlikely(ret))
20182 return ret;
20183 __get_user_asm(*(u64 *)(8 + (char *)dst),
20184- (u64 __user *)(8 + (char __user *)src),
20185+ (const u64 __user *)(8 + (const char __user *)src),
20186 ret, "q", "", "=r", 8);
20187 return ret;
20188 default:
20189- return copy_user_generic(dst, (__force void *)src, size);
20190+ return copy_user_generic(dst, (__force_kernel const void *)____m(src), size);
20191 }
20192 }
20193
20194 static __always_inline __must_check
20195-int __copy_from_user(void *dst, const void __user *src, unsigned size)
20196+unsigned long __copy_from_user(void *dst, const void __user *src, unsigned long size)
20197 {
20198 might_fault();
20199 return __copy_from_user_nocheck(dst, src, size);
20200 }
20201
20202 static __always_inline __must_check
20203-int __copy_to_user_nocheck(void __user *dst, const void *src, unsigned size)
20204+unsigned long __copy_to_user_nocheck(void __user *dst, const void *src, unsigned long size)
20205 {
20206- int ret = 0;
20207+ size_t sz = __compiletime_object_size(src);
20208+ unsigned ret = 0;
20209+
20210+ if (size > INT_MAX)
20211+ return size;
20212+
20213+ check_object_size(src, size, true);
20214+
20215+#ifdef CONFIG_PAX_MEMORY_UDEREF
20216+ if (!access_ok_noprefault(VERIFY_WRITE, dst, size))
20217+ return size;
20218+#endif
20219+
20220+ if (unlikely(sz != (size_t)-1 && sz < size)) {
20221+ if(__builtin_constant_p(size))
20222+ copy_to_user_overflow();
20223+ else
20224+ __copy_to_user_overflow(sz, size);
20225+ return size;
20226+ }
20227
20228 if (!__builtin_constant_p(size))
20229- return copy_user_generic((__force void *)dst, src, size);
20230+ return copy_user_generic((__force_kernel void *)____m(dst), src, size);
20231 switch (size) {
20232- case 1:__put_user_asm(*(u8 *)src, (u8 __user *)dst,
20233+ case 1:__put_user_asm(*(const u8 *)src, (u8 __user *)dst,
20234 ret, "b", "b", "iq", 1);
20235 return ret;
20236- case 2:__put_user_asm(*(u16 *)src, (u16 __user *)dst,
20237+ case 2:__put_user_asm(*(const u16 *)src, (u16 __user *)dst,
20238 ret, "w", "w", "ir", 2);
20239 return ret;
20240- case 4:__put_user_asm(*(u32 *)src, (u32 __user *)dst,
20241+ case 4:__put_user_asm(*(const u32 *)src, (u32 __user *)dst,
20242 ret, "l", "k", "ir", 4);
20243 return ret;
20244- case 8:__put_user_asm(*(u64 *)src, (u64 __user *)dst,
20245+ case 8:__put_user_asm(*(const u64 *)src, (u64 __user *)dst,
20246 ret, "q", "", "er", 8);
20247 return ret;
20248 case 10:
20249- __put_user_asm(*(u64 *)src, (u64 __user *)dst,
20250+ __put_user_asm(*(const u64 *)src, (u64 __user *)dst,
20251 ret, "q", "", "er", 10);
20252 if (unlikely(ret))
20253 return ret;
20254 asm("":::"memory");
20255- __put_user_asm(4[(u16 *)src], 4 + (u16 __user *)dst,
20256+ __put_user_asm(4[(const u16 *)src], 4 + (u16 __user *)dst,
20257 ret, "w", "w", "ir", 2);
20258 return ret;
20259 case 16:
20260- __put_user_asm(*(u64 *)src, (u64 __user *)dst,
20261+ __put_user_asm(*(const u64 *)src, (u64 __user *)dst,
20262 ret, "q", "", "er", 16);
20263 if (unlikely(ret))
20264 return ret;
20265 asm("":::"memory");
20266- __put_user_asm(1[(u64 *)src], 1 + (u64 __user *)dst,
20267+ __put_user_asm(1[(const u64 *)src], 1 + (u64 __user *)dst,
20268 ret, "q", "", "er", 8);
20269 return ret;
20270 default:
20271- return copy_user_generic((__force void *)dst, src, size);
20272+ return copy_user_generic((__force_kernel void *)____m(dst), src, size);
20273 }
20274 }
20275
20276 static __always_inline __must_check
20277-int __copy_to_user(void __user *dst, const void *src, unsigned size)
20278+unsigned long __copy_to_user(void __user *dst, const void *src, unsigned long size)
20279 {
20280 might_fault();
20281 return __copy_to_user_nocheck(dst, src, size);
20282 }
20283
20284 static __always_inline __must_check
20285-int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20286+unsigned long __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20287 {
20288- int ret = 0;
20289+ unsigned ret = 0;
20290
20291 might_fault();
20292+
20293+ if (size > INT_MAX)
20294+ return size;
20295+
20296+#ifdef CONFIG_PAX_MEMORY_UDEREF
20297+ if (!access_ok_noprefault(VERIFY_READ, src, size))
20298+ return size;
20299+ if (!access_ok_noprefault(VERIFY_WRITE, dst, size))
20300+ return size;
20301+#endif
20302+
20303 if (!__builtin_constant_p(size))
20304- return copy_user_generic((__force void *)dst,
20305- (__force void *)src, size);
20306+ return copy_user_generic((__force_kernel void *)____m(dst),
20307+ (__force_kernel const void *)____m(src), size);
20308 switch (size) {
20309 case 1: {
20310 u8 tmp;
20311- __get_user_asm(tmp, (u8 __user *)src,
20312+ __get_user_asm(tmp, (const u8 __user *)src,
20313 ret, "b", "b", "=q", 1);
20314 if (likely(!ret))
20315 __put_user_asm(tmp, (u8 __user *)dst,
20316@@ -169,7 +221,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20317 }
20318 case 2: {
20319 u16 tmp;
20320- __get_user_asm(tmp, (u16 __user *)src,
20321+ __get_user_asm(tmp, (const u16 __user *)src,
20322 ret, "w", "w", "=r", 2);
20323 if (likely(!ret))
20324 __put_user_asm(tmp, (u16 __user *)dst,
20325@@ -179,7 +231,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20326
20327 case 4: {
20328 u32 tmp;
20329- __get_user_asm(tmp, (u32 __user *)src,
20330+ __get_user_asm(tmp, (const u32 __user *)src,
20331 ret, "l", "k", "=r", 4);
20332 if (likely(!ret))
20333 __put_user_asm(tmp, (u32 __user *)dst,
20334@@ -188,7 +240,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20335 }
20336 case 8: {
20337 u64 tmp;
20338- __get_user_asm(tmp, (u64 __user *)src,
20339+ __get_user_asm(tmp, (const u64 __user *)src,
20340 ret, "q", "", "=r", 8);
20341 if (likely(!ret))
20342 __put_user_asm(tmp, (u64 __user *)dst,
20343@@ -196,41 +248,58 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20344 return ret;
20345 }
20346 default:
20347- return copy_user_generic((__force void *)dst,
20348- (__force void *)src, size);
20349+ return copy_user_generic((__force_kernel void *)____m(dst),
20350+ (__force_kernel const void *)____m(src), size);
20351 }
20352 }
20353
20354-static __must_check __always_inline int
20355-__copy_from_user_inatomic(void *dst, const void __user *src, unsigned size)
20356+static __must_check __always_inline unsigned long
20357+__copy_from_user_inatomic(void *dst, const void __user *src, unsigned long size)
20358 {
20359 return __copy_from_user_nocheck(dst, src, size);
20360 }
20361
20362-static __must_check __always_inline int
20363-__copy_to_user_inatomic(void __user *dst, const void *src, unsigned size)
20364+static __must_check __always_inline unsigned long
20365+__copy_to_user_inatomic(void __user *dst, const void *src, unsigned long size)
20366 {
20367 return __copy_to_user_nocheck(dst, src, size);
20368 }
20369
20370-extern long __copy_user_nocache(void *dst, const void __user *src,
20371- unsigned size, int zerorest);
20372+extern unsigned long __copy_user_nocache(void *dst, const void __user *src,
20373+ unsigned long size, int zerorest);
20374
20375-static inline int
20376-__copy_from_user_nocache(void *dst, const void __user *src, unsigned size)
20377+static inline unsigned long
20378+__copy_from_user_nocache(void *dst, const void __user *src, unsigned long size)
20379 {
20380 might_fault();
20381+
20382+ if (size > INT_MAX)
20383+ return size;
20384+
20385+#ifdef CONFIG_PAX_MEMORY_UDEREF
20386+ if (!access_ok_noprefault(VERIFY_READ, src, size))
20387+ return size;
20388+#endif
20389+
20390 return __copy_user_nocache(dst, src, size, 1);
20391 }
20392
20393-static inline int
20394+static inline unsigned long
20395 __copy_from_user_inatomic_nocache(void *dst, const void __user *src,
20396- unsigned size)
20397+ unsigned long size)
20398 {
20399+ if (size > INT_MAX)
20400+ return size;
20401+
20402+#ifdef CONFIG_PAX_MEMORY_UDEREF
20403+ if (!access_ok_noprefault(VERIFY_READ, src, size))
20404+ return size;
20405+#endif
20406+
20407 return __copy_user_nocache(dst, src, size, 0);
20408 }
20409
20410 unsigned long
20411-copy_user_handle_tail(char *to, char *from, unsigned len);
20412+copy_user_handle_tail(char __user *to, char __user *from, unsigned long len) __size_overflow(3);
20413
20414 #endif /* _ASM_X86_UACCESS_64_H */
20415diff --git a/arch/x86/include/asm/word-at-a-time.h b/arch/x86/include/asm/word-at-a-time.h
20416index 5b238981..77fdd78 100644
20417--- a/arch/x86/include/asm/word-at-a-time.h
20418+++ b/arch/x86/include/asm/word-at-a-time.h
20419@@ -11,7 +11,7 @@
20420 * and shift, for example.
20421 */
20422 struct word_at_a_time {
20423- const unsigned long one_bits, high_bits;
20424+ unsigned long one_bits, high_bits;
20425 };
20426
20427 #define WORD_AT_A_TIME_CONSTANTS { REPEAT_BYTE(0x01), REPEAT_BYTE(0x80) }
20428diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h
20429index f58a9c7..dc378042a 100644
20430--- a/arch/x86/include/asm/x86_init.h
20431+++ b/arch/x86/include/asm/x86_init.h
20432@@ -129,7 +129,7 @@ struct x86_init_ops {
20433 struct x86_init_timers timers;
20434 struct x86_init_iommu iommu;
20435 struct x86_init_pci pci;
20436-};
20437+} __no_const;
20438
20439 /**
20440 * struct x86_cpuinit_ops - platform specific cpu hotplug setups
20441@@ -140,7 +140,7 @@ struct x86_cpuinit_ops {
20442 void (*setup_percpu_clockev)(void);
20443 void (*early_percpu_clock_init)(void);
20444 void (*fixup_cpu_id)(struct cpuinfo_x86 *c, int node);
20445-};
20446+} __no_const;
20447
20448 struct timespec;
20449
20450@@ -168,7 +168,7 @@ struct x86_platform_ops {
20451 void (*save_sched_clock_state)(void);
20452 void (*restore_sched_clock_state)(void);
20453 void (*apic_post_init)(void);
20454-};
20455+} __no_const;
20456
20457 struct pci_dev;
20458 struct msi_msg;
20459@@ -182,7 +182,7 @@ struct x86_msi_ops {
20460 void (*teardown_msi_irqs)(struct pci_dev *dev);
20461 void (*restore_msi_irqs)(struct pci_dev *dev);
20462 int (*setup_hpet_msi)(unsigned int irq, unsigned int id);
20463-};
20464+} __no_const;
20465
20466 struct IO_APIC_route_entry;
20467 struct io_apic_irq_attr;
20468@@ -203,7 +203,7 @@ struct x86_io_apic_ops {
20469 unsigned int destination, int vector,
20470 struct io_apic_irq_attr *attr);
20471 void (*eoi_ioapic_pin)(int apic, int pin, int vector);
20472-};
20473+} __no_const;
20474
20475 extern struct x86_init_ops x86_init;
20476 extern struct x86_cpuinit_ops x86_cpuinit;
20477diff --git a/arch/x86/include/asm/xen/page.h b/arch/x86/include/asm/xen/page.h
20478index 358dcd3..23c0bf1 100644
20479--- a/arch/x86/include/asm/xen/page.h
20480+++ b/arch/x86/include/asm/xen/page.h
20481@@ -82,7 +82,7 @@ static inline int xen_safe_read_ulong(unsigned long *addr, unsigned long *val)
20482 * - get_phys_to_machine() is to be called by __pfn_to_mfn() only in special
20483 * cases needing an extended handling.
20484 */
20485-static inline unsigned long __pfn_to_mfn(unsigned long pfn)
20486+static inline unsigned long __intentional_overflow(-1) __pfn_to_mfn(unsigned long pfn)
20487 {
20488 unsigned long mfn;
20489
20490diff --git a/arch/x86/include/asm/xsave.h b/arch/x86/include/asm/xsave.h
20491index c9a6d68..cb57f42 100644
20492--- a/arch/x86/include/asm/xsave.h
20493+++ b/arch/x86/include/asm/xsave.h
20494@@ -223,12 +223,16 @@ static inline int xsave_user(struct xsave_struct __user *buf)
20495 if (unlikely(err))
20496 return -EFAULT;
20497
20498+ pax_open_userland();
20499 __asm__ __volatile__(ASM_STAC "\n"
20500- "1:"XSAVE"\n"
20501+ "1:"
20502+ __copyuser_seg
20503+ XSAVE"\n"
20504 "2: " ASM_CLAC "\n"
20505 xstate_fault
20506 : "D" (buf), "a" (-1), "d" (-1), "0" (0)
20507 : "memory");
20508+ pax_close_userland();
20509 return err;
20510 }
20511
20512@@ -238,16 +242,20 @@ static inline int xsave_user(struct xsave_struct __user *buf)
20513 static inline int xrestore_user(struct xsave_struct __user *buf, u64 mask)
20514 {
20515 int err = 0;
20516- struct xsave_struct *xstate = ((__force struct xsave_struct *)buf);
20517+ struct xsave_struct *xstate = ((__force_kernel struct xsave_struct *)buf);
20518 u32 lmask = mask;
20519 u32 hmask = mask >> 32;
20520
20521+ pax_open_userland();
20522 __asm__ __volatile__(ASM_STAC "\n"
20523- "1:"XRSTOR"\n"
20524+ "1:"
20525+ __copyuser_seg
20526+ XRSTOR"\n"
20527 "2: " ASM_CLAC "\n"
20528 xstate_fault
20529 : "D" (xstate), "a" (lmask), "d" (hmask), "0" (0)
20530 : "memory"); /* memory required? */
20531+ pax_close_userland();
20532 return err;
20533 }
20534
20535diff --git a/arch/x86/include/uapi/asm/e820.h b/arch/x86/include/uapi/asm/e820.h
20536index d993e33..8db1b18 100644
20537--- a/arch/x86/include/uapi/asm/e820.h
20538+++ b/arch/x86/include/uapi/asm/e820.h
20539@@ -58,7 +58,7 @@ struct e820map {
20540 #define ISA_START_ADDRESS 0xa0000
20541 #define ISA_END_ADDRESS 0x100000
20542
20543-#define BIOS_BEGIN 0x000a0000
20544+#define BIOS_BEGIN 0x000c0000
20545 #define BIOS_END 0x00100000
20546
20547 #define BIOS_ROM_BASE 0xffe00000
20548diff --git a/arch/x86/include/uapi/asm/ptrace-abi.h b/arch/x86/include/uapi/asm/ptrace-abi.h
20549index 7b0a55a..ad115bf 100644
20550--- a/arch/x86/include/uapi/asm/ptrace-abi.h
20551+++ b/arch/x86/include/uapi/asm/ptrace-abi.h
20552@@ -49,7 +49,6 @@
20553 #define EFLAGS 144
20554 #define RSP 152
20555 #define SS 160
20556-#define ARGOFFSET R11
20557 #endif /* __ASSEMBLY__ */
20558
20559 /* top of stack page */
20560diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
20561index cdb1b70..426434c 100644
20562--- a/arch/x86/kernel/Makefile
20563+++ b/arch/x86/kernel/Makefile
20564@@ -28,7 +28,7 @@ obj-y += time.o ioport.o ldt.o dumpstack.o nmi.o
20565 obj-y += setup.o x86_init.o i8259.o irqinit.o jump_label.o
20566 obj-$(CONFIG_IRQ_WORK) += irq_work.o
20567 obj-y += probe_roms.o
20568-obj-$(CONFIG_X86_32) += i386_ksyms_32.o
20569+obj-$(CONFIG_X86_32) += sys_i386_32.o i386_ksyms_32.o
20570 obj-$(CONFIG_X86_64) += sys_x86_64.o x8664_ksyms_64.o
20571 obj-$(CONFIG_X86_64) += mcount_64.o
20572 obj-y += syscall_$(BITS).o vsyscall_gtod.o
20573diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
20574index 803b684..68c64f1 100644
20575--- a/arch/x86/kernel/acpi/boot.c
20576+++ b/arch/x86/kernel/acpi/boot.c
20577@@ -1361,7 +1361,7 @@ static void __init acpi_reduced_hw_init(void)
20578 * If your system is blacklisted here, but you find that acpi=force
20579 * works for you, please contact linux-acpi@vger.kernel.org
20580 */
20581-static struct dmi_system_id __initdata acpi_dmi_table[] = {
20582+static const struct dmi_system_id __initconst acpi_dmi_table[] = {
20583 /*
20584 * Boxes that need ACPI disabled
20585 */
20586@@ -1436,7 +1436,7 @@ static struct dmi_system_id __initdata acpi_dmi_table[] = {
20587 };
20588
20589 /* second table for DMI checks that should run after early-quirks */
20590-static struct dmi_system_id __initdata acpi_dmi_table_late[] = {
20591+static const struct dmi_system_id __initconst acpi_dmi_table_late[] = {
20592 /*
20593 * HP laptops which use a DSDT reporting as HP/SB400/10000,
20594 * which includes some code which overrides all temperature
20595diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
20596index d1daead..acd77e2 100644
20597--- a/arch/x86/kernel/acpi/sleep.c
20598+++ b/arch/x86/kernel/acpi/sleep.c
20599@@ -99,8 +99,12 @@ int x86_acpi_suspend_lowlevel(void)
20600 #else /* CONFIG_64BIT */
20601 #ifdef CONFIG_SMP
20602 stack_start = (unsigned long)temp_stack + sizeof(temp_stack);
20603+
20604+ pax_open_kernel();
20605 early_gdt_descr.address =
20606 (unsigned long)get_cpu_gdt_table(smp_processor_id());
20607+ pax_close_kernel();
20608+
20609 initial_gs = per_cpu_offset(smp_processor_id());
20610 #endif
20611 initial_code = (unsigned long)wakeup_long64;
20612diff --git a/arch/x86/kernel/acpi/wakeup_32.S b/arch/x86/kernel/acpi/wakeup_32.S
20613index 665c6b7..eae4d56 100644
20614--- a/arch/x86/kernel/acpi/wakeup_32.S
20615+++ b/arch/x86/kernel/acpi/wakeup_32.S
20616@@ -29,13 +29,11 @@ wakeup_pmode_return:
20617 # and restore the stack ... but you need gdt for this to work
20618 movl saved_context_esp, %esp
20619
20620- movl %cs:saved_magic, %eax
20621- cmpl $0x12345678, %eax
20622+ cmpl $0x12345678, saved_magic
20623 jne bogus_magic
20624
20625 # jump to place where we left off
20626- movl saved_eip, %eax
20627- jmp *%eax
20628+ jmp *(saved_eip)
20629
20630 bogus_magic:
20631 jmp bogus_magic
20632diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
20633index 703130f..27a155d 100644
20634--- a/arch/x86/kernel/alternative.c
20635+++ b/arch/x86/kernel/alternative.c
20636@@ -268,6 +268,13 @@ void __init_or_module apply_alternatives(struct alt_instr *start,
20637 */
20638 for (a = start; a < end; a++) {
20639 instr = (u8 *)&a->instr_offset + a->instr_offset;
20640+
20641+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20642+ instr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20643+ if (instr < (u8 *)_text || (u8 *)_einittext <= instr)
20644+ instr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20645+#endif
20646+
20647 replacement = (u8 *)&a->repl_offset + a->repl_offset;
20648 BUG_ON(a->replacementlen > a->instrlen);
20649 BUG_ON(a->instrlen > sizeof(insnbuf));
20650@@ -284,6 +291,11 @@ void __init_or_module apply_alternatives(struct alt_instr *start,
20651 add_nops(insnbuf + a->replacementlen,
20652 a->instrlen - a->replacementlen);
20653
20654+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20655+ if (instr < (u8 *)_text || (u8 *)_einittext <= instr)
20656+ instr = ktva_ktla(instr);
20657+#endif
20658+
20659 text_poke_early(instr, insnbuf, a->instrlen);
20660 }
20661 }
20662@@ -299,10 +311,16 @@ static void alternatives_smp_lock(const s32 *start, const s32 *end,
20663 for (poff = start; poff < end; poff++) {
20664 u8 *ptr = (u8 *)poff + *poff;
20665
20666+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20667+ ptr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20668+ if (ptr < (u8 *)_text || (u8 *)_einittext <= ptr)
20669+ ptr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20670+#endif
20671+
20672 if (!*poff || ptr < text || ptr >= text_end)
20673 continue;
20674 /* turn DS segment override prefix into lock prefix */
20675- if (*ptr == 0x3e)
20676+ if (*ktla_ktva(ptr) == 0x3e)
20677 text_poke(ptr, ((unsigned char []){0xf0}), 1);
20678 }
20679 mutex_unlock(&text_mutex);
20680@@ -317,10 +335,16 @@ static void alternatives_smp_unlock(const s32 *start, const s32 *end,
20681 for (poff = start; poff < end; poff++) {
20682 u8 *ptr = (u8 *)poff + *poff;
20683
20684+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20685+ ptr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20686+ if (ptr < (u8 *)_text || (u8 *)_einittext <= ptr)
20687+ ptr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20688+#endif
20689+
20690 if (!*poff || ptr < text || ptr >= text_end)
20691 continue;
20692 /* turn lock prefix into DS segment override prefix */
20693- if (*ptr == 0xf0)
20694+ if (*ktla_ktva(ptr) == 0xf0)
20695 text_poke(ptr, ((unsigned char []){0x3E}), 1);
20696 }
20697 mutex_unlock(&text_mutex);
20698@@ -457,7 +481,7 @@ void __init_or_module apply_paravirt(struct paravirt_patch_site *start,
20699
20700 BUG_ON(p->len > MAX_PATCH_LEN);
20701 /* prep the buffer with the original instructions */
20702- memcpy(insnbuf, p->instr, p->len);
20703+ memcpy(insnbuf, ktla_ktva(p->instr), p->len);
20704 used = pv_init_ops.patch(p->instrtype, p->clobbers, insnbuf,
20705 (unsigned long)p->instr, p->len);
20706
20707@@ -504,7 +528,7 @@ void __init alternative_instructions(void)
20708 if (!uniproc_patched || num_possible_cpus() == 1)
20709 free_init_pages("SMP alternatives",
20710 (unsigned long)__smp_locks,
20711- (unsigned long)__smp_locks_end);
20712+ PAGE_ALIGN((unsigned long)__smp_locks_end));
20713 #endif
20714
20715 apply_paravirt(__parainstructions, __parainstructions_end);
20716@@ -524,13 +548,17 @@ void __init alternative_instructions(void)
20717 * instructions. And on the local CPU you need to be protected again NMI or MCE
20718 * handlers seeing an inconsistent instruction while you patch.
20719 */
20720-void *__init_or_module text_poke_early(void *addr, const void *opcode,
20721+void *__kprobes text_poke_early(void *addr, const void *opcode,
20722 size_t len)
20723 {
20724 unsigned long flags;
20725 local_irq_save(flags);
20726- memcpy(addr, opcode, len);
20727+
20728+ pax_open_kernel();
20729+ memcpy(ktla_ktva(addr), opcode, len);
20730 sync_core();
20731+ pax_close_kernel();
20732+
20733 local_irq_restore(flags);
20734 /* Could also do a CLFLUSH here to speed up CPU recovery; but
20735 that causes hangs on some VIA CPUs. */
20736@@ -552,36 +580,22 @@ void *__init_or_module text_poke_early(void *addr, const void *opcode,
20737 */
20738 void *text_poke(void *addr, const void *opcode, size_t len)
20739 {
20740- unsigned long flags;
20741- char *vaddr;
20742+ unsigned char *vaddr = ktla_ktva(addr);
20743 struct page *pages[2];
20744- int i;
20745+ size_t i;
20746
20747 if (!core_kernel_text((unsigned long)addr)) {
20748- pages[0] = vmalloc_to_page(addr);
20749- pages[1] = vmalloc_to_page(addr + PAGE_SIZE);
20750+ pages[0] = vmalloc_to_page(vaddr);
20751+ pages[1] = vmalloc_to_page(vaddr + PAGE_SIZE);
20752 } else {
20753- pages[0] = virt_to_page(addr);
20754+ pages[0] = virt_to_page(vaddr);
20755 WARN_ON(!PageReserved(pages[0]));
20756- pages[1] = virt_to_page(addr + PAGE_SIZE);
20757+ pages[1] = virt_to_page(vaddr + PAGE_SIZE);
20758 }
20759 BUG_ON(!pages[0]);
20760- local_irq_save(flags);
20761- set_fixmap(FIX_TEXT_POKE0, page_to_phys(pages[0]));
20762- if (pages[1])
20763- set_fixmap(FIX_TEXT_POKE1, page_to_phys(pages[1]));
20764- vaddr = (char *)fix_to_virt(FIX_TEXT_POKE0);
20765- memcpy(&vaddr[(unsigned long)addr & ~PAGE_MASK], opcode, len);
20766- clear_fixmap(FIX_TEXT_POKE0);
20767- if (pages[1])
20768- clear_fixmap(FIX_TEXT_POKE1);
20769- local_flush_tlb();
20770- sync_core();
20771- /* Could also do a CLFLUSH here to speed up CPU recovery; but
20772- that causes hangs on some VIA CPUs. */
20773+ text_poke_early(addr, opcode, len);
20774 for (i = 0; i < len; i++)
20775- BUG_ON(((char *)addr)[i] != ((char *)opcode)[i]);
20776- local_irq_restore(flags);
20777+ BUG_ON((vaddr)[i] != ((const unsigned char *)opcode)[i]);
20778 return addr;
20779 }
20780
20781@@ -601,7 +615,7 @@ int poke_int3_handler(struct pt_regs *regs)
20782 if (likely(!bp_patching_in_progress))
20783 return 0;
20784
20785- if (user_mode_vm(regs) || regs->ip != (unsigned long)bp_int3_addr)
20786+ if (user_mode(regs) || regs->ip != (unsigned long)bp_int3_addr)
20787 return 0;
20788
20789 /* set up the specified breakpoint handler */
20790@@ -635,7 +649,7 @@ int poke_int3_handler(struct pt_regs *regs)
20791 */
20792 void *text_poke_bp(void *addr, const void *opcode, size_t len, void *handler)
20793 {
20794- unsigned char int3 = 0xcc;
20795+ const unsigned char int3 = 0xcc;
20796
20797 bp_int3_handler = handler;
20798 bp_int3_addr = (u8 *)addr + sizeof(int3);
20799diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
20800index ad3639a..bd4253c 100644
20801--- a/arch/x86/kernel/apic/apic.c
20802+++ b/arch/x86/kernel/apic/apic.c
20803@@ -171,7 +171,7 @@ int first_system_vector = FIRST_SYSTEM_VECTOR;
20804 /*
20805 * Debug level, exported for io_apic.c
20806 */
20807-unsigned int apic_verbosity;
20808+int apic_verbosity;
20809
20810 int pic_mode;
20811
20812@@ -1918,7 +1918,7 @@ static inline void __smp_error_interrupt(struct pt_regs *regs)
20813 apic_write(APIC_ESR, 0);
20814 v = apic_read(APIC_ESR);
20815 ack_APIC_irq();
20816- atomic_inc(&irq_err_count);
20817+ atomic_inc_unchecked(&irq_err_count);
20818
20819 apic_printk(APIC_DEBUG, KERN_DEBUG "APIC error on CPU%d: %02x",
20820 smp_processor_id(), v);
20821diff --git a/arch/x86/kernel/apic/apic_flat_64.c b/arch/x86/kernel/apic/apic_flat_64.c
20822index de918c4..32eed23 100644
20823--- a/arch/x86/kernel/apic/apic_flat_64.c
20824+++ b/arch/x86/kernel/apic/apic_flat_64.c
20825@@ -154,7 +154,7 @@ static int flat_probe(void)
20826 return 1;
20827 }
20828
20829-static struct apic apic_flat = {
20830+static struct apic apic_flat __read_only = {
20831 .name = "flat",
20832 .probe = flat_probe,
20833 .acpi_madt_oem_check = flat_acpi_madt_oem_check,
20834@@ -260,7 +260,7 @@ static int physflat_probe(void)
20835 return 0;
20836 }
20837
20838-static struct apic apic_physflat = {
20839+static struct apic apic_physflat __read_only = {
20840
20841 .name = "physical flat",
20842 .probe = physflat_probe,
20843diff --git a/arch/x86/kernel/apic/apic_noop.c b/arch/x86/kernel/apic/apic_noop.c
20844index b205cdb..d8503ff 100644
20845--- a/arch/x86/kernel/apic/apic_noop.c
20846+++ b/arch/x86/kernel/apic/apic_noop.c
20847@@ -108,7 +108,7 @@ static void noop_apic_write(u32 reg, u32 v)
20848 WARN_ON_ONCE(cpu_has_apic && !disable_apic);
20849 }
20850
20851-struct apic apic_noop = {
20852+struct apic apic_noop __read_only = {
20853 .name = "noop",
20854 .probe = noop_probe,
20855 .acpi_madt_oem_check = NULL,
20856diff --git a/arch/x86/kernel/apic/bigsmp_32.c b/arch/x86/kernel/apic/bigsmp_32.c
20857index c4a8d63..fe893ac 100644
20858--- a/arch/x86/kernel/apic/bigsmp_32.c
20859+++ b/arch/x86/kernel/apic/bigsmp_32.c
20860@@ -147,7 +147,7 @@ static int probe_bigsmp(void)
20861 return dmi_bigsmp;
20862 }
20863
20864-static struct apic apic_bigsmp = {
20865+static struct apic apic_bigsmp __read_only = {
20866
20867 .name = "bigsmp",
20868 .probe = probe_bigsmp,
20869diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
20870index f4dc246..fbab133 100644
20871--- a/arch/x86/kernel/apic/io_apic.c
20872+++ b/arch/x86/kernel/apic/io_apic.c
20873@@ -1862,7 +1862,7 @@ int native_ioapic_set_affinity(struct irq_data *data,
20874 return ret;
20875 }
20876
20877-atomic_t irq_mis_count;
20878+atomic_unchecked_t irq_mis_count;
20879
20880 #ifdef CONFIG_GENERIC_PENDING_IRQ
20881 static bool io_apic_level_ack_pending(struct irq_cfg *cfg)
20882@@ -2003,7 +2003,7 @@ static void ack_ioapic_level(struct irq_data *data)
20883 * at the cpu.
20884 */
20885 if (!(v & (1 << (i & 0x1f)))) {
20886- atomic_inc(&irq_mis_count);
20887+ atomic_inc_unchecked(&irq_mis_count);
20888
20889 eoi_ioapic_irq(irq, cfg);
20890 }
20891@@ -2011,7 +2011,7 @@ static void ack_ioapic_level(struct irq_data *data)
20892 ioapic_irqd_unmask(data, cfg, masked);
20893 }
20894
20895-static struct irq_chip ioapic_chip __read_mostly = {
20896+static struct irq_chip ioapic_chip = {
20897 .name = "IO-APIC",
20898 .irq_startup = startup_ioapic_irq,
20899 .irq_mask = mask_ioapic_irq,
20900@@ -2070,7 +2070,7 @@ static void ack_lapic_irq(struct irq_data *data)
20901 ack_APIC_irq();
20902 }
20903
20904-static struct irq_chip lapic_chip __read_mostly = {
20905+static struct irq_chip lapic_chip = {
20906 .name = "local-APIC",
20907 .irq_mask = mask_lapic_irq,
20908 .irq_unmask = unmask_lapic_irq,
20909diff --git a/arch/x86/kernel/apic/probe_32.c b/arch/x86/kernel/apic/probe_32.c
20910index bda4886..f9c7195 100644
20911--- a/arch/x86/kernel/apic/probe_32.c
20912+++ b/arch/x86/kernel/apic/probe_32.c
20913@@ -72,7 +72,7 @@ static int probe_default(void)
20914 return 1;
20915 }
20916
20917-static struct apic apic_default = {
20918+static struct apic apic_default __read_only = {
20919
20920 .name = "default",
20921 .probe = probe_default,
20922diff --git a/arch/x86/kernel/apic/vector.c b/arch/x86/kernel/apic/vector.c
20923index 6cedd79..023ff8e 100644
20924--- a/arch/x86/kernel/apic/vector.c
20925+++ b/arch/x86/kernel/apic/vector.c
20926@@ -21,7 +21,7 @@
20927
20928 static DEFINE_RAW_SPINLOCK(vector_lock);
20929
20930-void lock_vector_lock(void)
20931+void lock_vector_lock(void) __acquires(vector_lock)
20932 {
20933 /* Used to the online set of cpus does not change
20934 * during assign_irq_vector.
20935@@ -29,7 +29,7 @@ void lock_vector_lock(void)
20936 raw_spin_lock(&vector_lock);
20937 }
20938
20939-void unlock_vector_lock(void)
20940+void unlock_vector_lock(void) __releases(vector_lock)
20941 {
20942 raw_spin_unlock(&vector_lock);
20943 }
20944diff --git a/arch/x86/kernel/apic/x2apic_cluster.c b/arch/x86/kernel/apic/x2apic_cluster.c
20945index e658f21..b695a1a 100644
20946--- a/arch/x86/kernel/apic/x2apic_cluster.c
20947+++ b/arch/x86/kernel/apic/x2apic_cluster.c
20948@@ -182,7 +182,7 @@ update_clusterinfo(struct notifier_block *nfb, unsigned long action, void *hcpu)
20949 return notifier_from_errno(err);
20950 }
20951
20952-static struct notifier_block __refdata x2apic_cpu_notifier = {
20953+static struct notifier_block x2apic_cpu_notifier = {
20954 .notifier_call = update_clusterinfo,
20955 };
20956
20957@@ -234,7 +234,7 @@ static void cluster_vector_allocation_domain(int cpu, struct cpumask *retmask,
20958 cpumask_and(retmask, mask, per_cpu(cpus_in_cluster, cpu));
20959 }
20960
20961-static struct apic apic_x2apic_cluster = {
20962+static struct apic apic_x2apic_cluster __read_only = {
20963
20964 .name = "cluster x2apic",
20965 .probe = x2apic_cluster_probe,
20966diff --git a/arch/x86/kernel/apic/x2apic_phys.c b/arch/x86/kernel/apic/x2apic_phys.c
20967index 6fae733..5ca17af 100644
20968--- a/arch/x86/kernel/apic/x2apic_phys.c
20969+++ b/arch/x86/kernel/apic/x2apic_phys.c
20970@@ -88,7 +88,7 @@ static int x2apic_phys_probe(void)
20971 return apic == &apic_x2apic_phys;
20972 }
20973
20974-static struct apic apic_x2apic_phys = {
20975+static struct apic apic_x2apic_phys __read_only = {
20976
20977 .name = "physical x2apic",
20978 .probe = x2apic_phys_probe,
20979diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
20980index 8e9dcfd..c61b3e4 100644
20981--- a/arch/x86/kernel/apic/x2apic_uv_x.c
20982+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
20983@@ -348,7 +348,7 @@ static int uv_probe(void)
20984 return apic == &apic_x2apic_uv_x;
20985 }
20986
20987-static struct apic __refdata apic_x2apic_uv_x = {
20988+static struct apic apic_x2apic_uv_x __read_only = {
20989
20990 .name = "UV large system",
20991 .probe = uv_probe,
20992diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
20993index 927ec92..de68f32 100644
20994--- a/arch/x86/kernel/apm_32.c
20995+++ b/arch/x86/kernel/apm_32.c
20996@@ -432,7 +432,7 @@ static DEFINE_MUTEX(apm_mutex);
20997 * This is for buggy BIOS's that refer to (real mode) segment 0x40
20998 * even though they are called in protected mode.
20999 */
21000-static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
21001+static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
21002 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
21003
21004 static const char driver_version[] = "1.16ac"; /* no spaces */
21005@@ -610,7 +610,10 @@ static long __apm_bios_call(void *_call)
21006 BUG_ON(cpu != 0);
21007 gdt = get_cpu_gdt_table(cpu);
21008 save_desc_40 = gdt[0x40 / 8];
21009+
21010+ pax_open_kernel();
21011 gdt[0x40 / 8] = bad_bios_desc;
21012+ pax_close_kernel();
21013
21014 apm_irq_save(flags);
21015 APM_DO_SAVE_SEGS;
21016@@ -619,7 +622,11 @@ static long __apm_bios_call(void *_call)
21017 &call->esi);
21018 APM_DO_RESTORE_SEGS;
21019 apm_irq_restore(flags);
21020+
21021+ pax_open_kernel();
21022 gdt[0x40 / 8] = save_desc_40;
21023+ pax_close_kernel();
21024+
21025 put_cpu();
21026
21027 return call->eax & 0xff;
21028@@ -686,7 +693,10 @@ static long __apm_bios_call_simple(void *_call)
21029 BUG_ON(cpu != 0);
21030 gdt = get_cpu_gdt_table(cpu);
21031 save_desc_40 = gdt[0x40 / 8];
21032+
21033+ pax_open_kernel();
21034 gdt[0x40 / 8] = bad_bios_desc;
21035+ pax_close_kernel();
21036
21037 apm_irq_save(flags);
21038 APM_DO_SAVE_SEGS;
21039@@ -694,7 +704,11 @@ static long __apm_bios_call_simple(void *_call)
21040 &call->eax);
21041 APM_DO_RESTORE_SEGS;
21042 apm_irq_restore(flags);
21043+
21044+ pax_open_kernel();
21045 gdt[0x40 / 8] = save_desc_40;
21046+ pax_close_kernel();
21047+
21048 put_cpu();
21049 return error;
21050 }
21051@@ -2039,7 +2053,7 @@ static int __init swab_apm_power_in_minutes(const struct dmi_system_id *d)
21052 return 0;
21053 }
21054
21055-static struct dmi_system_id __initdata apm_dmi_table[] = {
21056+static const struct dmi_system_id __initconst apm_dmi_table[] = {
21057 {
21058 print_if_true,
21059 KERN_WARNING "IBM T23 - BIOS 1.03b+ and controller firmware 1.02+ may be needed for Linux APM.",
21060@@ -2349,12 +2363,15 @@ static int __init apm_init(void)
21061 * code to that CPU.
21062 */
21063 gdt = get_cpu_gdt_table(0);
21064+
21065+ pax_open_kernel();
21066 set_desc_base(&gdt[APM_CS >> 3],
21067 (unsigned long)__va((unsigned long)apm_info.bios.cseg << 4));
21068 set_desc_base(&gdt[APM_CS_16 >> 3],
21069 (unsigned long)__va((unsigned long)apm_info.bios.cseg_16 << 4));
21070 set_desc_base(&gdt[APM_DS >> 3],
21071 (unsigned long)__va((unsigned long)apm_info.bios.dseg << 4));
21072+ pax_close_kernel();
21073
21074 proc_create("apm", 0, NULL, &apm_file_ops);
21075
21076diff --git a/arch/x86/kernel/asm-offsets.c b/arch/x86/kernel/asm-offsets.c
21077index 9f6b934..cf5ffb3 100644
21078--- a/arch/x86/kernel/asm-offsets.c
21079+++ b/arch/x86/kernel/asm-offsets.c
21080@@ -32,6 +32,8 @@ void common(void) {
21081 OFFSET(TI_flags, thread_info, flags);
21082 OFFSET(TI_status, thread_info, status);
21083 OFFSET(TI_addr_limit, thread_info, addr_limit);
21084+ OFFSET(TI_lowest_stack, thread_info, lowest_stack);
21085+ DEFINE(TI_task_thread_sp0, offsetof(struct task_struct, thread.sp0) - offsetof(struct task_struct, tinfo));
21086
21087 BLANK();
21088 OFFSET(crypto_tfm_ctx_offset, crypto_tfm, __crt_ctx);
21089@@ -52,8 +54,26 @@ void common(void) {
21090 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
21091 OFFSET(PV_CPU_read_cr0, pv_cpu_ops, read_cr0);
21092 OFFSET(PV_MMU_read_cr2, pv_mmu_ops, read_cr2);
21093+
21094+#ifdef CONFIG_PAX_KERNEXEC
21095+ OFFSET(PV_CPU_write_cr0, pv_cpu_ops, write_cr0);
21096 #endif
21097
21098+#ifdef CONFIG_PAX_MEMORY_UDEREF
21099+ OFFSET(PV_MMU_read_cr3, pv_mmu_ops, read_cr3);
21100+ OFFSET(PV_MMU_write_cr3, pv_mmu_ops, write_cr3);
21101+#ifdef CONFIG_X86_64
21102+ OFFSET(PV_MMU_set_pgd_batched, pv_mmu_ops, set_pgd_batched);
21103+#endif
21104+#endif
21105+
21106+#endif
21107+
21108+ BLANK();
21109+ DEFINE(PAGE_SIZE_asm, PAGE_SIZE);
21110+ DEFINE(PAGE_SHIFT_asm, PAGE_SHIFT);
21111+ DEFINE(THREAD_SIZE_asm, THREAD_SIZE);
21112+
21113 #ifdef CONFIG_XEN
21114 BLANK();
21115 OFFSET(XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask);
21116diff --git a/arch/x86/kernel/asm-offsets_64.c b/arch/x86/kernel/asm-offsets_64.c
21117index fdcbb4d..036dd93 100644
21118--- a/arch/x86/kernel/asm-offsets_64.c
21119+++ b/arch/x86/kernel/asm-offsets_64.c
21120@@ -80,6 +80,7 @@ int main(void)
21121 BLANK();
21122 #undef ENTRY
21123
21124+ DEFINE(TSS_size, sizeof(struct tss_struct));
21125 OFFSET(TSS_ist, tss_struct, x86_tss.ist);
21126 BLANK();
21127
21128diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
21129index 80091ae..0c5184f 100644
21130--- a/arch/x86/kernel/cpu/Makefile
21131+++ b/arch/x86/kernel/cpu/Makefile
21132@@ -8,10 +8,6 @@ CFLAGS_REMOVE_common.o = -pg
21133 CFLAGS_REMOVE_perf_event.o = -pg
21134 endif
21135
21136-# Make sure load_percpu_segment has no stackprotector
21137-nostackp := $(call cc-option, -fno-stack-protector)
21138-CFLAGS_common.o := $(nostackp)
21139-
21140 obj-y := intel_cacheinfo.o scattered.o topology.o
21141 obj-y += common.o
21142 obj-y += rdrand.o
21143diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
21144index a220239..607fc38 100644
21145--- a/arch/x86/kernel/cpu/amd.c
21146+++ b/arch/x86/kernel/cpu/amd.c
21147@@ -717,7 +717,7 @@ static void init_amd(struct cpuinfo_x86 *c)
21148 static unsigned int amd_size_cache(struct cpuinfo_x86 *c, unsigned int size)
21149 {
21150 /* AMD errata T13 (order #21922) */
21151- if ((c->x86 == 6)) {
21152+ if (c->x86 == 6) {
21153 /* Duron Rev A0 */
21154 if (c->x86_model == 3 && c->x86_mask == 0)
21155 size = 64;
21156diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
21157index 2346c95..c061472 100644
21158--- a/arch/x86/kernel/cpu/common.c
21159+++ b/arch/x86/kernel/cpu/common.c
21160@@ -91,60 +91,6 @@ static const struct cpu_dev default_cpu = {
21161
21162 static const struct cpu_dev *this_cpu = &default_cpu;
21163
21164-DEFINE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page) = { .gdt = {
21165-#ifdef CONFIG_X86_64
21166- /*
21167- * We need valid kernel segments for data and code in long mode too
21168- * IRET will check the segment types kkeil 2000/10/28
21169- * Also sysret mandates a special GDT layout
21170- *
21171- * TLS descriptors are currently at a different place compared to i386.
21172- * Hopefully nobody expects them at a fixed place (Wine?)
21173- */
21174- [GDT_ENTRY_KERNEL32_CS] = GDT_ENTRY_INIT(0xc09b, 0, 0xfffff),
21175- [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xa09b, 0, 0xfffff),
21176- [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc093, 0, 0xfffff),
21177- [GDT_ENTRY_DEFAULT_USER32_CS] = GDT_ENTRY_INIT(0xc0fb, 0, 0xfffff),
21178- [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f3, 0, 0xfffff),
21179- [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xa0fb, 0, 0xfffff),
21180-#else
21181- [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xc09a, 0, 0xfffff),
21182- [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
21183- [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xc0fa, 0, 0xfffff),
21184- [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f2, 0, 0xfffff),
21185- /*
21186- * Segments used for calling PnP BIOS have byte granularity.
21187- * They code segments and data segments have fixed 64k limits,
21188- * the transfer segment sizes are set at run time.
21189- */
21190- /* 32-bit code */
21191- [GDT_ENTRY_PNPBIOS_CS32] = GDT_ENTRY_INIT(0x409a, 0, 0xffff),
21192- /* 16-bit code */
21193- [GDT_ENTRY_PNPBIOS_CS16] = GDT_ENTRY_INIT(0x009a, 0, 0xffff),
21194- /* 16-bit data */
21195- [GDT_ENTRY_PNPBIOS_DS] = GDT_ENTRY_INIT(0x0092, 0, 0xffff),
21196- /* 16-bit data */
21197- [GDT_ENTRY_PNPBIOS_TS1] = GDT_ENTRY_INIT(0x0092, 0, 0),
21198- /* 16-bit data */
21199- [GDT_ENTRY_PNPBIOS_TS2] = GDT_ENTRY_INIT(0x0092, 0, 0),
21200- /*
21201- * The APM segments have byte granularity and their bases
21202- * are set at run time. All have 64k limits.
21203- */
21204- /* 32-bit code */
21205- [GDT_ENTRY_APMBIOS_BASE] = GDT_ENTRY_INIT(0x409a, 0, 0xffff),
21206- /* 16-bit code */
21207- [GDT_ENTRY_APMBIOS_BASE+1] = GDT_ENTRY_INIT(0x009a, 0, 0xffff),
21208- /* data */
21209- [GDT_ENTRY_APMBIOS_BASE+2] = GDT_ENTRY_INIT(0x4092, 0, 0xffff),
21210-
21211- [GDT_ENTRY_ESPFIX_SS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
21212- [GDT_ENTRY_PERCPU] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
21213- GDT_STACK_CANARY_INIT
21214-#endif
21215-} };
21216-EXPORT_PER_CPU_SYMBOL_GPL(gdt_page);
21217-
21218 static int __init x86_xsave_setup(char *s)
21219 {
21220 if (strlen(s))
21221@@ -306,6 +252,59 @@ static __always_inline void setup_smap(struct cpuinfo_x86 *c)
21222 }
21223 }
21224
21225+#ifdef CONFIG_X86_64
21226+static __init int setup_disable_pcid(char *arg)
21227+{
21228+ setup_clear_cpu_cap(X86_FEATURE_PCID);
21229+ setup_clear_cpu_cap(X86_FEATURE_INVPCID);
21230+
21231+#ifdef CONFIG_PAX_MEMORY_UDEREF
21232+ if (clone_pgd_mask != ~(pgdval_t)0UL)
21233+ pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
21234+#endif
21235+
21236+ return 1;
21237+}
21238+__setup("nopcid", setup_disable_pcid);
21239+
21240+static void setup_pcid(struct cpuinfo_x86 *c)
21241+{
21242+ if (!cpu_has(c, X86_FEATURE_PCID)) {
21243+ clear_cpu_cap(c, X86_FEATURE_INVPCID);
21244+
21245+#ifdef CONFIG_PAX_MEMORY_UDEREF
21246+ if (clone_pgd_mask != ~(pgdval_t)0UL) {
21247+ pax_open_kernel();
21248+ pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
21249+ pax_close_kernel();
21250+ printk("PAX: slow and weak UDEREF enabled\n");
21251+ } else
21252+ printk("PAX: UDEREF disabled\n");
21253+#endif
21254+
21255+ return;
21256+ }
21257+
21258+ printk("PAX: PCID detected\n");
21259+ cr4_set_bits(X86_CR4_PCIDE);
21260+
21261+#ifdef CONFIG_PAX_MEMORY_UDEREF
21262+ pax_open_kernel();
21263+ clone_pgd_mask = ~(pgdval_t)0UL;
21264+ pax_close_kernel();
21265+ if (pax_user_shadow_base)
21266+ printk("PAX: weak UDEREF enabled\n");
21267+ else {
21268+ set_cpu_cap(c, X86_FEATURE_STRONGUDEREF);
21269+ printk("PAX: strong UDEREF enabled\n");
21270+ }
21271+#endif
21272+
21273+ if (cpu_has(c, X86_FEATURE_INVPCID))
21274+ printk("PAX: INVPCID detected\n");
21275+}
21276+#endif
21277+
21278 /*
21279 * Some CPU features depend on higher CPUID levels, which may not always
21280 * be available due to CPUID level capping or broken virtualization
21281@@ -406,7 +405,7 @@ void switch_to_new_gdt(int cpu)
21282 {
21283 struct desc_ptr gdt_descr;
21284
21285- gdt_descr.address = (long)get_cpu_gdt_table(cpu);
21286+ gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
21287 gdt_descr.size = GDT_SIZE - 1;
21288 load_gdt(&gdt_descr);
21289 /* Reload the per-cpu base */
21290@@ -897,6 +896,20 @@ static void identify_cpu(struct cpuinfo_x86 *c)
21291 setup_smep(c);
21292 setup_smap(c);
21293
21294+#ifdef CONFIG_X86_32
21295+#ifdef CONFIG_PAX_PAGEEXEC
21296+ if (!(__supported_pte_mask & _PAGE_NX))
21297+ clear_cpu_cap(c, X86_FEATURE_PSE);
21298+#endif
21299+#if defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
21300+ clear_cpu_cap(c, X86_FEATURE_SEP);
21301+#endif
21302+#endif
21303+
21304+#ifdef CONFIG_X86_64
21305+ setup_pcid(c);
21306+#endif
21307+
21308 /*
21309 * The vendor-specific functions might have changed features.
21310 * Now we do "generic changes."
21311@@ -979,7 +992,7 @@ static void syscall32_cpu_init(void)
21312 void enable_sep_cpu(void)
21313 {
21314 int cpu = get_cpu();
21315- struct tss_struct *tss = &per_cpu(init_tss, cpu);
21316+ struct tss_struct *tss = init_tss + cpu;
21317
21318 if (!boot_cpu_has(X86_FEATURE_SEP)) {
21319 put_cpu();
21320@@ -1117,14 +1130,16 @@ static __init int setup_disablecpuid(char *arg)
21321 }
21322 __setup("clearcpuid=", setup_disablecpuid);
21323
21324+DEFINE_PER_CPU(struct thread_info *, current_tinfo) = &init_task.tinfo;
21325+EXPORT_PER_CPU_SYMBOL(current_tinfo);
21326+
21327 DEFINE_PER_CPU(unsigned long, kernel_stack) =
21328- (unsigned long)&init_thread_union - KERNEL_STACK_OFFSET + THREAD_SIZE;
21329+ (unsigned long)&init_thread_union - 16 + THREAD_SIZE;
21330 EXPORT_PER_CPU_SYMBOL(kernel_stack);
21331
21332 #ifdef CONFIG_X86_64
21333-struct desc_ptr idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) idt_table };
21334-struct desc_ptr debug_idt_descr = { NR_VECTORS * 16 - 1,
21335- (unsigned long) debug_idt_table };
21336+struct desc_ptr idt_descr __read_only = { NR_VECTORS * 16 - 1, (unsigned long) idt_table };
21337+const struct desc_ptr debug_idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) debug_idt_table };
21338
21339 DEFINE_PER_CPU_FIRST(union irq_stack_union,
21340 irq_stack_union) __aligned(PAGE_SIZE) __visible;
21341@@ -1307,7 +1322,7 @@ void cpu_init(void)
21342 */
21343 load_ucode_ap();
21344
21345- t = &per_cpu(init_tss, cpu);
21346+ t = init_tss + cpu;
21347 oist = &per_cpu(orig_ist, cpu);
21348
21349 #ifdef CONFIG_NUMA
21350@@ -1339,7 +1354,6 @@ void cpu_init(void)
21351 wrmsrl(MSR_KERNEL_GS_BASE, 0);
21352 barrier();
21353
21354- x86_configure_nx();
21355 x2apic_setup();
21356
21357 /*
21358@@ -1391,7 +1405,7 @@ void cpu_init(void)
21359 {
21360 int cpu = smp_processor_id();
21361 struct task_struct *curr = current;
21362- struct tss_struct *t = &per_cpu(init_tss, cpu);
21363+ struct tss_struct *t = init_tss + cpu;
21364 struct thread_struct *thread = &curr->thread;
21365
21366 wait_for_master_cpu(cpu);
21367diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c
21368index 6596433..1ad6eaf 100644
21369--- a/arch/x86/kernel/cpu/intel_cacheinfo.c
21370+++ b/arch/x86/kernel/cpu/intel_cacheinfo.c
21371@@ -1024,6 +1024,22 @@ static struct attribute *default_attrs[] = {
21372 };
21373
21374 #ifdef CONFIG_AMD_NB
21375+static struct attribute *default_attrs_amd_nb[] = {
21376+ &type.attr,
21377+ &level.attr,
21378+ &coherency_line_size.attr,
21379+ &physical_line_partition.attr,
21380+ &ways_of_associativity.attr,
21381+ &number_of_sets.attr,
21382+ &size.attr,
21383+ &shared_cpu_map.attr,
21384+ &shared_cpu_list.attr,
21385+ NULL,
21386+ NULL,
21387+ NULL,
21388+ NULL
21389+};
21390+
21391 static struct attribute **amd_l3_attrs(void)
21392 {
21393 static struct attribute **attrs;
21394@@ -1034,18 +1050,7 @@ static struct attribute **amd_l3_attrs(void)
21395
21396 n = ARRAY_SIZE(default_attrs);
21397
21398- if (amd_nb_has_feature(AMD_NB_L3_INDEX_DISABLE))
21399- n += 2;
21400-
21401- if (amd_nb_has_feature(AMD_NB_L3_PARTITIONING))
21402- n += 1;
21403-
21404- attrs = kzalloc(n * sizeof (struct attribute *), GFP_KERNEL);
21405- if (attrs == NULL)
21406- return attrs = default_attrs;
21407-
21408- for (n = 0; default_attrs[n]; n++)
21409- attrs[n] = default_attrs[n];
21410+ attrs = default_attrs_amd_nb;
21411
21412 if (amd_nb_has_feature(AMD_NB_L3_INDEX_DISABLE)) {
21413 attrs[n++] = &cache_disable_0.attr;
21414@@ -1096,6 +1101,13 @@ static struct kobj_type ktype_cache = {
21415 .default_attrs = default_attrs,
21416 };
21417
21418+#ifdef CONFIG_AMD_NB
21419+static struct kobj_type ktype_cache_amd_nb = {
21420+ .sysfs_ops = &sysfs_ops,
21421+ .default_attrs = default_attrs_amd_nb,
21422+};
21423+#endif
21424+
21425 static struct kobj_type ktype_percpu_entry = {
21426 .sysfs_ops = &sysfs_ops,
21427 };
21428@@ -1161,20 +1173,26 @@ static int cache_add_dev(struct device *dev)
21429 return retval;
21430 }
21431
21432+#ifdef CONFIG_AMD_NB
21433+ amd_l3_attrs();
21434+#endif
21435+
21436 for (i = 0; i < num_cache_leaves; i++) {
21437+ struct kobj_type *ktype;
21438+
21439 this_object = INDEX_KOBJECT_PTR(cpu, i);
21440 this_object->cpu = cpu;
21441 this_object->index = i;
21442
21443 this_leaf = CPUID4_INFO_IDX(cpu, i);
21444
21445- ktype_cache.default_attrs = default_attrs;
21446+ ktype = &ktype_cache;
21447 #ifdef CONFIG_AMD_NB
21448 if (this_leaf->base.nb)
21449- ktype_cache.default_attrs = amd_l3_attrs();
21450+ ktype = &ktype_cache_amd_nb;
21451 #endif
21452 retval = kobject_init_and_add(&(this_object->kobj),
21453- &ktype_cache,
21454+ ktype,
21455 per_cpu(ici_cache_kobject, cpu),
21456 "index%1lu", i);
21457 if (unlikely(retval)) {
21458diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
21459index 11dd8f2..fd88f68 100644
21460--- a/arch/x86/kernel/cpu/mcheck/mce.c
21461+++ b/arch/x86/kernel/cpu/mcheck/mce.c
21462@@ -47,6 +47,7 @@
21463 #include <asm/tlbflush.h>
21464 #include <asm/mce.h>
21465 #include <asm/msr.h>
21466+#include <asm/local.h>
21467
21468 #include "mce-internal.h"
21469
21470@@ -258,7 +259,7 @@ static void print_mce(struct mce *m)
21471 !(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "",
21472 m->cs, m->ip);
21473
21474- if (m->cs == __KERNEL_CS)
21475+ if (m->cs == __KERNEL_CS || m->cs == __KERNEXEC_KERNEL_CS)
21476 print_symbol("{%s}", m->ip);
21477 pr_cont("\n");
21478 }
21479@@ -291,10 +292,10 @@ static void print_mce(struct mce *m)
21480
21481 #define PANIC_TIMEOUT 5 /* 5 seconds */
21482
21483-static atomic_t mce_panicked;
21484+static atomic_unchecked_t mce_panicked;
21485
21486 static int fake_panic;
21487-static atomic_t mce_fake_panicked;
21488+static atomic_unchecked_t mce_fake_panicked;
21489
21490 /* Panic in progress. Enable interrupts and wait for final IPI */
21491 static void wait_for_panic(void)
21492@@ -318,7 +319,7 @@ static void mce_panic(const char *msg, struct mce *final, char *exp)
21493 /*
21494 * Make sure only one CPU runs in machine check panic
21495 */
21496- if (atomic_inc_return(&mce_panicked) > 1)
21497+ if (atomic_inc_return_unchecked(&mce_panicked) > 1)
21498 wait_for_panic();
21499 barrier();
21500
21501@@ -326,7 +327,7 @@ static void mce_panic(const char *msg, struct mce *final, char *exp)
21502 console_verbose();
21503 } else {
21504 /* Don't log too much for fake panic */
21505- if (atomic_inc_return(&mce_fake_panicked) > 1)
21506+ if (atomic_inc_return_unchecked(&mce_fake_panicked) > 1)
21507 return;
21508 }
21509 /* First print corrected ones that are still unlogged */
21510@@ -365,7 +366,7 @@ static void mce_panic(const char *msg, struct mce *final, char *exp)
21511 if (!fake_panic) {
21512 if (panic_timeout == 0)
21513 panic_timeout = mca_cfg.panic_timeout;
21514- panic(msg);
21515+ panic("%s", msg);
21516 } else
21517 pr_emerg(HW_ERR "Fake kernel panic: %s\n", msg);
21518 }
21519@@ -746,7 +747,7 @@ static int mce_timed_out(u64 *t, const char *msg)
21520 * might have been modified by someone else.
21521 */
21522 rmb();
21523- if (atomic_read(&mce_panicked))
21524+ if (atomic_read_unchecked(&mce_panicked))
21525 wait_for_panic();
21526 if (!mca_cfg.monarch_timeout)
21527 goto out;
21528@@ -1672,7 +1673,7 @@ static void unexpected_machine_check(struct pt_regs *regs, long error_code)
21529 }
21530
21531 /* Call the installed machine check handler for this CPU setup. */
21532-void (*machine_check_vector)(struct pt_regs *, long error_code) =
21533+void (*machine_check_vector)(struct pt_regs *, long error_code) __read_only =
21534 unexpected_machine_check;
21535
21536 /*
21537@@ -1695,7 +1696,9 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c)
21538 return;
21539 }
21540
21541+ pax_open_kernel();
21542 machine_check_vector = do_machine_check;
21543+ pax_close_kernel();
21544
21545 __mcheck_cpu_init_generic();
21546 __mcheck_cpu_init_vendor(c);
21547@@ -1709,7 +1712,7 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c)
21548 */
21549
21550 static DEFINE_SPINLOCK(mce_chrdev_state_lock);
21551-static int mce_chrdev_open_count; /* #times opened */
21552+static local_t mce_chrdev_open_count; /* #times opened */
21553 static int mce_chrdev_open_exclu; /* already open exclusive? */
21554
21555 static int mce_chrdev_open(struct inode *inode, struct file *file)
21556@@ -1717,7 +1720,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
21557 spin_lock(&mce_chrdev_state_lock);
21558
21559 if (mce_chrdev_open_exclu ||
21560- (mce_chrdev_open_count && (file->f_flags & O_EXCL))) {
21561+ (local_read(&mce_chrdev_open_count) && (file->f_flags & O_EXCL))) {
21562 spin_unlock(&mce_chrdev_state_lock);
21563
21564 return -EBUSY;
21565@@ -1725,7 +1728,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
21566
21567 if (file->f_flags & O_EXCL)
21568 mce_chrdev_open_exclu = 1;
21569- mce_chrdev_open_count++;
21570+ local_inc(&mce_chrdev_open_count);
21571
21572 spin_unlock(&mce_chrdev_state_lock);
21573
21574@@ -1736,7 +1739,7 @@ static int mce_chrdev_release(struct inode *inode, struct file *file)
21575 {
21576 spin_lock(&mce_chrdev_state_lock);
21577
21578- mce_chrdev_open_count--;
21579+ local_dec(&mce_chrdev_open_count);
21580 mce_chrdev_open_exclu = 0;
21581
21582 spin_unlock(&mce_chrdev_state_lock);
21583@@ -2411,7 +2414,7 @@ static __init void mce_init_banks(void)
21584
21585 for (i = 0; i < mca_cfg.banks; i++) {
21586 struct mce_bank *b = &mce_banks[i];
21587- struct device_attribute *a = &b->attr;
21588+ device_attribute_no_const *a = &b->attr;
21589
21590 sysfs_attr_init(&a->attr);
21591 a->attr.name = b->attrname;
21592@@ -2518,7 +2521,7 @@ struct dentry *mce_get_debugfs_dir(void)
21593 static void mce_reset(void)
21594 {
21595 cpu_missing = 0;
21596- atomic_set(&mce_fake_panicked, 0);
21597+ atomic_set_unchecked(&mce_fake_panicked, 0);
21598 atomic_set(&mce_executing, 0);
21599 atomic_set(&mce_callin, 0);
21600 atomic_set(&global_nwo, 0);
21601diff --git a/arch/x86/kernel/cpu/mcheck/p5.c b/arch/x86/kernel/cpu/mcheck/p5.c
21602index 737b0ad..09ec66e 100644
21603--- a/arch/x86/kernel/cpu/mcheck/p5.c
21604+++ b/arch/x86/kernel/cpu/mcheck/p5.c
21605@@ -12,6 +12,7 @@
21606 #include <asm/tlbflush.h>
21607 #include <asm/mce.h>
21608 #include <asm/msr.h>
21609+#include <asm/pgtable.h>
21610
21611 /* By default disabled */
21612 int mce_p5_enabled __read_mostly;
21613@@ -55,7 +56,9 @@ void intel_p5_mcheck_init(struct cpuinfo_x86 *c)
21614 if (!cpu_has(c, X86_FEATURE_MCE))
21615 return;
21616
21617+ pax_open_kernel();
21618 machine_check_vector = pentium_machine_check;
21619+ pax_close_kernel();
21620 /* Make sure the vector pointer is visible before we enable MCEs: */
21621 wmb();
21622
21623diff --git a/arch/x86/kernel/cpu/mcheck/winchip.c b/arch/x86/kernel/cpu/mcheck/winchip.c
21624index 44f1382..315b292 100644
21625--- a/arch/x86/kernel/cpu/mcheck/winchip.c
21626+++ b/arch/x86/kernel/cpu/mcheck/winchip.c
21627@@ -11,6 +11,7 @@
21628 #include <asm/tlbflush.h>
21629 #include <asm/mce.h>
21630 #include <asm/msr.h>
21631+#include <asm/pgtable.h>
21632
21633 /* Machine check handler for WinChip C6: */
21634 static void winchip_machine_check(struct pt_regs *regs, long error_code)
21635@@ -28,7 +29,9 @@ void winchip_mcheck_init(struct cpuinfo_x86 *c)
21636 {
21637 u32 lo, hi;
21638
21639+ pax_open_kernel();
21640 machine_check_vector = winchip_machine_check;
21641+ pax_close_kernel();
21642 /* Make sure the vector pointer is visible before we enable MCEs: */
21643 wmb();
21644
21645diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c
21646index 36a8361..e7058c2 100644
21647--- a/arch/x86/kernel/cpu/microcode/core.c
21648+++ b/arch/x86/kernel/cpu/microcode/core.c
21649@@ -518,7 +518,7 @@ mc_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu)
21650 return NOTIFY_OK;
21651 }
21652
21653-static struct notifier_block __refdata mc_cpu_notifier = {
21654+static struct notifier_block mc_cpu_notifier = {
21655 .notifier_call = mc_cpu_callback,
21656 };
21657
21658diff --git a/arch/x86/kernel/cpu/microcode/intel.c b/arch/x86/kernel/cpu/microcode/intel.c
21659index 746e7fd..8dc677e 100644
21660--- a/arch/x86/kernel/cpu/microcode/intel.c
21661+++ b/arch/x86/kernel/cpu/microcode/intel.c
21662@@ -298,13 +298,13 @@ static enum ucode_state request_microcode_fw(int cpu, struct device *device,
21663
21664 static int get_ucode_user(void *to, const void *from, size_t n)
21665 {
21666- return copy_from_user(to, from, n);
21667+ return copy_from_user(to, (const void __force_user *)from, n);
21668 }
21669
21670 static enum ucode_state
21671 request_microcode_user(int cpu, const void __user *buf, size_t size)
21672 {
21673- return generic_load_microcode(cpu, (void *)buf, size, &get_ucode_user);
21674+ return generic_load_microcode(cpu, (__force_kernel void *)buf, size, &get_ucode_user);
21675 }
21676
21677 static void microcode_fini_cpu(int cpu)
21678diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c
21679index ea5f363..cb0e905 100644
21680--- a/arch/x86/kernel/cpu/mtrr/main.c
21681+++ b/arch/x86/kernel/cpu/mtrr/main.c
21682@@ -66,7 +66,7 @@ static DEFINE_MUTEX(mtrr_mutex);
21683 u64 size_or_mask, size_and_mask;
21684 static bool mtrr_aps_delayed_init;
21685
21686-static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM];
21687+static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM] __read_only;
21688
21689 const struct mtrr_ops *mtrr_if;
21690
21691diff --git a/arch/x86/kernel/cpu/mtrr/mtrr.h b/arch/x86/kernel/cpu/mtrr/mtrr.h
21692index df5e41f..816c719 100644
21693--- a/arch/x86/kernel/cpu/mtrr/mtrr.h
21694+++ b/arch/x86/kernel/cpu/mtrr/mtrr.h
21695@@ -25,7 +25,7 @@ struct mtrr_ops {
21696 int (*validate_add_page)(unsigned long base, unsigned long size,
21697 unsigned int type);
21698 int (*have_wrcomb)(void);
21699-};
21700+} __do_const;
21701
21702 extern int generic_get_free_region(unsigned long base, unsigned long size,
21703 int replace_reg);
21704diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
21705index b71a7f8..534af0e 100644
21706--- a/arch/x86/kernel/cpu/perf_event.c
21707+++ b/arch/x86/kernel/cpu/perf_event.c
21708@@ -1376,7 +1376,7 @@ static void __init pmu_check_apic(void)
21709
21710 }
21711
21712-static struct attribute_group x86_pmu_format_group = {
21713+static attribute_group_no_const x86_pmu_format_group = {
21714 .name = "format",
21715 .attrs = NULL,
21716 };
21717@@ -1475,7 +1475,7 @@ static struct attribute *events_attr[] = {
21718 NULL,
21719 };
21720
21721-static struct attribute_group x86_pmu_events_group = {
21722+static attribute_group_no_const x86_pmu_events_group = {
21723 .name = "events",
21724 .attrs = events_attr,
21725 };
21726@@ -2037,7 +2037,7 @@ static unsigned long get_segment_base(unsigned int segment)
21727 if (idx > GDT_ENTRIES)
21728 return 0;
21729
21730- desc = raw_cpu_ptr(gdt_page.gdt);
21731+ desc = get_cpu_gdt_table(smp_processor_id());
21732 }
21733
21734 return get_desc_base(desc + idx);
21735@@ -2127,7 +2127,7 @@ perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs)
21736 break;
21737
21738 perf_callchain_store(entry, frame.return_address);
21739- fp = frame.next_frame;
21740+ fp = (const void __force_user *)frame.next_frame;
21741 }
21742 }
21743
21744diff --git a/arch/x86/kernel/cpu/perf_event_amd_iommu.c b/arch/x86/kernel/cpu/perf_event_amd_iommu.c
21745index 97242a9..cf9c30e 100644
21746--- a/arch/x86/kernel/cpu/perf_event_amd_iommu.c
21747+++ b/arch/x86/kernel/cpu/perf_event_amd_iommu.c
21748@@ -402,7 +402,7 @@ static void perf_iommu_del(struct perf_event *event, int flags)
21749 static __init int _init_events_attrs(struct perf_amd_iommu *perf_iommu)
21750 {
21751 struct attribute **attrs;
21752- struct attribute_group *attr_group;
21753+ attribute_group_no_const *attr_group;
21754 int i = 0, j;
21755
21756 while (amd_iommu_v2_event_descs[i].attr.attr.name)
21757diff --git a/arch/x86/kernel/cpu/perf_event_intel.c b/arch/x86/kernel/cpu/perf_event_intel.c
21758index 2589906..1ca1000 100644
21759--- a/arch/x86/kernel/cpu/perf_event_intel.c
21760+++ b/arch/x86/kernel/cpu/perf_event_intel.c
21761@@ -2353,10 +2353,10 @@ __init int intel_pmu_init(void)
21762 x86_pmu.num_counters_fixed = max((int)edx.split.num_counters_fixed, 3);
21763
21764 if (boot_cpu_has(X86_FEATURE_PDCM)) {
21765- u64 capabilities;
21766+ u64 capabilities = x86_pmu.intel_cap.capabilities;
21767
21768- rdmsrl(MSR_IA32_PERF_CAPABILITIES, capabilities);
21769- x86_pmu.intel_cap.capabilities = capabilities;
21770+ if (rdmsrl_safe(MSR_IA32_PERF_CAPABILITIES, &x86_pmu.intel_cap.capabilities))
21771+ x86_pmu.intel_cap.capabilities = capabilities;
21772 }
21773
21774 intel_ds_init();
21775diff --git a/arch/x86/kernel/cpu/perf_event_intel_rapl.c b/arch/x86/kernel/cpu/perf_event_intel_rapl.c
21776index 76d8cbe..e5f9681 100644
21777--- a/arch/x86/kernel/cpu/perf_event_intel_rapl.c
21778+++ b/arch/x86/kernel/cpu/perf_event_intel_rapl.c
21779@@ -465,7 +465,7 @@ static struct attribute *rapl_events_hsw_attr[] = {
21780 NULL,
21781 };
21782
21783-static struct attribute_group rapl_pmu_events_group = {
21784+static attribute_group_no_const rapl_pmu_events_group __read_only = {
21785 .name = "events",
21786 .attrs = NULL, /* patched at runtime */
21787 };
21788diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.c b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
21789index c635b8b..b78835e 100644
21790--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.c
21791+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
21792@@ -733,7 +733,7 @@ static void __init uncore_types_exit(struct intel_uncore_type **types)
21793 static int __init uncore_type_init(struct intel_uncore_type *type)
21794 {
21795 struct intel_uncore_pmu *pmus;
21796- struct attribute_group *attr_group;
21797+ attribute_group_no_const *attr_group;
21798 struct attribute **attrs;
21799 int i, j;
21800
21801diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.h b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
21802index 6c8c1e7..515b98a 100644
21803--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.h
21804+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
21805@@ -114,7 +114,7 @@ struct intel_uncore_box {
21806 struct uncore_event_desc {
21807 struct kobj_attribute attr;
21808 const char *config;
21809-};
21810+} __do_const;
21811
21812 ssize_t uncore_event_show(struct kobject *kobj,
21813 struct kobj_attribute *attr, char *buf);
21814diff --git a/arch/x86/kernel/cpuid.c b/arch/x86/kernel/cpuid.c
21815index 83741a7..bd3507d 100644
21816--- a/arch/x86/kernel/cpuid.c
21817+++ b/arch/x86/kernel/cpuid.c
21818@@ -170,7 +170,7 @@ static int cpuid_class_cpu_callback(struct notifier_block *nfb,
21819 return notifier_from_errno(err);
21820 }
21821
21822-static struct notifier_block __refdata cpuid_class_cpu_notifier =
21823+static struct notifier_block cpuid_class_cpu_notifier =
21824 {
21825 .notifier_call = cpuid_class_cpu_callback,
21826 };
21827diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
21828index aceb2f9..c76d3e3 100644
21829--- a/arch/x86/kernel/crash.c
21830+++ b/arch/x86/kernel/crash.c
21831@@ -105,7 +105,7 @@ static void kdump_nmi_callback(int cpu, struct pt_regs *regs)
21832 #ifdef CONFIG_X86_32
21833 struct pt_regs fixed_regs;
21834
21835- if (!user_mode_vm(regs)) {
21836+ if (!user_mode(regs)) {
21837 crash_fixup_ss_esp(&fixed_regs, regs);
21838 regs = &fixed_regs;
21839 }
21840diff --git a/arch/x86/kernel/crash_dump_64.c b/arch/x86/kernel/crash_dump_64.c
21841index afa64ad..dce67dd 100644
21842--- a/arch/x86/kernel/crash_dump_64.c
21843+++ b/arch/x86/kernel/crash_dump_64.c
21844@@ -36,7 +36,7 @@ ssize_t copy_oldmem_page(unsigned long pfn, char *buf,
21845 return -ENOMEM;
21846
21847 if (userbuf) {
21848- if (copy_to_user(buf, vaddr + offset, csize)) {
21849+ if (copy_to_user((char __force_user *)buf, vaddr + offset, csize)) {
21850 iounmap(vaddr);
21851 return -EFAULT;
21852 }
21853diff --git a/arch/x86/kernel/doublefault.c b/arch/x86/kernel/doublefault.c
21854index f6dfd93..892ade4 100644
21855--- a/arch/x86/kernel/doublefault.c
21856+++ b/arch/x86/kernel/doublefault.c
21857@@ -12,7 +12,7 @@
21858
21859 #define DOUBLEFAULT_STACKSIZE (1024)
21860 static unsigned long doublefault_stack[DOUBLEFAULT_STACKSIZE];
21861-#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE)
21862+#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE-2)
21863
21864 #define ptr_ok(x) ((x) > PAGE_OFFSET && (x) < PAGE_OFFSET + MAXMEM)
21865
21866@@ -22,7 +22,7 @@ static void doublefault_fn(void)
21867 unsigned long gdt, tss;
21868
21869 native_store_gdt(&gdt_desc);
21870- gdt = gdt_desc.address;
21871+ gdt = (unsigned long)gdt_desc.address;
21872
21873 printk(KERN_EMERG "PANIC: double fault, gdt at %08lx [%d bytes]\n", gdt, gdt_desc.size);
21874
21875@@ -59,10 +59,10 @@ struct tss_struct doublefault_tss __cacheline_aligned = {
21876 /* 0x2 bit is always set */
21877 .flags = X86_EFLAGS_SF | 0x2,
21878 .sp = STACK_START,
21879- .es = __USER_DS,
21880+ .es = __KERNEL_DS,
21881 .cs = __KERNEL_CS,
21882 .ss = __KERNEL_DS,
21883- .ds = __USER_DS,
21884+ .ds = __KERNEL_DS,
21885 .fs = __KERNEL_PERCPU,
21886
21887 .__cr3 = __pa_nodebug(swapper_pg_dir),
21888diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
21889index cf3df1d..b637d9a 100644
21890--- a/arch/x86/kernel/dumpstack.c
21891+++ b/arch/x86/kernel/dumpstack.c
21892@@ -2,6 +2,9 @@
21893 * Copyright (C) 1991, 1992 Linus Torvalds
21894 * Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs
21895 */
21896+#ifdef CONFIG_GRKERNSEC_HIDESYM
21897+#define __INCLUDED_BY_HIDESYM 1
21898+#endif
21899 #include <linux/kallsyms.h>
21900 #include <linux/kprobes.h>
21901 #include <linux/uaccess.h>
21902@@ -33,23 +36,21 @@ static void printk_stack_address(unsigned long address, int reliable)
21903
21904 void printk_address(unsigned long address)
21905 {
21906- pr_cont(" [<%p>] %pS\n", (void *)address, (void *)address);
21907+ pr_cont(" [<%p>] %pA\n", (void *)address, (void *)address);
21908 }
21909
21910 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
21911 static void
21912 print_ftrace_graph_addr(unsigned long addr, void *data,
21913 const struct stacktrace_ops *ops,
21914- struct thread_info *tinfo, int *graph)
21915+ struct task_struct *task, int *graph)
21916 {
21917- struct task_struct *task;
21918 unsigned long ret_addr;
21919 int index;
21920
21921 if (addr != (unsigned long)return_to_handler)
21922 return;
21923
21924- task = tinfo->task;
21925 index = task->curr_ret_stack;
21926
21927 if (!task->ret_stack || index < *graph)
21928@@ -66,7 +67,7 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
21929 static inline void
21930 print_ftrace_graph_addr(unsigned long addr, void *data,
21931 const struct stacktrace_ops *ops,
21932- struct thread_info *tinfo, int *graph)
21933+ struct task_struct *task, int *graph)
21934 { }
21935 #endif
21936
21937@@ -77,10 +78,8 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
21938 * severe exception (double fault, nmi, stack fault, debug, mce) hardware stack
21939 */
21940
21941-static inline int valid_stack_ptr(struct thread_info *tinfo,
21942- void *p, unsigned int size, void *end)
21943+static inline int valid_stack_ptr(void *t, void *p, unsigned int size, void *end)
21944 {
21945- void *t = tinfo;
21946 if (end) {
21947 if (p < end && p >= (end-THREAD_SIZE))
21948 return 1;
21949@@ -91,14 +90,14 @@ static inline int valid_stack_ptr(struct thread_info *tinfo,
21950 }
21951
21952 unsigned long
21953-print_context_stack(struct thread_info *tinfo,
21954+print_context_stack(struct task_struct *task, void *stack_start,
21955 unsigned long *stack, unsigned long bp,
21956 const struct stacktrace_ops *ops, void *data,
21957 unsigned long *end, int *graph)
21958 {
21959 struct stack_frame *frame = (struct stack_frame *)bp;
21960
21961- while (valid_stack_ptr(tinfo, stack, sizeof(*stack), end)) {
21962+ while (valid_stack_ptr(stack_start, stack, sizeof(*stack), end)) {
21963 unsigned long addr;
21964
21965 addr = *stack;
21966@@ -110,7 +109,7 @@ print_context_stack(struct thread_info *tinfo,
21967 } else {
21968 ops->address(data, addr, 0);
21969 }
21970- print_ftrace_graph_addr(addr, data, ops, tinfo, graph);
21971+ print_ftrace_graph_addr(addr, data, ops, task, graph);
21972 }
21973 stack++;
21974 }
21975@@ -119,7 +118,7 @@ print_context_stack(struct thread_info *tinfo,
21976 EXPORT_SYMBOL_GPL(print_context_stack);
21977
21978 unsigned long
21979-print_context_stack_bp(struct thread_info *tinfo,
21980+print_context_stack_bp(struct task_struct *task, void *stack_start,
21981 unsigned long *stack, unsigned long bp,
21982 const struct stacktrace_ops *ops, void *data,
21983 unsigned long *end, int *graph)
21984@@ -127,7 +126,7 @@ print_context_stack_bp(struct thread_info *tinfo,
21985 struct stack_frame *frame = (struct stack_frame *)bp;
21986 unsigned long *ret_addr = &frame->return_address;
21987
21988- while (valid_stack_ptr(tinfo, ret_addr, sizeof(*ret_addr), end)) {
21989+ while (valid_stack_ptr(stack_start, ret_addr, sizeof(*ret_addr), end)) {
21990 unsigned long addr = *ret_addr;
21991
21992 if (!__kernel_text_address(addr))
21993@@ -136,7 +135,7 @@ print_context_stack_bp(struct thread_info *tinfo,
21994 ops->address(data, addr, 1);
21995 frame = frame->next_frame;
21996 ret_addr = &frame->return_address;
21997- print_ftrace_graph_addr(addr, data, ops, tinfo, graph);
21998+ print_ftrace_graph_addr(addr, data, ops, task, graph);
21999 }
22000
22001 return (unsigned long)frame;
22002@@ -155,7 +154,7 @@ static int print_trace_stack(void *data, char *name)
22003 static void print_trace_address(void *data, unsigned long addr, int reliable)
22004 {
22005 touch_nmi_watchdog();
22006- printk(data);
22007+ printk("%s", (char *)data);
22008 printk_stack_address(addr, reliable);
22009 }
22010
22011@@ -225,6 +224,8 @@ unsigned long oops_begin(void)
22012 EXPORT_SYMBOL_GPL(oops_begin);
22013 NOKPROBE_SYMBOL(oops_begin);
22014
22015+extern void gr_handle_kernel_exploit(void);
22016+
22017 void oops_end(unsigned long flags, struct pt_regs *regs, int signr)
22018 {
22019 if (regs && kexec_should_crash(current))
22020@@ -246,7 +247,10 @@ void oops_end(unsigned long flags, struct pt_regs *regs, int signr)
22021 panic("Fatal exception in interrupt");
22022 if (panic_on_oops)
22023 panic("Fatal exception");
22024- do_exit(signr);
22025+
22026+ gr_handle_kernel_exploit();
22027+
22028+ do_group_exit(signr);
22029 }
22030 NOKPROBE_SYMBOL(oops_end);
22031
22032@@ -278,7 +282,7 @@ int __die(const char *str, struct pt_regs *regs, long err)
22033 print_modules();
22034 show_regs(regs);
22035 #ifdef CONFIG_X86_32
22036- if (user_mode_vm(regs)) {
22037+ if (user_mode(regs)) {
22038 sp = regs->sp;
22039 ss = regs->ss & 0xffff;
22040 } else {
22041@@ -307,7 +311,7 @@ void die(const char *str, struct pt_regs *regs, long err)
22042 unsigned long flags = oops_begin();
22043 int sig = SIGSEGV;
22044
22045- if (!user_mode_vm(regs))
22046+ if (!user_mode(regs))
22047 report_bug(regs->ip, regs);
22048
22049 if (__die(str, regs, err))
22050diff --git a/arch/x86/kernel/dumpstack_32.c b/arch/x86/kernel/dumpstack_32.c
22051index 5abd4cd..c65733b 100644
22052--- a/arch/x86/kernel/dumpstack_32.c
22053+++ b/arch/x86/kernel/dumpstack_32.c
22054@@ -61,15 +61,14 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22055 bp = stack_frame(task, regs);
22056
22057 for (;;) {
22058- struct thread_info *context;
22059+ void *stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
22060 void *end_stack;
22061
22062 end_stack = is_hardirq_stack(stack, cpu);
22063 if (!end_stack)
22064 end_stack = is_softirq_stack(stack, cpu);
22065
22066- context = task_thread_info(task);
22067- bp = ops->walk_stack(context, stack, bp, ops, data,
22068+ bp = ops->walk_stack(task, stack_start, stack, bp, ops, data,
22069 end_stack, &graph);
22070
22071 /* Stop if not on irq stack */
22072@@ -123,27 +122,28 @@ void show_regs(struct pt_regs *regs)
22073 int i;
22074
22075 show_regs_print_info(KERN_EMERG);
22076- __show_regs(regs, !user_mode_vm(regs));
22077+ __show_regs(regs, !user_mode(regs));
22078
22079 /*
22080 * When in-kernel, we also print out the stack and code at the
22081 * time of the fault..
22082 */
22083- if (!user_mode_vm(regs)) {
22084+ if (!user_mode(regs)) {
22085 unsigned int code_prologue = code_bytes * 43 / 64;
22086 unsigned int code_len = code_bytes;
22087 unsigned char c;
22088 u8 *ip;
22089+ unsigned long cs_base = get_desc_base(&get_cpu_gdt_table(0)[(0xffff & regs->cs) >> 3]);
22090
22091 pr_emerg("Stack:\n");
22092 show_stack_log_lvl(NULL, regs, &regs->sp, 0, KERN_EMERG);
22093
22094 pr_emerg("Code:");
22095
22096- ip = (u8 *)regs->ip - code_prologue;
22097+ ip = (u8 *)regs->ip - code_prologue + cs_base;
22098 if (ip < (u8 *)PAGE_OFFSET || probe_kernel_address(ip, c)) {
22099 /* try starting at IP */
22100- ip = (u8 *)regs->ip;
22101+ ip = (u8 *)regs->ip + cs_base;
22102 code_len = code_len - code_prologue + 1;
22103 }
22104 for (i = 0; i < code_len; i++, ip++) {
22105@@ -152,7 +152,7 @@ void show_regs(struct pt_regs *regs)
22106 pr_cont(" Bad EIP value.");
22107 break;
22108 }
22109- if (ip == (u8 *)regs->ip)
22110+ if (ip == (u8 *)regs->ip + cs_base)
22111 pr_cont(" <%02x>", c);
22112 else
22113 pr_cont(" %02x", c);
22114@@ -165,6 +165,7 @@ int is_valid_bugaddr(unsigned long ip)
22115 {
22116 unsigned short ud2;
22117
22118+ ip = ktla_ktva(ip);
22119 if (ip < PAGE_OFFSET)
22120 return 0;
22121 if (probe_kernel_address((unsigned short *)ip, ud2))
22122@@ -172,3 +173,15 @@ int is_valid_bugaddr(unsigned long ip)
22123
22124 return ud2 == 0x0b0f;
22125 }
22126+
22127+#if defined(CONFIG_PAX_MEMORY_STACKLEAK) || defined(CONFIG_PAX_USERCOPY)
22128+void pax_check_alloca(unsigned long size)
22129+{
22130+ unsigned long sp = (unsigned long)&sp, stack_left;
22131+
22132+ /* all kernel stacks are of the same size */
22133+ stack_left = sp & (THREAD_SIZE - 1);
22134+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
22135+}
22136+EXPORT_SYMBOL(pax_check_alloca);
22137+#endif
22138diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c
22139index ff86f19..73eabf4 100644
22140--- a/arch/x86/kernel/dumpstack_64.c
22141+++ b/arch/x86/kernel/dumpstack_64.c
22142@@ -153,12 +153,12 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22143 const struct stacktrace_ops *ops, void *data)
22144 {
22145 const unsigned cpu = get_cpu();
22146- struct thread_info *tinfo;
22147 unsigned long *irq_stack = (unsigned long *)per_cpu(irq_stack_ptr, cpu);
22148 unsigned long dummy;
22149 unsigned used = 0;
22150 int graph = 0;
22151 int done = 0;
22152+ void *stack_start;
22153
22154 if (!task)
22155 task = current;
22156@@ -179,7 +179,6 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22157 * current stack address. If the stacks consist of nested
22158 * exceptions
22159 */
22160- tinfo = task_thread_info(task);
22161 while (!done) {
22162 unsigned long *stack_end;
22163 enum stack_type stype;
22164@@ -202,7 +201,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22165 if (ops->stack(data, id) < 0)
22166 break;
22167
22168- bp = ops->walk_stack(tinfo, stack, bp, ops,
22169+ bp = ops->walk_stack(task, stack_end - EXCEPTION_STKSZ, stack, bp, ops,
22170 data, stack_end, &graph);
22171 ops->stack(data, "<EOE>");
22172 /*
22173@@ -210,6 +209,8 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22174 * second-to-last pointer (index -2 to end) in the
22175 * exception stack:
22176 */
22177+ if ((u16)stack_end[-1] != __KERNEL_DS)
22178+ goto out;
22179 stack = (unsigned long *) stack_end[-2];
22180 done = 0;
22181 break;
22182@@ -218,7 +219,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22183
22184 if (ops->stack(data, "IRQ") < 0)
22185 break;
22186- bp = ops->walk_stack(tinfo, stack, bp,
22187+ bp = ops->walk_stack(task, irq_stack, stack, bp,
22188 ops, data, stack_end, &graph);
22189 /*
22190 * We link to the next stack (which would be
22191@@ -240,7 +241,9 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22192 /*
22193 * This handles the process stack:
22194 */
22195- bp = ops->walk_stack(tinfo, stack, bp, ops, data, NULL, &graph);
22196+ stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
22197+ bp = ops->walk_stack(task, stack_start, stack, bp, ops, data, NULL, &graph);
22198+out:
22199 put_cpu();
22200 }
22201 EXPORT_SYMBOL(dump_trace);
22202@@ -344,8 +347,55 @@ int is_valid_bugaddr(unsigned long ip)
22203 {
22204 unsigned short ud2;
22205
22206- if (__copy_from_user(&ud2, (const void __user *) ip, sizeof(ud2)))
22207+ if (probe_kernel_address((unsigned short *)ip, ud2))
22208 return 0;
22209
22210 return ud2 == 0x0b0f;
22211 }
22212+
22213+#if defined(CONFIG_PAX_MEMORY_STACKLEAK) || defined(CONFIG_PAX_USERCOPY)
22214+void pax_check_alloca(unsigned long size)
22215+{
22216+ unsigned long sp = (unsigned long)&sp, stack_start, stack_end;
22217+ unsigned cpu, used;
22218+ char *id;
22219+
22220+ /* check the process stack first */
22221+ stack_start = (unsigned long)task_stack_page(current);
22222+ stack_end = stack_start + THREAD_SIZE;
22223+ if (likely(stack_start <= sp && sp < stack_end)) {
22224+ unsigned long stack_left = sp & (THREAD_SIZE - 1);
22225+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
22226+ return;
22227+ }
22228+
22229+ cpu = get_cpu();
22230+
22231+ /* check the irq stacks */
22232+ stack_end = (unsigned long)per_cpu(irq_stack_ptr, cpu);
22233+ stack_start = stack_end - IRQ_STACK_SIZE;
22234+ if (stack_start <= sp && sp < stack_end) {
22235+ unsigned long stack_left = sp & (IRQ_STACK_SIZE - 1);
22236+ put_cpu();
22237+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
22238+ return;
22239+ }
22240+
22241+ /* check the exception stacks */
22242+ used = 0;
22243+ stack_end = (unsigned long)in_exception_stack(cpu, sp, &used, &id);
22244+ stack_start = stack_end - EXCEPTION_STKSZ;
22245+ if (stack_end && stack_start <= sp && sp < stack_end) {
22246+ unsigned long stack_left = sp & (EXCEPTION_STKSZ - 1);
22247+ put_cpu();
22248+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
22249+ return;
22250+ }
22251+
22252+ put_cpu();
22253+
22254+ /* unknown stack */
22255+ BUG();
22256+}
22257+EXPORT_SYMBOL(pax_check_alloca);
22258+#endif
22259diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
22260index 46201de..ebffabf 100644
22261--- a/arch/x86/kernel/e820.c
22262+++ b/arch/x86/kernel/e820.c
22263@@ -794,8 +794,8 @@ unsigned long __init e820_end_of_low_ram_pfn(void)
22264
22265 static void early_panic(char *msg)
22266 {
22267- early_printk(msg);
22268- panic(msg);
22269+ early_printk("%s", msg);
22270+ panic("%s", msg);
22271 }
22272
22273 static int userdef __initdata;
22274diff --git a/arch/x86/kernel/early_printk.c b/arch/x86/kernel/early_printk.c
22275index a62536a..8444df4 100644
22276--- a/arch/x86/kernel/early_printk.c
22277+++ b/arch/x86/kernel/early_printk.c
22278@@ -7,6 +7,7 @@
22279 #include <linux/pci_regs.h>
22280 #include <linux/pci_ids.h>
22281 #include <linux/errno.h>
22282+#include <linux/sched.h>
22283 #include <asm/io.h>
22284 #include <asm/processor.h>
22285 #include <asm/fcntl.h>
22286diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
22287index 31e2d5b..b31c76d 100644
22288--- a/arch/x86/kernel/entry_32.S
22289+++ b/arch/x86/kernel/entry_32.S
22290@@ -177,13 +177,154 @@
22291 /*CFI_REL_OFFSET gs, PT_GS*/
22292 .endm
22293 .macro SET_KERNEL_GS reg
22294+
22295+#ifdef CONFIG_CC_STACKPROTECTOR
22296 movl $(__KERNEL_STACK_CANARY), \reg
22297+#elif defined(CONFIG_PAX_MEMORY_UDEREF)
22298+ movl $(__USER_DS), \reg
22299+#else
22300+ xorl \reg, \reg
22301+#endif
22302+
22303 movl \reg, %gs
22304 .endm
22305
22306 #endif /* CONFIG_X86_32_LAZY_GS */
22307
22308-.macro SAVE_ALL
22309+.macro pax_enter_kernel
22310+#ifdef CONFIG_PAX_KERNEXEC
22311+ call pax_enter_kernel
22312+#endif
22313+.endm
22314+
22315+.macro pax_exit_kernel
22316+#ifdef CONFIG_PAX_KERNEXEC
22317+ call pax_exit_kernel
22318+#endif
22319+.endm
22320+
22321+#ifdef CONFIG_PAX_KERNEXEC
22322+ENTRY(pax_enter_kernel)
22323+#ifdef CONFIG_PARAVIRT
22324+ pushl %eax
22325+ pushl %ecx
22326+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0)
22327+ mov %eax, %esi
22328+#else
22329+ mov %cr0, %esi
22330+#endif
22331+ bts $16, %esi
22332+ jnc 1f
22333+ mov %cs, %esi
22334+ cmp $__KERNEL_CS, %esi
22335+ jz 3f
22336+ ljmp $__KERNEL_CS, $3f
22337+1: ljmp $__KERNEXEC_KERNEL_CS, $2f
22338+2:
22339+#ifdef CONFIG_PARAVIRT
22340+ mov %esi, %eax
22341+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
22342+#else
22343+ mov %esi, %cr0
22344+#endif
22345+3:
22346+#ifdef CONFIG_PARAVIRT
22347+ popl %ecx
22348+ popl %eax
22349+#endif
22350+ ret
22351+ENDPROC(pax_enter_kernel)
22352+
22353+ENTRY(pax_exit_kernel)
22354+#ifdef CONFIG_PARAVIRT
22355+ pushl %eax
22356+ pushl %ecx
22357+#endif
22358+ mov %cs, %esi
22359+ cmp $__KERNEXEC_KERNEL_CS, %esi
22360+ jnz 2f
22361+#ifdef CONFIG_PARAVIRT
22362+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0);
22363+ mov %eax, %esi
22364+#else
22365+ mov %cr0, %esi
22366+#endif
22367+ btr $16, %esi
22368+ ljmp $__KERNEL_CS, $1f
22369+1:
22370+#ifdef CONFIG_PARAVIRT
22371+ mov %esi, %eax
22372+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0);
22373+#else
22374+ mov %esi, %cr0
22375+#endif
22376+2:
22377+#ifdef CONFIG_PARAVIRT
22378+ popl %ecx
22379+ popl %eax
22380+#endif
22381+ ret
22382+ENDPROC(pax_exit_kernel)
22383+#endif
22384+
22385+ .macro pax_erase_kstack
22386+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
22387+ call pax_erase_kstack
22388+#endif
22389+ .endm
22390+
22391+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
22392+/*
22393+ * ebp: thread_info
22394+ */
22395+ENTRY(pax_erase_kstack)
22396+ pushl %edi
22397+ pushl %ecx
22398+ pushl %eax
22399+
22400+ mov TI_lowest_stack(%ebp), %edi
22401+ mov $-0xBEEF, %eax
22402+ std
22403+
22404+1: mov %edi, %ecx
22405+ and $THREAD_SIZE_asm - 1, %ecx
22406+ shr $2, %ecx
22407+ repne scasl
22408+ jecxz 2f
22409+
22410+ cmp $2*16, %ecx
22411+ jc 2f
22412+
22413+ mov $2*16, %ecx
22414+ repe scasl
22415+ jecxz 2f
22416+ jne 1b
22417+
22418+2: cld
22419+ or $2*4, %edi
22420+ mov %esp, %ecx
22421+ sub %edi, %ecx
22422+
22423+ cmp $THREAD_SIZE_asm, %ecx
22424+ jb 3f
22425+ ud2
22426+3:
22427+
22428+ shr $2, %ecx
22429+ rep stosl
22430+
22431+ mov TI_task_thread_sp0(%ebp), %edi
22432+ sub $128, %edi
22433+ mov %edi, TI_lowest_stack(%ebp)
22434+
22435+ popl %eax
22436+ popl %ecx
22437+ popl %edi
22438+ ret
22439+ENDPROC(pax_erase_kstack)
22440+#endif
22441+
22442+.macro __SAVE_ALL _DS
22443 cld
22444 PUSH_GS
22445 pushl_cfi %fs
22446@@ -206,7 +347,7 @@
22447 CFI_REL_OFFSET ecx, 0
22448 pushl_cfi %ebx
22449 CFI_REL_OFFSET ebx, 0
22450- movl $(__USER_DS), %edx
22451+ movl $\_DS, %edx
22452 movl %edx, %ds
22453 movl %edx, %es
22454 movl $(__KERNEL_PERCPU), %edx
22455@@ -214,6 +355,15 @@
22456 SET_KERNEL_GS %edx
22457 .endm
22458
22459+.macro SAVE_ALL
22460+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
22461+ __SAVE_ALL __KERNEL_DS
22462+ pax_enter_kernel
22463+#else
22464+ __SAVE_ALL __USER_DS
22465+#endif
22466+.endm
22467+
22468 .macro RESTORE_INT_REGS
22469 popl_cfi %ebx
22470 CFI_RESTORE ebx
22471@@ -297,7 +447,7 @@ ENTRY(ret_from_fork)
22472 popfl_cfi
22473 jmp syscall_exit
22474 CFI_ENDPROC
22475-END(ret_from_fork)
22476+ENDPROC(ret_from_fork)
22477
22478 ENTRY(ret_from_kernel_thread)
22479 CFI_STARTPROC
22480@@ -340,7 +490,15 @@ ret_from_intr:
22481 andl $SEGMENT_RPL_MASK, %eax
22482 #endif
22483 cmpl $USER_RPL, %eax
22484+
22485+#ifdef CONFIG_PAX_KERNEXEC
22486+ jae resume_userspace
22487+
22488+ pax_exit_kernel
22489+ jmp resume_kernel
22490+#else
22491 jb resume_kernel # not returning to v8086 or userspace
22492+#endif
22493
22494 ENTRY(resume_userspace)
22495 LOCKDEP_SYS_EXIT
22496@@ -352,8 +510,8 @@ ENTRY(resume_userspace)
22497 andl $_TIF_WORK_MASK, %ecx # is there any work to be done on
22498 # int/exception return?
22499 jne work_pending
22500- jmp restore_all
22501-END(ret_from_exception)
22502+ jmp restore_all_pax
22503+ENDPROC(ret_from_exception)
22504
22505 #ifdef CONFIG_PREEMPT
22506 ENTRY(resume_kernel)
22507@@ -365,7 +523,7 @@ need_resched:
22508 jz restore_all
22509 call preempt_schedule_irq
22510 jmp need_resched
22511-END(resume_kernel)
22512+ENDPROC(resume_kernel)
22513 #endif
22514 CFI_ENDPROC
22515
22516@@ -395,30 +553,45 @@ sysenter_past_esp:
22517 /*CFI_REL_OFFSET cs, 0*/
22518 /*
22519 * Push current_thread_info()->sysenter_return to the stack.
22520- * A tiny bit of offset fixup is necessary - 4*4 means the 4 words
22521- * pushed above; +8 corresponds to copy_thread's esp0 setting.
22522 */
22523- pushl_cfi ((TI_sysenter_return)-THREAD_SIZE+8+4*4)(%esp)
22524+ pushl_cfi $0
22525 CFI_REL_OFFSET eip, 0
22526
22527 pushl_cfi %eax
22528 SAVE_ALL
22529+ GET_THREAD_INFO(%ebp)
22530+ movl TI_sysenter_return(%ebp),%ebp
22531+ movl %ebp,PT_EIP(%esp)
22532 ENABLE_INTERRUPTS(CLBR_NONE)
22533
22534 /*
22535 * Load the potential sixth argument from user stack.
22536 * Careful about security.
22537 */
22538+ movl PT_OLDESP(%esp),%ebp
22539+
22540+#ifdef CONFIG_PAX_MEMORY_UDEREF
22541+ mov PT_OLDSS(%esp),%ds
22542+1: movl %ds:(%ebp),%ebp
22543+ push %ss
22544+ pop %ds
22545+#else
22546 cmpl $__PAGE_OFFSET-3,%ebp
22547 jae syscall_fault
22548 ASM_STAC
22549 1: movl (%ebp),%ebp
22550 ASM_CLAC
22551+#endif
22552+
22553 movl %ebp,PT_EBP(%esp)
22554 _ASM_EXTABLE(1b,syscall_fault)
22555
22556 GET_THREAD_INFO(%ebp)
22557
22558+#ifdef CONFIG_PAX_RANDKSTACK
22559+ pax_erase_kstack
22560+#endif
22561+
22562 testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
22563 jnz sysenter_audit
22564 sysenter_do_call:
22565@@ -434,12 +607,24 @@ sysenter_after_call:
22566 testl $_TIF_ALLWORK_MASK, %ecx
22567 jne sysexit_audit
22568 sysenter_exit:
22569+
22570+#ifdef CONFIG_PAX_RANDKSTACK
22571+ pushl_cfi %eax
22572+ movl %esp, %eax
22573+ call pax_randomize_kstack
22574+ popl_cfi %eax
22575+#endif
22576+
22577+ pax_erase_kstack
22578+
22579 /* if something modifies registers it must also disable sysexit */
22580 movl PT_EIP(%esp), %edx
22581 movl PT_OLDESP(%esp), %ecx
22582 xorl %ebp,%ebp
22583 TRACE_IRQS_ON
22584 1: mov PT_FS(%esp), %fs
22585+2: mov PT_DS(%esp), %ds
22586+3: mov PT_ES(%esp), %es
22587 PTGS_TO_GS
22588 ENABLE_INTERRUPTS_SYSEXIT
22589
22590@@ -453,6 +638,9 @@ sysenter_audit:
22591 pushl_cfi PT_ESI(%esp) /* a3: 5th arg */
22592 pushl_cfi PT_EDX+4(%esp) /* a2: 4th arg */
22593 call __audit_syscall_entry
22594+
22595+ pax_erase_kstack
22596+
22597 popl_cfi %ecx /* get that remapped edx off the stack */
22598 popl_cfi %ecx /* get that remapped esi off the stack */
22599 movl PT_EAX(%esp),%eax /* reload syscall number */
22600@@ -479,10 +667,16 @@ sysexit_audit:
22601
22602 CFI_ENDPROC
22603 .pushsection .fixup,"ax"
22604-2: movl $0,PT_FS(%esp)
22605+4: movl $0,PT_FS(%esp)
22606+ jmp 1b
22607+5: movl $0,PT_DS(%esp)
22608+ jmp 1b
22609+6: movl $0,PT_ES(%esp)
22610 jmp 1b
22611 .popsection
22612- _ASM_EXTABLE(1b,2b)
22613+ _ASM_EXTABLE(1b,4b)
22614+ _ASM_EXTABLE(2b,5b)
22615+ _ASM_EXTABLE(3b,6b)
22616 PTGS_TO_GS_EX
22617 ENDPROC(ia32_sysenter_target)
22618
22619@@ -493,6 +687,11 @@ ENTRY(system_call)
22620 pushl_cfi %eax # save orig_eax
22621 SAVE_ALL
22622 GET_THREAD_INFO(%ebp)
22623+
22624+#ifdef CONFIG_PAX_RANDKSTACK
22625+ pax_erase_kstack
22626+#endif
22627+
22628 # system call tracing in operation / emulation
22629 testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
22630 jnz syscall_trace_entry
22631@@ -512,6 +711,15 @@ syscall_exit:
22632 testl $_TIF_ALLWORK_MASK, %ecx # current->work
22633 jne syscall_exit_work
22634
22635+restore_all_pax:
22636+
22637+#ifdef CONFIG_PAX_RANDKSTACK
22638+ movl %esp, %eax
22639+ call pax_randomize_kstack
22640+#endif
22641+
22642+ pax_erase_kstack
22643+
22644 restore_all:
22645 TRACE_IRQS_IRET
22646 restore_all_notrace:
22647@@ -566,14 +774,34 @@ ldt_ss:
22648 * compensating for the offset by changing to the ESPFIX segment with
22649 * a base address that matches for the difference.
22650 */
22651-#define GDT_ESPFIX_SS PER_CPU_VAR(gdt_page) + (GDT_ENTRY_ESPFIX_SS * 8)
22652+#define GDT_ESPFIX_SS (GDT_ENTRY_ESPFIX_SS * 8)(%ebx)
22653 mov %esp, %edx /* load kernel esp */
22654 mov PT_OLDESP(%esp), %eax /* load userspace esp */
22655 mov %dx, %ax /* eax: new kernel esp */
22656 sub %eax, %edx /* offset (low word is 0) */
22657+#ifdef CONFIG_SMP
22658+ movl PER_CPU_VAR(cpu_number), %ebx
22659+ shll $PAGE_SHIFT_asm, %ebx
22660+ addl $cpu_gdt_table, %ebx
22661+#else
22662+ movl $cpu_gdt_table, %ebx
22663+#endif
22664 shr $16, %edx
22665- mov %dl, GDT_ESPFIX_SS + 4 /* bits 16..23 */
22666- mov %dh, GDT_ESPFIX_SS + 7 /* bits 24..31 */
22667+
22668+#ifdef CONFIG_PAX_KERNEXEC
22669+ mov %cr0, %esi
22670+ btr $16, %esi
22671+ mov %esi, %cr0
22672+#endif
22673+
22674+ mov %dl, 4 + GDT_ESPFIX_SS /* bits 16..23 */
22675+ mov %dh, 7 + GDT_ESPFIX_SS /* bits 24..31 */
22676+
22677+#ifdef CONFIG_PAX_KERNEXEC
22678+ bts $16, %esi
22679+ mov %esi, %cr0
22680+#endif
22681+
22682 pushl_cfi $__ESPFIX_SS
22683 pushl_cfi %eax /* new kernel esp */
22684 /* Disable interrupts, but do not irqtrace this section: we
22685@@ -603,20 +831,18 @@ work_resched:
22686 movl TI_flags(%ebp), %ecx
22687 andl $_TIF_WORK_MASK, %ecx # is there any work to be done other
22688 # than syscall tracing?
22689- jz restore_all
22690+ jz restore_all_pax
22691 testb $_TIF_NEED_RESCHED, %cl
22692 jnz work_resched
22693
22694 work_notifysig: # deal with pending signals and
22695 # notify-resume requests
22696+ movl %esp, %eax
22697 #ifdef CONFIG_VM86
22698 testl $X86_EFLAGS_VM, PT_EFLAGS(%esp)
22699- movl %esp, %eax
22700 jne work_notifysig_v86 # returning to kernel-space or
22701 # vm86-space
22702 1:
22703-#else
22704- movl %esp, %eax
22705 #endif
22706 TRACE_IRQS_ON
22707 ENABLE_INTERRUPTS(CLBR_NONE)
22708@@ -637,7 +863,7 @@ work_notifysig_v86:
22709 movl %eax, %esp
22710 jmp 1b
22711 #endif
22712-END(work_pending)
22713+ENDPROC(work_pending)
22714
22715 # perform syscall exit tracing
22716 ALIGN
22717@@ -645,11 +871,14 @@ syscall_trace_entry:
22718 movl $-ENOSYS,PT_EAX(%esp)
22719 movl %esp, %eax
22720 call syscall_trace_enter
22721+
22722+ pax_erase_kstack
22723+
22724 /* What it returned is what we'll actually use. */
22725 cmpl $(NR_syscalls), %eax
22726 jnae syscall_call
22727 jmp syscall_exit
22728-END(syscall_trace_entry)
22729+ENDPROC(syscall_trace_entry)
22730
22731 # perform syscall exit tracing
22732 ALIGN
22733@@ -662,26 +891,30 @@ syscall_exit_work:
22734 movl %esp, %eax
22735 call syscall_trace_leave
22736 jmp resume_userspace
22737-END(syscall_exit_work)
22738+ENDPROC(syscall_exit_work)
22739 CFI_ENDPROC
22740
22741 RING0_INT_FRAME # can't unwind into user space anyway
22742 syscall_fault:
22743+#ifdef CONFIG_PAX_MEMORY_UDEREF
22744+ push %ss
22745+ pop %ds
22746+#endif
22747 ASM_CLAC
22748 GET_THREAD_INFO(%ebp)
22749 movl $-EFAULT,PT_EAX(%esp)
22750 jmp resume_userspace
22751-END(syscall_fault)
22752+ENDPROC(syscall_fault)
22753
22754 syscall_badsys:
22755 movl $-ENOSYS,%eax
22756 jmp syscall_after_call
22757-END(syscall_badsys)
22758+ENDPROC(syscall_badsys)
22759
22760 sysenter_badsys:
22761 movl $-ENOSYS,%eax
22762 jmp sysenter_after_call
22763-END(sysenter_badsys)
22764+ENDPROC(sysenter_badsys)
22765 CFI_ENDPROC
22766
22767 .macro FIXUP_ESPFIX_STACK
22768@@ -694,8 +927,15 @@ END(sysenter_badsys)
22769 */
22770 #ifdef CONFIG_X86_ESPFIX32
22771 /* fixup the stack */
22772- mov GDT_ESPFIX_SS + 4, %al /* bits 16..23 */
22773- mov GDT_ESPFIX_SS + 7, %ah /* bits 24..31 */
22774+#ifdef CONFIG_SMP
22775+ movl PER_CPU_VAR(cpu_number), %ebx
22776+ shll $PAGE_SHIFT_asm, %ebx
22777+ addl $cpu_gdt_table, %ebx
22778+#else
22779+ movl $cpu_gdt_table, %ebx
22780+#endif
22781+ mov 4 + GDT_ESPFIX_SS, %al /* bits 16..23 */
22782+ mov 7 + GDT_ESPFIX_SS, %ah /* bits 24..31 */
22783 shl $16, %eax
22784 addl %esp, %eax /* the adjusted stack pointer */
22785 pushl_cfi $__KERNEL_DS
22786@@ -751,7 +991,7 @@ vector=vector+1
22787 .endr
22788 2: jmp common_interrupt
22789 .endr
22790-END(irq_entries_start)
22791+ENDPROC(irq_entries_start)
22792
22793 .previous
22794 END(interrupt)
22795@@ -808,7 +1048,7 @@ ENTRY(coprocessor_error)
22796 pushl_cfi $do_coprocessor_error
22797 jmp error_code
22798 CFI_ENDPROC
22799-END(coprocessor_error)
22800+ENDPROC(coprocessor_error)
22801
22802 ENTRY(simd_coprocessor_error)
22803 RING0_INT_FRAME
22804@@ -821,7 +1061,7 @@ ENTRY(simd_coprocessor_error)
22805 .section .altinstructions,"a"
22806 altinstruction_entry 661b, 663f, X86_FEATURE_XMM, 662b-661b, 664f-663f
22807 .previous
22808-.section .altinstr_replacement,"ax"
22809+.section .altinstr_replacement,"a"
22810 663: pushl $do_simd_coprocessor_error
22811 664:
22812 .previous
22813@@ -830,7 +1070,7 @@ ENTRY(simd_coprocessor_error)
22814 #endif
22815 jmp error_code
22816 CFI_ENDPROC
22817-END(simd_coprocessor_error)
22818+ENDPROC(simd_coprocessor_error)
22819
22820 ENTRY(device_not_available)
22821 RING0_INT_FRAME
22822@@ -839,18 +1079,18 @@ ENTRY(device_not_available)
22823 pushl_cfi $do_device_not_available
22824 jmp error_code
22825 CFI_ENDPROC
22826-END(device_not_available)
22827+ENDPROC(device_not_available)
22828
22829 #ifdef CONFIG_PARAVIRT
22830 ENTRY(native_iret)
22831 iret
22832 _ASM_EXTABLE(native_iret, iret_exc)
22833-END(native_iret)
22834+ENDPROC(native_iret)
22835
22836 ENTRY(native_irq_enable_sysexit)
22837 sti
22838 sysexit
22839-END(native_irq_enable_sysexit)
22840+ENDPROC(native_irq_enable_sysexit)
22841 #endif
22842
22843 ENTRY(overflow)
22844@@ -860,7 +1100,7 @@ ENTRY(overflow)
22845 pushl_cfi $do_overflow
22846 jmp error_code
22847 CFI_ENDPROC
22848-END(overflow)
22849+ENDPROC(overflow)
22850
22851 ENTRY(bounds)
22852 RING0_INT_FRAME
22853@@ -869,7 +1109,7 @@ ENTRY(bounds)
22854 pushl_cfi $do_bounds
22855 jmp error_code
22856 CFI_ENDPROC
22857-END(bounds)
22858+ENDPROC(bounds)
22859
22860 ENTRY(invalid_op)
22861 RING0_INT_FRAME
22862@@ -878,7 +1118,7 @@ ENTRY(invalid_op)
22863 pushl_cfi $do_invalid_op
22864 jmp error_code
22865 CFI_ENDPROC
22866-END(invalid_op)
22867+ENDPROC(invalid_op)
22868
22869 ENTRY(coprocessor_segment_overrun)
22870 RING0_INT_FRAME
22871@@ -887,7 +1127,7 @@ ENTRY(coprocessor_segment_overrun)
22872 pushl_cfi $do_coprocessor_segment_overrun
22873 jmp error_code
22874 CFI_ENDPROC
22875-END(coprocessor_segment_overrun)
22876+ENDPROC(coprocessor_segment_overrun)
22877
22878 ENTRY(invalid_TSS)
22879 RING0_EC_FRAME
22880@@ -895,7 +1135,7 @@ ENTRY(invalid_TSS)
22881 pushl_cfi $do_invalid_TSS
22882 jmp error_code
22883 CFI_ENDPROC
22884-END(invalid_TSS)
22885+ENDPROC(invalid_TSS)
22886
22887 ENTRY(segment_not_present)
22888 RING0_EC_FRAME
22889@@ -903,7 +1143,7 @@ ENTRY(segment_not_present)
22890 pushl_cfi $do_segment_not_present
22891 jmp error_code
22892 CFI_ENDPROC
22893-END(segment_not_present)
22894+ENDPROC(segment_not_present)
22895
22896 ENTRY(stack_segment)
22897 RING0_EC_FRAME
22898@@ -911,7 +1151,7 @@ ENTRY(stack_segment)
22899 pushl_cfi $do_stack_segment
22900 jmp error_code
22901 CFI_ENDPROC
22902-END(stack_segment)
22903+ENDPROC(stack_segment)
22904
22905 ENTRY(alignment_check)
22906 RING0_EC_FRAME
22907@@ -919,7 +1159,7 @@ ENTRY(alignment_check)
22908 pushl_cfi $do_alignment_check
22909 jmp error_code
22910 CFI_ENDPROC
22911-END(alignment_check)
22912+ENDPROC(alignment_check)
22913
22914 ENTRY(divide_error)
22915 RING0_INT_FRAME
22916@@ -928,7 +1168,7 @@ ENTRY(divide_error)
22917 pushl_cfi $do_divide_error
22918 jmp error_code
22919 CFI_ENDPROC
22920-END(divide_error)
22921+ENDPROC(divide_error)
22922
22923 #ifdef CONFIG_X86_MCE
22924 ENTRY(machine_check)
22925@@ -938,7 +1178,7 @@ ENTRY(machine_check)
22926 pushl_cfi machine_check_vector
22927 jmp error_code
22928 CFI_ENDPROC
22929-END(machine_check)
22930+ENDPROC(machine_check)
22931 #endif
22932
22933 ENTRY(spurious_interrupt_bug)
22934@@ -948,7 +1188,7 @@ ENTRY(spurious_interrupt_bug)
22935 pushl_cfi $do_spurious_interrupt_bug
22936 jmp error_code
22937 CFI_ENDPROC
22938-END(spurious_interrupt_bug)
22939+ENDPROC(spurious_interrupt_bug)
22940
22941 #ifdef CONFIG_XEN
22942 /* Xen doesn't set %esp to be precisely what the normal sysenter
22943@@ -1057,7 +1297,7 @@ BUILD_INTERRUPT3(hyperv_callback_vector, HYPERVISOR_CALLBACK_VECTOR,
22944
22945 ENTRY(mcount)
22946 ret
22947-END(mcount)
22948+ENDPROC(mcount)
22949
22950 ENTRY(ftrace_caller)
22951 pushl %eax
22952@@ -1087,7 +1327,7 @@ ftrace_graph_call:
22953 .globl ftrace_stub
22954 ftrace_stub:
22955 ret
22956-END(ftrace_caller)
22957+ENDPROC(ftrace_caller)
22958
22959 ENTRY(ftrace_regs_caller)
22960 pushf /* push flags before compare (in cs location) */
22961@@ -1185,7 +1425,7 @@ trace:
22962 popl %ecx
22963 popl %eax
22964 jmp ftrace_stub
22965-END(mcount)
22966+ENDPROC(mcount)
22967 #endif /* CONFIG_DYNAMIC_FTRACE */
22968 #endif /* CONFIG_FUNCTION_TRACER */
22969
22970@@ -1203,7 +1443,7 @@ ENTRY(ftrace_graph_caller)
22971 popl %ecx
22972 popl %eax
22973 ret
22974-END(ftrace_graph_caller)
22975+ENDPROC(ftrace_graph_caller)
22976
22977 .globl return_to_handler
22978 return_to_handler:
22979@@ -1264,15 +1504,18 @@ error_code:
22980 movl $-1, PT_ORIG_EAX(%esp) # no syscall to restart
22981 REG_TO_PTGS %ecx
22982 SET_KERNEL_GS %ecx
22983- movl $(__USER_DS), %ecx
22984+ movl $(__KERNEL_DS), %ecx
22985 movl %ecx, %ds
22986 movl %ecx, %es
22987+
22988+ pax_enter_kernel
22989+
22990 TRACE_IRQS_OFF
22991 movl %esp,%eax # pt_regs pointer
22992 call *%edi
22993 jmp ret_from_exception
22994 CFI_ENDPROC
22995-END(page_fault)
22996+ENDPROC(page_fault)
22997
22998 /*
22999 * Debug traps and NMI can happen at the one SYSENTER instruction
23000@@ -1315,7 +1558,7 @@ debug_stack_correct:
23001 call do_debug
23002 jmp ret_from_exception
23003 CFI_ENDPROC
23004-END(debug)
23005+ENDPROC(debug)
23006
23007 /*
23008 * NMI is doubly nasty. It can happen _while_ we're handling
23009@@ -1355,6 +1598,9 @@ nmi_stack_correct:
23010 xorl %edx,%edx # zero error code
23011 movl %esp,%eax # pt_regs pointer
23012 call do_nmi
23013+
23014+ pax_exit_kernel
23015+
23016 jmp restore_all_notrace
23017 CFI_ENDPROC
23018
23019@@ -1392,13 +1638,16 @@ nmi_espfix_stack:
23020 FIXUP_ESPFIX_STACK # %eax == %esp
23021 xorl %edx,%edx # zero error code
23022 call do_nmi
23023+
23024+ pax_exit_kernel
23025+
23026 RESTORE_REGS
23027 lss 12+4(%esp), %esp # back to espfix stack
23028 CFI_ADJUST_CFA_OFFSET -24
23029 jmp irq_return
23030 #endif
23031 CFI_ENDPROC
23032-END(nmi)
23033+ENDPROC(nmi)
23034
23035 ENTRY(int3)
23036 RING0_INT_FRAME
23037@@ -1411,14 +1660,14 @@ ENTRY(int3)
23038 call do_int3
23039 jmp ret_from_exception
23040 CFI_ENDPROC
23041-END(int3)
23042+ENDPROC(int3)
23043
23044 ENTRY(general_protection)
23045 RING0_EC_FRAME
23046 pushl_cfi $do_general_protection
23047 jmp error_code
23048 CFI_ENDPROC
23049-END(general_protection)
23050+ENDPROC(general_protection)
23051
23052 #ifdef CONFIG_KVM_GUEST
23053 ENTRY(async_page_fault)
23054@@ -1427,6 +1676,6 @@ ENTRY(async_page_fault)
23055 pushl_cfi $do_async_page_fault
23056 jmp error_code
23057 CFI_ENDPROC
23058-END(async_page_fault)
23059+ENDPROC(async_page_fault)
23060 #endif
23061
23062diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
23063index f0095a7..ec77893 100644
23064--- a/arch/x86/kernel/entry_64.S
23065+++ b/arch/x86/kernel/entry_64.S
23066@@ -59,6 +59,8 @@
23067 #include <asm/smap.h>
23068 #include <asm/pgtable_types.h>
23069 #include <linux/err.h>
23070+#include <asm/pgtable.h>
23071+#include <asm/alternative-asm.h>
23072
23073 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
23074 #include <linux/elf-em.h>
23075@@ -81,6 +83,431 @@ ENTRY(native_usergs_sysret64)
23076 ENDPROC(native_usergs_sysret64)
23077 #endif /* CONFIG_PARAVIRT */
23078
23079+ .macro ljmpq sel, off
23080+#if defined(CONFIG_MPSC) || defined(CONFIG_MCORE2) || defined (CONFIG_MATOM)
23081+ .byte 0x48; ljmp *1234f(%rip)
23082+ .pushsection .rodata
23083+ .align 16
23084+ 1234: .quad \off; .word \sel
23085+ .popsection
23086+#else
23087+ pushq $\sel
23088+ pushq $\off
23089+ lretq
23090+#endif
23091+ .endm
23092+
23093+ .macro pax_enter_kernel
23094+ pax_set_fptr_mask
23095+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
23096+ call pax_enter_kernel
23097+#endif
23098+ .endm
23099+
23100+ .macro pax_exit_kernel
23101+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
23102+ call pax_exit_kernel
23103+#endif
23104+
23105+ .endm
23106+
23107+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
23108+ENTRY(pax_enter_kernel)
23109+ pushq %rdi
23110+
23111+#ifdef CONFIG_PARAVIRT
23112+ PV_SAVE_REGS(CLBR_RDI)
23113+#endif
23114+
23115+#ifdef CONFIG_PAX_KERNEXEC
23116+ GET_CR0_INTO_RDI
23117+ bts $16,%rdi
23118+ jnc 3f
23119+ mov %cs,%edi
23120+ cmp $__KERNEL_CS,%edi
23121+ jnz 2f
23122+1:
23123+#endif
23124+
23125+#ifdef CONFIG_PAX_MEMORY_UDEREF
23126+ 661: jmp 111f
23127+ .pushsection .altinstr_replacement, "a"
23128+ 662: ASM_NOP2
23129+ .popsection
23130+ .pushsection .altinstructions, "a"
23131+ altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23132+ .popsection
23133+ GET_CR3_INTO_RDI
23134+ cmp $0,%dil
23135+ jnz 112f
23136+ mov $__KERNEL_DS,%edi
23137+ mov %edi,%ss
23138+ jmp 111f
23139+112: cmp $1,%dil
23140+ jz 113f
23141+ ud2
23142+113: sub $4097,%rdi
23143+ bts $63,%rdi
23144+ SET_RDI_INTO_CR3
23145+ mov $__UDEREF_KERNEL_DS,%edi
23146+ mov %edi,%ss
23147+111:
23148+#endif
23149+
23150+#ifdef CONFIG_PARAVIRT
23151+ PV_RESTORE_REGS(CLBR_RDI)
23152+#endif
23153+
23154+ popq %rdi
23155+ pax_force_retaddr
23156+ retq
23157+
23158+#ifdef CONFIG_PAX_KERNEXEC
23159+2: ljmpq __KERNEL_CS,1b
23160+3: ljmpq __KERNEXEC_KERNEL_CS,4f
23161+4: SET_RDI_INTO_CR0
23162+ jmp 1b
23163+#endif
23164+ENDPROC(pax_enter_kernel)
23165+
23166+ENTRY(pax_exit_kernel)
23167+ pushq %rdi
23168+
23169+#ifdef CONFIG_PARAVIRT
23170+ PV_SAVE_REGS(CLBR_RDI)
23171+#endif
23172+
23173+#ifdef CONFIG_PAX_KERNEXEC
23174+ mov %cs,%rdi
23175+ cmp $__KERNEXEC_KERNEL_CS,%edi
23176+ jz 2f
23177+ GET_CR0_INTO_RDI
23178+ bts $16,%rdi
23179+ jnc 4f
23180+1:
23181+#endif
23182+
23183+#ifdef CONFIG_PAX_MEMORY_UDEREF
23184+ 661: jmp 111f
23185+ .pushsection .altinstr_replacement, "a"
23186+ 662: ASM_NOP2
23187+ .popsection
23188+ .pushsection .altinstructions, "a"
23189+ altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23190+ .popsection
23191+ mov %ss,%edi
23192+ cmp $__UDEREF_KERNEL_DS,%edi
23193+ jnz 111f
23194+ GET_CR3_INTO_RDI
23195+ cmp $0,%dil
23196+ jz 112f
23197+ ud2
23198+112: add $4097,%rdi
23199+ bts $63,%rdi
23200+ SET_RDI_INTO_CR3
23201+ mov $__KERNEL_DS,%edi
23202+ mov %edi,%ss
23203+111:
23204+#endif
23205+
23206+#ifdef CONFIG_PARAVIRT
23207+ PV_RESTORE_REGS(CLBR_RDI);
23208+#endif
23209+
23210+ popq %rdi
23211+ pax_force_retaddr
23212+ retq
23213+
23214+#ifdef CONFIG_PAX_KERNEXEC
23215+2: GET_CR0_INTO_RDI
23216+ btr $16,%rdi
23217+ jnc 4f
23218+ ljmpq __KERNEL_CS,3f
23219+3: SET_RDI_INTO_CR0
23220+ jmp 1b
23221+4: ud2
23222+ jmp 4b
23223+#endif
23224+ENDPROC(pax_exit_kernel)
23225+#endif
23226+
23227+ .macro pax_enter_kernel_user
23228+ pax_set_fptr_mask
23229+#ifdef CONFIG_PAX_MEMORY_UDEREF
23230+ call pax_enter_kernel_user
23231+#endif
23232+ .endm
23233+
23234+ .macro pax_exit_kernel_user
23235+#ifdef CONFIG_PAX_MEMORY_UDEREF
23236+ call pax_exit_kernel_user
23237+#endif
23238+#ifdef CONFIG_PAX_RANDKSTACK
23239+ pushq %rax
23240+ pushq %r11
23241+ call pax_randomize_kstack
23242+ popq %r11
23243+ popq %rax
23244+#endif
23245+ .endm
23246+
23247+#ifdef CONFIG_PAX_MEMORY_UDEREF
23248+ENTRY(pax_enter_kernel_user)
23249+ pushq %rdi
23250+ pushq %rbx
23251+
23252+#ifdef CONFIG_PARAVIRT
23253+ PV_SAVE_REGS(CLBR_RDI)
23254+#endif
23255+
23256+ 661: jmp 111f
23257+ .pushsection .altinstr_replacement, "a"
23258+ 662: ASM_NOP2
23259+ .popsection
23260+ .pushsection .altinstructions, "a"
23261+ altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23262+ .popsection
23263+ GET_CR3_INTO_RDI
23264+ cmp $1,%dil
23265+ jnz 4f
23266+ sub $4097,%rdi
23267+ bts $63,%rdi
23268+ SET_RDI_INTO_CR3
23269+ jmp 3f
23270+111:
23271+
23272+ GET_CR3_INTO_RDI
23273+ mov %rdi,%rbx
23274+ add $__START_KERNEL_map,%rbx
23275+ sub phys_base(%rip),%rbx
23276+
23277+#ifdef CONFIG_PARAVIRT
23278+ cmpl $0, pv_info+PARAVIRT_enabled
23279+ jz 1f
23280+ pushq %rdi
23281+ i = 0
23282+ .rept USER_PGD_PTRS
23283+ mov i*8(%rbx),%rsi
23284+ mov $0,%sil
23285+ lea i*8(%rbx),%rdi
23286+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched)
23287+ i = i + 1
23288+ .endr
23289+ popq %rdi
23290+ jmp 2f
23291+1:
23292+#endif
23293+
23294+ i = 0
23295+ .rept USER_PGD_PTRS
23296+ movb $0,i*8(%rbx)
23297+ i = i + 1
23298+ .endr
23299+
23300+2: SET_RDI_INTO_CR3
23301+
23302+#ifdef CONFIG_PAX_KERNEXEC
23303+ GET_CR0_INTO_RDI
23304+ bts $16,%rdi
23305+ SET_RDI_INTO_CR0
23306+#endif
23307+
23308+3:
23309+
23310+#ifdef CONFIG_PARAVIRT
23311+ PV_RESTORE_REGS(CLBR_RDI)
23312+#endif
23313+
23314+ popq %rbx
23315+ popq %rdi
23316+ pax_force_retaddr
23317+ retq
23318+4: ud2
23319+ENDPROC(pax_enter_kernel_user)
23320+
23321+ENTRY(pax_exit_kernel_user)
23322+ pushq %rdi
23323+ pushq %rbx
23324+
23325+#ifdef CONFIG_PARAVIRT
23326+ PV_SAVE_REGS(CLBR_RDI)
23327+#endif
23328+
23329+ GET_CR3_INTO_RDI
23330+ 661: jmp 1f
23331+ .pushsection .altinstr_replacement, "a"
23332+ 662: ASM_NOP2
23333+ .popsection
23334+ .pushsection .altinstructions, "a"
23335+ altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23336+ .popsection
23337+ cmp $0,%dil
23338+ jnz 3f
23339+ add $4097,%rdi
23340+ bts $63,%rdi
23341+ SET_RDI_INTO_CR3
23342+ jmp 2f
23343+1:
23344+
23345+ mov %rdi,%rbx
23346+
23347+#ifdef CONFIG_PAX_KERNEXEC
23348+ GET_CR0_INTO_RDI
23349+ btr $16,%rdi
23350+ jnc 3f
23351+ SET_RDI_INTO_CR0
23352+#endif
23353+
23354+ add $__START_KERNEL_map,%rbx
23355+ sub phys_base(%rip),%rbx
23356+
23357+#ifdef CONFIG_PARAVIRT
23358+ cmpl $0, pv_info+PARAVIRT_enabled
23359+ jz 1f
23360+ i = 0
23361+ .rept USER_PGD_PTRS
23362+ mov i*8(%rbx),%rsi
23363+ mov $0x67,%sil
23364+ lea i*8(%rbx),%rdi
23365+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched)
23366+ i = i + 1
23367+ .endr
23368+ jmp 2f
23369+1:
23370+#endif
23371+
23372+ i = 0
23373+ .rept USER_PGD_PTRS
23374+ movb $0x67,i*8(%rbx)
23375+ i = i + 1
23376+ .endr
23377+2:
23378+
23379+#ifdef CONFIG_PARAVIRT
23380+ PV_RESTORE_REGS(CLBR_RDI)
23381+#endif
23382+
23383+ popq %rbx
23384+ popq %rdi
23385+ pax_force_retaddr
23386+ retq
23387+3: ud2
23388+ENDPROC(pax_exit_kernel_user)
23389+#endif
23390+
23391+ .macro pax_enter_kernel_nmi
23392+ pax_set_fptr_mask
23393+
23394+#ifdef CONFIG_PAX_KERNEXEC
23395+ GET_CR0_INTO_RDI
23396+ bts $16,%rdi
23397+ jc 110f
23398+ SET_RDI_INTO_CR0
23399+ or $2,%ebx
23400+110:
23401+#endif
23402+
23403+#ifdef CONFIG_PAX_MEMORY_UDEREF
23404+ 661: jmp 111f
23405+ .pushsection .altinstr_replacement, "a"
23406+ 662: ASM_NOP2
23407+ .popsection
23408+ .pushsection .altinstructions, "a"
23409+ altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23410+ .popsection
23411+ GET_CR3_INTO_RDI
23412+ cmp $0,%dil
23413+ jz 111f
23414+ sub $4097,%rdi
23415+ or $4,%ebx
23416+ bts $63,%rdi
23417+ SET_RDI_INTO_CR3
23418+ mov $__UDEREF_KERNEL_DS,%edi
23419+ mov %edi,%ss
23420+111:
23421+#endif
23422+ .endm
23423+
23424+ .macro pax_exit_kernel_nmi
23425+#ifdef CONFIG_PAX_KERNEXEC
23426+ btr $1,%ebx
23427+ jnc 110f
23428+ GET_CR0_INTO_RDI
23429+ btr $16,%rdi
23430+ SET_RDI_INTO_CR0
23431+110:
23432+#endif
23433+
23434+#ifdef CONFIG_PAX_MEMORY_UDEREF
23435+ btr $2,%ebx
23436+ jnc 111f
23437+ GET_CR3_INTO_RDI
23438+ add $4097,%rdi
23439+ bts $63,%rdi
23440+ SET_RDI_INTO_CR3
23441+ mov $__KERNEL_DS,%edi
23442+ mov %edi,%ss
23443+111:
23444+#endif
23445+ .endm
23446+
23447+ .macro pax_erase_kstack
23448+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
23449+ call pax_erase_kstack
23450+#endif
23451+ .endm
23452+
23453+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
23454+ENTRY(pax_erase_kstack)
23455+ pushq %rdi
23456+ pushq %rcx
23457+ pushq %rax
23458+ pushq %r11
23459+
23460+ GET_THREAD_INFO(%r11)
23461+ mov TI_lowest_stack(%r11), %rdi
23462+ mov $-0xBEEF, %rax
23463+ std
23464+
23465+1: mov %edi, %ecx
23466+ and $THREAD_SIZE_asm - 1, %ecx
23467+ shr $3, %ecx
23468+ repne scasq
23469+ jecxz 2f
23470+
23471+ cmp $2*8, %ecx
23472+ jc 2f
23473+
23474+ mov $2*8, %ecx
23475+ repe scasq
23476+ jecxz 2f
23477+ jne 1b
23478+
23479+2: cld
23480+ or $2*8, %rdi
23481+ mov %esp, %ecx
23482+ sub %edi, %ecx
23483+
23484+ cmp $THREAD_SIZE_asm, %rcx
23485+ jb 3f
23486+ ud2
23487+3:
23488+
23489+ shr $3, %ecx
23490+ rep stosq
23491+
23492+ mov TI_task_thread_sp0(%r11), %rdi
23493+ sub $256, %rdi
23494+ mov %rdi, TI_lowest_stack(%r11)
23495+
23496+ popq %r11
23497+ popq %rax
23498+ popq %rcx
23499+ popq %rdi
23500+ pax_force_retaddr
23501+ ret
23502+ENDPROC(pax_erase_kstack)
23503+#endif
23504
23505 .macro TRACE_IRQS_IRETQ offset=ARGOFFSET
23506 #ifdef CONFIG_TRACE_IRQFLAGS
23507@@ -117,7 +544,7 @@ ENDPROC(native_usergs_sysret64)
23508 .endm
23509
23510 .macro TRACE_IRQS_IRETQ_DEBUG offset=ARGOFFSET
23511- bt $9,EFLAGS-\offset(%rsp) /* interrupts off? */
23512+ bt $X86_EFLAGS_IF_BIT,EFLAGS-\offset(%rsp) /* interrupts off? */
23513 jnc 1f
23514 TRACE_IRQS_ON_DEBUG
23515 1:
23516@@ -243,9 +670,52 @@ ENTRY(save_paranoid)
23517 js 1f /* negative -> in kernel */
23518 SWAPGS
23519 xorl %ebx,%ebx
23520-1: ret
23521+1:
23522+#ifdef CONFIG_PAX_MEMORY_UDEREF
23523+ testb $3, CS+8(%rsp)
23524+ jnz 1f
23525+ pax_enter_kernel
23526+ jmp 2f
23527+1: pax_enter_kernel_user
23528+2:
23529+#else
23530+ pax_enter_kernel
23531+#endif
23532+ pax_force_retaddr
23533+ ret
23534 CFI_ENDPROC
23535-END(save_paranoid)
23536+ENDPROC(save_paranoid)
23537+
23538+ENTRY(save_paranoid_nmi)
23539+ XCPT_FRAME 1 RDI+8
23540+ cld
23541+ movq_cfi rdi, RDI+8
23542+ movq_cfi rsi, RSI+8
23543+ movq_cfi rdx, RDX+8
23544+ movq_cfi rcx, RCX+8
23545+ movq_cfi rax, RAX+8
23546+ movq_cfi r8, R8+8
23547+ movq_cfi r9, R9+8
23548+ movq_cfi r10, R10+8
23549+ movq_cfi r11, R11+8
23550+ movq_cfi rbx, RBX+8
23551+ movq_cfi rbp, RBP+8
23552+ movq_cfi r12, R12+8
23553+ movq_cfi r13, R13+8
23554+ movq_cfi r14, R14+8
23555+ movq_cfi r15, R15+8
23556+ movl $1,%ebx
23557+ movl $MSR_GS_BASE,%ecx
23558+ rdmsr
23559+ testl %edx,%edx
23560+ js 1f /* negative -> in kernel */
23561+ SWAPGS
23562+ xorl %ebx,%ebx
23563+1: pax_enter_kernel_nmi
23564+ pax_force_retaddr
23565+ ret
23566+ CFI_ENDPROC
23567+ENDPROC(save_paranoid_nmi)
23568
23569 /*
23570 * A newly forked process directly context switches into this address.
23571@@ -266,7 +736,7 @@ ENTRY(ret_from_fork)
23572
23573 RESTORE_REST
23574
23575- testl $3, CS-ARGOFFSET(%rsp) # from kernel_thread?
23576+ testb $3, CS-ARGOFFSET(%rsp) # from kernel_thread?
23577 jz 1f
23578
23579 /*
23580@@ -279,15 +749,13 @@ ENTRY(ret_from_fork)
23581 jmp int_ret_from_sys_call
23582
23583 1:
23584- subq $REST_SKIP, %rsp # leave space for volatiles
23585- CFI_ADJUST_CFA_OFFSET REST_SKIP
23586 movq %rbp, %rdi
23587 call *%rbx
23588 movl $0, RAX(%rsp)
23589 RESTORE_REST
23590 jmp int_ret_from_sys_call
23591 CFI_ENDPROC
23592-END(ret_from_fork)
23593+ENDPROC(ret_from_fork)
23594
23595 /*
23596 * System call entry. Up to 6 arguments in registers are supported.
23597@@ -324,7 +792,7 @@ END(ret_from_fork)
23598 ENTRY(system_call)
23599 CFI_STARTPROC simple
23600 CFI_SIGNAL_FRAME
23601- CFI_DEF_CFA rsp,KERNEL_STACK_OFFSET
23602+ CFI_DEF_CFA rsp,0
23603 CFI_REGISTER rip,rcx
23604 /*CFI_REGISTER rflags,r11*/
23605 SWAPGS_UNSAFE_STACK
23606@@ -337,16 +805,23 @@ GLOBAL(system_call_after_swapgs)
23607
23608 movq %rsp,PER_CPU_VAR(old_rsp)
23609 movq PER_CPU_VAR(kernel_stack),%rsp
23610+ SAVE_ARGS 8*6, 0, rax_enosys=1
23611+ pax_enter_kernel_user
23612+
23613+#ifdef CONFIG_PAX_RANDKSTACK
23614+ pax_erase_kstack
23615+#endif
23616+
23617 /*
23618 * No need to follow this irqs off/on section - it's straight
23619 * and short:
23620 */
23621 ENABLE_INTERRUPTS(CLBR_NONE)
23622- SAVE_ARGS 8, 0, rax_enosys=1
23623 movq_cfi rax,(ORIG_RAX-ARGOFFSET)
23624 movq %rcx,RIP-ARGOFFSET(%rsp)
23625 CFI_REL_OFFSET rip,RIP-ARGOFFSET
23626- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
23627+ GET_THREAD_INFO(%rcx)
23628+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%rcx)
23629 jnz tracesys
23630 system_call_fastpath:
23631 #if __SYSCALL_MASK == ~0
23632@@ -376,10 +851,13 @@ ret_from_sys_call:
23633 * flags (TIF_NOTIFY_RESUME, TIF_USER_RETURN_NOTIFY, etc) set is
23634 * very bad.
23635 */
23636- testl $_TIF_ALLWORK_MASK,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
23637+ GET_THREAD_INFO(%rcx)
23638+ testl $_TIF_ALLWORK_MASK,TI_flags(%rcx)
23639 jnz int_ret_from_sys_call_fixup /* Go the the slow path */
23640
23641 CFI_REMEMBER_STATE
23642+ pax_exit_kernel_user
23643+ pax_erase_kstack
23644 /*
23645 * sysretq will re-enable interrupts:
23646 */
23647@@ -399,12 +877,15 @@ int_ret_from_sys_call_fixup:
23648
23649 /* Do syscall tracing */
23650 tracesys:
23651- leaq -REST_SKIP(%rsp), %rdi
23652+ movq %rsp, %rdi
23653 movq $AUDIT_ARCH_X86_64, %rsi
23654 call syscall_trace_enter_phase1
23655 test %rax, %rax
23656 jnz tracesys_phase2 /* if needed, run the slow path */
23657- LOAD_ARGS 0 /* else restore clobbered regs */
23658+
23659+ pax_erase_kstack
23660+
23661+ LOAD_ARGS /* else restore clobbered regs */
23662 jmp system_call_fastpath /* and return to the fast path */
23663
23664 tracesys_phase2:
23665@@ -415,12 +896,14 @@ tracesys_phase2:
23666 movq %rax,%rdx
23667 call syscall_trace_enter_phase2
23668
23669+ pax_erase_kstack
23670+
23671 /*
23672 * Reload arg registers from stack in case ptrace changed them.
23673 * We don't reload %rax because syscall_trace_entry_phase2() returned
23674 * the value it wants us to use in the table lookup.
23675 */
23676- LOAD_ARGS ARGOFFSET, 1
23677+ LOAD_ARGS 1
23678 RESTORE_REST
23679 #if __SYSCALL_MASK == ~0
23680 cmpq $__NR_syscall_max,%rax
23681@@ -451,7 +934,9 @@ GLOBAL(int_with_check)
23682 andl %edi,%edx
23683 jnz int_careful
23684 andl $~TS_COMPAT,TI_status(%rcx)
23685- jmp retint_swapgs
23686+ pax_exit_kernel_user
23687+ pax_erase_kstack
23688+ jmp retint_swapgs_pax
23689
23690 /* Either reschedule or signal or syscall exit tracking needed. */
23691 /* First do a reschedule test. */
23692@@ -497,7 +982,7 @@ int_restore_rest:
23693 TRACE_IRQS_OFF
23694 jmp int_with_check
23695 CFI_ENDPROC
23696-END(system_call)
23697+ENDPROC(system_call)
23698
23699 .macro FORK_LIKE func
23700 ENTRY(stub_\func)
23701@@ -510,9 +995,10 @@ ENTRY(stub_\func)
23702 DEFAULT_FRAME 0 8 /* offset 8: return address */
23703 call sys_\func
23704 RESTORE_TOP_OF_STACK %r11, 8
23705- ret $REST_SKIP /* pop extended registers */
23706+ pax_force_retaddr
23707+ ret
23708 CFI_ENDPROC
23709-END(stub_\func)
23710+ENDPROC(stub_\func)
23711 .endm
23712
23713 .macro FIXED_FRAME label,func
23714@@ -522,9 +1008,10 @@ ENTRY(\label)
23715 FIXUP_TOP_OF_STACK %r11, 8-ARGOFFSET
23716 call \func
23717 RESTORE_TOP_OF_STACK %r11, 8-ARGOFFSET
23718+ pax_force_retaddr
23719 ret
23720 CFI_ENDPROC
23721-END(\label)
23722+ENDPROC(\label)
23723 .endm
23724
23725 FORK_LIKE clone
23726@@ -543,7 +1030,7 @@ ENTRY(stub_execve)
23727 RESTORE_REST
23728 jmp int_ret_from_sys_call
23729 CFI_ENDPROC
23730-END(stub_execve)
23731+ENDPROC(stub_execve)
23732
23733 ENTRY(stub_execveat)
23734 CFI_STARTPROC
23735@@ -557,7 +1044,7 @@ ENTRY(stub_execveat)
23736 RESTORE_REST
23737 jmp int_ret_from_sys_call
23738 CFI_ENDPROC
23739-END(stub_execveat)
23740+ENDPROC(stub_execveat)
23741
23742 /*
23743 * sigreturn is special because it needs to restore all registers on return.
23744@@ -574,7 +1061,7 @@ ENTRY(stub_rt_sigreturn)
23745 RESTORE_REST
23746 jmp int_ret_from_sys_call
23747 CFI_ENDPROC
23748-END(stub_rt_sigreturn)
23749+ENDPROC(stub_rt_sigreturn)
23750
23751 #ifdef CONFIG_X86_X32_ABI
23752 ENTRY(stub_x32_rt_sigreturn)
23753@@ -588,7 +1075,7 @@ ENTRY(stub_x32_rt_sigreturn)
23754 RESTORE_REST
23755 jmp int_ret_from_sys_call
23756 CFI_ENDPROC
23757-END(stub_x32_rt_sigreturn)
23758+ENDPROC(stub_x32_rt_sigreturn)
23759
23760 ENTRY(stub_x32_execve)
23761 CFI_STARTPROC
23762@@ -602,7 +1089,7 @@ ENTRY(stub_x32_execve)
23763 RESTORE_REST
23764 jmp int_ret_from_sys_call
23765 CFI_ENDPROC
23766-END(stub_x32_execve)
23767+ENDPROC(stub_x32_execve)
23768
23769 ENTRY(stub_x32_execveat)
23770 CFI_STARTPROC
23771@@ -616,7 +1103,7 @@ ENTRY(stub_x32_execveat)
23772 RESTORE_REST
23773 jmp int_ret_from_sys_call
23774 CFI_ENDPROC
23775-END(stub_x32_execveat)
23776+ENDPROC(stub_x32_execveat)
23777
23778 #endif
23779
23780@@ -653,7 +1140,7 @@ vector=vector+1
23781 2: jmp common_interrupt
23782 .endr
23783 CFI_ENDPROC
23784-END(irq_entries_start)
23785+ENDPROC(irq_entries_start)
23786
23787 .previous
23788 END(interrupt)
23789@@ -670,28 +1157,29 @@ END(interrupt)
23790 /* 0(%rsp): ~(interrupt number) */
23791 .macro interrupt func
23792 /* reserve pt_regs for scratch regs and rbp */
23793- subq $ORIG_RAX-RBP, %rsp
23794- CFI_ADJUST_CFA_OFFSET ORIG_RAX-RBP
23795+ subq $ORIG_RAX, %rsp
23796+ CFI_ADJUST_CFA_OFFSET ORIG_RAX
23797 cld
23798- /* start from rbp in pt_regs and jump over */
23799- movq_cfi rdi, (RDI-RBP)
23800- movq_cfi rsi, (RSI-RBP)
23801- movq_cfi rdx, (RDX-RBP)
23802- movq_cfi rcx, (RCX-RBP)
23803- movq_cfi rax, (RAX-RBP)
23804- movq_cfi r8, (R8-RBP)
23805- movq_cfi r9, (R9-RBP)
23806- movq_cfi r10, (R10-RBP)
23807- movq_cfi r11, (R11-RBP)
23808+ /* start from r15 in pt_regs and jump over */
23809+ movq_cfi rdi, RDI
23810+ movq_cfi rsi, RSI
23811+ movq_cfi rdx, RDX
23812+ movq_cfi rcx, RCX
23813+ movq_cfi rax, RAX
23814+ movq_cfi r8, R8
23815+ movq_cfi r9, R9
23816+ movq_cfi r10, R10
23817+ movq_cfi r11, R11
23818+ movq_cfi r12, R12
23819
23820 /* Save rbp so that we can unwind from get_irq_regs() */
23821- movq_cfi rbp, 0
23822+ movq_cfi rbp, RBP
23823
23824 /* Save previous stack value */
23825 movq %rsp, %rsi
23826
23827- leaq -RBP(%rsp),%rdi /* arg1 for handler */
23828- testl $3, CS-RBP(%rsi)
23829+ movq %rsp,%rdi /* arg1 for handler */
23830+ testb $3, CS(%rsi)
23831 je 1f
23832 SWAPGS
23833 /*
23834@@ -711,6 +1199,18 @@ END(interrupt)
23835 0x06 /* DW_OP_deref */, \
23836 0x08 /* DW_OP_const1u */, SS+8-RBP, \
23837 0x22 /* DW_OP_plus */
23838+
23839+#ifdef CONFIG_PAX_MEMORY_UDEREF
23840+ testb $3, CS(%rdi)
23841+ jnz 1f
23842+ pax_enter_kernel
23843+ jmp 2f
23844+1: pax_enter_kernel_user
23845+2:
23846+#else
23847+ pax_enter_kernel
23848+#endif
23849+
23850 /* We entered an interrupt context - irqs are off: */
23851 TRACE_IRQS_OFF
23852
23853@@ -735,14 +1235,14 @@ ret_from_intr:
23854
23855 /* Restore saved previous stack */
23856 popq %rsi
23857- CFI_DEF_CFA rsi,SS+8-RBP /* reg/off reset after def_cfa_expr */
23858- leaq ARGOFFSET-RBP(%rsi), %rsp
23859+ CFI_DEF_CFA rsi,SS+8 /* reg/off reset after def_cfa_expr */
23860+ movq %rsi, %rsp
23861 CFI_DEF_CFA_REGISTER rsp
23862- CFI_ADJUST_CFA_OFFSET RBP-ARGOFFSET
23863+ CFI_ADJUST_CFA_OFFSET -ARGOFFSET
23864
23865 exit_intr:
23866 GET_THREAD_INFO(%rcx)
23867- testl $3,CS-ARGOFFSET(%rsp)
23868+ testb $3,CS-ARGOFFSET(%rsp)
23869 je retint_kernel
23870
23871 /* Interrupt came from user space */
23872@@ -764,14 +1264,16 @@ retint_swapgs: /* return to user-space */
23873 * The iretq could re-enable interrupts:
23874 */
23875 DISABLE_INTERRUPTS(CLBR_ANY)
23876+ pax_exit_kernel_user
23877+retint_swapgs_pax:
23878 TRACE_IRQS_IRETQ
23879
23880 /*
23881 * Try to use SYSRET instead of IRET if we're returning to
23882 * a completely clean 64-bit userspace context.
23883 */
23884- movq (RCX-R11)(%rsp), %rcx
23885- cmpq %rcx,(RIP-R11)(%rsp) /* RCX == RIP */
23886+ movq (RCX-ARGOFFSET)(%rsp), %rcx
23887+ cmpq %rcx,(RIP-ARGOFFSET)(%rsp) /* RCX == RIP */
23888 jne opportunistic_sysret_failed
23889
23890 /*
23891@@ -792,7 +1294,7 @@ retint_swapgs: /* return to user-space */
23892 shr $__VIRTUAL_MASK_SHIFT, %rcx
23893 jnz opportunistic_sysret_failed
23894
23895- cmpq $__USER_CS,(CS-R11)(%rsp) /* CS must match SYSRET */
23896+ cmpq $__USER_CS,(CS-ARGOFFSET)(%rsp) /* CS must match SYSRET */
23897 jne opportunistic_sysret_failed
23898
23899 movq (R11-ARGOFFSET)(%rsp), %r11
23900@@ -838,6 +1340,27 @@ opportunistic_sysret_failed:
23901
23902 retint_restore_args: /* return to kernel space */
23903 DISABLE_INTERRUPTS(CLBR_ANY)
23904+ pax_exit_kernel
23905+
23906+#if defined(CONFIG_EFI) && defined(CONFIG_PAX_KERNEXEC)
23907+ /* This is a quirk to allow IRQs/NMIs/MCEs during early EFI setup,
23908+ * namely calling EFI runtime services with a phys mapping. We're
23909+ * starting off with NOPs and patch in the real instrumentation
23910+ * (BTS/OR) before starting any userland process; even before starting
23911+ * up the APs.
23912+ */
23913+ .pushsection .altinstr_replacement, "a"
23914+ 601: pax_force_retaddr (RIP-ARGOFFSET)
23915+ 602:
23916+ .popsection
23917+ 603: .fill 602b-601b, 1, 0x90
23918+ .pushsection .altinstructions, "a"
23919+ altinstruction_entry 603b, 601b, X86_FEATURE_ALWAYS, 602b-601b, 602b-601b
23920+ .popsection
23921+#else
23922+ pax_force_retaddr (RIP-ARGOFFSET)
23923+#endif
23924+
23925 /*
23926 * The iretq could re-enable interrupts:
23927 */
23928@@ -875,15 +1398,15 @@ native_irq_return_ldt:
23929 SWAPGS
23930 movq PER_CPU_VAR(espfix_waddr),%rdi
23931 movq %rax,(0*8)(%rdi) /* RAX */
23932- movq (2*8)(%rsp),%rax /* RIP */
23933+ movq (2*8 + RIP-RIP)(%rsp),%rax /* RIP */
23934 movq %rax,(1*8)(%rdi)
23935- movq (3*8)(%rsp),%rax /* CS */
23936+ movq (2*8 + CS-RIP)(%rsp),%rax /* CS */
23937 movq %rax,(2*8)(%rdi)
23938- movq (4*8)(%rsp),%rax /* RFLAGS */
23939+ movq (2*8 + EFLAGS-RIP)(%rsp),%rax /* RFLAGS */
23940 movq %rax,(3*8)(%rdi)
23941- movq (6*8)(%rsp),%rax /* SS */
23942+ movq (2*8 + SS-RIP)(%rsp),%rax /* SS */
23943 movq %rax,(5*8)(%rdi)
23944- movq (5*8)(%rsp),%rax /* RSP */
23945+ movq (2*8 + RSP-RIP)(%rsp),%rax /* RSP */
23946 movq %rax,(4*8)(%rdi)
23947 andl $0xffff0000,%eax
23948 popq_cfi %rdi
23949@@ -937,7 +1460,7 @@ ENTRY(retint_kernel)
23950 jmp exit_intr
23951 #endif
23952 CFI_ENDPROC
23953-END(common_interrupt)
23954+ENDPROC(common_interrupt)
23955
23956 /*
23957 * APIC interrupts.
23958@@ -951,7 +1474,7 @@ ENTRY(\sym)
23959 interrupt \do_sym
23960 jmp ret_from_intr
23961 CFI_ENDPROC
23962-END(\sym)
23963+ENDPROC(\sym)
23964 .endm
23965
23966 #ifdef CONFIG_TRACING
23967@@ -1024,7 +1547,7 @@ apicinterrupt IRQ_WORK_VECTOR \
23968 /*
23969 * Exception entry points.
23970 */
23971-#define INIT_TSS_IST(x) PER_CPU_VAR(init_tss) + (TSS_ist + ((x) - 1) * 8)
23972+#define INIT_TSS_IST(x) (TSS_ist + ((x) - 1) * 8)(%r13)
23973
23974 .macro idtentry sym do_sym has_error_code:req paranoid=0 shift_ist=-1
23975 ENTRY(\sym)
23976@@ -1080,6 +1603,12 @@ ENTRY(\sym)
23977 .endif
23978
23979 .if \shift_ist != -1
23980+#ifdef CONFIG_SMP
23981+ imul $TSS_size, PER_CPU_VAR(cpu_number), %r13d
23982+ lea init_tss(%r13), %r13
23983+#else
23984+ lea init_tss(%rip), %r13
23985+#endif
23986 subq $EXCEPTION_STKSZ, INIT_TSS_IST(\shift_ist)
23987 .endif
23988
23989@@ -1126,7 +1655,7 @@ ENTRY(\sym)
23990 .endif
23991
23992 CFI_ENDPROC
23993-END(\sym)
23994+ENDPROC(\sym)
23995 .endm
23996
23997 #ifdef CONFIG_TRACING
23998@@ -1167,9 +1696,10 @@ gs_change:
23999 2: mfence /* workaround */
24000 SWAPGS
24001 popfq_cfi
24002+ pax_force_retaddr
24003 ret
24004 CFI_ENDPROC
24005-END(native_load_gs_index)
24006+ENDPROC(native_load_gs_index)
24007
24008 _ASM_EXTABLE(gs_change,bad_gs)
24009 .section .fixup,"ax"
24010@@ -1197,9 +1727,10 @@ ENTRY(do_softirq_own_stack)
24011 CFI_DEF_CFA_REGISTER rsp
24012 CFI_ADJUST_CFA_OFFSET -8
24013 decl PER_CPU_VAR(irq_count)
24014+ pax_force_retaddr
24015 ret
24016 CFI_ENDPROC
24017-END(do_softirq_own_stack)
24018+ENDPROC(do_softirq_own_stack)
24019
24020 #ifdef CONFIG_XEN
24021 idtentry xen_hypervisor_callback xen_do_hypervisor_callback has_error_code=0
24022@@ -1240,7 +1771,7 @@ ENTRY(xen_do_hypervisor_callback) # do_hypervisor_callback(struct *pt_regs)
24023 #endif
24024 jmp error_exit
24025 CFI_ENDPROC
24026-END(xen_do_hypervisor_callback)
24027+ENDPROC(xen_do_hypervisor_callback)
24028
24029 /*
24030 * Hypervisor uses this for application faults while it executes.
24031@@ -1299,7 +1830,7 @@ ENTRY(xen_failsafe_callback)
24032 SAVE_ALL
24033 jmp error_exit
24034 CFI_ENDPROC
24035-END(xen_failsafe_callback)
24036+ENDPROC(xen_failsafe_callback)
24037
24038 apicinterrupt3 HYPERVISOR_CALLBACK_VECTOR \
24039 xen_hvm_callback_vector xen_evtchn_do_upcall
24040@@ -1344,18 +1875,25 @@ ENTRY(paranoid_exit)
24041 DEFAULT_FRAME
24042 DISABLE_INTERRUPTS(CLBR_NONE)
24043 TRACE_IRQS_OFF_DEBUG
24044- testl %ebx,%ebx /* swapgs needed? */
24045+ testl $1,%ebx /* swapgs needed? */
24046 jnz paranoid_restore
24047+#ifdef CONFIG_PAX_MEMORY_UDEREF
24048+ pax_exit_kernel_user
24049+#else
24050+ pax_exit_kernel
24051+#endif
24052 TRACE_IRQS_IRETQ 0
24053 SWAPGS_UNSAFE_STACK
24054 RESTORE_ALL 8
24055 INTERRUPT_RETURN
24056 paranoid_restore:
24057+ pax_exit_kernel
24058 TRACE_IRQS_IRETQ_DEBUG 0
24059 RESTORE_ALL 8
24060+ pax_force_retaddr_bts
24061 INTERRUPT_RETURN
24062 CFI_ENDPROC
24063-END(paranoid_exit)
24064+ENDPROC(paranoid_exit)
24065
24066 /*
24067 * Exception entry point. This expects an error code/orig_rax on the stack.
24068@@ -1382,12 +1920,23 @@ ENTRY(error_entry)
24069 movq %r14, R14+8(%rsp)
24070 movq %r15, R15+8(%rsp)
24071 xorl %ebx,%ebx
24072- testl $3,CS+8(%rsp)
24073+ testb $3,CS+8(%rsp)
24074 je error_kernelspace
24075 error_swapgs:
24076 SWAPGS
24077 error_sti:
24078+#ifdef CONFIG_PAX_MEMORY_UDEREF
24079+ testb $3, CS+8(%rsp)
24080+ jnz 1f
24081+ pax_enter_kernel
24082+ jmp 2f
24083+1: pax_enter_kernel_user
24084+2:
24085+#else
24086+ pax_enter_kernel
24087+#endif
24088 TRACE_IRQS_OFF
24089+ pax_force_retaddr
24090 ret
24091
24092 /*
24093@@ -1422,7 +1971,7 @@ error_bad_iret:
24094 decl %ebx /* Return to usergs */
24095 jmp error_sti
24096 CFI_ENDPROC
24097-END(error_entry)
24098+ENDPROC(error_entry)
24099
24100
24101 /* ebx: no swapgs flag (1: don't need swapgs, 0: need it) */
24102@@ -1433,7 +1982,7 @@ ENTRY(error_exit)
24103 DISABLE_INTERRUPTS(CLBR_NONE)
24104 TRACE_IRQS_OFF
24105 GET_THREAD_INFO(%rcx)
24106- testl %eax,%eax
24107+ testl $1,%eax
24108 jne retint_kernel
24109 LOCKDEP_SYS_EXIT_IRQ
24110 movl TI_flags(%rcx),%edx
24111@@ -1442,7 +1991,7 @@ ENTRY(error_exit)
24112 jnz retint_careful
24113 jmp retint_swapgs
24114 CFI_ENDPROC
24115-END(error_exit)
24116+ENDPROC(error_exit)
24117
24118 /*
24119 * Test if a given stack is an NMI stack or not.
24120@@ -1500,9 +2049,11 @@ ENTRY(nmi)
24121 * If %cs was not the kernel segment, then the NMI triggered in user
24122 * space, which means it is definitely not nested.
24123 */
24124+ cmpl $__KERNEXEC_KERNEL_CS, 16(%rsp)
24125+ je 1f
24126 cmpl $__KERNEL_CS, 16(%rsp)
24127 jne first_nmi
24128-
24129+1:
24130 /*
24131 * Check the special variable on the stack to see if NMIs are
24132 * executing.
24133@@ -1536,8 +2087,7 @@ nested_nmi:
24134
24135 1:
24136 /* Set up the interrupted NMIs stack to jump to repeat_nmi */
24137- leaq -1*8(%rsp), %rdx
24138- movq %rdx, %rsp
24139+ subq $8, %rsp
24140 CFI_ADJUST_CFA_OFFSET 1*8
24141 leaq -10*8(%rsp), %rdx
24142 pushq_cfi $__KERNEL_DS
24143@@ -1555,6 +2105,7 @@ nested_nmi_out:
24144 CFI_RESTORE rdx
24145
24146 /* No need to check faults here */
24147+# pax_force_retaddr_bts
24148 INTERRUPT_RETURN
24149
24150 CFI_RESTORE_STATE
24151@@ -1651,13 +2202,13 @@ end_repeat_nmi:
24152 subq $ORIG_RAX-R15, %rsp
24153 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
24154 /*
24155- * Use save_paranoid to handle SWAPGS, but no need to use paranoid_exit
24156+ * Use save_paranoid_nmi to handle SWAPGS, but no need to use paranoid_exit
24157 * as we should not be calling schedule in NMI context.
24158 * Even with normal interrupts enabled. An NMI should not be
24159 * setting NEED_RESCHED or anything that normal interrupts and
24160 * exceptions might do.
24161 */
24162- call save_paranoid
24163+ call save_paranoid_nmi
24164 DEFAULT_FRAME 0
24165
24166 /*
24167@@ -1667,9 +2218,9 @@ end_repeat_nmi:
24168 * NMI itself takes a page fault, the page fault that was preempted
24169 * will read the information from the NMI page fault and not the
24170 * origin fault. Save it off and restore it if it changes.
24171- * Use the r12 callee-saved register.
24172+ * Use the r13 callee-saved register.
24173 */
24174- movq %cr2, %r12
24175+ movq %cr2, %r13
24176
24177 /* paranoidentry do_nmi, 0; without TRACE_IRQS_OFF */
24178 movq %rsp,%rdi
24179@@ -1678,29 +2229,34 @@ end_repeat_nmi:
24180
24181 /* Did the NMI take a page fault? Restore cr2 if it did */
24182 movq %cr2, %rcx
24183- cmpq %rcx, %r12
24184+ cmpq %rcx, %r13
24185 je 1f
24186- movq %r12, %cr2
24187+ movq %r13, %cr2
24188 1:
24189
24190- testl %ebx,%ebx /* swapgs needed? */
24191+ testl $1,%ebx /* swapgs needed? */
24192 jnz nmi_restore
24193 nmi_swapgs:
24194 SWAPGS_UNSAFE_STACK
24195 nmi_restore:
24196+ pax_exit_kernel_nmi
24197 /* Pop the extra iret frame at once */
24198 RESTORE_ALL 6*8
24199+ testb $3, 8(%rsp)
24200+ jnz 1f
24201+ pax_force_retaddr_bts
24202+1:
24203
24204 /* Clear the NMI executing stack variable */
24205 movq $0, 5*8(%rsp)
24206 jmp irq_return
24207 CFI_ENDPROC
24208-END(nmi)
24209+ENDPROC(nmi)
24210
24211 ENTRY(ignore_sysret)
24212 CFI_STARTPROC
24213 mov $-ENOSYS,%eax
24214 sysret
24215 CFI_ENDPROC
24216-END(ignore_sysret)
24217+ENDPROC(ignore_sysret)
24218
24219diff --git a/arch/x86/kernel/espfix_64.c b/arch/x86/kernel/espfix_64.c
24220index f5d0730..5bce89c 100644
24221--- a/arch/x86/kernel/espfix_64.c
24222+++ b/arch/x86/kernel/espfix_64.c
24223@@ -70,8 +70,7 @@ static DEFINE_MUTEX(espfix_init_mutex);
24224 #define ESPFIX_MAX_PAGES DIV_ROUND_UP(CONFIG_NR_CPUS, ESPFIX_STACKS_PER_PAGE)
24225 static void *espfix_pages[ESPFIX_MAX_PAGES];
24226
24227-static __page_aligned_bss pud_t espfix_pud_page[PTRS_PER_PUD]
24228- __aligned(PAGE_SIZE);
24229+static pud_t espfix_pud_page[PTRS_PER_PUD] __page_aligned_rodata;
24230
24231 static unsigned int page_random, slot_random;
24232
24233@@ -122,11 +121,17 @@ static void init_espfix_random(void)
24234 void __init init_espfix_bsp(void)
24235 {
24236 pgd_t *pgd_p;
24237+ unsigned long index = pgd_index(ESPFIX_BASE_ADDR);
24238
24239 /* Install the espfix pud into the kernel page directory */
24240- pgd_p = &init_level4_pgt[pgd_index(ESPFIX_BASE_ADDR)];
24241+ pgd_p = &init_level4_pgt[index];
24242 pgd_populate(&init_mm, pgd_p, (pud_t *)espfix_pud_page);
24243
24244+#ifdef CONFIG_PAX_PER_CPU_PGD
24245+ clone_pgd_range(get_cpu_pgd(0, kernel) + index, swapper_pg_dir + index, 1);
24246+ clone_pgd_range(get_cpu_pgd(0, user) + index, swapper_pg_dir + index, 1);
24247+#endif
24248+
24249 /* Randomize the locations */
24250 init_espfix_random();
24251
24252@@ -194,7 +199,7 @@ void init_espfix_ap(void)
24253 set_pte(&pte_p[n*PTE_STRIDE], pte);
24254
24255 /* Job is done for this CPU and any CPU which shares this page */
24256- ACCESS_ONCE(espfix_pages[page]) = stack_page;
24257+ ACCESS_ONCE_RW(espfix_pages[page]) = stack_page;
24258
24259 unlock_done:
24260 mutex_unlock(&espfix_init_mutex);
24261diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
24262index 8b7b0a5..02219db 100644
24263--- a/arch/x86/kernel/ftrace.c
24264+++ b/arch/x86/kernel/ftrace.c
24265@@ -89,7 +89,7 @@ static unsigned long text_ip_addr(unsigned long ip)
24266 * kernel identity mapping to modify code.
24267 */
24268 if (within(ip, (unsigned long)_text, (unsigned long)_etext))
24269- ip = (unsigned long)__va(__pa_symbol(ip));
24270+ ip = (unsigned long)__va(__pa_symbol(ktla_ktva(ip)));
24271
24272 return ip;
24273 }
24274@@ -105,6 +105,8 @@ ftrace_modify_code_direct(unsigned long ip, unsigned const char *old_code,
24275 {
24276 unsigned char replaced[MCOUNT_INSN_SIZE];
24277
24278+ ip = ktla_ktva(ip);
24279+
24280 /*
24281 * Note: Due to modules and __init, code can
24282 * disappear and change, we need to protect against faulting
24283@@ -230,7 +232,7 @@ static int update_ftrace_func(unsigned long ip, void *new)
24284 unsigned char old[MCOUNT_INSN_SIZE];
24285 int ret;
24286
24287- memcpy(old, (void *)ip, MCOUNT_INSN_SIZE);
24288+ memcpy(old, (void *)ktla_ktva(ip), MCOUNT_INSN_SIZE);
24289
24290 ftrace_update_func = ip;
24291 /* Make sure the breakpoints see the ftrace_update_func update */
24292@@ -311,7 +313,7 @@ static int add_break(unsigned long ip, const char *old)
24293 unsigned char replaced[MCOUNT_INSN_SIZE];
24294 unsigned char brk = BREAKPOINT_INSTRUCTION;
24295
24296- if (probe_kernel_read(replaced, (void *)ip, MCOUNT_INSN_SIZE))
24297+ if (probe_kernel_read(replaced, (void *)ktla_ktva(ip), MCOUNT_INSN_SIZE))
24298 return -EFAULT;
24299
24300 /* Make sure it is what we expect it to be */
24301@@ -670,11 +672,11 @@ static unsigned char *ftrace_jmp_replace(unsigned long ip, unsigned long addr)
24302 /* Module allocation simplifies allocating memory for code */
24303 static inline void *alloc_tramp(unsigned long size)
24304 {
24305- return module_alloc(size);
24306+ return module_alloc_exec(size);
24307 }
24308 static inline void tramp_free(void *tramp)
24309 {
24310- module_memfree(tramp);
24311+ module_memfree_exec(tramp);
24312 }
24313 #else
24314 /* Trampolines can only be created if modules are supported */
24315@@ -753,7 +755,9 @@ create_trampoline(struct ftrace_ops *ops, unsigned int *tramp_size)
24316 *tramp_size = size + MCOUNT_INSN_SIZE + sizeof(void *);
24317
24318 /* Copy ftrace_caller onto the trampoline memory */
24319+ pax_open_kernel();
24320 ret = probe_kernel_read(trampoline, (void *)start_offset, size);
24321+ pax_close_kernel();
24322 if (WARN_ON(ret < 0)) {
24323 tramp_free(trampoline);
24324 return 0;
24325@@ -763,6 +767,7 @@ create_trampoline(struct ftrace_ops *ops, unsigned int *tramp_size)
24326
24327 /* The trampoline ends with a jmp to ftrace_return */
24328 jmp = ftrace_jmp_replace(ip, (unsigned long)ftrace_return);
24329+ pax_open_kernel();
24330 memcpy(trampoline + size, jmp, MCOUNT_INSN_SIZE);
24331
24332 /*
24333@@ -775,6 +780,7 @@ create_trampoline(struct ftrace_ops *ops, unsigned int *tramp_size)
24334
24335 ptr = (unsigned long *)(trampoline + size + MCOUNT_INSN_SIZE);
24336 *ptr = (unsigned long)ops;
24337+ pax_close_kernel();
24338
24339 op_offset -= start_offset;
24340 memcpy(&op_ptr, trampoline + op_offset, OP_REF_SIZE);
24341@@ -792,7 +798,9 @@ create_trampoline(struct ftrace_ops *ops, unsigned int *tramp_size)
24342 op_ptr.offset = offset;
24343
24344 /* put in the new offset to the ftrace_ops */
24345+ pax_open_kernel();
24346 memcpy(trampoline + op_offset, &op_ptr, OP_REF_SIZE);
24347+ pax_close_kernel();
24348
24349 /* ALLOC_TRAMP flags lets us know we created it */
24350 ops->flags |= FTRACE_OPS_FL_ALLOC_TRAMP;
24351diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c
24352index b111ab5..3d419ea 100644
24353--- a/arch/x86/kernel/head64.c
24354+++ b/arch/x86/kernel/head64.c
24355@@ -68,12 +68,12 @@ again:
24356 pgd = *pgd_p;
24357
24358 /*
24359- * The use of __START_KERNEL_map rather than __PAGE_OFFSET here is
24360- * critical -- __PAGE_OFFSET would point us back into the dynamic
24361+ * The use of __early_va rather than __va here is critical:
24362+ * __va would point us back into the dynamic
24363 * range and we might end up looping forever...
24364 */
24365 if (pgd)
24366- pud_p = (pudval_t *)((pgd & PTE_PFN_MASK) + __START_KERNEL_map - phys_base);
24367+ pud_p = (pudval_t *)(__early_va(pgd & PTE_PFN_MASK));
24368 else {
24369 if (next_early_pgt >= EARLY_DYNAMIC_PAGE_TABLES) {
24370 reset_early_page_tables();
24371@@ -83,13 +83,13 @@ again:
24372 pud_p = (pudval_t *)early_dynamic_pgts[next_early_pgt++];
24373 for (i = 0; i < PTRS_PER_PUD; i++)
24374 pud_p[i] = 0;
24375- *pgd_p = (pgdval_t)pud_p - __START_KERNEL_map + phys_base + _KERNPG_TABLE;
24376+ *pgd_p = (pgdval_t)__pa(pud_p) + _KERNPG_TABLE;
24377 }
24378 pud_p += pud_index(address);
24379 pud = *pud_p;
24380
24381 if (pud)
24382- pmd_p = (pmdval_t *)((pud & PTE_PFN_MASK) + __START_KERNEL_map - phys_base);
24383+ pmd_p = (pmdval_t *)(__early_va(pud & PTE_PFN_MASK));
24384 else {
24385 if (next_early_pgt >= EARLY_DYNAMIC_PAGE_TABLES) {
24386 reset_early_page_tables();
24387@@ -99,7 +99,7 @@ again:
24388 pmd_p = (pmdval_t *)early_dynamic_pgts[next_early_pgt++];
24389 for (i = 0; i < PTRS_PER_PMD; i++)
24390 pmd_p[i] = 0;
24391- *pud_p = (pudval_t)pmd_p - __START_KERNEL_map + phys_base + _KERNPG_TABLE;
24392+ *pud_p = (pudval_t)__pa(pmd_p) + _KERNPG_TABLE;
24393 }
24394 pmd = (physaddr & PMD_MASK) + early_pmd_flags;
24395 pmd_p[pmd_index(address)] = pmd;
24396@@ -180,7 +180,6 @@ asmlinkage __visible void __init x86_64_start_kernel(char * real_mode_data)
24397 if (console_loglevel >= CONSOLE_LOGLEVEL_DEBUG)
24398 early_printk("Kernel alive\n");
24399
24400- clear_page(init_level4_pgt);
24401 /* set init_level4_pgt kernel high mapping*/
24402 init_level4_pgt[511] = early_level4_pgt[511];
24403
24404diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
24405index 30a2aa3..d62e1dd 100644
24406--- a/arch/x86/kernel/head_32.S
24407+++ b/arch/x86/kernel/head_32.S
24408@@ -26,6 +26,12 @@
24409 /* Physical address */
24410 #define pa(X) ((X) - __PAGE_OFFSET)
24411
24412+#ifdef CONFIG_PAX_KERNEXEC
24413+#define ta(X) (X)
24414+#else
24415+#define ta(X) ((X) - __PAGE_OFFSET)
24416+#endif
24417+
24418 /*
24419 * References to members of the new_cpu_data structure.
24420 */
24421@@ -55,11 +61,7 @@
24422 * and small than max_low_pfn, otherwise will waste some page table entries
24423 */
24424
24425-#if PTRS_PER_PMD > 1
24426-#define PAGE_TABLE_SIZE(pages) (((pages) / PTRS_PER_PMD) + PTRS_PER_PGD)
24427-#else
24428-#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PGD)
24429-#endif
24430+#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PTE)
24431
24432 /* Number of possible pages in the lowmem region */
24433 LOWMEM_PAGES = (((1<<32) - __PAGE_OFFSET) >> PAGE_SHIFT)
24434@@ -78,6 +80,12 @@ INIT_MAP_SIZE = PAGE_TABLE_SIZE(KERNEL_PAGES) * PAGE_SIZE
24435 RESERVE_BRK(pagetables, INIT_MAP_SIZE)
24436
24437 /*
24438+ * Real beginning of normal "text" segment
24439+ */
24440+ENTRY(stext)
24441+ENTRY(_stext)
24442+
24443+/*
24444 * 32-bit kernel entrypoint; only used by the boot CPU. On entry,
24445 * %esi points to the real-mode code as a 32-bit pointer.
24446 * CS and DS must be 4 GB flat segments, but we don't depend on
24447@@ -85,6 +93,13 @@ RESERVE_BRK(pagetables, INIT_MAP_SIZE)
24448 * can.
24449 */
24450 __HEAD
24451+
24452+#ifdef CONFIG_PAX_KERNEXEC
24453+ jmp startup_32
24454+/* PaX: fill first page in .text with int3 to catch NULL derefs in kernel mode */
24455+.fill PAGE_SIZE-5,1,0xcc
24456+#endif
24457+
24458 ENTRY(startup_32)
24459 movl pa(stack_start),%ecx
24460
24461@@ -106,6 +121,59 @@ ENTRY(startup_32)
24462 2:
24463 leal -__PAGE_OFFSET(%ecx),%esp
24464
24465+#ifdef CONFIG_SMP
24466+ movl $pa(cpu_gdt_table),%edi
24467+ movl $__per_cpu_load,%eax
24468+ movw %ax,GDT_ENTRY_PERCPU * 8 + 2(%edi)
24469+ rorl $16,%eax
24470+ movb %al,GDT_ENTRY_PERCPU * 8 + 4(%edi)
24471+ movb %ah,GDT_ENTRY_PERCPU * 8 + 7(%edi)
24472+ movl $__per_cpu_end - 1,%eax
24473+ subl $__per_cpu_start,%eax
24474+ movw %ax,GDT_ENTRY_PERCPU * 8 + 0(%edi)
24475+#endif
24476+
24477+#ifdef CONFIG_PAX_MEMORY_UDEREF
24478+ movl $NR_CPUS,%ecx
24479+ movl $pa(cpu_gdt_table),%edi
24480+1:
24481+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c09700),GDT_ENTRY_KERNEL_DS * 8 + 4(%edi)
24482+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0fb00),GDT_ENTRY_DEFAULT_USER_CS * 8 + 4(%edi)
24483+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0f300),GDT_ENTRY_DEFAULT_USER_DS * 8 + 4(%edi)
24484+ addl $PAGE_SIZE_asm,%edi
24485+ loop 1b
24486+#endif
24487+
24488+#ifdef CONFIG_PAX_KERNEXEC
24489+ movl $pa(boot_gdt),%edi
24490+ movl $__LOAD_PHYSICAL_ADDR,%eax
24491+ movw %ax,GDT_ENTRY_BOOT_CS * 8 + 2(%edi)
24492+ rorl $16,%eax
24493+ movb %al,GDT_ENTRY_BOOT_CS * 8 + 4(%edi)
24494+ movb %ah,GDT_ENTRY_BOOT_CS * 8 + 7(%edi)
24495+ rorl $16,%eax
24496+
24497+ ljmp $(__BOOT_CS),$1f
24498+1:
24499+
24500+ movl $NR_CPUS,%ecx
24501+ movl $pa(cpu_gdt_table),%edi
24502+ addl $__PAGE_OFFSET,%eax
24503+1:
24504+ movb $0xc0,GDT_ENTRY_KERNEL_CS * 8 + 6(%edi)
24505+ movb $0xc0,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 6(%edi)
24506+ movw %ax,GDT_ENTRY_KERNEL_CS * 8 + 2(%edi)
24507+ movw %ax,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 2(%edi)
24508+ rorl $16,%eax
24509+ movb %al,GDT_ENTRY_KERNEL_CS * 8 + 4(%edi)
24510+ movb %al,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 4(%edi)
24511+ movb %ah,GDT_ENTRY_KERNEL_CS * 8 + 7(%edi)
24512+ movb %ah,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 7(%edi)
24513+ rorl $16,%eax
24514+ addl $PAGE_SIZE_asm,%edi
24515+ loop 1b
24516+#endif
24517+
24518 /*
24519 * Clear BSS first so that there are no surprises...
24520 */
24521@@ -201,8 +269,11 @@ ENTRY(startup_32)
24522 movl %eax, pa(max_pfn_mapped)
24523
24524 /* Do early initialization of the fixmap area */
24525- movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,%eax
24526- movl %eax,pa(initial_pg_pmd+0x1000*KPMDS-8)
24527+#ifdef CONFIG_COMPAT_VDSO
24528+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(initial_pg_pmd+0x1000*KPMDS-8)
24529+#else
24530+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,pa(initial_pg_pmd+0x1000*KPMDS-8)
24531+#endif
24532 #else /* Not PAE */
24533
24534 page_pde_offset = (__PAGE_OFFSET >> 20);
24535@@ -232,8 +303,11 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
24536 movl %eax, pa(max_pfn_mapped)
24537
24538 /* Do early initialization of the fixmap area */
24539- movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,%eax
24540- movl %eax,pa(initial_page_table+0xffc)
24541+#ifdef CONFIG_COMPAT_VDSO
24542+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(initial_page_table+0xffc)
24543+#else
24544+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,pa(initial_page_table+0xffc)
24545+#endif
24546 #endif
24547
24548 #ifdef CONFIG_PARAVIRT
24549@@ -247,9 +321,7 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
24550 cmpl $num_subarch_entries, %eax
24551 jae bad_subarch
24552
24553- movl pa(subarch_entries)(,%eax,4), %eax
24554- subl $__PAGE_OFFSET, %eax
24555- jmp *%eax
24556+ jmp *pa(subarch_entries)(,%eax,4)
24557
24558 bad_subarch:
24559 WEAK(lguest_entry)
24560@@ -261,10 +333,10 @@ WEAK(xen_entry)
24561 __INITDATA
24562
24563 subarch_entries:
24564- .long default_entry /* normal x86/PC */
24565- .long lguest_entry /* lguest hypervisor */
24566- .long xen_entry /* Xen hypervisor */
24567- .long default_entry /* Moorestown MID */
24568+ .long ta(default_entry) /* normal x86/PC */
24569+ .long ta(lguest_entry) /* lguest hypervisor */
24570+ .long ta(xen_entry) /* Xen hypervisor */
24571+ .long ta(default_entry) /* Moorestown MID */
24572 num_subarch_entries = (. - subarch_entries) / 4
24573 .previous
24574 #else
24575@@ -354,6 +426,7 @@ default_entry:
24576 movl pa(mmu_cr4_features),%eax
24577 movl %eax,%cr4
24578
24579+#ifdef CONFIG_X86_PAE
24580 testb $X86_CR4_PAE, %al # check if PAE is enabled
24581 jz enable_paging
24582
24583@@ -382,6 +455,9 @@ default_entry:
24584 /* Make changes effective */
24585 wrmsr
24586
24587+ btsl $_PAGE_BIT_NX-32,pa(__supported_pte_mask+4)
24588+#endif
24589+
24590 enable_paging:
24591
24592 /*
24593@@ -449,14 +525,20 @@ is486:
24594 1: movl $(__KERNEL_DS),%eax # reload all the segment registers
24595 movl %eax,%ss # after changing gdt.
24596
24597- movl $(__USER_DS),%eax # DS/ES contains default USER segment
24598+# movl $(__KERNEL_DS),%eax # DS/ES contains default KERNEL segment
24599 movl %eax,%ds
24600 movl %eax,%es
24601
24602 movl $(__KERNEL_PERCPU), %eax
24603 movl %eax,%fs # set this cpu's percpu
24604
24605+#ifdef CONFIG_CC_STACKPROTECTOR
24606 movl $(__KERNEL_STACK_CANARY),%eax
24607+#elif defined(CONFIG_PAX_MEMORY_UDEREF)
24608+ movl $(__USER_DS),%eax
24609+#else
24610+ xorl %eax,%eax
24611+#endif
24612 movl %eax,%gs
24613
24614 xorl %eax,%eax # Clear LDT
24615@@ -513,8 +595,11 @@ setup_once:
24616 * relocation. Manually set base address in stack canary
24617 * segment descriptor.
24618 */
24619- movl $gdt_page,%eax
24620+ movl $cpu_gdt_table,%eax
24621 movl $stack_canary,%ecx
24622+#ifdef CONFIG_SMP
24623+ addl $__per_cpu_load,%ecx
24624+#endif
24625 movw %cx, 8 * GDT_ENTRY_STACK_CANARY + 2(%eax)
24626 shrl $16, %ecx
24627 movb %cl, 8 * GDT_ENTRY_STACK_CANARY + 4(%eax)
24628@@ -551,7 +636,7 @@ early_idt_handler_common:
24629 cmpl $2,(%esp) # X86_TRAP_NMI
24630 je is_nmi # Ignore NMI
24631
24632- cmpl $2,%ss:early_recursion_flag
24633+ cmpl $1,%ss:early_recursion_flag
24634 je hlt_loop
24635 incl %ss:early_recursion_flag
24636
24637@@ -589,8 +674,8 @@ early_idt_handler_common:
24638 pushl (20+6*4)(%esp) /* trapno */
24639 pushl $fault_msg
24640 call printk
24641-#endif
24642 call dump_stack
24643+#endif
24644 hlt_loop:
24645 hlt
24646 jmp hlt_loop
24647@@ -610,8 +695,11 @@ ENDPROC(early_idt_handler_common)
24648 /* This is the default interrupt "handler" :-) */
24649 ALIGN
24650 ignore_int:
24651- cld
24652 #ifdef CONFIG_PRINTK
24653+ cmpl $2,%ss:early_recursion_flag
24654+ je hlt_loop
24655+ incl %ss:early_recursion_flag
24656+ cld
24657 pushl %eax
24658 pushl %ecx
24659 pushl %edx
24660@@ -620,9 +708,6 @@ ignore_int:
24661 movl $(__KERNEL_DS),%eax
24662 movl %eax,%ds
24663 movl %eax,%es
24664- cmpl $2,early_recursion_flag
24665- je hlt_loop
24666- incl early_recursion_flag
24667 pushl 16(%esp)
24668 pushl 24(%esp)
24669 pushl 32(%esp)
24670@@ -656,29 +741,34 @@ ENTRY(setup_once_ref)
24671 /*
24672 * BSS section
24673 */
24674-__PAGE_ALIGNED_BSS
24675- .align PAGE_SIZE
24676 #ifdef CONFIG_X86_PAE
24677+.section .initial_pg_pmd,"a",@progbits
24678 initial_pg_pmd:
24679 .fill 1024*KPMDS,4,0
24680 #else
24681+.section .initial_page_table,"a",@progbits
24682 ENTRY(initial_page_table)
24683 .fill 1024,4,0
24684 #endif
24685+.section .initial_pg_fixmap,"a",@progbits
24686 initial_pg_fixmap:
24687 .fill 1024,4,0
24688+.section .empty_zero_page,"a",@progbits
24689 ENTRY(empty_zero_page)
24690 .fill 4096,1,0
24691+.section .swapper_pg_dir,"a",@progbits
24692 ENTRY(swapper_pg_dir)
24693+#ifdef CONFIG_X86_PAE
24694+ .fill 4,8,0
24695+#else
24696 .fill 1024,4,0
24697+#endif
24698
24699 /*
24700 * This starts the data section.
24701 */
24702 #ifdef CONFIG_X86_PAE
24703-__PAGE_ALIGNED_DATA
24704- /* Page-aligned for the benefit of paravirt? */
24705- .align PAGE_SIZE
24706+.section .initial_page_table,"a",@progbits
24707 ENTRY(initial_page_table)
24708 .long pa(initial_pg_pmd+PGD_IDENT_ATTR),0 /* low identity map */
24709 # if KPMDS == 3
24710@@ -697,12 +787,20 @@ ENTRY(initial_page_table)
24711 # error "Kernel PMDs should be 1, 2 or 3"
24712 # endif
24713 .align PAGE_SIZE /* needs to be page-sized too */
24714+
24715+#ifdef CONFIG_PAX_PER_CPU_PGD
24716+ENTRY(cpu_pgd)
24717+ .rept 2*NR_CPUS
24718+ .fill 4,8,0
24719+ .endr
24720+#endif
24721+
24722 #endif
24723
24724 .data
24725 .balign 4
24726 ENTRY(stack_start)
24727- .long init_thread_union+THREAD_SIZE
24728+ .long init_thread_union+THREAD_SIZE-8
24729
24730 __INITRODATA
24731 int_msg:
24732@@ -730,7 +828,7 @@ fault_msg:
24733 * segment size, and 32-bit linear address value:
24734 */
24735
24736- .data
24737+.section .rodata,"a",@progbits
24738 .globl boot_gdt_descr
24739 .globl idt_descr
24740
24741@@ -739,7 +837,7 @@ fault_msg:
24742 .word 0 # 32 bit align gdt_desc.address
24743 boot_gdt_descr:
24744 .word __BOOT_DS+7
24745- .long boot_gdt - __PAGE_OFFSET
24746+ .long pa(boot_gdt)
24747
24748 .word 0 # 32-bit align idt_desc.address
24749 idt_descr:
24750@@ -750,7 +848,7 @@ idt_descr:
24751 .word 0 # 32 bit align gdt_desc.address
24752 ENTRY(early_gdt_descr)
24753 .word GDT_ENTRIES*8-1
24754- .long gdt_page /* Overwritten for secondary CPUs */
24755+ .long cpu_gdt_table /* Overwritten for secondary CPUs */
24756
24757 /*
24758 * The boot_gdt must mirror the equivalent in setup.S and is
24759@@ -759,5 +857,65 @@ ENTRY(early_gdt_descr)
24760 .align L1_CACHE_BYTES
24761 ENTRY(boot_gdt)
24762 .fill GDT_ENTRY_BOOT_CS,8,0
24763- .quad 0x00cf9a000000ffff /* kernel 4GB code at 0x00000000 */
24764- .quad 0x00cf92000000ffff /* kernel 4GB data at 0x00000000 */
24765+ .quad 0x00cf9b000000ffff /* kernel 4GB code at 0x00000000 */
24766+ .quad 0x00cf93000000ffff /* kernel 4GB data at 0x00000000 */
24767+
24768+ .align PAGE_SIZE_asm
24769+ENTRY(cpu_gdt_table)
24770+ .rept NR_CPUS
24771+ .quad 0x0000000000000000 /* NULL descriptor */
24772+ .quad 0x0000000000000000 /* 0x0b reserved */
24773+ .quad 0x0000000000000000 /* 0x13 reserved */
24774+ .quad 0x0000000000000000 /* 0x1b reserved */
24775+
24776+#ifdef CONFIG_PAX_KERNEXEC
24777+ .quad 0x00cf9b000000ffff /* 0x20 alternate kernel 4GB code at 0x00000000 */
24778+#else
24779+ .quad 0x0000000000000000 /* 0x20 unused */
24780+#endif
24781+
24782+ .quad 0x0000000000000000 /* 0x28 unused */
24783+ .quad 0x0000000000000000 /* 0x33 TLS entry 1 */
24784+ .quad 0x0000000000000000 /* 0x3b TLS entry 2 */
24785+ .quad 0x0000000000000000 /* 0x43 TLS entry 3 */
24786+ .quad 0x0000000000000000 /* 0x4b reserved */
24787+ .quad 0x0000000000000000 /* 0x53 reserved */
24788+ .quad 0x0000000000000000 /* 0x5b reserved */
24789+
24790+ .quad 0x00cf9b000000ffff /* 0x60 kernel 4GB code at 0x00000000 */
24791+ .quad 0x00cf93000000ffff /* 0x68 kernel 4GB data at 0x00000000 */
24792+ .quad 0x00cffb000000ffff /* 0x73 user 4GB code at 0x00000000 */
24793+ .quad 0x00cff3000000ffff /* 0x7b user 4GB data at 0x00000000 */
24794+
24795+ .quad 0x0000000000000000 /* 0x80 TSS descriptor */
24796+ .quad 0x0000000000000000 /* 0x88 LDT descriptor */
24797+
24798+ /*
24799+ * Segments used for calling PnP BIOS have byte granularity.
24800+ * The code segments and data segments have fixed 64k limits,
24801+ * the transfer segment sizes are set at run time.
24802+ */
24803+ .quad 0x00409b000000ffff /* 0x90 32-bit code */
24804+ .quad 0x00009b000000ffff /* 0x98 16-bit code */
24805+ .quad 0x000093000000ffff /* 0xa0 16-bit data */
24806+ .quad 0x0000930000000000 /* 0xa8 16-bit data */
24807+ .quad 0x0000930000000000 /* 0xb0 16-bit data */
24808+
24809+ /*
24810+ * The APM segments have byte granularity and their bases
24811+ * are set at run time. All have 64k limits.
24812+ */
24813+ .quad 0x00409b000000ffff /* 0xb8 APM CS code */
24814+ .quad 0x00009b000000ffff /* 0xc0 APM CS 16 code (16 bit) */
24815+ .quad 0x004093000000ffff /* 0xc8 APM DS data */
24816+
24817+ .quad 0x00c093000000ffff /* 0xd0 - ESPFIX SS */
24818+ .quad 0x0040930000000000 /* 0xd8 - PERCPU */
24819+ .quad 0x0040910000000017 /* 0xe0 - STACK_CANARY */
24820+ .quad 0x0000000000000000 /* 0xe8 - PCIBIOS_CS */
24821+ .quad 0x0000000000000000 /* 0xf0 - PCIBIOS_DS */
24822+ .quad 0x0000000000000000 /* 0xf8 - GDT entry 31: double-fault TSS */
24823+
24824+ /* Be sure this is zeroed to avoid false validations in Xen */
24825+ .fill PAGE_SIZE_asm - GDT_SIZE,1,0
24826+ .endr
24827diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
24828index f8a8406..ad6d014 100644
24829--- a/arch/x86/kernel/head_64.S
24830+++ b/arch/x86/kernel/head_64.S
24831@@ -20,6 +20,8 @@
24832 #include <asm/processor-flags.h>
24833 #include <asm/percpu.h>
24834 #include <asm/nops.h>
24835+#include <asm/cpufeature.h>
24836+#include <asm/alternative-asm.h>
24837
24838 #ifdef CONFIG_PARAVIRT
24839 #include <asm/asm-offsets.h>
24840@@ -41,6 +43,12 @@ L4_PAGE_OFFSET = pgd_index(__PAGE_OFFSET)
24841 L3_PAGE_OFFSET = pud_index(__PAGE_OFFSET)
24842 L4_START_KERNEL = pgd_index(__START_KERNEL_map)
24843 L3_START_KERNEL = pud_index(__START_KERNEL_map)
24844+L4_VMALLOC_START = pgd_index(VMALLOC_START)
24845+L3_VMALLOC_START = pud_index(VMALLOC_START)
24846+L4_VMALLOC_END = pgd_index(VMALLOC_END)
24847+L3_VMALLOC_END = pud_index(VMALLOC_END)
24848+L4_VMEMMAP_START = pgd_index(VMEMMAP_START)
24849+L3_VMEMMAP_START = pud_index(VMEMMAP_START)
24850
24851 .text
24852 __HEAD
24853@@ -89,11 +97,26 @@ startup_64:
24854 * Fixup the physical addresses in the page table
24855 */
24856 addq %rbp, early_level4_pgt + (L4_START_KERNEL*8)(%rip)
24857+ addq %rbp, init_level4_pgt + (L4_PAGE_OFFSET*8)(%rip)
24858+ addq %rbp, init_level4_pgt + (L4_VMALLOC_START*8)(%rip)
24859+ addq %rbp, init_level4_pgt + (L4_VMALLOC_END*8)(%rip)
24860+ addq %rbp, init_level4_pgt + (L4_VMEMMAP_START*8)(%rip)
24861+ addq %rbp, init_level4_pgt + (L4_START_KERNEL*8)(%rip)
24862
24863- addq %rbp, level3_kernel_pgt + (510*8)(%rip)
24864- addq %rbp, level3_kernel_pgt + (511*8)(%rip)
24865+ addq %rbp, level3_ident_pgt + (0*8)(%rip)
24866+#ifndef CONFIG_XEN
24867+ addq %rbp, level3_ident_pgt + (1*8)(%rip)
24868+#endif
24869
24870+ addq %rbp, level3_vmemmap_pgt + (L3_VMEMMAP_START*8)(%rip)
24871+
24872+ addq %rbp, level3_kernel_pgt + (L3_START_KERNEL*8)(%rip)
24873+ addq %rbp, level3_kernel_pgt + ((L3_START_KERNEL+1)*8)(%rip)
24874+
24875+ addq %rbp, level2_fixmap_pgt + (504*8)(%rip)
24876+ addq %rbp, level2_fixmap_pgt + (505*8)(%rip)
24877 addq %rbp, level2_fixmap_pgt + (506*8)(%rip)
24878+ addq %rbp, level2_fixmap_pgt + (507*8)(%rip)
24879
24880 /*
24881 * Set up the identity mapping for the switchover. These
24882@@ -174,11 +197,12 @@ ENTRY(secondary_startup_64)
24883 * after the boot processor executes this code.
24884 */
24885
24886+ orq $-1, %rbp
24887 movq $(init_level4_pgt - __START_KERNEL_map), %rax
24888 1:
24889
24890- /* Enable PAE mode and PGE */
24891- movl $(X86_CR4_PAE | X86_CR4_PGE), %ecx
24892+ /* Enable PAE mode and PSE/PGE */
24893+ movl $(X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE), %ecx
24894 movq %rcx, %cr4
24895
24896 /* Setup early boot stage 4 level pagetables. */
24897@@ -199,10 +223,21 @@ ENTRY(secondary_startup_64)
24898 movl $MSR_EFER, %ecx
24899 rdmsr
24900 btsl $_EFER_SCE, %eax /* Enable System Call */
24901- btl $20,%edi /* No Execute supported? */
24902+ btl $(X86_FEATURE_NX & 31),%edi /* No Execute supported? */
24903 jnc 1f
24904 btsl $_EFER_NX, %eax
24905+ cmpq $-1, %rbp
24906+ je 1f
24907 btsq $_PAGE_BIT_NX,early_pmd_flags(%rip)
24908+ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_PAGE_OFFSET(%rip)
24909+ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMALLOC_START(%rip)
24910+ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMALLOC_END(%rip)
24911+ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMEMMAP_START(%rip)
24912+ btsq $_PAGE_BIT_NX, level2_fixmap_pgt + 8*504(%rip)
24913+ btsq $_PAGE_BIT_NX, level2_fixmap_pgt + 8*505(%rip)
24914+ btsq $_PAGE_BIT_NX, level2_fixmap_pgt + 8*506(%rip)
24915+ btsq $_PAGE_BIT_NX, level2_fixmap_pgt + 8*507(%rip)
24916+ btsq $_PAGE_BIT_NX, __supported_pte_mask(%rip)
24917 1: wrmsr /* Make changes effective */
24918
24919 /* Setup cr0 */
24920@@ -282,6 +317,7 @@ ENTRY(secondary_startup_64)
24921 * REX.W + FF /5 JMP m16:64 Jump far, absolute indirect,
24922 * address given in m16:64.
24923 */
24924+ pax_set_fptr_mask
24925 movq initial_code(%rip),%rax
24926 pushq $0 # fake return address to stop unwinder
24927 pushq $__KERNEL_CS # set correct cs
24928@@ -313,7 +349,7 @@ ENDPROC(start_cpu0)
24929 .quad INIT_PER_CPU_VAR(irq_stack_union)
24930
24931 GLOBAL(stack_start)
24932- .quad init_thread_union+THREAD_SIZE-8
24933+ .quad init_thread_union+THREAD_SIZE-16
24934 .word 0
24935 __FINITDATA
24936
24937@@ -393,7 +429,7 @@ early_idt_handler_common:
24938 call dump_stack
24939 #ifdef CONFIG_KALLSYMS
24940 leaq early_idt_ripmsg(%rip),%rdi
24941- movq 40(%rsp),%rsi # %rip again
24942+ movq 88(%rsp),%rsi # %rip again
24943 call __print_symbol
24944 #endif
24945 #endif /* EARLY_PRINTK */
24946@@ -422,6 +458,7 @@ ENDPROC(early_idt_handler_common)
24947 early_recursion_flag:
24948 .long 0
24949
24950+ .section .rodata,"a",@progbits
24951 #ifdef CONFIG_EARLY_PRINTK
24952 early_idt_msg:
24953 .asciz "PANIC: early exception %02lx rip %lx:%lx error %lx cr2 %lx\n"
24954@@ -449,29 +486,52 @@ NEXT_PAGE(early_level4_pgt)
24955 NEXT_PAGE(early_dynamic_pgts)
24956 .fill 512*EARLY_DYNAMIC_PAGE_TABLES,8,0
24957
24958- .data
24959+ .section .rodata,"a",@progbits
24960
24961-#ifndef CONFIG_XEN
24962 NEXT_PAGE(init_level4_pgt)
24963- .fill 512,8,0
24964-#else
24965-NEXT_PAGE(init_level4_pgt)
24966- .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
24967 .org init_level4_pgt + L4_PAGE_OFFSET*8, 0
24968 .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
24969+ .org init_level4_pgt + L4_VMALLOC_START*8, 0
24970+ .quad level3_vmalloc_start_pgt - __START_KERNEL_map + _KERNPG_TABLE
24971+ .org init_level4_pgt + L4_VMALLOC_END*8, 0
24972+ .quad level3_vmalloc_end_pgt - __START_KERNEL_map + _KERNPG_TABLE
24973+ .org init_level4_pgt + L4_VMEMMAP_START*8, 0
24974+ .quad level3_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
24975 .org init_level4_pgt + L4_START_KERNEL*8, 0
24976 /* (2^48-(2*1024*1024*1024))/(2^39) = 511 */
24977 .quad level3_kernel_pgt - __START_KERNEL_map + _PAGE_TABLE
24978
24979+#ifdef CONFIG_PAX_PER_CPU_PGD
24980+NEXT_PAGE(cpu_pgd)
24981+ .rept 2*NR_CPUS
24982+ .fill 512,8,0
24983+ .endr
24984+#endif
24985+
24986 NEXT_PAGE(level3_ident_pgt)
24987 .quad level2_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
24988+#ifdef CONFIG_XEN
24989 .fill 511, 8, 0
24990+#else
24991+ .quad level2_ident_pgt + PAGE_SIZE - __START_KERNEL_map + _KERNPG_TABLE
24992+ .fill 510,8,0
24993+#endif
24994+
24995+NEXT_PAGE(level3_vmalloc_start_pgt)
24996+ .fill 512,8,0
24997+
24998+NEXT_PAGE(level3_vmalloc_end_pgt)
24999+ .fill 512,8,0
25000+
25001+NEXT_PAGE(level3_vmemmap_pgt)
25002+ .fill L3_VMEMMAP_START,8,0
25003+ .quad level2_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
25004+
25005 NEXT_PAGE(level2_ident_pgt)
25006- /* Since I easily can, map the first 1G.
25007+ /* Since I easily can, map the first 2G.
25008 * Don't set NX because code runs from these pages.
25009 */
25010- PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, PTRS_PER_PMD)
25011-#endif
25012+ PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, 2*PTRS_PER_PMD)
25013
25014 NEXT_PAGE(level3_kernel_pgt)
25015 .fill L3_START_KERNEL,8,0
25016@@ -479,6 +539,9 @@ NEXT_PAGE(level3_kernel_pgt)
25017 .quad level2_kernel_pgt - __START_KERNEL_map + _KERNPG_TABLE
25018 .quad level2_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
25019
25020+NEXT_PAGE(level2_vmemmap_pgt)
25021+ .fill 512,8,0
25022+
25023 NEXT_PAGE(level2_kernel_pgt)
25024 /*
25025 * 512 MB kernel mapping. We spend a full page on this pagetable
25026@@ -494,23 +557,61 @@ NEXT_PAGE(level2_kernel_pgt)
25027 KERNEL_IMAGE_SIZE/PMD_SIZE)
25028
25029 NEXT_PAGE(level2_fixmap_pgt)
25030- .fill 506,8,0
25031- .quad level1_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
25032- /* 8MB reserved for vsyscalls + a 2MB hole = 4 + 1 entries */
25033- .fill 5,8,0
25034+ .fill 504,8,0
25035+ .quad level1_fixmap_pgt - __START_KERNEL_map + 0 * PAGE_SIZE + _PAGE_TABLE
25036+ .quad level1_fixmap_pgt - __START_KERNEL_map + 1 * PAGE_SIZE + _PAGE_TABLE
25037+ .quad level1_fixmap_pgt - __START_KERNEL_map + 2 * PAGE_SIZE + _PAGE_TABLE
25038+ .quad level1_vsyscall_pgt - __START_KERNEL_map + _PAGE_TABLE
25039+ /* 6MB reserved for vsyscalls + a 2MB hole = 3 + 1 entries */
25040+ .fill 4,8,0
25041
25042 NEXT_PAGE(level1_fixmap_pgt)
25043+ .fill 3*512,8,0
25044+
25045+NEXT_PAGE(level1_vsyscall_pgt)
25046 .fill 512,8,0
25047
25048 #undef PMDS
25049
25050- .data
25051+ .align PAGE_SIZE
25052+ENTRY(cpu_gdt_table)
25053+ .rept NR_CPUS
25054+ .quad 0x0000000000000000 /* NULL descriptor */
25055+ .quad 0x00cf9b000000ffff /* __KERNEL32_CS */
25056+ .quad 0x00af9b000000ffff /* __KERNEL_CS */
25057+ .quad 0x00cf93000000ffff /* __KERNEL_DS */
25058+ .quad 0x00cffb000000ffff /* __USER32_CS */
25059+ .quad 0x00cff3000000ffff /* __USER_DS, __USER32_DS */
25060+ .quad 0x00affb000000ffff /* __USER_CS */
25061+
25062+#ifdef CONFIG_PAX_KERNEXEC
25063+ .quad 0x00af9b000000ffff /* __KERNEXEC_KERNEL_CS */
25064+#else
25065+ .quad 0x0 /* unused */
25066+#endif
25067+
25068+ .quad 0,0 /* TSS */
25069+ .quad 0,0 /* LDT */
25070+ .quad 0,0,0 /* three TLS descriptors */
25071+ .quad 0x0000f40000000000 /* node/CPU stored in limit */
25072+ /* asm/segment.h:GDT_ENTRIES must match this */
25073+
25074+#ifdef CONFIG_PAX_MEMORY_UDEREF
25075+ .quad 0x00cf93000000ffff /* __UDEREF_KERNEL_DS */
25076+#else
25077+ .quad 0x0 /* unused */
25078+#endif
25079+
25080+ /* zero the remaining page */
25081+ .fill PAGE_SIZE / 8 - GDT_ENTRIES,8,0
25082+ .endr
25083+
25084 .align 16
25085 .globl early_gdt_descr
25086 early_gdt_descr:
25087 .word GDT_ENTRIES*8-1
25088 early_gdt_descr_base:
25089- .quad INIT_PER_CPU_VAR(gdt_page)
25090+ .quad cpu_gdt_table
25091
25092 ENTRY(phys_base)
25093 /* This must match the first entry in level2_kernel_pgt */
25094@@ -534,8 +635,8 @@ NEXT_PAGE(kasan_zero_pud)
25095
25096
25097 #include "../../x86/xen/xen-head.S"
25098-
25099- __PAGE_ALIGNED_BSS
25100+
25101+ .section .rodata,"a",@progbits
25102 NEXT_PAGE(empty_zero_page)
25103 .skip PAGE_SIZE
25104
25105diff --git a/arch/x86/kernel/i386_ksyms_32.c b/arch/x86/kernel/i386_ksyms_32.c
25106index 05fd74f..c3548b1 100644
25107--- a/arch/x86/kernel/i386_ksyms_32.c
25108+++ b/arch/x86/kernel/i386_ksyms_32.c
25109@@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
25110 EXPORT_SYMBOL(cmpxchg8b_emu);
25111 #endif
25112
25113+EXPORT_SYMBOL_GPL(cpu_gdt_table);
25114+
25115 /* Networking helper routines. */
25116 EXPORT_SYMBOL(csum_partial_copy_generic);
25117+EXPORT_SYMBOL(csum_partial_copy_generic_to_user);
25118+EXPORT_SYMBOL(csum_partial_copy_generic_from_user);
25119
25120 EXPORT_SYMBOL(__get_user_1);
25121 EXPORT_SYMBOL(__get_user_2);
25122@@ -44,3 +48,11 @@ EXPORT_SYMBOL(___preempt_schedule);
25123 EXPORT_SYMBOL(___preempt_schedule_context);
25124 #endif
25125 #endif
25126+
25127+#ifdef CONFIG_PAX_KERNEXEC
25128+EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
25129+#endif
25130+
25131+#ifdef CONFIG_PAX_PER_CPU_PGD
25132+EXPORT_SYMBOL(cpu_pgd);
25133+#endif
25134diff --git a/arch/x86/kernel/i387.c b/arch/x86/kernel/i387.c
25135index f341d56..d9b527b 100644
25136--- a/arch/x86/kernel/i387.c
25137+++ b/arch/x86/kernel/i387.c
25138@@ -68,7 +68,7 @@ static inline bool interrupted_kernel_fpu_idle(void)
25139 static inline bool interrupted_user_mode(void)
25140 {
25141 struct pt_regs *regs = get_irq_regs();
25142- return regs && user_mode_vm(regs);
25143+ return regs && user_mode(regs);
25144 }
25145
25146 /*
25147diff --git a/arch/x86/kernel/i8259.c b/arch/x86/kernel/i8259.c
25148index e7cc537..67d7372 100644
25149--- a/arch/x86/kernel/i8259.c
25150+++ b/arch/x86/kernel/i8259.c
25151@@ -110,7 +110,7 @@ static int i8259A_irq_pending(unsigned int irq)
25152 static void make_8259A_irq(unsigned int irq)
25153 {
25154 disable_irq_nosync(irq);
25155- io_apic_irqs &= ~(1<<irq);
25156+ io_apic_irqs &= ~(1UL<<irq);
25157 irq_set_chip_and_handler(irq, &i8259A_chip, handle_level_irq);
25158 enable_irq(irq);
25159 }
25160@@ -208,7 +208,7 @@ spurious_8259A_irq:
25161 "spurious 8259A interrupt: IRQ%d.\n", irq);
25162 spurious_irq_mask |= irqmask;
25163 }
25164- atomic_inc(&irq_err_count);
25165+ atomic_inc_unchecked(&irq_err_count);
25166 /*
25167 * Theoretically we do not have to handle this IRQ,
25168 * but in Linux this does not cause problems and is
25169@@ -349,14 +349,16 @@ static void init_8259A(int auto_eoi)
25170 /* (slave's support for AEOI in flat mode is to be investigated) */
25171 outb_pic(SLAVE_ICW4_DEFAULT, PIC_SLAVE_IMR);
25172
25173+ pax_open_kernel();
25174 if (auto_eoi)
25175 /*
25176 * In AEOI mode we just have to mask the interrupt
25177 * when acking.
25178 */
25179- i8259A_chip.irq_mask_ack = disable_8259A_irq;
25180+ *(void **)&i8259A_chip.irq_mask_ack = disable_8259A_irq;
25181 else
25182- i8259A_chip.irq_mask_ack = mask_and_ack_8259A;
25183+ *(void **)&i8259A_chip.irq_mask_ack = mask_and_ack_8259A;
25184+ pax_close_kernel();
25185
25186 udelay(100); /* wait for 8259A to initialize */
25187
25188diff --git a/arch/x86/kernel/io_delay.c b/arch/x86/kernel/io_delay.c
25189index a979b5b..1d6db75 100644
25190--- a/arch/x86/kernel/io_delay.c
25191+++ b/arch/x86/kernel/io_delay.c
25192@@ -58,7 +58,7 @@ static int __init dmi_io_delay_0xed_port(const struct dmi_system_id *id)
25193 * Quirk table for systems that misbehave (lock up, etc.) if port
25194 * 0x80 is used:
25195 */
25196-static struct dmi_system_id __initdata io_delay_0xed_port_dmi_table[] = {
25197+static const struct dmi_system_id __initconst io_delay_0xed_port_dmi_table[] = {
25198 {
25199 .callback = dmi_io_delay_0xed_port,
25200 .ident = "Compaq Presario V6000",
25201diff --git a/arch/x86/kernel/ioport.c b/arch/x86/kernel/ioport.c
25202index 4ddaf66..49d5c18 100644
25203--- a/arch/x86/kernel/ioport.c
25204+++ b/arch/x86/kernel/ioport.c
25205@@ -6,6 +6,7 @@
25206 #include <linux/sched.h>
25207 #include <linux/kernel.h>
25208 #include <linux/capability.h>
25209+#include <linux/security.h>
25210 #include <linux/errno.h>
25211 #include <linux/types.h>
25212 #include <linux/ioport.h>
25213@@ -30,6 +31,12 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
25214 return -EINVAL;
25215 if (turn_on && !capable(CAP_SYS_RAWIO))
25216 return -EPERM;
25217+#ifdef CONFIG_GRKERNSEC_IO
25218+ if (turn_on && grsec_disable_privio) {
25219+ gr_handle_ioperm();
25220+ return -ENODEV;
25221+ }
25222+#endif
25223
25224 /*
25225 * If it's the first ioperm() call in this thread's lifetime, set the
25226@@ -54,7 +61,7 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
25227 * because the ->io_bitmap_max value must match the bitmap
25228 * contents:
25229 */
25230- tss = &per_cpu(init_tss, get_cpu());
25231+ tss = init_tss + get_cpu();
25232
25233 if (turn_on)
25234 bitmap_clear(t->io_bitmap_ptr, from, num);
25235@@ -105,6 +112,12 @@ SYSCALL_DEFINE1(iopl, unsigned int, level)
25236 if (level > old) {
25237 if (!capable(CAP_SYS_RAWIO))
25238 return -EPERM;
25239+#ifdef CONFIG_GRKERNSEC_IO
25240+ if (grsec_disable_privio) {
25241+ gr_handle_iopl();
25242+ return -ENODEV;
25243+ }
25244+#endif
25245 }
25246 regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) | (level << 12);
25247 t->iopl = level << 12;
25248diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c
25249index 67b1cbe..6ad4cbc 100644
25250--- a/arch/x86/kernel/irq.c
25251+++ b/arch/x86/kernel/irq.c
25252@@ -22,7 +22,7 @@
25253 #define CREATE_TRACE_POINTS
25254 #include <asm/trace/irq_vectors.h>
25255
25256-atomic_t irq_err_count;
25257+atomic_unchecked_t irq_err_count;
25258
25259 /* Function pointer for generic interrupt vector handling */
25260 void (*x86_platform_ipi_callback)(void) = NULL;
25261@@ -132,9 +132,9 @@ int arch_show_interrupts(struct seq_file *p, int prec)
25262 seq_printf(p, "%10u ", irq_stats(j)->irq_hv_callback_count);
25263 seq_puts(p, " Hypervisor callback interrupts\n");
25264 #endif
25265- seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
25266+ seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read_unchecked(&irq_err_count));
25267 #if defined(CONFIG_X86_IO_APIC)
25268- seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read(&irq_mis_count));
25269+ seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read_unchecked(&irq_mis_count));
25270 #endif
25271 return 0;
25272 }
25273@@ -174,7 +174,7 @@ u64 arch_irq_stat_cpu(unsigned int cpu)
25274
25275 u64 arch_irq_stat(void)
25276 {
25277- u64 sum = atomic_read(&irq_err_count);
25278+ u64 sum = atomic_read_unchecked(&irq_err_count);
25279 return sum;
25280 }
25281
25282diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c
25283index 28d28f5..e6cc9ae 100644
25284--- a/arch/x86/kernel/irq_32.c
25285+++ b/arch/x86/kernel/irq_32.c
25286@@ -29,6 +29,8 @@ EXPORT_PER_CPU_SYMBOL(irq_regs);
25287
25288 #ifdef CONFIG_DEBUG_STACKOVERFLOW
25289
25290+extern void gr_handle_kernel_exploit(void);
25291+
25292 int sysctl_panic_on_stackoverflow __read_mostly;
25293
25294 /* Debugging check for stack overflow: is there less than 1KB free? */
25295@@ -39,13 +41,14 @@ static int check_stack_overflow(void)
25296 __asm__ __volatile__("andl %%esp,%0" :
25297 "=r" (sp) : "0" (THREAD_SIZE - 1));
25298
25299- return sp < (sizeof(struct thread_info) + STACK_WARN);
25300+ return sp < STACK_WARN;
25301 }
25302
25303 static void print_stack_overflow(void)
25304 {
25305 printk(KERN_WARNING "low stack detected by irq handler\n");
25306 dump_stack();
25307+ gr_handle_kernel_exploit();
25308 if (sysctl_panic_on_stackoverflow)
25309 panic("low stack detected by irq handler - check messages\n");
25310 }
25311@@ -77,10 +80,9 @@ static inline void *current_stack(void)
25312 static inline int
25313 execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25314 {
25315- struct irq_stack *curstk, *irqstk;
25316+ struct irq_stack *irqstk;
25317 u32 *isp, *prev_esp, arg1, arg2;
25318
25319- curstk = (struct irq_stack *) current_stack();
25320 irqstk = __this_cpu_read(hardirq_stack);
25321
25322 /*
25323@@ -89,15 +91,19 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25324 * handler) we can't do that and just have to keep using the
25325 * current stack (which is the irq stack already after all)
25326 */
25327- if (unlikely(curstk == irqstk))
25328+ if (unlikely((void *)current_stack_pointer - (void *)irqstk < THREAD_SIZE))
25329 return 0;
25330
25331- isp = (u32 *) ((char *)irqstk + sizeof(*irqstk));
25332+ isp = (u32 *) ((char *)irqstk + sizeof(*irqstk) - 8);
25333
25334 /* Save the next esp at the bottom of the stack */
25335 prev_esp = (u32 *)irqstk;
25336 *prev_esp = current_stack_pointer();
25337
25338+#ifdef CONFIG_PAX_MEMORY_UDEREF
25339+ __set_fs(MAKE_MM_SEG(0));
25340+#endif
25341+
25342 if (unlikely(overflow))
25343 call_on_stack(print_stack_overflow, isp);
25344
25345@@ -108,6 +114,11 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25346 : "0" (irq), "1" (desc), "2" (isp),
25347 "D" (desc->handle_irq)
25348 : "memory", "cc", "ecx");
25349+
25350+#ifdef CONFIG_PAX_MEMORY_UDEREF
25351+ __set_fs(current_thread_info()->addr_limit);
25352+#endif
25353+
25354 return 1;
25355 }
25356
25357@@ -116,32 +127,18 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25358 */
25359 void irq_ctx_init(int cpu)
25360 {
25361- struct irq_stack *irqstk;
25362-
25363 if (per_cpu(hardirq_stack, cpu))
25364 return;
25365
25366- irqstk = page_address(alloc_pages_node(cpu_to_node(cpu),
25367- THREADINFO_GFP,
25368- THREAD_SIZE_ORDER));
25369- per_cpu(hardirq_stack, cpu) = irqstk;
25370-
25371- irqstk = page_address(alloc_pages_node(cpu_to_node(cpu),
25372- THREADINFO_GFP,
25373- THREAD_SIZE_ORDER));
25374- per_cpu(softirq_stack, cpu) = irqstk;
25375-
25376- printk(KERN_DEBUG "CPU %u irqstacks, hard=%p soft=%p\n",
25377- cpu, per_cpu(hardirq_stack, cpu), per_cpu(softirq_stack, cpu));
25378+ per_cpu(hardirq_stack, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREADINFO_GFP, THREAD_SIZE_ORDER));
25379+ per_cpu(softirq_stack, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREADINFO_GFP, THREAD_SIZE_ORDER));
25380 }
25381
25382 void do_softirq_own_stack(void)
25383 {
25384- struct thread_info *curstk;
25385 struct irq_stack *irqstk;
25386 u32 *isp, *prev_esp;
25387
25388- curstk = current_stack();
25389 irqstk = __this_cpu_read(softirq_stack);
25390
25391 /* build the stack frame on the softirq stack */
25392@@ -151,7 +148,16 @@ void do_softirq_own_stack(void)
25393 prev_esp = (u32 *)irqstk;
25394 *prev_esp = current_stack_pointer();
25395
25396+#ifdef CONFIG_PAX_MEMORY_UDEREF
25397+ __set_fs(MAKE_MM_SEG(0));
25398+#endif
25399+
25400 call_on_stack(__do_softirq, isp);
25401+
25402+#ifdef CONFIG_PAX_MEMORY_UDEREF
25403+ __set_fs(current_thread_info()->addr_limit);
25404+#endif
25405+
25406 }
25407
25408 bool handle_irq(unsigned irq, struct pt_regs *regs)
25409@@ -165,7 +171,7 @@ bool handle_irq(unsigned irq, struct pt_regs *regs)
25410 if (unlikely(!desc))
25411 return false;
25412
25413- if (user_mode_vm(regs) || !execute_on_irq_stack(overflow, desc, irq)) {
25414+ if (user_mode(regs) || !execute_on_irq_stack(overflow, desc, irq)) {
25415 if (unlikely(overflow))
25416 print_stack_overflow();
25417 desc->handle_irq(irq, desc);
25418diff --git a/arch/x86/kernel/irq_64.c b/arch/x86/kernel/irq_64.c
25419index e4b503d..824fce8 100644
25420--- a/arch/x86/kernel/irq_64.c
25421+++ b/arch/x86/kernel/irq_64.c
25422@@ -26,6 +26,8 @@ EXPORT_PER_CPU_SYMBOL(irq_stat);
25423 DEFINE_PER_CPU(struct pt_regs *, irq_regs);
25424 EXPORT_PER_CPU_SYMBOL(irq_regs);
25425
25426+extern void gr_handle_kernel_exploit(void);
25427+
25428 int sysctl_panic_on_stackoverflow;
25429
25430 /*
25431@@ -44,7 +46,7 @@ static inline void stack_overflow_check(struct pt_regs *regs)
25432 u64 estack_top, estack_bottom;
25433 u64 curbase = (u64)task_stack_page(current);
25434
25435- if (user_mode_vm(regs))
25436+ if (user_mode(regs))
25437 return;
25438
25439 if (regs->sp >= curbase + sizeof(struct thread_info) +
25440@@ -69,6 +71,8 @@ static inline void stack_overflow_check(struct pt_regs *regs)
25441 irq_stack_top, irq_stack_bottom,
25442 estack_top, estack_bottom);
25443
25444+ gr_handle_kernel_exploit();
25445+
25446 if (sysctl_panic_on_stackoverflow)
25447 panic("low stack detected by irq handler - check messages\n");
25448 #endif
25449diff --git a/arch/x86/kernel/jump_label.c b/arch/x86/kernel/jump_label.c
25450index 26d5a55..a01160a 100644
25451--- a/arch/x86/kernel/jump_label.c
25452+++ b/arch/x86/kernel/jump_label.c
25453@@ -51,7 +51,7 @@ static void __jump_label_transform(struct jump_entry *entry,
25454 * Jump label is enabled for the first time.
25455 * So we expect a default_nop...
25456 */
25457- if (unlikely(memcmp((void *)entry->code, default_nop, 5)
25458+ if (unlikely(memcmp((void *)ktla_ktva(entry->code), default_nop, 5)
25459 != 0))
25460 bug_at((void *)entry->code, __LINE__);
25461 } else {
25462@@ -59,7 +59,7 @@ static void __jump_label_transform(struct jump_entry *entry,
25463 * ...otherwise expect an ideal_nop. Otherwise
25464 * something went horribly wrong.
25465 */
25466- if (unlikely(memcmp((void *)entry->code, ideal_nop, 5)
25467+ if (unlikely(memcmp((void *)ktla_ktva(entry->code), ideal_nop, 5)
25468 != 0))
25469 bug_at((void *)entry->code, __LINE__);
25470 }
25471@@ -75,13 +75,13 @@ static void __jump_label_transform(struct jump_entry *entry,
25472 * are converting the default nop to the ideal nop.
25473 */
25474 if (init) {
25475- if (unlikely(memcmp((void *)entry->code, default_nop, 5) != 0))
25476+ if (unlikely(memcmp((void *)ktla_ktva(entry->code), default_nop, 5) != 0))
25477 bug_at((void *)entry->code, __LINE__);
25478 } else {
25479 code.jump = 0xe9;
25480 code.offset = entry->target -
25481 (entry->code + JUMP_LABEL_NOP_SIZE);
25482- if (unlikely(memcmp((void *)entry->code, &code, 5) != 0))
25483+ if (unlikely(memcmp((void *)ktla_ktva(entry->code), &code, 5) != 0))
25484 bug_at((void *)entry->code, __LINE__);
25485 }
25486 memcpy(&code, ideal_nops[NOP_ATOMIC5], JUMP_LABEL_NOP_SIZE);
25487diff --git a/arch/x86/kernel/kgdb.c b/arch/x86/kernel/kgdb.c
25488index 25ecd56..e12482f 100644
25489--- a/arch/x86/kernel/kgdb.c
25490+++ b/arch/x86/kernel/kgdb.c
25491@@ -126,11 +126,11 @@ char *dbg_get_reg(int regno, void *mem, struct pt_regs *regs)
25492 #ifdef CONFIG_X86_32
25493 switch (regno) {
25494 case GDB_SS:
25495- if (!user_mode_vm(regs))
25496+ if (!user_mode(regs))
25497 *(unsigned long *)mem = __KERNEL_DS;
25498 break;
25499 case GDB_SP:
25500- if (!user_mode_vm(regs))
25501+ if (!user_mode(regs))
25502 *(unsigned long *)mem = kernel_stack_pointer(regs);
25503 break;
25504 case GDB_GS:
25505@@ -228,7 +228,10 @@ static void kgdb_correct_hw_break(void)
25506 bp->attr.bp_addr = breakinfo[breakno].addr;
25507 bp->attr.bp_len = breakinfo[breakno].len;
25508 bp->attr.bp_type = breakinfo[breakno].type;
25509- info->address = breakinfo[breakno].addr;
25510+ if (breakinfo[breakno].type == X86_BREAKPOINT_EXECUTE)
25511+ info->address = ktla_ktva(breakinfo[breakno].addr);
25512+ else
25513+ info->address = breakinfo[breakno].addr;
25514 info->len = breakinfo[breakno].len;
25515 info->type = breakinfo[breakno].type;
25516 val = arch_install_hw_breakpoint(bp);
25517@@ -475,12 +478,12 @@ int kgdb_arch_handle_exception(int e_vector, int signo, int err_code,
25518 case 'k':
25519 /* clear the trace bit */
25520 linux_regs->flags &= ~X86_EFLAGS_TF;
25521- atomic_set(&kgdb_cpu_doing_single_step, -1);
25522+ atomic_set_unchecked(&kgdb_cpu_doing_single_step, -1);
25523
25524 /* set the trace bit if we're stepping */
25525 if (remcomInBuffer[0] == 's') {
25526 linux_regs->flags |= X86_EFLAGS_TF;
25527- atomic_set(&kgdb_cpu_doing_single_step,
25528+ atomic_set_unchecked(&kgdb_cpu_doing_single_step,
25529 raw_smp_processor_id());
25530 }
25531
25532@@ -545,7 +548,7 @@ static int __kgdb_notify(struct die_args *args, unsigned long cmd)
25533
25534 switch (cmd) {
25535 case DIE_DEBUG:
25536- if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
25537+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1) {
25538 if (user_mode(regs))
25539 return single_step_cont(regs, args);
25540 break;
25541@@ -750,11 +753,11 @@ int kgdb_arch_set_breakpoint(struct kgdb_bkpt *bpt)
25542 #endif /* CONFIG_DEBUG_RODATA */
25543
25544 bpt->type = BP_BREAKPOINT;
25545- err = probe_kernel_read(bpt->saved_instr, (char *)bpt->bpt_addr,
25546+ err = probe_kernel_read(bpt->saved_instr, ktla_ktva((char *)bpt->bpt_addr),
25547 BREAK_INSTR_SIZE);
25548 if (err)
25549 return err;
25550- err = probe_kernel_write((char *)bpt->bpt_addr,
25551+ err = probe_kernel_write(ktla_ktva((char *)bpt->bpt_addr),
25552 arch_kgdb_ops.gdb_bpt_instr, BREAK_INSTR_SIZE);
25553 #ifdef CONFIG_DEBUG_RODATA
25554 if (!err)
25555@@ -767,7 +770,7 @@ int kgdb_arch_set_breakpoint(struct kgdb_bkpt *bpt)
25556 return -EBUSY;
25557 text_poke((void *)bpt->bpt_addr, arch_kgdb_ops.gdb_bpt_instr,
25558 BREAK_INSTR_SIZE);
25559- err = probe_kernel_read(opc, (char *)bpt->bpt_addr, BREAK_INSTR_SIZE);
25560+ err = probe_kernel_read(opc, ktla_ktva((char *)bpt->bpt_addr), BREAK_INSTR_SIZE);
25561 if (err)
25562 return err;
25563 if (memcmp(opc, arch_kgdb_ops.gdb_bpt_instr, BREAK_INSTR_SIZE))
25564@@ -792,13 +795,13 @@ int kgdb_arch_remove_breakpoint(struct kgdb_bkpt *bpt)
25565 if (mutex_is_locked(&text_mutex))
25566 goto knl_write;
25567 text_poke((void *)bpt->bpt_addr, bpt->saved_instr, BREAK_INSTR_SIZE);
25568- err = probe_kernel_read(opc, (char *)bpt->bpt_addr, BREAK_INSTR_SIZE);
25569+ err = probe_kernel_read(opc, ktla_ktva((char *)bpt->bpt_addr), BREAK_INSTR_SIZE);
25570 if (err || memcmp(opc, bpt->saved_instr, BREAK_INSTR_SIZE))
25571 goto knl_write;
25572 return err;
25573 knl_write:
25574 #endif /* CONFIG_DEBUG_RODATA */
25575- return probe_kernel_write((char *)bpt->bpt_addr,
25576+ return probe_kernel_write(ktla_ktva((char *)bpt->bpt_addr),
25577 (char *)bpt->saved_instr, BREAK_INSTR_SIZE);
25578 }
25579
25580diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c
25581index 4e3d5a9..03fffd8 100644
25582--- a/arch/x86/kernel/kprobes/core.c
25583+++ b/arch/x86/kernel/kprobes/core.c
25584@@ -120,9 +120,12 @@ __synthesize_relative_insn(void *from, void *to, u8 op)
25585 s32 raddr;
25586 } __packed *insn;
25587
25588- insn = (struct __arch_relative_insn *)from;
25589+ insn = (struct __arch_relative_insn *)ktla_ktva(from);
25590+
25591+ pax_open_kernel();
25592 insn->raddr = (s32)((long)(to) - ((long)(from) + 5));
25593 insn->op = op;
25594+ pax_close_kernel();
25595 }
25596
25597 /* Insert a jump instruction at address 'from', which jumps to address 'to'.*/
25598@@ -168,7 +171,7 @@ int can_boost(kprobe_opcode_t *opcodes)
25599 kprobe_opcode_t opcode;
25600 kprobe_opcode_t *orig_opcodes = opcodes;
25601
25602- if (search_exception_tables((unsigned long)opcodes))
25603+ if (search_exception_tables(ktva_ktla((unsigned long)opcodes)))
25604 return 0; /* Page fault may occur on this address. */
25605
25606 retry:
25607@@ -260,12 +263,12 @@ __recover_probed_insn(kprobe_opcode_t *buf, unsigned long addr)
25608 * Fortunately, we know that the original code is the ideal 5-byte
25609 * long NOP.
25610 */
25611- memcpy(buf, (void *)addr, MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
25612+ memcpy(buf, (void *)ktla_ktva(addr), MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
25613 if (faddr)
25614 memcpy(buf, ideal_nops[NOP_ATOMIC5], 5);
25615 else
25616 buf[0] = kp->opcode;
25617- return (unsigned long)buf;
25618+ return ktva_ktla((unsigned long)buf);
25619 }
25620
25621 /*
25622@@ -364,7 +367,9 @@ int __copy_instruction(u8 *dest, u8 *src)
25623 /* Another subsystem puts a breakpoint, failed to recover */
25624 if (insn.opcode.bytes[0] == BREAKPOINT_INSTRUCTION)
25625 return 0;
25626+ pax_open_kernel();
25627 memcpy(dest, insn.kaddr, insn.length);
25628+ pax_close_kernel();
25629
25630 #ifdef CONFIG_X86_64
25631 if (insn_rip_relative(&insn)) {
25632@@ -391,7 +396,9 @@ int __copy_instruction(u8 *dest, u8 *src)
25633 return 0;
25634 }
25635 disp = (u8 *) dest + insn_offset_displacement(&insn);
25636+ pax_open_kernel();
25637 *(s32 *) disp = (s32) newdisp;
25638+ pax_close_kernel();
25639 }
25640 #endif
25641 return insn.length;
25642@@ -533,7 +540,7 @@ static void setup_singlestep(struct kprobe *p, struct pt_regs *regs,
25643 * nor set current_kprobe, because it doesn't use single
25644 * stepping.
25645 */
25646- regs->ip = (unsigned long)p->ainsn.insn;
25647+ regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
25648 preempt_enable_no_resched();
25649 return;
25650 }
25651@@ -550,9 +557,9 @@ static void setup_singlestep(struct kprobe *p, struct pt_regs *regs,
25652 regs->flags &= ~X86_EFLAGS_IF;
25653 /* single step inline if the instruction is an int3 */
25654 if (p->opcode == BREAKPOINT_INSTRUCTION)
25655- regs->ip = (unsigned long)p->addr;
25656+ regs->ip = ktla_ktva((unsigned long)p->addr);
25657 else
25658- regs->ip = (unsigned long)p->ainsn.insn;
25659+ regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
25660 }
25661 NOKPROBE_SYMBOL(setup_singlestep);
25662
25663@@ -602,7 +609,7 @@ int kprobe_int3_handler(struct pt_regs *regs)
25664 struct kprobe *p;
25665 struct kprobe_ctlblk *kcb;
25666
25667- if (user_mode_vm(regs))
25668+ if (user_mode(regs))
25669 return 0;
25670
25671 addr = (kprobe_opcode_t *)(regs->ip - sizeof(kprobe_opcode_t));
25672@@ -637,7 +644,7 @@ int kprobe_int3_handler(struct pt_regs *regs)
25673 setup_singlestep(p, regs, kcb, 0);
25674 return 1;
25675 }
25676- } else if (*addr != BREAKPOINT_INSTRUCTION) {
25677+ } else if (*(kprobe_opcode_t *)ktla_ktva((unsigned long)addr) != BREAKPOINT_INSTRUCTION) {
25678 /*
25679 * The breakpoint instruction was removed right
25680 * after we hit it. Another cpu has removed
25681@@ -684,6 +691,9 @@ static void __used kretprobe_trampoline_holder(void)
25682 " movq %rax, 152(%rsp)\n"
25683 RESTORE_REGS_STRING
25684 " popfq\n"
25685+#ifdef KERNEXEC_PLUGIN
25686+ " btsq $63,(%rsp)\n"
25687+#endif
25688 #else
25689 " pushf\n"
25690 SAVE_REGS_STRING
25691@@ -824,7 +834,7 @@ static void resume_execution(struct kprobe *p, struct pt_regs *regs,
25692 struct kprobe_ctlblk *kcb)
25693 {
25694 unsigned long *tos = stack_addr(regs);
25695- unsigned long copy_ip = (unsigned long)p->ainsn.insn;
25696+ unsigned long copy_ip = ktva_ktla((unsigned long)p->ainsn.insn);
25697 unsigned long orig_ip = (unsigned long)p->addr;
25698 kprobe_opcode_t *insn = p->ainsn.insn;
25699
25700@@ -1007,7 +1017,7 @@ int kprobe_exceptions_notify(struct notifier_block *self, unsigned long val,
25701 struct die_args *args = data;
25702 int ret = NOTIFY_DONE;
25703
25704- if (args->regs && user_mode_vm(args->regs))
25705+ if (args->regs && user_mode(args->regs))
25706 return ret;
25707
25708 if (val == DIE_GPF) {
25709diff --git a/arch/x86/kernel/kprobes/opt.c b/arch/x86/kernel/kprobes/opt.c
25710index 7b3b9d1..e2478b91 100644
25711--- a/arch/x86/kernel/kprobes/opt.c
25712+++ b/arch/x86/kernel/kprobes/opt.c
25713@@ -79,6 +79,7 @@ found:
25714 /* Insert a move instruction which sets a pointer to eax/rdi (1st arg). */
25715 static void synthesize_set_arg1(kprobe_opcode_t *addr, unsigned long val)
25716 {
25717+ pax_open_kernel();
25718 #ifdef CONFIG_X86_64
25719 *addr++ = 0x48;
25720 *addr++ = 0xbf;
25721@@ -86,6 +87,7 @@ static void synthesize_set_arg1(kprobe_opcode_t *addr, unsigned long val)
25722 *addr++ = 0xb8;
25723 #endif
25724 *(unsigned long *)addr = val;
25725+ pax_close_kernel();
25726 }
25727
25728 asm (
25729@@ -342,7 +344,7 @@ int arch_prepare_optimized_kprobe(struct optimized_kprobe *op,
25730 * Verify if the address gap is in 2GB range, because this uses
25731 * a relative jump.
25732 */
25733- rel = (long)op->optinsn.insn - (long)op->kp.addr + RELATIVEJUMP_SIZE;
25734+ rel = (long)op->optinsn.insn - ktla_ktva((long)op->kp.addr) + RELATIVEJUMP_SIZE;
25735 if (abs(rel) > 0x7fffffff) {
25736 __arch_remove_optimized_kprobe(op, 0);
25737 return -ERANGE;
25738@@ -359,16 +361,18 @@ int arch_prepare_optimized_kprobe(struct optimized_kprobe *op,
25739 op->optinsn.size = ret;
25740
25741 /* Copy arch-dep-instance from template */
25742- memcpy(buf, &optprobe_template_entry, TMPL_END_IDX);
25743+ pax_open_kernel();
25744+ memcpy(buf, ktla_ktva(&optprobe_template_entry), TMPL_END_IDX);
25745+ pax_close_kernel();
25746
25747 /* Set probe information */
25748 synthesize_set_arg1(buf + TMPL_MOVE_IDX, (unsigned long)op);
25749
25750 /* Set probe function call */
25751- synthesize_relcall(buf + TMPL_CALL_IDX, optimized_callback);
25752+ synthesize_relcall(ktva_ktla(buf) + TMPL_CALL_IDX, optimized_callback);
25753
25754 /* Set returning jmp instruction at the tail of out-of-line buffer */
25755- synthesize_reljump(buf + TMPL_END_IDX + op->optinsn.size,
25756+ synthesize_reljump(ktva_ktla(buf) + TMPL_END_IDX + op->optinsn.size,
25757 (u8 *)op->kp.addr + op->optinsn.size);
25758
25759 flush_icache_range((unsigned long) buf,
25760@@ -393,7 +397,7 @@ void arch_optimize_kprobes(struct list_head *oplist)
25761 WARN_ON(kprobe_disabled(&op->kp));
25762
25763 /* Backup instructions which will be replaced by jump address */
25764- memcpy(op->optinsn.copied_insn, op->kp.addr + INT3_SIZE,
25765+ memcpy(op->optinsn.copied_insn, ktla_ktva(op->kp.addr) + INT3_SIZE,
25766 RELATIVE_ADDR_SIZE);
25767
25768 insn_buf[0] = RELATIVEJUMP_OPCODE;
25769@@ -441,7 +445,7 @@ int setup_detour_execution(struct kprobe *p, struct pt_regs *regs, int reenter)
25770 /* This kprobe is really able to run optimized path. */
25771 op = container_of(p, struct optimized_kprobe, kp);
25772 /* Detour through copied instructions */
25773- regs->ip = (unsigned long)op->optinsn.insn + TMPL_END_IDX;
25774+ regs->ip = ktva_ktla((unsigned long)op->optinsn.insn) + TMPL_END_IDX;
25775 if (!reenter)
25776 reset_current_kprobe();
25777 preempt_enable_no_resched();
25778diff --git a/arch/x86/kernel/ksysfs.c b/arch/x86/kernel/ksysfs.c
25779index c2bedae..25e7ab60 100644
25780--- a/arch/x86/kernel/ksysfs.c
25781+++ b/arch/x86/kernel/ksysfs.c
25782@@ -184,7 +184,7 @@ out:
25783
25784 static struct kobj_attribute type_attr = __ATTR_RO(type);
25785
25786-static struct bin_attribute data_attr = {
25787+static bin_attribute_no_const data_attr __read_only = {
25788 .attr = {
25789 .name = "data",
25790 .mode = S_IRUGO,
25791diff --git a/arch/x86/kernel/ldt.c b/arch/x86/kernel/ldt.c
25792index c37886d..d851d32 100644
25793--- a/arch/x86/kernel/ldt.c
25794+++ b/arch/x86/kernel/ldt.c
25795@@ -66,13 +66,13 @@ static int alloc_ldt(mm_context_t *pc, int mincount, int reload)
25796 if (reload) {
25797 #ifdef CONFIG_SMP
25798 preempt_disable();
25799- load_LDT(pc);
25800+ load_LDT_nolock(pc);
25801 if (!cpumask_equal(mm_cpumask(current->mm),
25802 cpumask_of(smp_processor_id())))
25803 smp_call_function(flush_ldt, current->mm, 1);
25804 preempt_enable();
25805 #else
25806- load_LDT(pc);
25807+ load_LDT_nolock(pc);
25808 #endif
25809 }
25810 if (oldsize) {
25811@@ -94,7 +94,7 @@ static inline int copy_ldt(mm_context_t *new, mm_context_t *old)
25812 return err;
25813
25814 for (i = 0; i < old->size; i++)
25815- write_ldt_entry(new->ldt, i, old->ldt + i * LDT_ENTRY_SIZE);
25816+ write_ldt_entry(new->ldt, i, old->ldt + i);
25817 return 0;
25818 }
25819
25820@@ -115,6 +115,24 @@ int init_new_context(struct task_struct *tsk, struct mm_struct *mm)
25821 retval = copy_ldt(&mm->context, &old_mm->context);
25822 mutex_unlock(&old_mm->context.lock);
25823 }
25824+
25825+ if (tsk == current) {
25826+ mm->context.vdso = 0;
25827+
25828+#ifdef CONFIG_X86_32
25829+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
25830+ mm->context.user_cs_base = 0UL;
25831+ mm->context.user_cs_limit = ~0UL;
25832+
25833+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
25834+ cpus_clear(mm->context.cpu_user_cs_mask);
25835+#endif
25836+
25837+#endif
25838+#endif
25839+
25840+ }
25841+
25842 return retval;
25843 }
25844
25845@@ -229,6 +247,13 @@ static int write_ldt(void __user *ptr, unsigned long bytecount, int oldmode)
25846 }
25847 }
25848
25849+#ifdef CONFIG_PAX_SEGMEXEC
25850+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (ldt_info.contents & MODIFY_LDT_CONTENTS_CODE)) {
25851+ error = -EINVAL;
25852+ goto out_unlock;
25853+ }
25854+#endif
25855+
25856 if (!IS_ENABLED(CONFIG_X86_16BIT) && !ldt_info.seg_32bit) {
25857 error = -EINVAL;
25858 goto out_unlock;
25859diff --git a/arch/x86/kernel/livepatch.c b/arch/x86/kernel/livepatch.c
25860index ff3c3101d..d7c0cd8 100644
25861--- a/arch/x86/kernel/livepatch.c
25862+++ b/arch/x86/kernel/livepatch.c
25863@@ -41,9 +41,10 @@ int klp_write_module_reloc(struct module *mod, unsigned long type,
25864 int ret, numpages, size = 4;
25865 bool readonly;
25866 unsigned long val;
25867- unsigned long core = (unsigned long)mod->module_core;
25868- unsigned long core_ro_size = mod->core_ro_size;
25869- unsigned long core_size = mod->core_size;
25870+ unsigned long core_rx = (unsigned long)mod->module_core_rx;
25871+ unsigned long core_rw = (unsigned long)mod->module_core_rw;
25872+ unsigned long core_size_rx = mod->core_size_rx;
25873+ unsigned long core_size_rw = mod->core_size_rw;
25874
25875 switch (type) {
25876 case R_X86_64_NONE:
25877@@ -66,11 +67,12 @@ int klp_write_module_reloc(struct module *mod, unsigned long type,
25878 return -EINVAL;
25879 }
25880
25881- if (loc < core || loc >= core + core_size)
25882+ if ((loc < core_rx || loc >= core_rx + core_size_rx) &&
25883+ (loc < core_rw || loc >= core_rw + core_size_rw))
25884 /* loc does not point to any symbol inside the module */
25885 return -EINVAL;
25886
25887- if (loc < core + core_ro_size)
25888+ if (loc < core_rx + core_size_rx)
25889 readonly = true;
25890 else
25891 readonly = false;
25892diff --git a/arch/x86/kernel/machine_kexec_32.c b/arch/x86/kernel/machine_kexec_32.c
25893index 469b23d..5449cfe 100644
25894--- a/arch/x86/kernel/machine_kexec_32.c
25895+++ b/arch/x86/kernel/machine_kexec_32.c
25896@@ -26,7 +26,7 @@
25897 #include <asm/cacheflush.h>
25898 #include <asm/debugreg.h>
25899
25900-static void set_idt(void *newidt, __u16 limit)
25901+static void set_idt(struct desc_struct *newidt, __u16 limit)
25902 {
25903 struct desc_ptr curidt;
25904
25905@@ -38,7 +38,7 @@ static void set_idt(void *newidt, __u16 limit)
25906 }
25907
25908
25909-static void set_gdt(void *newgdt, __u16 limit)
25910+static void set_gdt(struct desc_struct *newgdt, __u16 limit)
25911 {
25912 struct desc_ptr curgdt;
25913
25914@@ -216,7 +216,7 @@ void machine_kexec(struct kimage *image)
25915 }
25916
25917 control_page = page_address(image->control_code_page);
25918- memcpy(control_page, relocate_kernel, KEXEC_CONTROL_CODE_MAX_SIZE);
25919+ memcpy(control_page, (void *)ktla_ktva((unsigned long)relocate_kernel), KEXEC_CONTROL_CODE_MAX_SIZE);
25920
25921 relocate_kernel_ptr = control_page;
25922 page_list[PA_CONTROL_PAGE] = __pa(control_page);
25923diff --git a/arch/x86/kernel/mcount_64.S b/arch/x86/kernel/mcount_64.S
25924index 94ea120..4154cea 100644
25925--- a/arch/x86/kernel/mcount_64.S
25926+++ b/arch/x86/kernel/mcount_64.S
25927@@ -7,7 +7,7 @@
25928 #include <linux/linkage.h>
25929 #include <asm/ptrace.h>
25930 #include <asm/ftrace.h>
25931-
25932+#include <asm/alternative-asm.h>
25933
25934 .code64
25935 .section .entry.text, "ax"
25936@@ -148,8 +148,9 @@
25937 #ifdef CONFIG_DYNAMIC_FTRACE
25938
25939 ENTRY(function_hook)
25940+ pax_force_retaddr
25941 retq
25942-END(function_hook)
25943+ENDPROC(function_hook)
25944
25945 ENTRY(ftrace_caller)
25946 /* save_mcount_regs fills in first two parameters */
25947@@ -181,8 +182,9 @@ GLOBAL(ftrace_graph_call)
25948 #endif
25949
25950 GLOBAL(ftrace_stub)
25951+ pax_force_retaddr
25952 retq
25953-END(ftrace_caller)
25954+ENDPROC(ftrace_caller)
25955
25956 ENTRY(ftrace_regs_caller)
25957 /* Save the current flags before any operations that can change them */
25958@@ -253,7 +255,7 @@ GLOBAL(ftrace_regs_caller_end)
25959
25960 jmp ftrace_return
25961
25962-END(ftrace_regs_caller)
25963+ENDPROC(ftrace_regs_caller)
25964
25965
25966 #else /* ! CONFIG_DYNAMIC_FTRACE */
25967@@ -272,18 +274,20 @@ fgraph_trace:
25968 #endif
25969
25970 GLOBAL(ftrace_stub)
25971+ pax_force_retaddr
25972 retq
25973
25974 trace:
25975 /* save_mcount_regs fills in first two parameters */
25976 save_mcount_regs
25977
25978+ pax_force_fptr ftrace_trace_function
25979 call *ftrace_trace_function
25980
25981 restore_mcount_regs
25982
25983 jmp fgraph_trace
25984-END(function_hook)
25985+ENDPROC(function_hook)
25986 #endif /* CONFIG_DYNAMIC_FTRACE */
25987 #endif /* CONFIG_FUNCTION_TRACER */
25988
25989@@ -305,8 +309,9 @@ ENTRY(ftrace_graph_caller)
25990
25991 restore_mcount_regs
25992
25993+ pax_force_retaddr
25994 retq
25995-END(ftrace_graph_caller)
25996+ENDPROC(ftrace_graph_caller)
25997
25998 GLOBAL(return_to_handler)
25999 subq $24, %rsp
26000@@ -322,5 +327,7 @@ GLOBAL(return_to_handler)
26001 movq 8(%rsp), %rdx
26002 movq (%rsp), %rax
26003 addq $24, %rsp
26004+ pax_force_fptr %rdi
26005 jmp *%rdi
26006+ENDPROC(return_to_handler)
26007 #endif
26008diff --git a/arch/x86/kernel/module.c b/arch/x86/kernel/module.c
26009index d1ac80b..f593701 100644
26010--- a/arch/x86/kernel/module.c
26011+++ b/arch/x86/kernel/module.c
26012@@ -82,17 +82,17 @@ static unsigned long int get_module_load_offset(void)
26013 }
26014 #endif
26015
26016-void *module_alloc(unsigned long size)
26017+static inline void *__module_alloc(unsigned long size, pgprot_t prot)
26018 {
26019 void *p;
26020
26021- if (PAGE_ALIGN(size) > MODULES_LEN)
26022+ if (!size || PAGE_ALIGN(size) > MODULES_LEN)
26023 return NULL;
26024
26025 p = __vmalloc_node_range(size, MODULE_ALIGN,
26026 MODULES_VADDR + get_module_load_offset(),
26027- MODULES_END, GFP_KERNEL | __GFP_HIGHMEM,
26028- PAGE_KERNEL_EXEC, 0, NUMA_NO_NODE,
26029+ MODULES_END, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO,
26030+ prot, 0, NUMA_NO_NODE,
26031 __builtin_return_address(0));
26032 if (p && (kasan_module_alloc(p, size) < 0)) {
26033 vfree(p);
26034@@ -102,6 +102,51 @@ void *module_alloc(unsigned long size)
26035 return p;
26036 }
26037
26038+void *module_alloc(unsigned long size)
26039+{
26040+
26041+#ifdef CONFIG_PAX_KERNEXEC
26042+ return __module_alloc(size, PAGE_KERNEL);
26043+#else
26044+ return __module_alloc(size, PAGE_KERNEL_EXEC);
26045+#endif
26046+
26047+}
26048+
26049+#ifdef CONFIG_PAX_KERNEXEC
26050+#ifdef CONFIG_X86_32
26051+void *module_alloc_exec(unsigned long size)
26052+{
26053+ struct vm_struct *area;
26054+
26055+ if (size == 0)
26056+ return NULL;
26057+
26058+ area = __get_vm_area(size, VM_ALLOC, (unsigned long)&MODULES_EXEC_VADDR, (unsigned long)&MODULES_EXEC_END);
26059+return area ? area->addr : NULL;
26060+}
26061+EXPORT_SYMBOL(module_alloc_exec);
26062+
26063+void module_memfree_exec(void *module_region)
26064+{
26065+ vunmap(module_region);
26066+}
26067+EXPORT_SYMBOL(module_memfree_exec);
26068+#else
26069+void module_memfree_exec(void *module_region)
26070+{
26071+ module_memfree(module_region);
26072+}
26073+EXPORT_SYMBOL(module_memfree_exec);
26074+
26075+void *module_alloc_exec(unsigned long size)
26076+{
26077+ return __module_alloc(size, PAGE_KERNEL_RX);
26078+}
26079+EXPORT_SYMBOL(module_alloc_exec);
26080+#endif
26081+#endif
26082+
26083 #ifdef CONFIG_X86_32
26084 int apply_relocate(Elf32_Shdr *sechdrs,
26085 const char *strtab,
26086@@ -112,14 +157,16 @@ int apply_relocate(Elf32_Shdr *sechdrs,
26087 unsigned int i;
26088 Elf32_Rel *rel = (void *)sechdrs[relsec].sh_addr;
26089 Elf32_Sym *sym;
26090- uint32_t *location;
26091+ uint32_t *plocation, location;
26092
26093 DEBUGP("Applying relocate section %u to %u\n",
26094 relsec, sechdrs[relsec].sh_info);
26095 for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rel); i++) {
26096 /* This is where to make the change */
26097- location = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr
26098- + rel[i].r_offset;
26099+ plocation = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr + rel[i].r_offset;
26100+ location = (uint32_t)plocation;
26101+ if (sechdrs[sechdrs[relsec].sh_info].sh_flags & SHF_EXECINSTR)
26102+ plocation = ktla_ktva((void *)plocation);
26103 /* This is the symbol it is referring to. Note that all
26104 undefined symbols have been resolved. */
26105 sym = (Elf32_Sym *)sechdrs[symindex].sh_addr
26106@@ -128,11 +175,15 @@ int apply_relocate(Elf32_Shdr *sechdrs,
26107 switch (ELF32_R_TYPE(rel[i].r_info)) {
26108 case R_386_32:
26109 /* We add the value into the location given */
26110- *location += sym->st_value;
26111+ pax_open_kernel();
26112+ *plocation += sym->st_value;
26113+ pax_close_kernel();
26114 break;
26115 case R_386_PC32:
26116 /* Add the value, subtract its position */
26117- *location += sym->st_value - (uint32_t)location;
26118+ pax_open_kernel();
26119+ *plocation += sym->st_value - location;
26120+ pax_close_kernel();
26121 break;
26122 default:
26123 pr_err("%s: Unknown relocation: %u\n",
26124@@ -177,21 +228,30 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,
26125 case R_X86_64_NONE:
26126 break;
26127 case R_X86_64_64:
26128+ pax_open_kernel();
26129 *(u64 *)loc = val;
26130+ pax_close_kernel();
26131 break;
26132 case R_X86_64_32:
26133+ pax_open_kernel();
26134 *(u32 *)loc = val;
26135+ pax_close_kernel();
26136 if (val != *(u32 *)loc)
26137 goto overflow;
26138 break;
26139 case R_X86_64_32S:
26140+ pax_open_kernel();
26141 *(s32 *)loc = val;
26142+ pax_close_kernel();
26143 if ((s64)val != *(s32 *)loc)
26144 goto overflow;
26145 break;
26146 case R_X86_64_PC32:
26147 val -= (u64)loc;
26148+ pax_open_kernel();
26149 *(u32 *)loc = val;
26150+ pax_close_kernel();
26151+
26152 #if 0
26153 if ((s64)val != *(s32 *)loc)
26154 goto overflow;
26155diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c
26156index 113e707..0a690e1 100644
26157--- a/arch/x86/kernel/msr.c
26158+++ b/arch/x86/kernel/msr.c
26159@@ -39,6 +39,7 @@
26160 #include <linux/notifier.h>
26161 #include <linux/uaccess.h>
26162 #include <linux/gfp.h>
26163+#include <linux/grsecurity.h>
26164
26165 #include <asm/processor.h>
26166 #include <asm/msr.h>
26167@@ -105,6 +106,11 @@ static ssize_t msr_write(struct file *file, const char __user *buf,
26168 int err = 0;
26169 ssize_t bytes = 0;
26170
26171+#ifdef CONFIG_GRKERNSEC_KMEM
26172+ gr_handle_msr_write();
26173+ return -EPERM;
26174+#endif
26175+
26176 if (count % 8)
26177 return -EINVAL; /* Invalid chunk size */
26178
26179@@ -152,6 +158,10 @@ static long msr_ioctl(struct file *file, unsigned int ioc, unsigned long arg)
26180 err = -EBADF;
26181 break;
26182 }
26183+#ifdef CONFIG_GRKERNSEC_KMEM
26184+ gr_handle_msr_write();
26185+ return -EPERM;
26186+#endif
26187 if (copy_from_user(&regs, uregs, sizeof regs)) {
26188 err = -EFAULT;
26189 break;
26190@@ -235,7 +245,7 @@ static int msr_class_cpu_callback(struct notifier_block *nfb,
26191 return notifier_from_errno(err);
26192 }
26193
26194-static struct notifier_block __refdata msr_class_cpu_notifier = {
26195+static struct notifier_block msr_class_cpu_notifier = {
26196 .notifier_call = msr_class_cpu_callback,
26197 };
26198
26199diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
26200index c3e985d..110a36a 100644
26201--- a/arch/x86/kernel/nmi.c
26202+++ b/arch/x86/kernel/nmi.c
26203@@ -98,16 +98,16 @@ fs_initcall(nmi_warning_debugfs);
26204
26205 static void nmi_max_handler(struct irq_work *w)
26206 {
26207- struct nmiaction *a = container_of(w, struct nmiaction, irq_work);
26208+ struct nmiwork *n = container_of(w, struct nmiwork, irq_work);
26209 int remainder_ns, decimal_msecs;
26210- u64 whole_msecs = ACCESS_ONCE(a->max_duration);
26211+ u64 whole_msecs = ACCESS_ONCE(n->max_duration);
26212
26213 remainder_ns = do_div(whole_msecs, (1000 * 1000));
26214 decimal_msecs = remainder_ns / 1000;
26215
26216 printk_ratelimited(KERN_INFO
26217 "INFO: NMI handler (%ps) took too long to run: %lld.%03d msecs\n",
26218- a->handler, whole_msecs, decimal_msecs);
26219+ n->action->handler, whole_msecs, decimal_msecs);
26220 }
26221
26222 static int nmi_handle(unsigned int type, struct pt_regs *regs, bool b2b)
26223@@ -134,11 +134,11 @@ static int nmi_handle(unsigned int type, struct pt_regs *regs, bool b2b)
26224 delta = sched_clock() - delta;
26225 trace_nmi_handler(a->handler, (int)delta, thishandled);
26226
26227- if (delta < nmi_longest_ns || delta < a->max_duration)
26228+ if (delta < nmi_longest_ns || delta < a->work->max_duration)
26229 continue;
26230
26231- a->max_duration = delta;
26232- irq_work_queue(&a->irq_work);
26233+ a->work->max_duration = delta;
26234+ irq_work_queue(&a->work->irq_work);
26235 }
26236
26237 rcu_read_unlock();
26238@@ -148,7 +148,7 @@ static int nmi_handle(unsigned int type, struct pt_regs *regs, bool b2b)
26239 }
26240 NOKPROBE_SYMBOL(nmi_handle);
26241
26242-int __register_nmi_handler(unsigned int type, struct nmiaction *action)
26243+int __register_nmi_handler(unsigned int type, const struct nmiaction *action)
26244 {
26245 struct nmi_desc *desc = nmi_to_desc(type);
26246 unsigned long flags;
26247@@ -156,7 +156,8 @@ int __register_nmi_handler(unsigned int type, struct nmiaction *action)
26248 if (!action->handler)
26249 return -EINVAL;
26250
26251- init_irq_work(&action->irq_work, nmi_max_handler);
26252+ action->work->action = action;
26253+ init_irq_work(&action->work->irq_work, nmi_max_handler);
26254
26255 spin_lock_irqsave(&desc->lock, flags);
26256
26257@@ -174,9 +175,9 @@ int __register_nmi_handler(unsigned int type, struct nmiaction *action)
26258 * event confuses some handlers (kdump uses this flag)
26259 */
26260 if (action->flags & NMI_FLAG_FIRST)
26261- list_add_rcu(&action->list, &desc->head);
26262+ pax_list_add_rcu((struct list_head *)&action->list, &desc->head);
26263 else
26264- list_add_tail_rcu(&action->list, &desc->head);
26265+ pax_list_add_tail_rcu((struct list_head *)&action->list, &desc->head);
26266
26267 spin_unlock_irqrestore(&desc->lock, flags);
26268 return 0;
26269@@ -199,7 +200,7 @@ void unregister_nmi_handler(unsigned int type, const char *name)
26270 if (!strcmp(n->name, name)) {
26271 WARN(in_nmi(),
26272 "Trying to free NMI (%s) from NMI context!\n", n->name);
26273- list_del_rcu(&n->list);
26274+ pax_list_del_rcu((struct list_head *)&n->list);
26275 break;
26276 }
26277 }
26278@@ -528,6 +529,17 @@ static inline void nmi_nesting_postprocess(void)
26279 dotraplinkage notrace void
26280 do_nmi(struct pt_regs *regs, long error_code)
26281 {
26282+
26283+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
26284+ if (!user_mode(regs)) {
26285+ unsigned long cs = regs->cs & 0xFFFF;
26286+ unsigned long ip = ktva_ktla(regs->ip);
26287+
26288+ if ((cs == __KERNEL_CS || cs == __KERNEXEC_KERNEL_CS) && ip <= (unsigned long)_etext)
26289+ regs->ip = ip;
26290+ }
26291+#endif
26292+
26293 nmi_nesting_preprocess(regs);
26294
26295 nmi_enter();
26296diff --git a/arch/x86/kernel/nmi_selftest.c b/arch/x86/kernel/nmi_selftest.c
26297index 6d9582e..f746287 100644
26298--- a/arch/x86/kernel/nmi_selftest.c
26299+++ b/arch/x86/kernel/nmi_selftest.c
26300@@ -43,7 +43,7 @@ static void __init init_nmi_testsuite(void)
26301 {
26302 /* trap all the unknown NMIs we may generate */
26303 register_nmi_handler(NMI_UNKNOWN, nmi_unk_cb, 0, "nmi_selftest_unk",
26304- __initdata);
26305+ __initconst);
26306 }
26307
26308 static void __init cleanup_nmi_testsuite(void)
26309@@ -66,7 +66,7 @@ static void __init test_nmi_ipi(struct cpumask *mask)
26310 unsigned long timeout;
26311
26312 if (register_nmi_handler(NMI_LOCAL, test_nmi_ipi_callback,
26313- NMI_FLAG_FIRST, "nmi_selftest", __initdata)) {
26314+ NMI_FLAG_FIRST, "nmi_selftest", __initconst)) {
26315 nmi_fail = FAILURE;
26316 return;
26317 }
26318diff --git a/arch/x86/kernel/paravirt-spinlocks.c b/arch/x86/kernel/paravirt-spinlocks.c
26319index bbb6c73..24a58ef 100644
26320--- a/arch/x86/kernel/paravirt-spinlocks.c
26321+++ b/arch/x86/kernel/paravirt-spinlocks.c
26322@@ -8,7 +8,7 @@
26323
26324 #include <asm/paravirt.h>
26325
26326-struct pv_lock_ops pv_lock_ops = {
26327+struct pv_lock_ops pv_lock_ops __read_only = {
26328 #ifdef CONFIG_SMP
26329 .lock_spinning = __PV_IS_CALLEE_SAVE(paravirt_nop),
26330 .unlock_kick = paravirt_nop,
26331diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c
26332index 548d25f..f8fb99c 100644
26333--- a/arch/x86/kernel/paravirt.c
26334+++ b/arch/x86/kernel/paravirt.c
26335@@ -56,6 +56,9 @@ u64 _paravirt_ident_64(u64 x)
26336 {
26337 return x;
26338 }
26339+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
26340+PV_CALLEE_SAVE_REGS_THUNK(_paravirt_ident_64);
26341+#endif
26342
26343 void __init default_banner(void)
26344 {
26345@@ -142,16 +145,20 @@ unsigned paravirt_patch_default(u8 type, u16 clobbers, void *insnbuf,
26346
26347 if (opfunc == NULL)
26348 /* If there's no function, patch it with a ud2a (BUG) */
26349- ret = paravirt_patch_insns(insnbuf, len, ud2a, ud2a+sizeof(ud2a));
26350- else if (opfunc == _paravirt_nop)
26351+ ret = paravirt_patch_insns(insnbuf, len, ktva_ktla(ud2a), ud2a+sizeof(ud2a));
26352+ else if (opfunc == (void *)_paravirt_nop)
26353 /* If the operation is a nop, then nop the callsite */
26354 ret = paravirt_patch_nop();
26355
26356 /* identity functions just return their single argument */
26357- else if (opfunc == _paravirt_ident_32)
26358+ else if (opfunc == (void *)_paravirt_ident_32)
26359 ret = paravirt_patch_ident_32(insnbuf, len);
26360- else if (opfunc == _paravirt_ident_64)
26361+ else if (opfunc == (void *)_paravirt_ident_64)
26362 ret = paravirt_patch_ident_64(insnbuf, len);
26363+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
26364+ else if (opfunc == (void *)__raw_callee_save__paravirt_ident_64)
26365+ ret = paravirt_patch_ident_64(insnbuf, len);
26366+#endif
26367
26368 else if (type == PARAVIRT_PATCH(pv_cpu_ops.iret) ||
26369 type == PARAVIRT_PATCH(pv_cpu_ops.irq_enable_sysexit) ||
26370@@ -176,7 +183,7 @@ unsigned paravirt_patch_insns(void *insnbuf, unsigned len,
26371 if (insn_len > len || start == NULL)
26372 insn_len = len;
26373 else
26374- memcpy(insnbuf, start, insn_len);
26375+ memcpy(insnbuf, ktla_ktva(start), insn_len);
26376
26377 return insn_len;
26378 }
26379@@ -300,7 +307,7 @@ enum paravirt_lazy_mode paravirt_get_lazy_mode(void)
26380 return this_cpu_read(paravirt_lazy_mode);
26381 }
26382
26383-struct pv_info pv_info = {
26384+struct pv_info pv_info __read_only = {
26385 .name = "bare hardware",
26386 .paravirt_enabled = 0,
26387 .kernel_rpl = 0,
26388@@ -311,16 +318,16 @@ struct pv_info pv_info = {
26389 #endif
26390 };
26391
26392-struct pv_init_ops pv_init_ops = {
26393+struct pv_init_ops pv_init_ops __read_only = {
26394 .patch = native_patch,
26395 };
26396
26397-struct pv_time_ops pv_time_ops = {
26398+struct pv_time_ops pv_time_ops __read_only = {
26399 .sched_clock = native_sched_clock,
26400 .steal_clock = native_steal_clock,
26401 };
26402
26403-__visible struct pv_irq_ops pv_irq_ops = {
26404+__visible struct pv_irq_ops pv_irq_ops __read_only = {
26405 .save_fl = __PV_IS_CALLEE_SAVE(native_save_fl),
26406 .restore_fl = __PV_IS_CALLEE_SAVE(native_restore_fl),
26407 .irq_disable = __PV_IS_CALLEE_SAVE(native_irq_disable),
26408@@ -332,7 +339,7 @@ __visible struct pv_irq_ops pv_irq_ops = {
26409 #endif
26410 };
26411
26412-__visible struct pv_cpu_ops pv_cpu_ops = {
26413+__visible struct pv_cpu_ops pv_cpu_ops __read_only = {
26414 .cpuid = native_cpuid,
26415 .get_debugreg = native_get_debugreg,
26416 .set_debugreg = native_set_debugreg,
26417@@ -395,21 +402,26 @@ NOKPROBE_SYMBOL(native_get_debugreg);
26418 NOKPROBE_SYMBOL(native_set_debugreg);
26419 NOKPROBE_SYMBOL(native_load_idt);
26420
26421-struct pv_apic_ops pv_apic_ops = {
26422+struct pv_apic_ops pv_apic_ops __read_only= {
26423 #ifdef CONFIG_X86_LOCAL_APIC
26424 .startup_ipi_hook = paravirt_nop,
26425 #endif
26426 };
26427
26428-#if defined(CONFIG_X86_32) && !defined(CONFIG_X86_PAE)
26429+#ifdef CONFIG_X86_32
26430+#ifdef CONFIG_X86_PAE
26431+/* 64-bit pagetable entries */
26432+#define PTE_IDENT PV_CALLEE_SAVE(_paravirt_ident_64)
26433+#else
26434 /* 32-bit pagetable entries */
26435 #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_32)
26436+#endif
26437 #else
26438 /* 64-bit pagetable entries */
26439 #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_64)
26440 #endif
26441
26442-struct pv_mmu_ops pv_mmu_ops = {
26443+struct pv_mmu_ops pv_mmu_ops __read_only = {
26444
26445 .read_cr2 = native_read_cr2,
26446 .write_cr2 = native_write_cr2,
26447@@ -459,6 +471,7 @@ struct pv_mmu_ops pv_mmu_ops = {
26448 .make_pud = PTE_IDENT,
26449
26450 .set_pgd = native_set_pgd,
26451+ .set_pgd_batched = native_set_pgd_batched,
26452 #endif
26453 #endif /* PAGETABLE_LEVELS >= 3 */
26454
26455@@ -479,6 +492,12 @@ struct pv_mmu_ops pv_mmu_ops = {
26456 },
26457
26458 .set_fixmap = native_set_fixmap,
26459+
26460+#ifdef CONFIG_PAX_KERNEXEC
26461+ .pax_open_kernel = native_pax_open_kernel,
26462+ .pax_close_kernel = native_pax_close_kernel,
26463+#endif
26464+
26465 };
26466
26467 EXPORT_SYMBOL_GPL(pv_time_ops);
26468diff --git a/arch/x86/kernel/paravirt_patch_64.c b/arch/x86/kernel/paravirt_patch_64.c
26469index a1da673..b6f5831 100644
26470--- a/arch/x86/kernel/paravirt_patch_64.c
26471+++ b/arch/x86/kernel/paravirt_patch_64.c
26472@@ -9,7 +9,11 @@ DEF_NATIVE(pv_irq_ops, save_fl, "pushfq; popq %rax");
26473 DEF_NATIVE(pv_mmu_ops, read_cr2, "movq %cr2, %rax");
26474 DEF_NATIVE(pv_mmu_ops, read_cr3, "movq %cr3, %rax");
26475 DEF_NATIVE(pv_mmu_ops, write_cr3, "movq %rdi, %cr3");
26476+
26477+#ifndef CONFIG_PAX_MEMORY_UDEREF
26478 DEF_NATIVE(pv_mmu_ops, flush_tlb_single, "invlpg (%rdi)");
26479+#endif
26480+
26481 DEF_NATIVE(pv_cpu_ops, clts, "clts");
26482 DEF_NATIVE(pv_cpu_ops, wbinvd, "wbinvd");
26483
26484@@ -57,7 +61,11 @@ unsigned native_patch(u8 type, u16 clobbers, void *ibuf,
26485 PATCH_SITE(pv_mmu_ops, read_cr3);
26486 PATCH_SITE(pv_mmu_ops, write_cr3);
26487 PATCH_SITE(pv_cpu_ops, clts);
26488+
26489+#ifndef CONFIG_PAX_MEMORY_UDEREF
26490 PATCH_SITE(pv_mmu_ops, flush_tlb_single);
26491+#endif
26492+
26493 PATCH_SITE(pv_cpu_ops, wbinvd);
26494
26495 patch_site:
26496diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c
26497index 0497f71..7186c0d 100644
26498--- a/arch/x86/kernel/pci-calgary_64.c
26499+++ b/arch/x86/kernel/pci-calgary_64.c
26500@@ -1347,7 +1347,7 @@ static void __init get_tce_space_from_tar(void)
26501 tce_space = be64_to_cpu(readq(target));
26502 tce_space = tce_space & TAR_SW_BITS;
26503
26504- tce_space = tce_space & (~specified_table_size);
26505+ tce_space = tce_space & (~(unsigned long)specified_table_size);
26506 info->tce_space = (u64 *)__va(tce_space);
26507 }
26508 }
26509diff --git a/arch/x86/kernel/pci-iommu_table.c b/arch/x86/kernel/pci-iommu_table.c
26510index 35ccf75..7a15747 100644
26511--- a/arch/x86/kernel/pci-iommu_table.c
26512+++ b/arch/x86/kernel/pci-iommu_table.c
26513@@ -2,7 +2,7 @@
26514 #include <asm/iommu_table.h>
26515 #include <linux/string.h>
26516 #include <linux/kallsyms.h>
26517-
26518+#include <linux/sched.h>
26519
26520 #define DEBUG 1
26521
26522diff --git a/arch/x86/kernel/pci-swiotlb.c b/arch/x86/kernel/pci-swiotlb.c
26523index 77dd0ad..9ec4723 100644
26524--- a/arch/x86/kernel/pci-swiotlb.c
26525+++ b/arch/x86/kernel/pci-swiotlb.c
26526@@ -33,7 +33,7 @@ void x86_swiotlb_free_coherent(struct device *dev, size_t size,
26527 struct dma_attrs *attrs)
26528 {
26529 if (is_swiotlb_buffer(dma_to_phys(dev, dma_addr)))
26530- swiotlb_free_coherent(dev, size, vaddr, dma_addr);
26531+ swiotlb_free_coherent(dev, size, vaddr, dma_addr, attrs);
26532 else
26533 dma_generic_free_coherent(dev, size, vaddr, dma_addr, attrs);
26534 }
26535diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
26536index a388bb8..97064ad 100644
26537--- a/arch/x86/kernel/process.c
26538+++ b/arch/x86/kernel/process.c
26539@@ -38,7 +38,8 @@
26540 * section. Since TSS's are completely CPU-local, we want them
26541 * on exact cacheline boundaries, to eliminate cacheline ping-pong.
26542 */
26543-__visible DEFINE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss) = INIT_TSS;
26544+struct tss_struct init_tss[NR_CPUS] __visible ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS };
26545+EXPORT_SYMBOL(init_tss);
26546
26547 #ifdef CONFIG_X86_64
26548 static DEFINE_PER_CPU(unsigned char, is_idle);
26549@@ -96,7 +97,7 @@ void arch_task_cache_init(void)
26550 task_xstate_cachep =
26551 kmem_cache_create("task_xstate", xstate_size,
26552 __alignof__(union thread_xstate),
26553- SLAB_PANIC | SLAB_NOTRACK, NULL);
26554+ SLAB_PANIC | SLAB_NOTRACK | SLAB_USERCOPY, NULL);
26555 setup_xstate_comp();
26556 }
26557
26558@@ -110,7 +111,7 @@ void exit_thread(void)
26559 unsigned long *bp = t->io_bitmap_ptr;
26560
26561 if (bp) {
26562- struct tss_struct *tss = &per_cpu(init_tss, get_cpu());
26563+ struct tss_struct *tss = init_tss + get_cpu();
26564
26565 t->io_bitmap_ptr = NULL;
26566 clear_thread_flag(TIF_IO_BITMAP);
26567@@ -130,6 +131,9 @@ void flush_thread(void)
26568 {
26569 struct task_struct *tsk = current;
26570
26571+#if defined(CONFIG_X86_32) && !defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_PAX_MEMORY_UDEREF)
26572+ loadsegment(gs, 0);
26573+#endif
26574 flush_ptrace_hw_breakpoint(tsk);
26575 memset(tsk->thread.tls_array, 0, sizeof(tsk->thread.tls_array));
26576 drop_init_fpu(tsk);
26577@@ -276,7 +280,7 @@ static void __exit_idle(void)
26578 void exit_idle(void)
26579 {
26580 /* idle loop has pid 0 */
26581- if (current->pid)
26582+ if (task_pid_nr(current))
26583 return;
26584 __exit_idle();
26585 }
26586@@ -329,7 +333,7 @@ bool xen_set_default_idle(void)
26587 return ret;
26588 }
26589 #endif
26590-void stop_this_cpu(void *dummy)
26591+__noreturn void stop_this_cpu(void *dummy)
26592 {
26593 local_irq_disable();
26594 /*
26595@@ -508,16 +512,37 @@ static int __init idle_setup(char *str)
26596 }
26597 early_param("idle", idle_setup);
26598
26599-unsigned long arch_align_stack(unsigned long sp)
26600+#ifdef CONFIG_PAX_RANDKSTACK
26601+void pax_randomize_kstack(struct pt_regs *regs)
26602 {
26603- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
26604- sp -= get_random_int() % 8192;
26605- return sp & ~0xf;
26606-}
26607+ struct thread_struct *thread = &current->thread;
26608+ unsigned long time;
26609
26610-unsigned long arch_randomize_brk(struct mm_struct *mm)
26611-{
26612- unsigned long range_end = mm->brk + 0x02000000;
26613- return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
26614-}
26615+ if (!randomize_va_space)
26616+ return;
26617+
26618+ if (v8086_mode(regs))
26619+ return;
26620
26621+ rdtscl(time);
26622+
26623+ /* P4 seems to return a 0 LSB, ignore it */
26624+#ifdef CONFIG_MPENTIUM4
26625+ time &= 0x3EUL;
26626+ time <<= 2;
26627+#elif defined(CONFIG_X86_64)
26628+ time &= 0xFUL;
26629+ time <<= 4;
26630+#else
26631+ time &= 0x1FUL;
26632+ time <<= 3;
26633+#endif
26634+
26635+ thread->sp0 ^= time;
26636+ load_sp0(init_tss + smp_processor_id(), thread);
26637+
26638+#ifdef CONFIG_X86_64
26639+ this_cpu_write(kernel_stack, thread->sp0);
26640+#endif
26641+}
26642+#endif
26643diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
26644index 603c4f9..3a105d7 100644
26645--- a/arch/x86/kernel/process_32.c
26646+++ b/arch/x86/kernel/process_32.c
26647@@ -64,6 +64,7 @@ asmlinkage void ret_from_kernel_thread(void) __asm__("ret_from_kernel_thread");
26648 unsigned long thread_saved_pc(struct task_struct *tsk)
26649 {
26650 return ((unsigned long *)tsk->thread.sp)[3];
26651+//XXX return tsk->thread.eip;
26652 }
26653
26654 void __show_regs(struct pt_regs *regs, int all)
26655@@ -73,19 +74,18 @@ void __show_regs(struct pt_regs *regs, int all)
26656 unsigned long sp;
26657 unsigned short ss, gs;
26658
26659- if (user_mode_vm(regs)) {
26660+ if (user_mode(regs)) {
26661 sp = regs->sp;
26662 ss = regs->ss & 0xffff;
26663- gs = get_user_gs(regs);
26664 } else {
26665 sp = kernel_stack_pointer(regs);
26666 savesegment(ss, ss);
26667- savesegment(gs, gs);
26668 }
26669+ gs = get_user_gs(regs);
26670
26671 printk(KERN_DEFAULT "EIP: %04x:[<%08lx>] EFLAGS: %08lx CPU: %d\n",
26672 (u16)regs->cs, regs->ip, regs->flags,
26673- smp_processor_id());
26674+ raw_smp_processor_id());
26675 print_symbol("EIP is at %s\n", regs->ip);
26676
26677 printk(KERN_DEFAULT "EAX: %08lx EBX: %08lx ECX: %08lx EDX: %08lx\n",
26678@@ -132,21 +132,22 @@ void release_thread(struct task_struct *dead_task)
26679 int copy_thread(unsigned long clone_flags, unsigned long sp,
26680 unsigned long arg, struct task_struct *p)
26681 {
26682- struct pt_regs *childregs = task_pt_regs(p);
26683+ struct pt_regs *childregs = task_stack_page(p) + THREAD_SIZE - sizeof(struct pt_regs) - 8;
26684 struct task_struct *tsk;
26685 int err;
26686
26687 p->thread.sp = (unsigned long) childregs;
26688 p->thread.sp0 = (unsigned long) (childregs+1);
26689+ p->tinfo.lowest_stack = (unsigned long)task_stack_page(p) + 2 * sizeof(unsigned long);
26690 memset(p->thread.ptrace_bps, 0, sizeof(p->thread.ptrace_bps));
26691
26692 if (unlikely(p->flags & PF_KTHREAD)) {
26693 /* kernel thread */
26694 memset(childregs, 0, sizeof(struct pt_regs));
26695 p->thread.ip = (unsigned long) ret_from_kernel_thread;
26696- task_user_gs(p) = __KERNEL_STACK_CANARY;
26697- childregs->ds = __USER_DS;
26698- childregs->es = __USER_DS;
26699+ savesegment(gs, childregs->gs);
26700+ childregs->ds = __KERNEL_DS;
26701+ childregs->es = __KERNEL_DS;
26702 childregs->fs = __KERNEL_PERCPU;
26703 childregs->bx = sp; /* function */
26704 childregs->bp = arg;
26705@@ -248,7 +249,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26706 struct thread_struct *prev = &prev_p->thread,
26707 *next = &next_p->thread;
26708 int cpu = smp_processor_id();
26709- struct tss_struct *tss = &per_cpu(init_tss, cpu);
26710+ struct tss_struct *tss = init_tss + cpu;
26711 fpu_switch_t fpu;
26712
26713 /* never put a printk in __switch_to... printk() calls wake_up*() indirectly */
26714@@ -272,6 +273,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26715 */
26716 lazy_save_gs(prev->gs);
26717
26718+#ifdef CONFIG_PAX_MEMORY_UDEREF
26719+ __set_fs(task_thread_info(next_p)->addr_limit);
26720+#endif
26721+
26722 /*
26723 * Load the per-thread Thread-Local Storage descriptor.
26724 */
26725@@ -310,9 +315,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26726 */
26727 arch_end_context_switch(next_p);
26728
26729- this_cpu_write(kernel_stack,
26730- (unsigned long)task_stack_page(next_p) +
26731- THREAD_SIZE - KERNEL_STACK_OFFSET);
26732+ this_cpu_write(current_task, next_p);
26733+ this_cpu_write(current_tinfo, &next_p->tinfo);
26734+ this_cpu_write(kernel_stack, next->sp0);
26735
26736 /*
26737 * Restore %gs if needed (which is common)
26738@@ -322,8 +327,6 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26739
26740 switch_fpu_finish(next_p, fpu);
26741
26742- this_cpu_write(current_task, next_p);
26743-
26744 return prev_p;
26745 }
26746
26747@@ -353,4 +356,3 @@ unsigned long get_wchan(struct task_struct *p)
26748 } while (count++ < 16);
26749 return 0;
26750 }
26751-
26752diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
26753index 67fcc43..0d2c630 100644
26754--- a/arch/x86/kernel/process_64.c
26755+++ b/arch/x86/kernel/process_64.c
26756@@ -158,10 +158,11 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
26757 struct pt_regs *childregs;
26758 struct task_struct *me = current;
26759
26760- p->thread.sp0 = (unsigned long)task_stack_page(p) + THREAD_SIZE;
26761+ p->thread.sp0 = (unsigned long)task_stack_page(p) + THREAD_SIZE - 16;
26762 childregs = task_pt_regs(p);
26763 p->thread.sp = (unsigned long) childregs;
26764 p->thread.usersp = me->thread.usersp;
26765+ p->tinfo.lowest_stack = (unsigned long)task_stack_page(p) + 2 * sizeof(unsigned long);
26766 set_tsk_thread_flag(p, TIF_FORK);
26767 p->thread.io_bitmap_ptr = NULL;
26768
26769@@ -171,6 +172,8 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
26770 p->thread.fs = p->thread.fsindex ? 0 : me->thread.fs;
26771 savesegment(es, p->thread.es);
26772 savesegment(ds, p->thread.ds);
26773+ savesegment(ss, p->thread.ss);
26774+ BUG_ON(p->thread.ss == __UDEREF_KERNEL_DS);
26775 memset(p->thread.ptrace_bps, 0, sizeof(p->thread.ptrace_bps));
26776
26777 if (unlikely(p->flags & PF_KTHREAD)) {
26778@@ -277,7 +280,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26779 struct thread_struct *prev = &prev_p->thread;
26780 struct thread_struct *next = &next_p->thread;
26781 int cpu = smp_processor_id();
26782- struct tss_struct *tss = &per_cpu(init_tss, cpu);
26783+ struct tss_struct *tss = init_tss + cpu;
26784 unsigned fsindex, gsindex;
26785 fpu_switch_t fpu;
26786
26787@@ -331,6 +334,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26788 if (unlikely(next->ds | prev->ds))
26789 loadsegment(ds, next->ds);
26790
26791+ savesegment(ss, prev->ss);
26792+ if (unlikely(next->ss != prev->ss))
26793+ loadsegment(ss, next->ss);
26794+
26795 /*
26796 * Switch FS and GS.
26797 *
26798@@ -404,6 +411,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26799 prev->usersp = this_cpu_read(old_rsp);
26800 this_cpu_write(old_rsp, next->usersp);
26801 this_cpu_write(current_task, next_p);
26802+ this_cpu_write(current_tinfo, &next_p->tinfo);
26803
26804 /*
26805 * If it were not for PREEMPT_ACTIVE we could guarantee that the
26806@@ -413,9 +421,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26807 task_thread_info(prev_p)->saved_preempt_count = this_cpu_read(__preempt_count);
26808 this_cpu_write(__preempt_count, task_thread_info(next_p)->saved_preempt_count);
26809
26810- this_cpu_write(kernel_stack,
26811- (unsigned long)task_stack_page(next_p) +
26812- THREAD_SIZE - KERNEL_STACK_OFFSET);
26813+ this_cpu_write(kernel_stack, next->sp0);
26814
26815 /*
26816 * Now maybe reload the debug registers and handle I/O bitmaps
26817@@ -485,12 +491,11 @@ unsigned long get_wchan(struct task_struct *p)
26818 if (!p || p == current || p->state == TASK_RUNNING)
26819 return 0;
26820 stack = (unsigned long)task_stack_page(p);
26821- if (p->thread.sp < stack || p->thread.sp >= stack+THREAD_SIZE)
26822+ if (p->thread.sp < stack || p->thread.sp > stack+THREAD_SIZE-16-sizeof(u64))
26823 return 0;
26824 fp = *(u64 *)(p->thread.sp);
26825 do {
26826- if (fp < (unsigned long)stack ||
26827- fp >= (unsigned long)stack+THREAD_SIZE)
26828+ if (fp < stack || fp > stack+THREAD_SIZE-16-sizeof(u64))
26829 return 0;
26830 ip = *(u64 *)(fp+8);
26831 if (!in_sched_functions(ip))
26832diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
26833index e510618..5165ac0 100644
26834--- a/arch/x86/kernel/ptrace.c
26835+++ b/arch/x86/kernel/ptrace.c
26836@@ -186,10 +186,10 @@ unsigned long kernel_stack_pointer(struct pt_regs *regs)
26837 unsigned long sp = (unsigned long)&regs->sp;
26838 u32 *prev_esp;
26839
26840- if (context == (sp & ~(THREAD_SIZE - 1)))
26841+ if (context == ((sp + 8) & ~(THREAD_SIZE - 1)))
26842 return sp;
26843
26844- prev_esp = (u32 *)(context);
26845+ prev_esp = *(u32 **)(context);
26846 if (prev_esp)
26847 return (unsigned long)prev_esp;
26848
26849@@ -452,6 +452,20 @@ static int putreg(struct task_struct *child,
26850 if (child->thread.gs != value)
26851 return do_arch_prctl(child, ARCH_SET_GS, value);
26852 return 0;
26853+
26854+ case offsetof(struct user_regs_struct,ip):
26855+ /*
26856+ * Protect against any attempt to set ip to an
26857+ * impossible address. There are dragons lurking if the
26858+ * address is noncanonical. (This explicitly allows
26859+ * setting ip to TASK_SIZE_MAX, because user code can do
26860+ * that all by itself by running off the end of its
26861+ * address space.
26862+ */
26863+ if (value > TASK_SIZE_MAX)
26864+ return -EIO;
26865+ break;
26866+
26867 #endif
26868 }
26869
26870@@ -588,7 +602,7 @@ static void ptrace_triggered(struct perf_event *bp,
26871 static unsigned long ptrace_get_dr7(struct perf_event *bp[])
26872 {
26873 int i;
26874- int dr7 = 0;
26875+ unsigned long dr7 = 0;
26876 struct arch_hw_breakpoint *info;
26877
26878 for (i = 0; i < HBP_NUM; i++) {
26879@@ -822,7 +836,7 @@ long arch_ptrace(struct task_struct *child, long request,
26880 unsigned long addr, unsigned long data)
26881 {
26882 int ret;
26883- unsigned long __user *datap = (unsigned long __user *)data;
26884+ unsigned long __user *datap = (__force unsigned long __user *)data;
26885
26886 switch (request) {
26887 /* read the word at location addr in the USER area. */
26888@@ -907,14 +921,14 @@ long arch_ptrace(struct task_struct *child, long request,
26889 if ((int) addr < 0)
26890 return -EIO;
26891 ret = do_get_thread_area(child, addr,
26892- (struct user_desc __user *)data);
26893+ (__force struct user_desc __user *) data);
26894 break;
26895
26896 case PTRACE_SET_THREAD_AREA:
26897 if ((int) addr < 0)
26898 return -EIO;
26899 ret = do_set_thread_area(child, addr,
26900- (struct user_desc __user *)data, 0);
26901+ (__force struct user_desc __user *) data, 0);
26902 break;
26903 #endif
26904
26905@@ -1292,7 +1306,7 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
26906
26907 #ifdef CONFIG_X86_64
26908
26909-static struct user_regset x86_64_regsets[] __read_mostly = {
26910+static user_regset_no_const x86_64_regsets[] __read_only = {
26911 [REGSET_GENERAL] = {
26912 .core_note_type = NT_PRSTATUS,
26913 .n = sizeof(struct user_regs_struct) / sizeof(long),
26914@@ -1333,7 +1347,7 @@ static const struct user_regset_view user_x86_64_view = {
26915 #endif /* CONFIG_X86_64 */
26916
26917 #if defined CONFIG_X86_32 || defined CONFIG_IA32_EMULATION
26918-static struct user_regset x86_32_regsets[] __read_mostly = {
26919+static user_regset_no_const x86_32_regsets[] __read_only = {
26920 [REGSET_GENERAL] = {
26921 .core_note_type = NT_PRSTATUS,
26922 .n = sizeof(struct user_regs_struct32) / sizeof(u32),
26923@@ -1386,7 +1400,7 @@ static const struct user_regset_view user_x86_32_view = {
26924 */
26925 u64 xstate_fx_sw_bytes[USER_XSTATE_FX_SW_WORDS];
26926
26927-void update_regset_xstate_info(unsigned int size, u64 xstate_mask)
26928+void __init update_regset_xstate_info(unsigned int size, u64 xstate_mask)
26929 {
26930 #ifdef CONFIG_X86_64
26931 x86_64_regsets[REGSET_XSTATE].n = size / sizeof(u64);
26932@@ -1421,7 +1435,7 @@ static void fill_sigtrap_info(struct task_struct *tsk,
26933 memset(info, 0, sizeof(*info));
26934 info->si_signo = SIGTRAP;
26935 info->si_code = si_code;
26936- info->si_addr = user_mode_vm(regs) ? (void __user *)regs->ip : NULL;
26937+ info->si_addr = user_mode(regs) ? (__force void __user *)regs->ip : NULL;
26938 }
26939
26940 void user_single_step_siginfo(struct task_struct *tsk,
26941@@ -1455,6 +1469,10 @@ static void do_audit_syscall_entry(struct pt_regs *regs, u32 arch)
26942 }
26943 }
26944
26945+#ifdef CONFIG_GRKERNSEC_SETXID
26946+extern void gr_delayed_cred_worker(void);
26947+#endif
26948+
26949 /*
26950 * We can return 0 to resume the syscall or anything else to go to phase
26951 * 2. If we resume the syscall, we need to put something appropriate in
26952@@ -1562,6 +1580,11 @@ long syscall_trace_enter_phase2(struct pt_regs *regs, u32 arch,
26953
26954 BUG_ON(regs != task_pt_regs(current));
26955
26956+#ifdef CONFIG_GRKERNSEC_SETXID
26957+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
26958+ gr_delayed_cred_worker();
26959+#endif
26960+
26961 /*
26962 * If we stepped into a sysenter/syscall insn, it trapped in
26963 * kernel mode; do_debug() cleared TF and set TIF_SINGLESTEP.
26964@@ -1620,6 +1643,11 @@ void syscall_trace_leave(struct pt_regs *regs)
26965 */
26966 user_exit();
26967
26968+#ifdef CONFIG_GRKERNSEC_SETXID
26969+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
26970+ gr_delayed_cred_worker();
26971+#endif
26972+
26973 audit_syscall_exit(regs);
26974
26975 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
26976diff --git a/arch/x86/kernel/pvclock.c b/arch/x86/kernel/pvclock.c
26977index e5ecd20..60f7eef 100644
26978--- a/arch/x86/kernel/pvclock.c
26979+++ b/arch/x86/kernel/pvclock.c
26980@@ -51,11 +51,11 @@ void pvclock_touch_watchdogs(void)
26981 reset_hung_task_detector();
26982 }
26983
26984-static atomic64_t last_value = ATOMIC64_INIT(0);
26985+static atomic64_unchecked_t last_value = ATOMIC64_INIT(0);
26986
26987 void pvclock_resume(void)
26988 {
26989- atomic64_set(&last_value, 0);
26990+ atomic64_set_unchecked(&last_value, 0);
26991 }
26992
26993 u8 pvclock_read_flags(struct pvclock_vcpu_time_info *src)
26994@@ -105,11 +105,11 @@ cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src)
26995 * updating at the same time, and one of them could be slightly behind,
26996 * making the assumption that last_value always go forward fail to hold.
26997 */
26998- last = atomic64_read(&last_value);
26999+ last = atomic64_read_unchecked(&last_value);
27000 do {
27001 if (ret < last)
27002 return last;
27003- last = atomic64_cmpxchg(&last_value, last, ret);
27004+ last = atomic64_cmpxchg_unchecked(&last_value, last, ret);
27005 } while (unlikely(last != ret));
27006
27007 return ret;
27008diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
27009index 86db4bc..a50a54a 100644
27010--- a/arch/x86/kernel/reboot.c
27011+++ b/arch/x86/kernel/reboot.c
27012@@ -70,6 +70,11 @@ static int __init set_bios_reboot(const struct dmi_system_id *d)
27013
27014 void __noreturn machine_real_restart(unsigned int type)
27015 {
27016+
27017+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF))
27018+ struct desc_struct *gdt;
27019+#endif
27020+
27021 local_irq_disable();
27022
27023 /*
27024@@ -97,7 +102,29 @@ void __noreturn machine_real_restart(unsigned int type)
27025
27026 /* Jump to the identity-mapped low memory code */
27027 #ifdef CONFIG_X86_32
27028- asm volatile("jmpl *%0" : :
27029+
27030+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
27031+ gdt = get_cpu_gdt_table(smp_processor_id());
27032+ pax_open_kernel();
27033+#ifdef CONFIG_PAX_MEMORY_UDEREF
27034+ gdt[GDT_ENTRY_KERNEL_DS].type = 3;
27035+ gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
27036+ loadsegment(ds, __KERNEL_DS);
27037+ loadsegment(es, __KERNEL_DS);
27038+ loadsegment(ss, __KERNEL_DS);
27039+#endif
27040+#ifdef CONFIG_PAX_KERNEXEC
27041+ gdt[GDT_ENTRY_KERNEL_CS].base0 = 0;
27042+ gdt[GDT_ENTRY_KERNEL_CS].base1 = 0;
27043+ gdt[GDT_ENTRY_KERNEL_CS].base2 = 0;
27044+ gdt[GDT_ENTRY_KERNEL_CS].limit0 = 0xffff;
27045+ gdt[GDT_ENTRY_KERNEL_CS].limit = 0xf;
27046+ gdt[GDT_ENTRY_KERNEL_CS].g = 1;
27047+#endif
27048+ pax_close_kernel();
27049+#endif
27050+
27051+ asm volatile("ljmpl *%0" : :
27052 "rm" (real_mode_header->machine_real_restart_asm),
27053 "a" (type));
27054 #else
27055@@ -137,7 +164,7 @@ static int __init set_kbd_reboot(const struct dmi_system_id *d)
27056 /*
27057 * This is a single dmi_table handling all reboot quirks.
27058 */
27059-static struct dmi_system_id __initdata reboot_dmi_table[] = {
27060+static const struct dmi_system_id __initconst reboot_dmi_table[] = {
27061
27062 /* Acer */
27063 { /* Handle reboot issue on Acer Aspire one */
27064@@ -511,7 +538,7 @@ void __attribute__((weak)) mach_reboot_fixups(void)
27065 * This means that this function can never return, it can misbehave
27066 * by not rebooting properly and hanging.
27067 */
27068-static void native_machine_emergency_restart(void)
27069+static void __noreturn native_machine_emergency_restart(void)
27070 {
27071 int i;
27072 int attempt = 0;
27073@@ -631,13 +658,13 @@ void native_machine_shutdown(void)
27074 #endif
27075 }
27076
27077-static void __machine_emergency_restart(int emergency)
27078+static void __noreturn __machine_emergency_restart(int emergency)
27079 {
27080 reboot_emergency = emergency;
27081 machine_ops.emergency_restart();
27082 }
27083
27084-static void native_machine_restart(char *__unused)
27085+static void __noreturn native_machine_restart(char *__unused)
27086 {
27087 pr_notice("machine restart\n");
27088
27089@@ -646,7 +673,7 @@ static void native_machine_restart(char *__unused)
27090 __machine_emergency_restart(0);
27091 }
27092
27093-static void native_machine_halt(void)
27094+static void __noreturn native_machine_halt(void)
27095 {
27096 /* Stop other cpus and apics */
27097 machine_shutdown();
27098@@ -656,7 +683,7 @@ static void native_machine_halt(void)
27099 stop_this_cpu(NULL);
27100 }
27101
27102-static void native_machine_power_off(void)
27103+static void __noreturn native_machine_power_off(void)
27104 {
27105 if (pm_power_off) {
27106 if (!reboot_force)
27107@@ -665,9 +692,10 @@ static void native_machine_power_off(void)
27108 }
27109 /* A fallback in case there is no PM info available */
27110 tboot_shutdown(TB_SHUTDOWN_HALT);
27111+ unreachable();
27112 }
27113
27114-struct machine_ops machine_ops = {
27115+struct machine_ops machine_ops __read_only = {
27116 .power_off = native_machine_power_off,
27117 .shutdown = native_machine_shutdown,
27118 .emergency_restart = native_machine_emergency_restart,
27119diff --git a/arch/x86/kernel/reboot_fixups_32.c b/arch/x86/kernel/reboot_fixups_32.c
27120index c8e41e9..64049ef 100644
27121--- a/arch/x86/kernel/reboot_fixups_32.c
27122+++ b/arch/x86/kernel/reboot_fixups_32.c
27123@@ -57,7 +57,7 @@ struct device_fixup {
27124 unsigned int vendor;
27125 unsigned int device;
27126 void (*reboot_fixup)(struct pci_dev *);
27127-};
27128+} __do_const;
27129
27130 /*
27131 * PCI ids solely used for fixups_table go here
27132diff --git a/arch/x86/kernel/relocate_kernel_64.S b/arch/x86/kernel/relocate_kernel_64.S
27133index 3fd2c69..a444264 100644
27134--- a/arch/x86/kernel/relocate_kernel_64.S
27135+++ b/arch/x86/kernel/relocate_kernel_64.S
27136@@ -96,8 +96,7 @@ relocate_kernel:
27137
27138 /* jump to identity mapped page */
27139 addq $(identity_mapped - relocate_kernel), %r8
27140- pushq %r8
27141- ret
27142+ jmp *%r8
27143
27144 identity_mapped:
27145 /* set return address to 0 if not preserving context */
27146diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
27147index 0a2421c..11f3f36 100644
27148--- a/arch/x86/kernel/setup.c
27149+++ b/arch/x86/kernel/setup.c
27150@@ -111,6 +111,7 @@
27151 #include <asm/mce.h>
27152 #include <asm/alternative.h>
27153 #include <asm/prom.h>
27154+#include <asm/boot.h>
27155
27156 /*
27157 * max_low_pfn_mapped: highest direct mapped pfn under 4GB
27158@@ -206,10 +207,12 @@ EXPORT_SYMBOL(boot_cpu_data);
27159 #endif
27160
27161
27162-#if !defined(CONFIG_X86_PAE) || defined(CONFIG_X86_64)
27163-__visible unsigned long mmu_cr4_features;
27164+#ifdef CONFIG_X86_64
27165+__visible unsigned long mmu_cr4_features __read_only = X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE;
27166+#elif defined(CONFIG_X86_PAE)
27167+__visible unsigned long mmu_cr4_features __read_only = X86_CR4_PAE;
27168 #else
27169-__visible unsigned long mmu_cr4_features = X86_CR4_PAE;
27170+__visible unsigned long mmu_cr4_features __read_only;
27171 #endif
27172
27173 /* Boot loader ID and version as integers, for the benefit of proc_dointvec */
27174@@ -771,7 +774,7 @@ static void __init trim_bios_range(void)
27175 * area (640->1Mb) as ram even though it is not.
27176 * take them out.
27177 */
27178- e820_remove_range(BIOS_BEGIN, BIOS_END - BIOS_BEGIN, E820_RAM, 1);
27179+ e820_remove_range(ISA_START_ADDRESS, ISA_END_ADDRESS - ISA_START_ADDRESS, E820_RAM, 1);
27180
27181 sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map);
27182 }
27183@@ -779,7 +782,7 @@ static void __init trim_bios_range(void)
27184 /* called before trim_bios_range() to spare extra sanitize */
27185 static void __init e820_add_kernel_range(void)
27186 {
27187- u64 start = __pa_symbol(_text);
27188+ u64 start = __pa_symbol(ktla_ktva(_text));
27189 u64 size = __pa_symbol(_end) - start;
27190
27191 /*
27192@@ -855,8 +858,12 @@ dump_kernel_offset(struct notifier_block *self, unsigned long v, void *p)
27193
27194 void __init setup_arch(char **cmdline_p)
27195 {
27196+#ifdef CONFIG_X86_32
27197+ memblock_reserve(LOAD_PHYSICAL_ADDR, __pa_symbol(__bss_stop) - LOAD_PHYSICAL_ADDR);
27198+#else
27199 memblock_reserve(__pa_symbol(_text),
27200 (unsigned long)__bss_stop - (unsigned long)_text);
27201+#endif
27202
27203 early_reserve_initrd();
27204
27205@@ -954,16 +961,16 @@ void __init setup_arch(char **cmdline_p)
27206
27207 if (!boot_params.hdr.root_flags)
27208 root_mountflags &= ~MS_RDONLY;
27209- init_mm.start_code = (unsigned long) _text;
27210- init_mm.end_code = (unsigned long) _etext;
27211+ init_mm.start_code = ktla_ktva((unsigned long) _text);
27212+ init_mm.end_code = ktla_ktva((unsigned long) _etext);
27213 init_mm.end_data = (unsigned long) _edata;
27214 init_mm.brk = _brk_end;
27215
27216 mpx_mm_init(&init_mm);
27217
27218- code_resource.start = __pa_symbol(_text);
27219- code_resource.end = __pa_symbol(_etext)-1;
27220- data_resource.start = __pa_symbol(_etext);
27221+ code_resource.start = __pa_symbol(ktla_ktva(_text));
27222+ code_resource.end = __pa_symbol(ktla_ktva(_etext))-1;
27223+ data_resource.start = __pa_symbol(_sdata);
27224 data_resource.end = __pa_symbol(_edata)-1;
27225 bss_resource.start = __pa_symbol(__bss_start);
27226 bss_resource.end = __pa_symbol(__bss_stop)-1;
27227diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c
27228index e4fcb87..9c06c55 100644
27229--- a/arch/x86/kernel/setup_percpu.c
27230+++ b/arch/x86/kernel/setup_percpu.c
27231@@ -21,19 +21,17 @@
27232 #include <asm/cpu.h>
27233 #include <asm/stackprotector.h>
27234
27235-DEFINE_PER_CPU_READ_MOSTLY(int, cpu_number);
27236+#ifdef CONFIG_SMP
27237+DEFINE_PER_CPU_READ_MOSTLY(unsigned int, cpu_number);
27238 EXPORT_PER_CPU_SYMBOL(cpu_number);
27239+#endif
27240
27241-#ifdef CONFIG_X86_64
27242 #define BOOT_PERCPU_OFFSET ((unsigned long)__per_cpu_load)
27243-#else
27244-#define BOOT_PERCPU_OFFSET 0
27245-#endif
27246
27247 DEFINE_PER_CPU_READ_MOSTLY(unsigned long, this_cpu_off) = BOOT_PERCPU_OFFSET;
27248 EXPORT_PER_CPU_SYMBOL(this_cpu_off);
27249
27250-unsigned long __per_cpu_offset[NR_CPUS] __read_mostly = {
27251+unsigned long __per_cpu_offset[NR_CPUS] __read_only = {
27252 [0 ... NR_CPUS-1] = BOOT_PERCPU_OFFSET,
27253 };
27254 EXPORT_SYMBOL(__per_cpu_offset);
27255@@ -66,7 +64,7 @@ static bool __init pcpu_need_numa(void)
27256 {
27257 #ifdef CONFIG_NEED_MULTIPLE_NODES
27258 pg_data_t *last = NULL;
27259- unsigned int cpu;
27260+ int cpu;
27261
27262 for_each_possible_cpu(cpu) {
27263 int node = early_cpu_to_node(cpu);
27264@@ -155,10 +153,10 @@ static inline void setup_percpu_segment(int cpu)
27265 {
27266 #ifdef CONFIG_X86_32
27267 struct desc_struct gdt;
27268+ unsigned long base = per_cpu_offset(cpu);
27269
27270- pack_descriptor(&gdt, per_cpu_offset(cpu), 0xFFFFF,
27271- 0x2 | DESCTYPE_S, 0x8);
27272- gdt.s = 1;
27273+ pack_descriptor(&gdt, base, (VMALLOC_END - base - 1) >> PAGE_SHIFT,
27274+ 0x83 | DESCTYPE_S, 0xC);
27275 write_gdt_entry(get_cpu_gdt_table(cpu),
27276 GDT_ENTRY_PERCPU, &gdt, DESCTYPE_S);
27277 #endif
27278@@ -219,6 +217,11 @@ void __init setup_per_cpu_areas(void)
27279 /* alrighty, percpu areas up and running */
27280 delta = (unsigned long)pcpu_base_addr - (unsigned long)__per_cpu_start;
27281 for_each_possible_cpu(cpu) {
27282+#ifdef CONFIG_CC_STACKPROTECTOR
27283+#ifdef CONFIG_X86_32
27284+ unsigned long canary = per_cpu(stack_canary.canary, cpu);
27285+#endif
27286+#endif
27287 per_cpu_offset(cpu) = delta + pcpu_unit_offsets[cpu];
27288 per_cpu(this_cpu_off, cpu) = per_cpu_offset(cpu);
27289 per_cpu(cpu_number, cpu) = cpu;
27290@@ -259,6 +262,12 @@ void __init setup_per_cpu_areas(void)
27291 */
27292 set_cpu_numa_node(cpu, early_cpu_to_node(cpu));
27293 #endif
27294+#ifdef CONFIG_CC_STACKPROTECTOR
27295+#ifdef CONFIG_X86_32
27296+ if (!cpu)
27297+ per_cpu(stack_canary.canary, cpu) = canary;
27298+#endif
27299+#endif
27300 /*
27301 * Up to this point, the boot CPU has been using .init.data
27302 * area. Reload any changed state for the boot CPU.
27303diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c
27304index e504246..ba10432 100644
27305--- a/arch/x86/kernel/signal.c
27306+++ b/arch/x86/kernel/signal.c
27307@@ -190,7 +190,7 @@ static unsigned long align_sigframe(unsigned long sp)
27308 * Align the stack pointer according to the i386 ABI,
27309 * i.e. so that on function entry ((sp + 4) & 15) == 0.
27310 */
27311- sp = ((sp + 4) & -16ul) - 4;
27312+ sp = ((sp - 12) & -16ul) - 4;
27313 #else /* !CONFIG_X86_32 */
27314 sp = round_down(sp, 16) - 8;
27315 #endif
27316@@ -298,10 +298,9 @@ __setup_frame(int sig, struct ksignal *ksig, sigset_t *set,
27317 }
27318
27319 if (current->mm->context.vdso)
27320- restorer = current->mm->context.vdso +
27321- selected_vdso32->sym___kernel_sigreturn;
27322+ restorer = (void __force_user *)(current->mm->context.vdso + selected_vdso32->sym___kernel_sigreturn);
27323 else
27324- restorer = &frame->retcode;
27325+ restorer = (void __user *)&frame->retcode;
27326 if (ksig->ka.sa.sa_flags & SA_RESTORER)
27327 restorer = ksig->ka.sa.sa_restorer;
27328
27329@@ -315,7 +314,7 @@ __setup_frame(int sig, struct ksignal *ksig, sigset_t *set,
27330 * reasons and because gdb uses it as a signature to notice
27331 * signal handler stack frames.
27332 */
27333- err |= __put_user(*((u64 *)&retcode), (u64 *)frame->retcode);
27334+ err |= __put_user(*((u64 *)&retcode), (u64 __user *)frame->retcode);
27335
27336 if (err)
27337 return -EFAULT;
27338@@ -362,8 +361,10 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,
27339 save_altstack_ex(&frame->uc.uc_stack, regs->sp);
27340
27341 /* Set up to return from userspace. */
27342- restorer = current->mm->context.vdso +
27343- selected_vdso32->sym___kernel_rt_sigreturn;
27344+ if (current->mm->context.vdso)
27345+ restorer = (void __force_user *)(current->mm->context.vdso + selected_vdso32->sym___kernel_rt_sigreturn);
27346+ else
27347+ restorer = (void __user *)&frame->retcode;
27348 if (ksig->ka.sa.sa_flags & SA_RESTORER)
27349 restorer = ksig->ka.sa.sa_restorer;
27350 put_user_ex(restorer, &frame->pretcode);
27351@@ -375,7 +376,7 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,
27352 * reasons and because gdb uses it as a signature to notice
27353 * signal handler stack frames.
27354 */
27355- put_user_ex(*((u64 *)&rt_retcode), (u64 *)frame->retcode);
27356+ put_user_ex(*((u64 *)&rt_retcode), (u64 __user *)frame->retcode);
27357 } put_user_catch(err);
27358
27359 err |= copy_siginfo_to_user(&frame->info, &ksig->info);
27360@@ -611,7 +612,12 @@ setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)
27361 {
27362 int usig = signr_convert(ksig->sig);
27363 sigset_t *set = sigmask_to_save();
27364- compat_sigset_t *cset = (compat_sigset_t *) set;
27365+ sigset_t sigcopy;
27366+ compat_sigset_t *cset;
27367+
27368+ sigcopy = *set;
27369+
27370+ cset = (compat_sigset_t *) &sigcopy;
27371
27372 /* Set up the stack frame */
27373 if (is_ia32_frame()) {
27374@@ -622,7 +628,7 @@ setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)
27375 } else if (is_x32_frame()) {
27376 return x32_setup_rt_frame(ksig, cset, regs);
27377 } else {
27378- return __setup_rt_frame(ksig->sig, ksig, set, regs);
27379+ return __setup_rt_frame(ksig->sig, ksig, &sigcopy, regs);
27380 }
27381 }
27382
27383diff --git a/arch/x86/kernel/smp.c b/arch/x86/kernel/smp.c
27384index be8e1bd..a3d93fa 100644
27385--- a/arch/x86/kernel/smp.c
27386+++ b/arch/x86/kernel/smp.c
27387@@ -341,7 +341,7 @@ static int __init nonmi_ipi_setup(char *str)
27388
27389 __setup("nonmi_ipi", nonmi_ipi_setup);
27390
27391-struct smp_ops smp_ops = {
27392+struct smp_ops smp_ops __read_only = {
27393 .smp_prepare_boot_cpu = native_smp_prepare_boot_cpu,
27394 .smp_prepare_cpus = native_smp_prepare_cpus,
27395 .smp_cpus_done = native_smp_cpus_done,
27396diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
27397index febc6aa..37d8edf 100644
27398--- a/arch/x86/kernel/smpboot.c
27399+++ b/arch/x86/kernel/smpboot.c
27400@@ -229,14 +229,17 @@ static void notrace start_secondary(void *unused)
27401
27402 enable_start_cpu0 = 0;
27403
27404-#ifdef CONFIG_X86_32
27405+ /* otherwise gcc will move up smp_processor_id before the cpu_init */
27406+ barrier();
27407+
27408 /* switch away from the initial page table */
27409+#ifdef CONFIG_PAX_PER_CPU_PGD
27410+ load_cr3(get_cpu_pgd(smp_processor_id(), kernel));
27411+#else
27412 load_cr3(swapper_pg_dir);
27413+#endif
27414 __flush_tlb_all();
27415-#endif
27416
27417- /* otherwise gcc will move up smp_processor_id before the cpu_init */
27418- barrier();
27419 /*
27420 * Check TSC synchronization with the BP:
27421 */
27422@@ -800,8 +803,9 @@ static int do_boot_cpu(int apicid, int cpu, struct task_struct *idle)
27423 alternatives_enable_smp();
27424
27425 idle->thread.sp = (unsigned long) (((struct pt_regs *)
27426- (THREAD_SIZE + task_stack_page(idle))) - 1);
27427+ (THREAD_SIZE - 16 + task_stack_page(idle))) - 1);
27428 per_cpu(current_task, cpu) = idle;
27429+ per_cpu(current_tinfo, cpu) = &idle->tinfo;
27430
27431 #ifdef CONFIG_X86_32
27432 /* Stack for startup_32 can be just as for start_secondary onwards */
27433@@ -810,10 +814,10 @@ static int do_boot_cpu(int apicid, int cpu, struct task_struct *idle)
27434 clear_tsk_thread_flag(idle, TIF_FORK);
27435 initial_gs = per_cpu_offset(cpu);
27436 #endif
27437- per_cpu(kernel_stack, cpu) =
27438- (unsigned long)task_stack_page(idle) -
27439- KERNEL_STACK_OFFSET + THREAD_SIZE;
27440+ per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(idle) - 16 + THREAD_SIZE;
27441+ pax_open_kernel();
27442 early_gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
27443+ pax_close_kernel();
27444 initial_code = (unsigned long)start_secondary;
27445 stack_start = idle->thread.sp;
27446
27447@@ -953,6 +957,15 @@ int native_cpu_up(unsigned int cpu, struct task_struct *tidle)
27448 /* the FPU context is blank, nobody can own it */
27449 __cpu_disable_lazy_restore(cpu);
27450
27451+#ifdef CONFIG_PAX_PER_CPU_PGD
27452+ clone_pgd_range(get_cpu_pgd(cpu, kernel) + KERNEL_PGD_BOUNDARY,
27453+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
27454+ KERNEL_PGD_PTRS);
27455+ clone_pgd_range(get_cpu_pgd(cpu, user) + KERNEL_PGD_BOUNDARY,
27456+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
27457+ KERNEL_PGD_PTRS);
27458+#endif
27459+
27460 err = do_boot_cpu(apicid, cpu, tidle);
27461 if (err) {
27462 pr_err("do_boot_cpu failed(%d) to wakeup CPU#%u\n", err, cpu);
27463diff --git a/arch/x86/kernel/step.c b/arch/x86/kernel/step.c
27464index 9b4d51d..5d28b58 100644
27465--- a/arch/x86/kernel/step.c
27466+++ b/arch/x86/kernel/step.c
27467@@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
27468 struct desc_struct *desc;
27469 unsigned long base;
27470
27471- seg &= ~7UL;
27472+ seg >>= 3;
27473
27474 mutex_lock(&child->mm->context.lock);
27475- if (unlikely((seg >> 3) >= child->mm->context.size))
27476+ if (unlikely(seg >= child->mm->context.size))
27477 addr = -1L; /* bogus selector, access would fault */
27478 else {
27479 desc = child->mm->context.ldt + seg;
27480@@ -42,7 +42,8 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
27481 addr += base;
27482 }
27483 mutex_unlock(&child->mm->context.lock);
27484- }
27485+ } else if (seg == __KERNEL_CS || seg == __KERNEXEC_KERNEL_CS)
27486+ addr = ktla_ktva(addr);
27487
27488 return addr;
27489 }
27490@@ -53,6 +54,9 @@ static int is_setting_trap_flag(struct task_struct *child, struct pt_regs *regs)
27491 unsigned char opcode[15];
27492 unsigned long addr = convert_ip_to_linear(child, regs);
27493
27494+ if (addr == -EINVAL)
27495+ return 0;
27496+
27497 copied = access_process_vm(child, addr, opcode, sizeof(opcode), 0);
27498 for (i = 0; i < copied; i++) {
27499 switch (opcode[i]) {
27500diff --git a/arch/x86/kernel/sys_i386_32.c b/arch/x86/kernel/sys_i386_32.c
27501new file mode 100644
27502index 0000000..5877189
27503--- /dev/null
27504+++ b/arch/x86/kernel/sys_i386_32.c
27505@@ -0,0 +1,189 @@
27506+/*
27507+ * This file contains various random system calls that
27508+ * have a non-standard calling sequence on the Linux/i386
27509+ * platform.
27510+ */
27511+
27512+#include <linux/errno.h>
27513+#include <linux/sched.h>
27514+#include <linux/mm.h>
27515+#include <linux/fs.h>
27516+#include <linux/smp.h>
27517+#include <linux/sem.h>
27518+#include <linux/msg.h>
27519+#include <linux/shm.h>
27520+#include <linux/stat.h>
27521+#include <linux/syscalls.h>
27522+#include <linux/mman.h>
27523+#include <linux/file.h>
27524+#include <linux/utsname.h>
27525+#include <linux/ipc.h>
27526+#include <linux/elf.h>
27527+
27528+#include <linux/uaccess.h>
27529+#include <linux/unistd.h>
27530+
27531+#include <asm/syscalls.h>
27532+
27533+int i386_mmap_check(unsigned long addr, unsigned long len, unsigned long flags)
27534+{
27535+ unsigned long pax_task_size = TASK_SIZE;
27536+
27537+#ifdef CONFIG_PAX_SEGMEXEC
27538+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
27539+ pax_task_size = SEGMEXEC_TASK_SIZE;
27540+#endif
27541+
27542+ if (flags & MAP_FIXED)
27543+ if (len > pax_task_size || addr > pax_task_size - len)
27544+ return -EINVAL;
27545+
27546+ return 0;
27547+}
27548+
27549+/*
27550+ * Align a virtual address to avoid aliasing in the I$ on AMD F15h.
27551+ */
27552+static unsigned long get_align_mask(void)
27553+{
27554+ if (va_align.flags < 0 || !(va_align.flags & ALIGN_VA_32))
27555+ return 0;
27556+
27557+ if (!(current->flags & PF_RANDOMIZE))
27558+ return 0;
27559+
27560+ return va_align.mask;
27561+}
27562+
27563+unsigned long
27564+arch_get_unmapped_area(struct file *filp, unsigned long addr,
27565+ unsigned long len, unsigned long pgoff, unsigned long flags)
27566+{
27567+ struct mm_struct *mm = current->mm;
27568+ struct vm_area_struct *vma;
27569+ unsigned long pax_task_size = TASK_SIZE;
27570+ struct vm_unmapped_area_info info;
27571+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27572+
27573+#ifdef CONFIG_PAX_SEGMEXEC
27574+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
27575+ pax_task_size = SEGMEXEC_TASK_SIZE;
27576+#endif
27577+
27578+ pax_task_size -= PAGE_SIZE;
27579+
27580+ if (len > pax_task_size)
27581+ return -ENOMEM;
27582+
27583+ if (flags & MAP_FIXED)
27584+ return addr;
27585+
27586+#ifdef CONFIG_PAX_RANDMMAP
27587+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27588+#endif
27589+
27590+ if (addr) {
27591+ addr = PAGE_ALIGN(addr);
27592+ if (pax_task_size - len >= addr) {
27593+ vma = find_vma(mm, addr);
27594+ if (check_heap_stack_gap(vma, addr, len, offset))
27595+ return addr;
27596+ }
27597+ }
27598+
27599+ info.flags = 0;
27600+ info.length = len;
27601+ info.align_mask = filp ? get_align_mask() : 0;
27602+ info.align_offset = pgoff << PAGE_SHIFT;
27603+ info.threadstack_offset = offset;
27604+
27605+#ifdef CONFIG_PAX_PAGEEXEC
27606+ if (!(__supported_pte_mask & _PAGE_NX) && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE)) {
27607+ info.low_limit = 0x00110000UL;
27608+ info.high_limit = mm->start_code;
27609+
27610+#ifdef CONFIG_PAX_RANDMMAP
27611+ if (mm->pax_flags & MF_PAX_RANDMMAP)
27612+ info.low_limit += mm->delta_mmap & 0x03FFF000UL;
27613+#endif
27614+
27615+ if (info.low_limit < info.high_limit) {
27616+ addr = vm_unmapped_area(&info);
27617+ if (!IS_ERR_VALUE(addr))
27618+ return addr;
27619+ }
27620+ } else
27621+#endif
27622+
27623+ info.low_limit = mm->mmap_base;
27624+ info.high_limit = pax_task_size;
27625+
27626+ return vm_unmapped_area(&info);
27627+}
27628+
27629+unsigned long
27630+arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27631+ const unsigned long len, const unsigned long pgoff,
27632+ const unsigned long flags)
27633+{
27634+ struct vm_area_struct *vma;
27635+ struct mm_struct *mm = current->mm;
27636+ unsigned long addr = addr0, pax_task_size = TASK_SIZE;
27637+ struct vm_unmapped_area_info info;
27638+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27639+
27640+#ifdef CONFIG_PAX_SEGMEXEC
27641+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
27642+ pax_task_size = SEGMEXEC_TASK_SIZE;
27643+#endif
27644+
27645+ pax_task_size -= PAGE_SIZE;
27646+
27647+ /* requested length too big for entire address space */
27648+ if (len > pax_task_size)
27649+ return -ENOMEM;
27650+
27651+ if (flags & MAP_FIXED)
27652+ return addr;
27653+
27654+#ifdef CONFIG_PAX_PAGEEXEC
27655+ if (!(__supported_pte_mask & _PAGE_NX) && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE))
27656+ goto bottomup;
27657+#endif
27658+
27659+#ifdef CONFIG_PAX_RANDMMAP
27660+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27661+#endif
27662+
27663+ /* requesting a specific address */
27664+ if (addr) {
27665+ addr = PAGE_ALIGN(addr);
27666+ if (pax_task_size - len >= addr) {
27667+ vma = find_vma(mm, addr);
27668+ if (check_heap_stack_gap(vma, addr, len, offset))
27669+ return addr;
27670+ }
27671+ }
27672+
27673+ info.flags = VM_UNMAPPED_AREA_TOPDOWN;
27674+ info.length = len;
27675+ info.low_limit = PAGE_SIZE;
27676+ info.high_limit = mm->mmap_base;
27677+ info.align_mask = filp ? get_align_mask() : 0;
27678+ info.align_offset = pgoff << PAGE_SHIFT;
27679+ info.threadstack_offset = offset;
27680+
27681+ addr = vm_unmapped_area(&info);
27682+ if (!(addr & ~PAGE_MASK))
27683+ return addr;
27684+ VM_BUG_ON(addr != -ENOMEM);
27685+
27686+bottomup:
27687+ /*
27688+ * A failed mmap() very likely causes application failure,
27689+ * so fall back to the bottom-up function here. This scenario
27690+ * can happen with large stack limits and large mmap()
27691+ * allocations.
27692+ */
27693+ return arch_get_unmapped_area(filp, addr0, len, pgoff, flags);
27694+}
27695diff --git a/arch/x86/kernel/sys_x86_64.c b/arch/x86/kernel/sys_x86_64.c
27696index 30277e2..5664a29 100644
27697--- a/arch/x86/kernel/sys_x86_64.c
27698+++ b/arch/x86/kernel/sys_x86_64.c
27699@@ -81,8 +81,8 @@ out:
27700 return error;
27701 }
27702
27703-static void find_start_end(unsigned long flags, unsigned long *begin,
27704- unsigned long *end)
27705+static void find_start_end(struct mm_struct *mm, unsigned long flags,
27706+ unsigned long *begin, unsigned long *end)
27707 {
27708 if (!test_thread_flag(TIF_ADDR32) && (flags & MAP_32BIT)) {
27709 unsigned long new_begin;
27710@@ -101,7 +101,7 @@ static void find_start_end(unsigned long flags, unsigned long *begin,
27711 *begin = new_begin;
27712 }
27713 } else {
27714- *begin = current->mm->mmap_legacy_base;
27715+ *begin = mm->mmap_legacy_base;
27716 *end = TASK_SIZE;
27717 }
27718 }
27719@@ -114,20 +114,24 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
27720 struct vm_area_struct *vma;
27721 struct vm_unmapped_area_info info;
27722 unsigned long begin, end;
27723+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27724
27725 if (flags & MAP_FIXED)
27726 return addr;
27727
27728- find_start_end(flags, &begin, &end);
27729+ find_start_end(mm, flags, &begin, &end);
27730
27731 if (len > end)
27732 return -ENOMEM;
27733
27734+#ifdef CONFIG_PAX_RANDMMAP
27735+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27736+#endif
27737+
27738 if (addr) {
27739 addr = PAGE_ALIGN(addr);
27740 vma = find_vma(mm, addr);
27741- if (end - len >= addr &&
27742- (!vma || addr + len <= vma->vm_start))
27743+ if (end - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
27744 return addr;
27745 }
27746
27747@@ -137,6 +141,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
27748 info.high_limit = end;
27749 info.align_mask = filp ? get_align_mask() : 0;
27750 info.align_offset = pgoff << PAGE_SHIFT;
27751+ info.threadstack_offset = offset;
27752 return vm_unmapped_area(&info);
27753 }
27754
27755@@ -149,6 +154,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27756 struct mm_struct *mm = current->mm;
27757 unsigned long addr = addr0;
27758 struct vm_unmapped_area_info info;
27759+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27760
27761 /* requested length too big for entire address space */
27762 if (len > TASK_SIZE)
27763@@ -161,12 +167,15 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27764 if (!test_thread_flag(TIF_ADDR32) && (flags & MAP_32BIT))
27765 goto bottomup;
27766
27767+#ifdef CONFIG_PAX_RANDMMAP
27768+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27769+#endif
27770+
27771 /* requesting a specific address */
27772 if (addr) {
27773 addr = PAGE_ALIGN(addr);
27774 vma = find_vma(mm, addr);
27775- if (TASK_SIZE - len >= addr &&
27776- (!vma || addr + len <= vma->vm_start))
27777+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
27778 return addr;
27779 }
27780
27781@@ -176,6 +185,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27782 info.high_limit = mm->mmap_base;
27783 info.align_mask = filp ? get_align_mask() : 0;
27784 info.align_offset = pgoff << PAGE_SHIFT;
27785+ info.threadstack_offset = offset;
27786 addr = vm_unmapped_area(&info);
27787 if (!(addr & ~PAGE_MASK))
27788 return addr;
27789diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c
27790index 91a4496..42fc304 100644
27791--- a/arch/x86/kernel/tboot.c
27792+++ b/arch/x86/kernel/tboot.c
27793@@ -44,6 +44,7 @@
27794 #include <asm/setup.h>
27795 #include <asm/e820.h>
27796 #include <asm/io.h>
27797+#include <asm/tlbflush.h>
27798
27799 #include "../realmode/rm/wakeup.h"
27800
27801@@ -221,7 +222,7 @@ static int tboot_setup_sleep(void)
27802
27803 void tboot_shutdown(u32 shutdown_type)
27804 {
27805- void (*shutdown)(void);
27806+ void (* __noreturn shutdown)(void);
27807
27808 if (!tboot_enabled())
27809 return;
27810@@ -242,8 +243,9 @@ void tboot_shutdown(u32 shutdown_type)
27811 tboot->shutdown_type = shutdown_type;
27812
27813 switch_to_tboot_pt();
27814+ cr4_clear_bits(X86_CR4_PCIDE);
27815
27816- shutdown = (void(*)(void))(unsigned long)tboot->shutdown_entry;
27817+ shutdown = (void *)(unsigned long)tboot->shutdown_entry;
27818 shutdown();
27819
27820 /* should not reach here */
27821@@ -310,7 +312,7 @@ static int tboot_extended_sleep(u8 sleep_state, u32 val_a, u32 val_b)
27822 return -ENODEV;
27823 }
27824
27825-static atomic_t ap_wfs_count;
27826+static atomic_unchecked_t ap_wfs_count;
27827
27828 static int tboot_wait_for_aps(int num_aps)
27829 {
27830@@ -334,9 +336,9 @@ static int tboot_cpu_callback(struct notifier_block *nfb, unsigned long action,
27831 {
27832 switch (action) {
27833 case CPU_DYING:
27834- atomic_inc(&ap_wfs_count);
27835+ atomic_inc_unchecked(&ap_wfs_count);
27836 if (num_online_cpus() == 1)
27837- if (tboot_wait_for_aps(atomic_read(&ap_wfs_count)))
27838+ if (tboot_wait_for_aps(atomic_read_unchecked(&ap_wfs_count)))
27839 return NOTIFY_BAD;
27840 break;
27841 }
27842@@ -422,7 +424,7 @@ static __init int tboot_late_init(void)
27843
27844 tboot_create_trampoline();
27845
27846- atomic_set(&ap_wfs_count, 0);
27847+ atomic_set_unchecked(&ap_wfs_count, 0);
27848 register_hotcpu_notifier(&tboot_cpu_notifier);
27849
27850 #ifdef CONFIG_DEBUG_FS
27851diff --git a/arch/x86/kernel/time.c b/arch/x86/kernel/time.c
27852index 25adc0e..1df4349 100644
27853--- a/arch/x86/kernel/time.c
27854+++ b/arch/x86/kernel/time.c
27855@@ -30,9 +30,9 @@ unsigned long profile_pc(struct pt_regs *regs)
27856 {
27857 unsigned long pc = instruction_pointer(regs);
27858
27859- if (!user_mode_vm(regs) && in_lock_functions(pc)) {
27860+ if (!user_mode(regs) && in_lock_functions(pc)) {
27861 #ifdef CONFIG_FRAME_POINTER
27862- return *(unsigned long *)(regs->bp + sizeof(long));
27863+ return ktla_ktva(*(unsigned long *)(regs->bp + sizeof(long)));
27864 #else
27865 unsigned long *sp =
27866 (unsigned long *)kernel_stack_pointer(regs);
27867@@ -41,11 +41,17 @@ unsigned long profile_pc(struct pt_regs *regs)
27868 * or above a saved flags. Eflags has bits 22-31 zero,
27869 * kernel addresses don't.
27870 */
27871+
27872+#ifdef CONFIG_PAX_KERNEXEC
27873+ return ktla_ktva(sp[0]);
27874+#else
27875 if (sp[0] >> 22)
27876 return sp[0];
27877 if (sp[1] >> 22)
27878 return sp[1];
27879 #endif
27880+
27881+#endif
27882 }
27883 return pc;
27884 }
27885diff --git a/arch/x86/kernel/tls.c b/arch/x86/kernel/tls.c
27886index 7fc5e84..c6e445a 100644
27887--- a/arch/x86/kernel/tls.c
27888+++ b/arch/x86/kernel/tls.c
27889@@ -139,6 +139,11 @@ int do_set_thread_area(struct task_struct *p, int idx,
27890 if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
27891 return -EINVAL;
27892
27893+#ifdef CONFIG_PAX_SEGMEXEC
27894+ if ((p->mm->pax_flags & MF_PAX_SEGMEXEC) && (info.contents & MODIFY_LDT_CONTENTS_CODE))
27895+ return -EINVAL;
27896+#endif
27897+
27898 set_tls_desc(p, idx, &info, 1);
27899
27900 return 0;
27901@@ -256,7 +261,7 @@ int regset_tls_set(struct task_struct *target, const struct user_regset *regset,
27902
27903 if (kbuf)
27904 info = kbuf;
27905- else if (__copy_from_user(infobuf, ubuf, count))
27906+ else if (count > sizeof infobuf || __copy_from_user(infobuf, ubuf, count))
27907 return -EFAULT;
27908 else
27909 info = infobuf;
27910diff --git a/arch/x86/kernel/tracepoint.c b/arch/x86/kernel/tracepoint.c
27911index 1c113db..287b42e 100644
27912--- a/arch/x86/kernel/tracepoint.c
27913+++ b/arch/x86/kernel/tracepoint.c
27914@@ -9,11 +9,11 @@
27915 #include <linux/atomic.h>
27916
27917 atomic_t trace_idt_ctr = ATOMIC_INIT(0);
27918-struct desc_ptr trace_idt_descr = { NR_VECTORS * 16 - 1,
27919+const struct desc_ptr trace_idt_descr = { NR_VECTORS * 16 - 1,
27920 (unsigned long) trace_idt_table };
27921
27922 /* No need to be aligned, but done to keep all IDTs defined the same way. */
27923-gate_desc trace_idt_table[NR_VECTORS] __page_aligned_bss;
27924+gate_desc trace_idt_table[NR_VECTORS] __page_aligned_rodata;
27925
27926 static int trace_irq_vector_refcount;
27927 static DEFINE_MUTEX(irq_vector_mutex);
27928diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
27929index 4ff5d16..736e3e1 100644
27930--- a/arch/x86/kernel/traps.c
27931+++ b/arch/x86/kernel/traps.c
27932@@ -68,7 +68,7 @@
27933 #include <asm/proto.h>
27934
27935 /* No need to be aligned, but done to keep all IDTs defined the same way. */
27936-gate_desc debug_idt_table[NR_VECTORS] __page_aligned_bss;
27937+gate_desc debug_idt_table[NR_VECTORS] __page_aligned_rodata;
27938 #else
27939 #include <asm/processor-flags.h>
27940 #include <asm/setup.h>
27941@@ -77,7 +77,7 @@ asmlinkage int system_call(void);
27942 #endif
27943
27944 /* Must be page-aligned because the real IDT is used in a fixmap. */
27945-gate_desc idt_table[NR_VECTORS] __page_aligned_bss;
27946+gate_desc idt_table[NR_VECTORS] __page_aligned_rodata;
27947
27948 DECLARE_BITMAP(used_vectors, NR_VECTORS);
27949 EXPORT_SYMBOL_GPL(used_vectors);
27950@@ -112,7 +112,7 @@ enum ctx_state ist_enter(struct pt_regs *regs)
27951 {
27952 enum ctx_state prev_state;
27953
27954- if (user_mode_vm(regs)) {
27955+ if (user_mode(regs)) {
27956 /* Other than that, we're just an exception. */
27957 prev_state = exception_enter();
27958 } else {
27959@@ -146,7 +146,7 @@ void ist_exit(struct pt_regs *regs, enum ctx_state prev_state)
27960 /* Must be before exception_exit. */
27961 preempt_count_sub(HARDIRQ_OFFSET);
27962
27963- if (user_mode_vm(regs))
27964+ if (user_mode(regs))
27965 return exception_exit(prev_state);
27966 else
27967 rcu_nmi_exit();
27968@@ -158,7 +158,7 @@ void ist_exit(struct pt_regs *regs, enum ctx_state prev_state)
27969 *
27970 * IST exception handlers normally cannot schedule. As a special
27971 * exception, if the exception interrupted userspace code (i.e.
27972- * user_mode_vm(regs) would return true) and the exception was not
27973+ * user_mode(regs) would return true) and the exception was not
27974 * a double fault, it can be safe to schedule. ist_begin_non_atomic()
27975 * begins a non-atomic section within an ist_enter()/ist_exit() region.
27976 * Callers are responsible for enabling interrupts themselves inside
27977@@ -167,7 +167,7 @@ void ist_exit(struct pt_regs *regs, enum ctx_state prev_state)
27978 */
27979 void ist_begin_non_atomic(struct pt_regs *regs)
27980 {
27981- BUG_ON(!user_mode_vm(regs));
27982+ BUG_ON(!user_mode(regs));
27983
27984 /*
27985 * Sanity check: we need to be on the normal thread stack. This
27986@@ -191,11 +191,11 @@ void ist_end_non_atomic(void)
27987 }
27988
27989 static nokprobe_inline int
27990-do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
27991+do_trap_no_signal(struct task_struct *tsk, int trapnr, const char *str,
27992 struct pt_regs *regs, long error_code)
27993 {
27994 #ifdef CONFIG_X86_32
27995- if (regs->flags & X86_VM_MASK) {
27996+ if (v8086_mode(regs)) {
27997 /*
27998 * Traps 0, 1, 3, 4, and 5 should be forwarded to vm86.
27999 * On nmi (interrupt 2), do_trap should not be called.
28000@@ -208,12 +208,24 @@ do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
28001 return -1;
28002 }
28003 #endif
28004- if (!user_mode(regs)) {
28005+ if (!user_mode_novm(regs)) {
28006 if (!fixup_exception(regs)) {
28007 tsk->thread.error_code = error_code;
28008 tsk->thread.trap_nr = trapnr;
28009+
28010+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28011+ if (trapnr == X86_TRAP_SS && ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS))
28012+ str = "PAX: suspicious stack segment fault";
28013+#endif
28014+
28015 die(str, regs, error_code);
28016 }
28017+
28018+#ifdef CONFIG_PAX_REFCOUNT
28019+ if (trapnr == X86_TRAP_OF)
28020+ pax_report_refcount_overflow(regs);
28021+#endif
28022+
28023 return 0;
28024 }
28025
28026@@ -252,7 +264,7 @@ static siginfo_t *fill_trap_info(struct pt_regs *regs, int signr, int trapnr,
28027 }
28028
28029 static void
28030-do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
28031+do_trap(int trapnr, int signr, const char *str, struct pt_regs *regs,
28032 long error_code, siginfo_t *info)
28033 {
28034 struct task_struct *tsk = current;
28035@@ -276,7 +288,7 @@ do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
28036 if (show_unhandled_signals && unhandled_signal(tsk, signr) &&
28037 printk_ratelimit()) {
28038 pr_info("%s[%d] trap %s ip:%lx sp:%lx error:%lx",
28039- tsk->comm, tsk->pid, str,
28040+ tsk->comm, task_pid_nr(tsk), str,
28041 regs->ip, regs->sp, error_code);
28042 print_vma_addr(" in ", regs->ip);
28043 pr_cont("\n");
28044@@ -358,6 +370,11 @@ dotraplinkage void do_double_fault(struct pt_regs *regs, long error_code)
28045 tsk->thread.error_code = error_code;
28046 tsk->thread.trap_nr = X86_TRAP_DF;
28047
28048+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
28049+ if ((unsigned long)tsk->stack - regs->sp <= PAGE_SIZE)
28050+ die("grsec: kernel stack overflow detected", regs, error_code);
28051+#endif
28052+
28053 #ifdef CONFIG_DOUBLEFAULT
28054 df_debug(regs, error_code);
28055 #endif
28056@@ -384,7 +401,7 @@ dotraplinkage void do_bounds(struct pt_regs *regs, long error_code)
28057 goto exit;
28058 conditional_sti(regs);
28059
28060- if (!user_mode_vm(regs))
28061+ if (!user_mode(regs))
28062 die("bounds", regs, error_code);
28063
28064 if (!cpu_feature_enabled(X86_FEATURE_MPX)) {
28065@@ -463,7 +480,7 @@ do_general_protection(struct pt_regs *regs, long error_code)
28066 conditional_sti(regs);
28067
28068 #ifdef CONFIG_X86_32
28069- if (regs->flags & X86_VM_MASK) {
28070+ if (v8086_mode(regs)) {
28071 local_irq_enable();
28072 handle_vm86_fault((struct kernel_vm86_regs *) regs, error_code);
28073 goto exit;
28074@@ -471,18 +488,42 @@ do_general_protection(struct pt_regs *regs, long error_code)
28075 #endif
28076
28077 tsk = current;
28078- if (!user_mode(regs)) {
28079+ if (!user_mode_novm(regs)) {
28080 if (fixup_exception(regs))
28081 goto exit;
28082
28083 tsk->thread.error_code = error_code;
28084 tsk->thread.trap_nr = X86_TRAP_GP;
28085 if (notify_die(DIE_GPF, "general protection fault", regs, error_code,
28086- X86_TRAP_GP, SIGSEGV) != NOTIFY_STOP)
28087+ X86_TRAP_GP, SIGSEGV) != NOTIFY_STOP) {
28088+
28089+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28090+ if ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS)
28091+ die("PAX: suspicious general protection fault", regs, error_code);
28092+ else
28093+#endif
28094+
28095 die("general protection fault", regs, error_code);
28096+ }
28097 goto exit;
28098 }
28099
28100+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
28101+ if (!(__supported_pte_mask & _PAGE_NX) && tsk->mm && (tsk->mm->pax_flags & MF_PAX_PAGEEXEC)) {
28102+ struct mm_struct *mm = tsk->mm;
28103+ unsigned long limit;
28104+
28105+ down_write(&mm->mmap_sem);
28106+ limit = mm->context.user_cs_limit;
28107+ if (limit < TASK_SIZE) {
28108+ track_exec_limit(mm, limit, TASK_SIZE, VM_EXEC);
28109+ up_write(&mm->mmap_sem);
28110+ return;
28111+ }
28112+ up_write(&mm->mmap_sem);
28113+ }
28114+#endif
28115+
28116 tsk->thread.error_code = error_code;
28117 tsk->thread.trap_nr = X86_TRAP_GP;
28118
28119@@ -581,13 +622,16 @@ struct bad_iret_stack *fixup_bad_iret(struct bad_iret_stack *s)
28120 container_of(task_pt_regs(current),
28121 struct bad_iret_stack, regs);
28122
28123+ if ((current->thread.sp0 ^ (unsigned long)s) < THREAD_SIZE)
28124+ new_stack = s;
28125+
28126 /* Copy the IRET target to the new stack. */
28127 memmove(&new_stack->regs.ip, (void *)s->regs.sp, 5*8);
28128
28129 /* Copy the remainder of the stack from the current stack. */
28130 memmove(new_stack, s, offsetof(struct bad_iret_stack, regs.ip));
28131
28132- BUG_ON(!user_mode_vm(&new_stack->regs));
28133+ BUG_ON(!user_mode(&new_stack->regs));
28134 return new_stack;
28135 }
28136 NOKPROBE_SYMBOL(fixup_bad_iret);
28137@@ -637,7 +681,7 @@ dotraplinkage void do_debug(struct pt_regs *regs, long error_code)
28138 * then it's very likely the result of an icebp/int01 trap.
28139 * User wants a sigtrap for that.
28140 */
28141- if (!dr6 && user_mode_vm(regs))
28142+ if (!dr6 && user_mode(regs))
28143 user_icebp = 1;
28144
28145 /* Catch kmemcheck conditions first of all! */
28146@@ -673,7 +717,7 @@ dotraplinkage void do_debug(struct pt_regs *regs, long error_code)
28147 /* It's safe to allow irq's after DR6 has been saved */
28148 preempt_conditional_sti(regs);
28149
28150- if (regs->flags & X86_VM_MASK) {
28151+ if (v8086_mode(regs)) {
28152 handle_vm86_trap((struct kernel_vm86_regs *) regs, error_code,
28153 X86_TRAP_DB);
28154 preempt_conditional_cli(regs);
28155@@ -688,7 +732,7 @@ dotraplinkage void do_debug(struct pt_regs *regs, long error_code)
28156 * We already checked v86 mode above, so we can check for kernel mode
28157 * by just checking the CPL of CS.
28158 */
28159- if ((dr6 & DR_STEP) && !user_mode(regs)) {
28160+ if ((dr6 & DR_STEP) && !user_mode_novm(regs)) {
28161 tsk->thread.debugreg6 &= ~DR_STEP;
28162 set_tsk_thread_flag(tsk, TIF_SINGLESTEP);
28163 regs->flags &= ~X86_EFLAGS_TF;
28164@@ -721,7 +765,7 @@ static void math_error(struct pt_regs *regs, int error_code, int trapnr)
28165 return;
28166 conditional_sti(regs);
28167
28168- if (!user_mode_vm(regs))
28169+ if (!user_mode(regs))
28170 {
28171 if (!fixup_exception(regs)) {
28172 task->thread.error_code = error_code;
28173diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
28174index 5054497..139f8f8 100644
28175--- a/arch/x86/kernel/tsc.c
28176+++ b/arch/x86/kernel/tsc.c
28177@@ -150,7 +150,7 @@ static void cyc2ns_write_end(int cpu, struct cyc2ns_data *data)
28178 */
28179 smp_wmb();
28180
28181- ACCESS_ONCE(c2n->head) = data;
28182+ ACCESS_ONCE_RW(c2n->head) = data;
28183 }
28184
28185 /*
28186diff --git a/arch/x86/kernel/uprobes.c b/arch/x86/kernel/uprobes.c
28187index 81f8adb0..fff670e 100644
28188--- a/arch/x86/kernel/uprobes.c
28189+++ b/arch/x86/kernel/uprobes.c
28190@@ -912,7 +912,7 @@ int arch_uprobe_exception_notify(struct notifier_block *self, unsigned long val,
28191 int ret = NOTIFY_DONE;
28192
28193 /* We are only interested in userspace traps */
28194- if (regs && !user_mode_vm(regs))
28195+ if (regs && !user_mode(regs))
28196 return NOTIFY_DONE;
28197
28198 switch (val) {
28199@@ -986,7 +986,7 @@ arch_uretprobe_hijack_return_addr(unsigned long trampoline_vaddr, struct pt_regs
28200
28201 if (nleft != rasize) {
28202 pr_err("uprobe: return address clobbered: pid=%d, %%sp=%#lx, "
28203- "%%ip=%#lx\n", current->pid, regs->sp, regs->ip);
28204+ "%%ip=%#lx\n", task_pid_nr(current), regs->sp, regs->ip);
28205
28206 force_sig_info(SIGSEGV, SEND_SIG_FORCED, current);
28207 }
28208diff --git a/arch/x86/kernel/verify_cpu.S b/arch/x86/kernel/verify_cpu.S
28209index b9242ba..50c5edd 100644
28210--- a/arch/x86/kernel/verify_cpu.S
28211+++ b/arch/x86/kernel/verify_cpu.S
28212@@ -20,6 +20,7 @@
28213 * arch/x86/boot/compressed/head_64.S: Boot cpu verification
28214 * arch/x86/kernel/trampoline_64.S: secondary processor verification
28215 * arch/x86/kernel/head_32.S: processor startup
28216+ * arch/x86/kernel/acpi/realmode/wakeup.S: 32bit processor resume
28217 *
28218 * verify_cpu, returns the status of longmode and SSE in register %eax.
28219 * 0: Success 1: Failure
28220diff --git a/arch/x86/kernel/vm86_32.c b/arch/x86/kernel/vm86_32.c
28221index e8edcf5..27f9344 100644
28222--- a/arch/x86/kernel/vm86_32.c
28223+++ b/arch/x86/kernel/vm86_32.c
28224@@ -44,6 +44,7 @@
28225 #include <linux/ptrace.h>
28226 #include <linux/audit.h>
28227 #include <linux/stddef.h>
28228+#include <linux/grsecurity.h>
28229
28230 #include <asm/uaccess.h>
28231 #include <asm/io.h>
28232@@ -150,7 +151,7 @@ struct pt_regs *save_v86_state(struct kernel_vm86_regs *regs)
28233 do_exit(SIGSEGV);
28234 }
28235
28236- tss = &per_cpu(init_tss, get_cpu());
28237+ tss = init_tss + get_cpu();
28238 current->thread.sp0 = current->thread.saved_sp0;
28239 current->thread.sysenter_cs = __KERNEL_CS;
28240 load_sp0(tss, &current->thread);
28241@@ -214,6 +215,14 @@ SYSCALL_DEFINE1(vm86old, struct vm86_struct __user *, v86)
28242
28243 if (tsk->thread.saved_sp0)
28244 return -EPERM;
28245+
28246+#ifdef CONFIG_GRKERNSEC_VM86
28247+ if (!capable(CAP_SYS_RAWIO)) {
28248+ gr_handle_vm86();
28249+ return -EPERM;
28250+ }
28251+#endif
28252+
28253 tmp = copy_vm86_regs_from_user(&info.regs, &v86->regs,
28254 offsetof(struct kernel_vm86_struct, vm86plus) -
28255 sizeof(info.regs));
28256@@ -238,6 +247,13 @@ SYSCALL_DEFINE2(vm86, unsigned long, cmd, unsigned long, arg)
28257 int tmp;
28258 struct vm86plus_struct __user *v86;
28259
28260+#ifdef CONFIG_GRKERNSEC_VM86
28261+ if (!capable(CAP_SYS_RAWIO)) {
28262+ gr_handle_vm86();
28263+ return -EPERM;
28264+ }
28265+#endif
28266+
28267 tsk = current;
28268 switch (cmd) {
28269 case VM86_REQUEST_IRQ:
28270@@ -318,7 +334,7 @@ static void do_sys_vm86(struct kernel_vm86_struct *info, struct task_struct *tsk
28271 tsk->thread.saved_fs = info->regs32->fs;
28272 tsk->thread.saved_gs = get_user_gs(info->regs32);
28273
28274- tss = &per_cpu(init_tss, get_cpu());
28275+ tss = init_tss + get_cpu();
28276 tsk->thread.sp0 = (unsigned long) &info->VM86_TSS_ESP0;
28277 if (cpu_has_sep)
28278 tsk->thread.sysenter_cs = 0;
28279@@ -525,7 +541,7 @@ static void do_int(struct kernel_vm86_regs *regs, int i,
28280 goto cannot_handle;
28281 if (i == 0x21 && is_revectored(AH(regs), &KVM86->int21_revectored))
28282 goto cannot_handle;
28283- intr_ptr = (unsigned long __user *) (i << 2);
28284+ intr_ptr = (__force unsigned long __user *) (i << 2);
28285 if (get_user(segoffs, intr_ptr))
28286 goto cannot_handle;
28287 if ((segoffs >> 16) == BIOSSEG)
28288diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
28289index 00bf300..129df8e 100644
28290--- a/arch/x86/kernel/vmlinux.lds.S
28291+++ b/arch/x86/kernel/vmlinux.lds.S
28292@@ -26,6 +26,13 @@
28293 #include <asm/page_types.h>
28294 #include <asm/cache.h>
28295 #include <asm/boot.h>
28296+#include <asm/segment.h>
28297+
28298+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28299+#define __KERNEL_TEXT_OFFSET (LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR)
28300+#else
28301+#define __KERNEL_TEXT_OFFSET 0
28302+#endif
28303
28304 #undef i386 /* in case the preprocessor is a 32bit one */
28305
28306@@ -69,30 +76,43 @@ jiffies_64 = jiffies;
28307
28308 PHDRS {
28309 text PT_LOAD FLAGS(5); /* R_E */
28310+#ifdef CONFIG_X86_32
28311+ module PT_LOAD FLAGS(5); /* R_E */
28312+#endif
28313+#ifdef CONFIG_XEN
28314+ rodata PT_LOAD FLAGS(5); /* R_E */
28315+#else
28316+ rodata PT_LOAD FLAGS(4); /* R__ */
28317+#endif
28318 data PT_LOAD FLAGS(6); /* RW_ */
28319-#ifdef CONFIG_X86_64
28320+ init.begin PT_LOAD FLAGS(6); /* RW_ */
28321 #ifdef CONFIG_SMP
28322 percpu PT_LOAD FLAGS(6); /* RW_ */
28323 #endif
28324+ text.init PT_LOAD FLAGS(5); /* R_E */
28325+ text.exit PT_LOAD FLAGS(5); /* R_E */
28326 init PT_LOAD FLAGS(7); /* RWE */
28327-#endif
28328 note PT_NOTE FLAGS(0); /* ___ */
28329 }
28330
28331 SECTIONS
28332 {
28333 #ifdef CONFIG_X86_32
28334- . = LOAD_OFFSET + LOAD_PHYSICAL_ADDR;
28335- phys_startup_32 = startup_32 - LOAD_OFFSET;
28336+ . = LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR;
28337 #else
28338- . = __START_KERNEL;
28339- phys_startup_64 = startup_64 - LOAD_OFFSET;
28340+ . = __START_KERNEL;
28341 #endif
28342
28343 /* Text and read-only data */
28344- .text : AT(ADDR(.text) - LOAD_OFFSET) {
28345- _text = .;
28346+ .text (. - __KERNEL_TEXT_OFFSET): AT(ADDR(.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
28347 /* bootstrapping code */
28348+#ifdef CONFIG_X86_32
28349+ phys_startup_32 = startup_32 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
28350+#else
28351+ phys_startup_64 = startup_64 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
28352+#endif
28353+ __LOAD_PHYSICAL_ADDR = . - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
28354+ _text = .;
28355 HEAD_TEXT
28356 . = ALIGN(8);
28357 _stext = .;
28358@@ -104,13 +124,47 @@ SECTIONS
28359 IRQENTRY_TEXT
28360 *(.fixup)
28361 *(.gnu.warning)
28362- /* End of text section */
28363- _etext = .;
28364 } :text = 0x9090
28365
28366- NOTES :text :note
28367+ . += __KERNEL_TEXT_OFFSET;
28368
28369- EXCEPTION_TABLE(16) :text = 0x9090
28370+#ifdef CONFIG_X86_32
28371+ . = ALIGN(PAGE_SIZE);
28372+ .module.text : AT(ADDR(.module.text) - LOAD_OFFSET) {
28373+
28374+#ifdef CONFIG_PAX_KERNEXEC
28375+ MODULES_EXEC_VADDR = .;
28376+ BYTE(0)
28377+ . += (CONFIG_PAX_KERNEXEC_MODULE_TEXT * 1024 * 1024);
28378+ . = ALIGN(HPAGE_SIZE) - 1;
28379+ MODULES_EXEC_END = .;
28380+#endif
28381+
28382+ } :module
28383+#endif
28384+
28385+ .text.end : AT(ADDR(.text.end) - LOAD_OFFSET) {
28386+ /* End of text section */
28387+ BYTE(0)
28388+ _etext = . - __KERNEL_TEXT_OFFSET;
28389+ }
28390+
28391+#ifdef CONFIG_X86_32
28392+ . = ALIGN(PAGE_SIZE);
28393+ .rodata.page_aligned : AT(ADDR(.rodata.page_aligned) - LOAD_OFFSET) {
28394+ . = ALIGN(PAGE_SIZE);
28395+ *(.empty_zero_page)
28396+ *(.initial_pg_fixmap)
28397+ *(.initial_pg_pmd)
28398+ *(.initial_page_table)
28399+ *(.swapper_pg_dir)
28400+ } :rodata
28401+#endif
28402+
28403+ . = ALIGN(PAGE_SIZE);
28404+ NOTES :rodata :note
28405+
28406+ EXCEPTION_TABLE(16) :rodata
28407
28408 #if defined(CONFIG_DEBUG_RODATA)
28409 /* .text should occupy whole number of pages */
28410@@ -122,16 +176,20 @@ SECTIONS
28411
28412 /* Data */
28413 .data : AT(ADDR(.data) - LOAD_OFFSET) {
28414+
28415+#ifdef CONFIG_PAX_KERNEXEC
28416+ . = ALIGN(HPAGE_SIZE);
28417+#else
28418+ . = ALIGN(PAGE_SIZE);
28419+#endif
28420+
28421 /* Start of data section */
28422 _sdata = .;
28423
28424 /* init_task */
28425 INIT_TASK_DATA(THREAD_SIZE)
28426
28427-#ifdef CONFIG_X86_32
28428- /* 32 bit has nosave before _edata */
28429 NOSAVE_DATA
28430-#endif
28431
28432 PAGE_ALIGNED_DATA(PAGE_SIZE)
28433
28434@@ -174,12 +232,19 @@ SECTIONS
28435 . = ALIGN(__vvar_page + PAGE_SIZE, PAGE_SIZE);
28436
28437 /* Init code and data - will be freed after init */
28438- . = ALIGN(PAGE_SIZE);
28439 .init.begin : AT(ADDR(.init.begin) - LOAD_OFFSET) {
28440+ BYTE(0)
28441+
28442+#ifdef CONFIG_PAX_KERNEXEC
28443+ . = ALIGN(HPAGE_SIZE);
28444+#else
28445+ . = ALIGN(PAGE_SIZE);
28446+#endif
28447+
28448 __init_begin = .; /* paired with __init_end */
28449- }
28450+ } :init.begin
28451
28452-#if defined(CONFIG_X86_64) && defined(CONFIG_SMP)
28453+#ifdef CONFIG_SMP
28454 /*
28455 * percpu offsets are zero-based on SMP. PERCPU_VADDR() changes the
28456 * output PHDR, so the next output section - .init.text - should
28457@@ -190,12 +255,27 @@ SECTIONS
28458 "per-CPU data too large - increase CONFIG_PHYSICAL_START")
28459 #endif
28460
28461- INIT_TEXT_SECTION(PAGE_SIZE)
28462-#ifdef CONFIG_X86_64
28463- :init
28464-#endif
28465+ . = ALIGN(PAGE_SIZE);
28466+ init_begin = .;
28467+ .init.text (. - __KERNEL_TEXT_OFFSET): AT(init_begin - LOAD_OFFSET) {
28468+ VMLINUX_SYMBOL(_sinittext) = .;
28469+ INIT_TEXT
28470+ . = ALIGN(PAGE_SIZE);
28471+ } :text.init
28472
28473- INIT_DATA_SECTION(16)
28474+ /*
28475+ * .exit.text is discard at runtime, not link time, to deal with
28476+ * references from .altinstructions and .eh_frame
28477+ */
28478+ .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
28479+ EXIT_TEXT
28480+ VMLINUX_SYMBOL(_einittext) = .;
28481+ . = ALIGN(16);
28482+ } :text.exit
28483+ . = init_begin + SIZEOF(.init.text) + SIZEOF(.exit.text);
28484+
28485+ . = ALIGN(PAGE_SIZE);
28486+ INIT_DATA_SECTION(16) :init
28487
28488 .x86_cpu_dev.init : AT(ADDR(.x86_cpu_dev.init) - LOAD_OFFSET) {
28489 __x86_cpu_dev_start = .;
28490@@ -266,19 +346,12 @@ SECTIONS
28491 }
28492
28493 . = ALIGN(8);
28494- /*
28495- * .exit.text is discard at runtime, not link time, to deal with
28496- * references from .altinstructions and .eh_frame
28497- */
28498- .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) {
28499- EXIT_TEXT
28500- }
28501
28502 .exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) {
28503 EXIT_DATA
28504 }
28505
28506-#if !defined(CONFIG_X86_64) || !defined(CONFIG_SMP)
28507+#ifndef CONFIG_SMP
28508 PERCPU_SECTION(INTERNODE_CACHE_BYTES)
28509 #endif
28510
28511@@ -297,16 +370,10 @@ SECTIONS
28512 .smp_locks : AT(ADDR(.smp_locks) - LOAD_OFFSET) {
28513 __smp_locks = .;
28514 *(.smp_locks)
28515- . = ALIGN(PAGE_SIZE);
28516 __smp_locks_end = .;
28517+ . = ALIGN(PAGE_SIZE);
28518 }
28519
28520-#ifdef CONFIG_X86_64
28521- .data_nosave : AT(ADDR(.data_nosave) - LOAD_OFFSET) {
28522- NOSAVE_DATA
28523- }
28524-#endif
28525-
28526 /* BSS */
28527 . = ALIGN(PAGE_SIZE);
28528 .bss : AT(ADDR(.bss) - LOAD_OFFSET) {
28529@@ -322,6 +389,7 @@ SECTIONS
28530 __brk_base = .;
28531 . += 64 * 1024; /* 64k alignment slop space */
28532 *(.brk_reservation) /* areas brk users have reserved */
28533+ . = ALIGN(HPAGE_SIZE);
28534 __brk_limit = .;
28535 }
28536
28537@@ -348,13 +416,12 @@ SECTIONS
28538 * for the boot processor.
28539 */
28540 #define INIT_PER_CPU(x) init_per_cpu__##x = x + __per_cpu_load
28541-INIT_PER_CPU(gdt_page);
28542 INIT_PER_CPU(irq_stack_union);
28543
28544 /*
28545 * Build-time check on the image size:
28546 */
28547-. = ASSERT((_end - _text <= KERNEL_IMAGE_SIZE),
28548+. = ASSERT((_end - _text - __KERNEL_TEXT_OFFSET <= KERNEL_IMAGE_SIZE),
28549 "kernel image bigger than KERNEL_IMAGE_SIZE");
28550
28551 #ifdef CONFIG_SMP
28552diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c
28553index 2dcc6ff..082dc7a 100644
28554--- a/arch/x86/kernel/vsyscall_64.c
28555+++ b/arch/x86/kernel/vsyscall_64.c
28556@@ -38,15 +38,13 @@
28557 #define CREATE_TRACE_POINTS
28558 #include "vsyscall_trace.h"
28559
28560-static enum { EMULATE, NATIVE, NONE } vsyscall_mode = EMULATE;
28561+static enum { EMULATE, NONE } vsyscall_mode = EMULATE;
28562
28563 static int __init vsyscall_setup(char *str)
28564 {
28565 if (str) {
28566 if (!strcmp("emulate", str))
28567 vsyscall_mode = EMULATE;
28568- else if (!strcmp("native", str))
28569- vsyscall_mode = NATIVE;
28570 else if (!strcmp("none", str))
28571 vsyscall_mode = NONE;
28572 else
28573@@ -264,8 +262,7 @@ do_ret:
28574 return true;
28575
28576 sigsegv:
28577- force_sig(SIGSEGV, current);
28578- return true;
28579+ do_group_exit(SIGKILL);
28580 }
28581
28582 /*
28583@@ -283,8 +280,8 @@ static struct vm_operations_struct gate_vma_ops = {
28584 static struct vm_area_struct gate_vma = {
28585 .vm_start = VSYSCALL_ADDR,
28586 .vm_end = VSYSCALL_ADDR + PAGE_SIZE,
28587- .vm_page_prot = PAGE_READONLY_EXEC,
28588- .vm_flags = VM_READ | VM_EXEC,
28589+ .vm_page_prot = PAGE_READONLY,
28590+ .vm_flags = VM_READ,
28591 .vm_ops = &gate_vma_ops,
28592 };
28593
28594@@ -325,10 +322,7 @@ void __init map_vsyscall(void)
28595 unsigned long physaddr_vsyscall = __pa_symbol(&__vsyscall_page);
28596
28597 if (vsyscall_mode != NONE)
28598- __set_fixmap(VSYSCALL_PAGE, physaddr_vsyscall,
28599- vsyscall_mode == NATIVE
28600- ? PAGE_KERNEL_VSYSCALL
28601- : PAGE_KERNEL_VVAR);
28602+ __set_fixmap(VSYSCALL_PAGE, physaddr_vsyscall, PAGE_KERNEL_VVAR);
28603
28604 BUILD_BUG_ON((unsigned long)__fix_to_virt(VSYSCALL_PAGE) !=
28605 (unsigned long)VSYSCALL_ADDR);
28606diff --git a/arch/x86/kernel/x8664_ksyms_64.c b/arch/x86/kernel/x8664_ksyms_64.c
28607index 37d8fa4..66e319a 100644
28608--- a/arch/x86/kernel/x8664_ksyms_64.c
28609+++ b/arch/x86/kernel/x8664_ksyms_64.c
28610@@ -34,8 +34,6 @@ EXPORT_SYMBOL(copy_user_generic_string);
28611 EXPORT_SYMBOL(copy_user_generic_unrolled);
28612 EXPORT_SYMBOL(copy_user_enhanced_fast_string);
28613 EXPORT_SYMBOL(__copy_user_nocache);
28614-EXPORT_SYMBOL(_copy_from_user);
28615-EXPORT_SYMBOL(_copy_to_user);
28616
28617 EXPORT_SYMBOL(copy_page);
28618 EXPORT_SYMBOL(clear_page);
28619@@ -79,3 +77,7 @@ EXPORT_SYMBOL(___preempt_schedule);
28620 EXPORT_SYMBOL(___preempt_schedule_context);
28621 #endif
28622 #endif
28623+
28624+#ifdef CONFIG_PAX_PER_CPU_PGD
28625+EXPORT_SYMBOL(cpu_pgd);
28626+#endif
28627diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c
28628index 234b072..b7ab191 100644
28629--- a/arch/x86/kernel/x86_init.c
28630+++ b/arch/x86/kernel/x86_init.c
28631@@ -93,7 +93,7 @@ struct x86_cpuinit_ops x86_cpuinit = {
28632 static void default_nmi_init(void) { };
28633 static int default_i8042_detect(void) { return 1; };
28634
28635-struct x86_platform_ops x86_platform = {
28636+struct x86_platform_ops x86_platform __read_only = {
28637 .calibrate_tsc = native_calibrate_tsc,
28638 .get_wallclock = mach_get_cmos_time,
28639 .set_wallclock = mach_set_rtc_mmss,
28640@@ -109,7 +109,7 @@ struct x86_platform_ops x86_platform = {
28641 EXPORT_SYMBOL_GPL(x86_platform);
28642
28643 #if defined(CONFIG_PCI_MSI)
28644-struct x86_msi_ops x86_msi = {
28645+struct x86_msi_ops x86_msi __read_only = {
28646 .setup_msi_irqs = native_setup_msi_irqs,
28647 .compose_msi_msg = native_compose_msi_msg,
28648 .teardown_msi_irq = native_teardown_msi_irq,
28649@@ -140,7 +140,7 @@ void arch_restore_msi_irqs(struct pci_dev *dev)
28650 }
28651 #endif
28652
28653-struct x86_io_apic_ops x86_io_apic_ops = {
28654+struct x86_io_apic_ops x86_io_apic_ops __read_only = {
28655 .init = native_io_apic_init_mappings,
28656 .read = native_io_apic_read,
28657 .write = native_io_apic_write,
28658diff --git a/arch/x86/kernel/xsave.c b/arch/x86/kernel/xsave.c
28659index cdc6cf9..e04f495 100644
28660--- a/arch/x86/kernel/xsave.c
28661+++ b/arch/x86/kernel/xsave.c
28662@@ -168,18 +168,18 @@ static inline int save_xstate_epilog(void __user *buf, int ia32_frame)
28663
28664 /* Setup the bytes not touched by the [f]xsave and reserved for SW. */
28665 sw_bytes = ia32_frame ? &fx_sw_reserved_ia32 : &fx_sw_reserved;
28666- err = __copy_to_user(&x->i387.sw_reserved, sw_bytes, sizeof(*sw_bytes));
28667+ err = __copy_to_user(x->i387.sw_reserved, sw_bytes, sizeof(*sw_bytes));
28668
28669 if (!use_xsave())
28670 return err;
28671
28672- err |= __put_user(FP_XSTATE_MAGIC2, (__u32 *)(buf + xstate_size));
28673+ err |= __put_user(FP_XSTATE_MAGIC2, (__u32 __user *)(buf + xstate_size));
28674
28675 /*
28676 * Read the xstate_bv which we copied (directly from the cpu or
28677 * from the state in task struct) to the user buffers.
28678 */
28679- err |= __get_user(xstate_bv, (__u32 *)&x->xsave_hdr.xstate_bv);
28680+ err |= __get_user(xstate_bv, (__u32 __user *)&x->xsave_hdr.xstate_bv);
28681
28682 /*
28683 * For legacy compatible, we always set FP/SSE bits in the bit
28684@@ -194,7 +194,7 @@ static inline int save_xstate_epilog(void __user *buf, int ia32_frame)
28685 */
28686 xstate_bv |= XSTATE_FPSSE;
28687
28688- err |= __put_user(xstate_bv, (__u32 *)&x->xsave_hdr.xstate_bv);
28689+ err |= __put_user(xstate_bv, (__u32 __user *)&x->xsave_hdr.xstate_bv);
28690
28691 return err;
28692 }
28693@@ -203,6 +203,7 @@ static inline int save_user_xstate(struct xsave_struct __user *buf)
28694 {
28695 int err;
28696
28697+ buf = (struct xsave_struct __user *)____m(buf);
28698 if (use_xsave())
28699 err = xsave_user(buf);
28700 else if (use_fxsr())
28701@@ -313,6 +314,7 @@ sanitize_restored_xstate(struct task_struct *tsk,
28702 */
28703 static inline int restore_user_xstate(void __user *buf, u64 xbv, int fx_only)
28704 {
28705+ buf = (void __user *)____m(buf);
28706 if (use_xsave()) {
28707 if ((unsigned long)buf % 64 || fx_only) {
28708 u64 init_bv = pcntxt_mask & ~XSTATE_FPSSE;
28709diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
28710index 307f9ec..0d8aa91 100644
28711--- a/arch/x86/kvm/cpuid.c
28712+++ b/arch/x86/kvm/cpuid.c
28713@@ -186,15 +186,20 @@ int kvm_vcpu_ioctl_set_cpuid2(struct kvm_vcpu *vcpu,
28714 struct kvm_cpuid2 *cpuid,
28715 struct kvm_cpuid_entry2 __user *entries)
28716 {
28717- int r;
28718+ int r, i;
28719
28720 r = -E2BIG;
28721 if (cpuid->nent > KVM_MAX_CPUID_ENTRIES)
28722 goto out;
28723 r = -EFAULT;
28724- if (copy_from_user(&vcpu->arch.cpuid_entries, entries,
28725- cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
28726+ if (!access_ok(VERIFY_READ, entries, cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
28727 goto out;
28728+ for (i = 0; i < cpuid->nent; ++i) {
28729+ struct kvm_cpuid_entry2 cpuid_entry;
28730+ if (__copy_from_user(&cpuid_entry, entries + i, sizeof(cpuid_entry)))
28731+ goto out;
28732+ vcpu->arch.cpuid_entries[i] = cpuid_entry;
28733+ }
28734 vcpu->arch.cpuid_nent = cpuid->nent;
28735 kvm_apic_set_version(vcpu);
28736 kvm_x86_ops->cpuid_update(vcpu);
28737@@ -207,15 +212,19 @@ int kvm_vcpu_ioctl_get_cpuid2(struct kvm_vcpu *vcpu,
28738 struct kvm_cpuid2 *cpuid,
28739 struct kvm_cpuid_entry2 __user *entries)
28740 {
28741- int r;
28742+ int r, i;
28743
28744 r = -E2BIG;
28745 if (cpuid->nent < vcpu->arch.cpuid_nent)
28746 goto out;
28747 r = -EFAULT;
28748- if (copy_to_user(entries, &vcpu->arch.cpuid_entries,
28749- vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
28750+ if (!access_ok(VERIFY_WRITE, entries, vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
28751 goto out;
28752+ for (i = 0; i < vcpu->arch.cpuid_nent; ++i) {
28753+ struct kvm_cpuid_entry2 cpuid_entry = vcpu->arch.cpuid_entries[i];
28754+ if (__copy_to_user(entries + i, &cpuid_entry, sizeof(cpuid_entry)))
28755+ goto out;
28756+ }
28757 return 0;
28758
28759 out:
28760diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
28761index 106c015..2db7161 100644
28762--- a/arch/x86/kvm/emulate.c
28763+++ b/arch/x86/kvm/emulate.c
28764@@ -3572,7 +3572,7 @@ static int check_cr_write(struct x86_emulate_ctxt *ctxt)
28765 int cr = ctxt->modrm_reg;
28766 u64 efer = 0;
28767
28768- static u64 cr_reserved_bits[] = {
28769+ static const u64 cr_reserved_bits[] = {
28770 0xffffffff00000000ULL,
28771 0, 0, 0, /* CR3 checked later */
28772 CR4_RESERVED_BITS,
28773diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
28774index 4ee827d..83c8e31 100644
28775--- a/arch/x86/kvm/lapic.c
28776+++ b/arch/x86/kvm/lapic.c
28777@@ -56,7 +56,7 @@
28778 #define APIC_BUS_CYCLE_NS 1
28779
28780 /* #define apic_debug(fmt,arg...) printk(KERN_WARNING fmt,##arg) */
28781-#define apic_debug(fmt, arg...)
28782+#define apic_debug(fmt, arg...) do {} while (0)
28783
28784 #define APIC_LVT_NUM 6
28785 /* 14 is the version for Xeon and Pentium 8.4.8*/
28786@@ -1064,6 +1064,17 @@ static void update_divide_count(struct kvm_lapic *apic)
28787 apic->divide_count);
28788 }
28789
28790+static void apic_update_lvtt(struct kvm_lapic *apic)
28791+{
28792+ u32 timer_mode = kvm_apic_get_reg(apic, APIC_LVTT) &
28793+ apic->lapic_timer.timer_mode_mask;
28794+
28795+ if (apic->lapic_timer.timer_mode != timer_mode) {
28796+ apic->lapic_timer.timer_mode = timer_mode;
28797+ hrtimer_cancel(&apic->lapic_timer.timer);
28798+ }
28799+}
28800+
28801 static void apic_timer_expired(struct kvm_lapic *apic)
28802 {
28803 struct kvm_vcpu *vcpu = apic->vcpu;
28804@@ -1272,6 +1283,7 @@ static int apic_reg_write(struct kvm_lapic *apic, u32 reg, u32 val)
28805 apic_set_reg(apic, APIC_LVTT + 0x10 * i,
28806 lvt_val | APIC_LVT_MASKED);
28807 }
28808+ apic_update_lvtt(apic);
28809 atomic_set(&apic->lapic_timer.pending, 0);
28810
28811 }
28812@@ -1304,20 +1316,13 @@ static int apic_reg_write(struct kvm_lapic *apic, u32 reg, u32 val)
28813
28814 break;
28815
28816- case APIC_LVTT: {
28817- u32 timer_mode = val & apic->lapic_timer.timer_mode_mask;
28818-
28819- if (apic->lapic_timer.timer_mode != timer_mode) {
28820- apic->lapic_timer.timer_mode = timer_mode;
28821- hrtimer_cancel(&apic->lapic_timer.timer);
28822- }
28823-
28824+ case APIC_LVTT:
28825 if (!kvm_apic_sw_enabled(apic))
28826 val |= APIC_LVT_MASKED;
28827 val &= (apic_lvt_mask[0] | apic->lapic_timer.timer_mode_mask);
28828 apic_set_reg(apic, APIC_LVTT, val);
28829+ apic_update_lvtt(apic);
28830 break;
28831- }
28832
28833 case APIC_TMICT:
28834 if (apic_lvtt_tscdeadline(apic))
28835@@ -1552,7 +1557,7 @@ void kvm_lapic_reset(struct kvm_vcpu *vcpu)
28836
28837 for (i = 0; i < APIC_LVT_NUM; i++)
28838 apic_set_reg(apic, APIC_LVTT + 0x10 * i, APIC_LVT_MASKED);
28839- apic->lapic_timer.timer_mode = 0;
28840+ apic_update_lvtt(apic);
28841 apic_set_reg(apic, APIC_LVT0,
28842 SET_APIC_DELIVERY_MODE(0, APIC_MODE_EXTINT));
28843
28844@@ -1778,6 +1783,7 @@ void kvm_apic_post_state_restore(struct kvm_vcpu *vcpu,
28845
28846 apic_update_ppr(apic);
28847 hrtimer_cancel(&apic->lapic_timer.timer);
28848+ apic_update_lvtt(apic);
28849 update_divide_count(apic);
28850 start_apic_timer(apic);
28851 apic->irr_pending = true;
28852diff --git a/arch/x86/kvm/lapic.h b/arch/x86/kvm/lapic.h
28853index 0bc6c65..ca4f92d 100644
28854--- a/arch/x86/kvm/lapic.h
28855+++ b/arch/x86/kvm/lapic.h
28856@@ -165,7 +165,7 @@ static inline u16 apic_logical_id(struct kvm_apic_map *map, u32 ldr)
28857
28858 static inline bool kvm_apic_has_events(struct kvm_vcpu *vcpu)
28859 {
28860- return vcpu->arch.apic->pending_events;
28861+ return kvm_vcpu_has_lapic(vcpu) && vcpu->arch.apic->pending_events;
28862 }
28863
28864 bool kvm_apic_pending_eoi(struct kvm_vcpu *vcpu, int vector);
28865diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
28866index 6e6d115..43fecbf 100644
28867--- a/arch/x86/kvm/paging_tmpl.h
28868+++ b/arch/x86/kvm/paging_tmpl.h
28869@@ -343,7 +343,7 @@ retry_walk:
28870 if (unlikely(kvm_is_error_hva(host_addr)))
28871 goto error;
28872
28873- ptep_user = (pt_element_t __user *)((void *)host_addr + offset);
28874+ ptep_user = (pt_element_t __force_user *)((void *)host_addr + offset);
28875 if (unlikely(__copy_from_user(&pte, ptep_user, sizeof(pte))))
28876 goto error;
28877 walker->ptep_user[walker->level - 1] = ptep_user;
28878diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
28879index a4e62fc..fbbad55 100644
28880--- a/arch/x86/kvm/svm.c
28881+++ b/arch/x86/kvm/svm.c
28882@@ -3568,7 +3568,11 @@ static void reload_tss(struct kvm_vcpu *vcpu)
28883 int cpu = raw_smp_processor_id();
28884
28885 struct svm_cpu_data *sd = per_cpu(svm_data, cpu);
28886+
28887+ pax_open_kernel();
28888 sd->tss_desc->type = 9; /* available 32/64-bit TSS */
28889+ pax_close_kernel();
28890+
28891 load_TR_desc();
28892 }
28893
28894@@ -3964,6 +3968,10 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu)
28895 #endif
28896 #endif
28897
28898+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
28899+ __set_fs(current_thread_info()->addr_limit);
28900+#endif
28901+
28902 reload_tss(vcpu);
28903
28904 local_irq_disable();
28905diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
28906index 5318d64..ff5f7aa 100644
28907--- a/arch/x86/kvm/vmx.c
28908+++ b/arch/x86/kvm/vmx.c
28909@@ -1440,12 +1440,12 @@ static void vmcs_write64(unsigned long field, u64 value)
28910 #endif
28911 }
28912
28913-static void vmcs_clear_bits(unsigned long field, u32 mask)
28914+static void vmcs_clear_bits(unsigned long field, unsigned long mask)
28915 {
28916 vmcs_writel(field, vmcs_readl(field) & ~mask);
28917 }
28918
28919-static void vmcs_set_bits(unsigned long field, u32 mask)
28920+static void vmcs_set_bits(unsigned long field, unsigned long mask)
28921 {
28922 vmcs_writel(field, vmcs_readl(field) | mask);
28923 }
28924@@ -1705,7 +1705,11 @@ static void reload_tss(void)
28925 struct desc_struct *descs;
28926
28927 descs = (void *)gdt->address;
28928+
28929+ pax_open_kernel();
28930 descs[GDT_ENTRY_TSS].type = 9; /* available TSS */
28931+ pax_close_kernel();
28932+
28933 load_TR_desc();
28934 }
28935
28936@@ -1941,6 +1945,10 @@ static void vmx_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
28937 vmcs_writel(HOST_TR_BASE, kvm_read_tr_base()); /* 22.2.4 */
28938 vmcs_writel(HOST_GDTR_BASE, gdt->address); /* 22.2.4 */
28939
28940+#ifdef CONFIG_PAX_PER_CPU_PGD
28941+ vmcs_writel(HOST_CR3, read_cr3()); /* 22.2.3 FIXME: shadow tables */
28942+#endif
28943+
28944 rdmsrl(MSR_IA32_SYSENTER_ESP, sysenter_esp);
28945 vmcs_writel(HOST_IA32_SYSENTER_ESP, sysenter_esp); /* 22.2.3 */
28946 vmx->loaded_vmcs->cpu = cpu;
28947@@ -2233,7 +2241,7 @@ static void setup_msrs(struct vcpu_vmx *vmx)
28948 * reads and returns guest's timestamp counter "register"
28949 * guest_tsc = host_tsc + tsc_offset -- 21.3
28950 */
28951-static u64 guest_read_tsc(void)
28952+static u64 __intentional_overflow(-1) guest_read_tsc(void)
28953 {
28954 u64 host_tsc, tsc_offset;
28955
28956@@ -4466,7 +4474,10 @@ static void vmx_set_constant_host_state(struct vcpu_vmx *vmx)
28957 unsigned long cr4;
28958
28959 vmcs_writel(HOST_CR0, read_cr0() & ~X86_CR0_TS); /* 22.2.3 */
28960+
28961+#ifndef CONFIG_PAX_PER_CPU_PGD
28962 vmcs_writel(HOST_CR3, read_cr3()); /* 22.2.3 FIXME: shadow tables */
28963+#endif
28964
28965 /* Save the most likely value for this task's CR4 in the VMCS. */
28966 cr4 = cr4_read_shadow();
28967@@ -4493,7 +4504,7 @@ static void vmx_set_constant_host_state(struct vcpu_vmx *vmx)
28968 vmcs_writel(HOST_IDTR_BASE, dt.address); /* 22.2.4 */
28969 vmx->host_idt_base = dt.address;
28970
28971- vmcs_writel(HOST_RIP, vmx_return); /* 22.2.5 */
28972+ vmcs_writel(HOST_RIP, ktla_ktva(vmx_return)); /* 22.2.5 */
28973
28974 rdmsr(MSR_IA32_SYSENTER_CS, low32, high32);
28975 vmcs_write32(HOST_IA32_SYSENTER_CS, low32);
28976@@ -6104,11 +6115,17 @@ static __init int hardware_setup(void)
28977 * page upon invalidation. No need to do anything if not
28978 * using the APIC_ACCESS_ADDR VMCS field.
28979 */
28980- if (!flexpriority_enabled)
28981- kvm_x86_ops->set_apic_access_page_addr = NULL;
28982+ if (!flexpriority_enabled) {
28983+ pax_open_kernel();
28984+ *(void **)&kvm_x86_ops->set_apic_access_page_addr = NULL;
28985+ pax_close_kernel();
28986+ }
28987
28988- if (!cpu_has_vmx_tpr_shadow())
28989- kvm_x86_ops->update_cr8_intercept = NULL;
28990+ if (!cpu_has_vmx_tpr_shadow()) {
28991+ pax_open_kernel();
28992+ *(void **)&kvm_x86_ops->update_cr8_intercept = NULL;
28993+ pax_close_kernel();
28994+ }
28995
28996 if (enable_ept && !cpu_has_vmx_ept_2m_page())
28997 kvm_disable_largepages();
28998@@ -6119,14 +6136,16 @@ static __init int hardware_setup(void)
28999 if (!cpu_has_vmx_apicv())
29000 enable_apicv = 0;
29001
29002+ pax_open_kernel();
29003 if (enable_apicv)
29004- kvm_x86_ops->update_cr8_intercept = NULL;
29005+ *(void **)&kvm_x86_ops->update_cr8_intercept = NULL;
29006 else {
29007- kvm_x86_ops->hwapic_irr_update = NULL;
29008- kvm_x86_ops->hwapic_isr_update = NULL;
29009- kvm_x86_ops->deliver_posted_interrupt = NULL;
29010- kvm_x86_ops->sync_pir_to_irr = vmx_sync_pir_to_irr_dummy;
29011+ *(void **)&kvm_x86_ops->hwapic_irr_update = NULL;
29012+ *(void **)&kvm_x86_ops->hwapic_isr_update = NULL;
29013+ *(void **)&kvm_x86_ops->deliver_posted_interrupt = NULL;
29014+ *(void **)&kvm_x86_ops->sync_pir_to_irr = vmx_sync_pir_to_irr_dummy;
29015 }
29016+ pax_close_kernel();
29017
29018 vmx_disable_intercept_for_msr(MSR_FS_BASE, false);
29019 vmx_disable_intercept_for_msr(MSR_GS_BASE, false);
29020@@ -6179,10 +6198,12 @@ static __init int hardware_setup(void)
29021 enable_pml = 0;
29022
29023 if (!enable_pml) {
29024- kvm_x86_ops->slot_enable_log_dirty = NULL;
29025- kvm_x86_ops->slot_disable_log_dirty = NULL;
29026- kvm_x86_ops->flush_log_dirty = NULL;
29027- kvm_x86_ops->enable_log_dirty_pt_masked = NULL;
29028+ pax_open_kernel();
29029+ *(void **)&kvm_x86_ops->slot_enable_log_dirty = NULL;
29030+ *(void **)&kvm_x86_ops->slot_disable_log_dirty = NULL;
29031+ *(void **)&kvm_x86_ops->flush_log_dirty = NULL;
29032+ *(void **)&kvm_x86_ops->enable_log_dirty_pt_masked = NULL;
29033+ pax_close_kernel();
29034 }
29035
29036 return alloc_kvm_area();
29037@@ -8227,6 +8248,12 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
29038 "jmp 2f \n\t"
29039 "1: " __ex(ASM_VMX_VMRESUME) "\n\t"
29040 "2: "
29041+
29042+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
29043+ "ljmp %[cs],$3f\n\t"
29044+ "3: "
29045+#endif
29046+
29047 /* Save guest registers, load host registers, keep flags */
29048 "mov %0, %c[wordsize](%%" _ASM_SP ") \n\t"
29049 "pop %0 \n\t"
29050@@ -8279,6 +8306,11 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
29051 #endif
29052 [cr2]"i"(offsetof(struct vcpu_vmx, vcpu.arch.cr2)),
29053 [wordsize]"i"(sizeof(ulong))
29054+
29055+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
29056+ ,[cs]"i"(__KERNEL_CS)
29057+#endif
29058+
29059 : "cc", "memory"
29060 #ifdef CONFIG_X86_64
29061 , "rax", "rbx", "rdi", "rsi"
29062@@ -8292,7 +8324,7 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
29063 if (debugctlmsr)
29064 update_debugctlmsr(debugctlmsr);
29065
29066-#ifndef CONFIG_X86_64
29067+#ifdef CONFIG_X86_32
29068 /*
29069 * The sysexit path does not restore ds/es, so we must set them to
29070 * a reasonable value ourselves.
29071@@ -8301,8 +8333,18 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
29072 * may be executed in interrupt context, which saves and restore segments
29073 * around it, nullifying its effect.
29074 */
29075- loadsegment(ds, __USER_DS);
29076- loadsegment(es, __USER_DS);
29077+ loadsegment(ds, __KERNEL_DS);
29078+ loadsegment(es, __KERNEL_DS);
29079+ loadsegment(ss, __KERNEL_DS);
29080+
29081+#ifdef CONFIG_PAX_KERNEXEC
29082+ loadsegment(fs, __KERNEL_PERCPU);
29083+#endif
29084+
29085+#ifdef CONFIG_PAX_MEMORY_UDEREF
29086+ __set_fs(current_thread_info()->addr_limit);
29087+#endif
29088+
29089 #endif
29090
29091 vcpu->arch.regs_avail = ~((1 << VCPU_REGS_RIP) | (1 << VCPU_REGS_RSP)
29092diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
29093index 8838057..8f42ce3 100644
29094--- a/arch/x86/kvm/x86.c
29095+++ b/arch/x86/kvm/x86.c
29096@@ -1895,8 +1895,8 @@ static int xen_hvm_config(struct kvm_vcpu *vcpu, u64 data)
29097 {
29098 struct kvm *kvm = vcpu->kvm;
29099 int lm = is_long_mode(vcpu);
29100- u8 *blob_addr = lm ? (u8 *)(long)kvm->arch.xen_hvm_config.blob_addr_64
29101- : (u8 *)(long)kvm->arch.xen_hvm_config.blob_addr_32;
29102+ u8 __user *blob_addr = lm ? (u8 __user *)(long)kvm->arch.xen_hvm_config.blob_addr_64
29103+ : (u8 __user *)(long)kvm->arch.xen_hvm_config.blob_addr_32;
29104 u8 blob_size = lm ? kvm->arch.xen_hvm_config.blob_size_64
29105 : kvm->arch.xen_hvm_config.blob_size_32;
29106 u32 page_num = data & ~PAGE_MASK;
29107@@ -2833,6 +2833,8 @@ long kvm_arch_dev_ioctl(struct file *filp,
29108 if (n < msr_list.nmsrs)
29109 goto out;
29110 r = -EFAULT;
29111+ if (num_msrs_to_save > ARRAY_SIZE(msrs_to_save))
29112+ goto out;
29113 if (copy_to_user(user_msr_list->indices, &msrs_to_save,
29114 num_msrs_to_save * sizeof(u32)))
29115 goto out;
29116@@ -5737,7 +5739,7 @@ static struct notifier_block pvclock_gtod_notifier = {
29117 };
29118 #endif
29119
29120-int kvm_arch_init(void *opaque)
29121+int kvm_arch_init(const void *opaque)
29122 {
29123 int r;
29124 struct kvm_x86_ops *ops = opaque;
29125diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c
29126index ac4453d..1f43bf3 100644
29127--- a/arch/x86/lguest/boot.c
29128+++ b/arch/x86/lguest/boot.c
29129@@ -1340,9 +1340,10 @@ static __init int early_put_chars(u32 vtermno, const char *buf, int count)
29130 * Rebooting also tells the Host we're finished, but the RESTART flag tells the
29131 * Launcher to reboot us.
29132 */
29133-static void lguest_restart(char *reason)
29134+static __noreturn void lguest_restart(char *reason)
29135 {
29136 hcall(LHCALL_SHUTDOWN, __pa(reason), LGUEST_SHUTDOWN_RESTART, 0, 0);
29137+ BUG();
29138 }
29139
29140 /*G:050
29141diff --git a/arch/x86/lib/atomic64_386_32.S b/arch/x86/lib/atomic64_386_32.S
29142index 00933d5..3a64af9 100644
29143--- a/arch/x86/lib/atomic64_386_32.S
29144+++ b/arch/x86/lib/atomic64_386_32.S
29145@@ -48,6 +48,10 @@ BEGIN(read)
29146 movl (v), %eax
29147 movl 4(v), %edx
29148 RET_ENDP
29149+BEGIN(read_unchecked)
29150+ movl (v), %eax
29151+ movl 4(v), %edx
29152+RET_ENDP
29153 #undef v
29154
29155 #define v %esi
29156@@ -55,6 +59,10 @@ BEGIN(set)
29157 movl %ebx, (v)
29158 movl %ecx, 4(v)
29159 RET_ENDP
29160+BEGIN(set_unchecked)
29161+ movl %ebx, (v)
29162+ movl %ecx, 4(v)
29163+RET_ENDP
29164 #undef v
29165
29166 #define v %esi
29167@@ -70,6 +78,20 @@ RET_ENDP
29168 BEGIN(add)
29169 addl %eax, (v)
29170 adcl %edx, 4(v)
29171+
29172+#ifdef CONFIG_PAX_REFCOUNT
29173+ jno 0f
29174+ subl %eax, (v)
29175+ sbbl %edx, 4(v)
29176+ int $4
29177+0:
29178+ _ASM_EXTABLE(0b, 0b)
29179+#endif
29180+
29181+RET_ENDP
29182+BEGIN(add_unchecked)
29183+ addl %eax, (v)
29184+ adcl %edx, 4(v)
29185 RET_ENDP
29186 #undef v
29187
29188@@ -77,6 +99,24 @@ RET_ENDP
29189 BEGIN(add_return)
29190 addl (v), %eax
29191 adcl 4(v), %edx
29192+
29193+#ifdef CONFIG_PAX_REFCOUNT
29194+ into
29195+1234:
29196+ _ASM_EXTABLE(1234b, 2f)
29197+#endif
29198+
29199+ movl %eax, (v)
29200+ movl %edx, 4(v)
29201+
29202+#ifdef CONFIG_PAX_REFCOUNT
29203+2:
29204+#endif
29205+
29206+RET_ENDP
29207+BEGIN(add_return_unchecked)
29208+ addl (v), %eax
29209+ adcl 4(v), %edx
29210 movl %eax, (v)
29211 movl %edx, 4(v)
29212 RET_ENDP
29213@@ -86,6 +126,20 @@ RET_ENDP
29214 BEGIN(sub)
29215 subl %eax, (v)
29216 sbbl %edx, 4(v)
29217+
29218+#ifdef CONFIG_PAX_REFCOUNT
29219+ jno 0f
29220+ addl %eax, (v)
29221+ adcl %edx, 4(v)
29222+ int $4
29223+0:
29224+ _ASM_EXTABLE(0b, 0b)
29225+#endif
29226+
29227+RET_ENDP
29228+BEGIN(sub_unchecked)
29229+ subl %eax, (v)
29230+ sbbl %edx, 4(v)
29231 RET_ENDP
29232 #undef v
29233
29234@@ -96,6 +150,27 @@ BEGIN(sub_return)
29235 sbbl $0, %edx
29236 addl (v), %eax
29237 adcl 4(v), %edx
29238+
29239+#ifdef CONFIG_PAX_REFCOUNT
29240+ into
29241+1234:
29242+ _ASM_EXTABLE(1234b, 2f)
29243+#endif
29244+
29245+ movl %eax, (v)
29246+ movl %edx, 4(v)
29247+
29248+#ifdef CONFIG_PAX_REFCOUNT
29249+2:
29250+#endif
29251+
29252+RET_ENDP
29253+BEGIN(sub_return_unchecked)
29254+ negl %edx
29255+ negl %eax
29256+ sbbl $0, %edx
29257+ addl (v), %eax
29258+ adcl 4(v), %edx
29259 movl %eax, (v)
29260 movl %edx, 4(v)
29261 RET_ENDP
29262@@ -105,6 +180,20 @@ RET_ENDP
29263 BEGIN(inc)
29264 addl $1, (v)
29265 adcl $0, 4(v)
29266+
29267+#ifdef CONFIG_PAX_REFCOUNT
29268+ jno 0f
29269+ subl $1, (v)
29270+ sbbl $0, 4(v)
29271+ int $4
29272+0:
29273+ _ASM_EXTABLE(0b, 0b)
29274+#endif
29275+
29276+RET_ENDP
29277+BEGIN(inc_unchecked)
29278+ addl $1, (v)
29279+ adcl $0, 4(v)
29280 RET_ENDP
29281 #undef v
29282
29283@@ -114,6 +203,26 @@ BEGIN(inc_return)
29284 movl 4(v), %edx
29285 addl $1, %eax
29286 adcl $0, %edx
29287+
29288+#ifdef CONFIG_PAX_REFCOUNT
29289+ into
29290+1234:
29291+ _ASM_EXTABLE(1234b, 2f)
29292+#endif
29293+
29294+ movl %eax, (v)
29295+ movl %edx, 4(v)
29296+
29297+#ifdef CONFIG_PAX_REFCOUNT
29298+2:
29299+#endif
29300+
29301+RET_ENDP
29302+BEGIN(inc_return_unchecked)
29303+ movl (v), %eax
29304+ movl 4(v), %edx
29305+ addl $1, %eax
29306+ adcl $0, %edx
29307 movl %eax, (v)
29308 movl %edx, 4(v)
29309 RET_ENDP
29310@@ -123,6 +232,20 @@ RET_ENDP
29311 BEGIN(dec)
29312 subl $1, (v)
29313 sbbl $0, 4(v)
29314+
29315+#ifdef CONFIG_PAX_REFCOUNT
29316+ jno 0f
29317+ addl $1, (v)
29318+ adcl $0, 4(v)
29319+ int $4
29320+0:
29321+ _ASM_EXTABLE(0b, 0b)
29322+#endif
29323+
29324+RET_ENDP
29325+BEGIN(dec_unchecked)
29326+ subl $1, (v)
29327+ sbbl $0, 4(v)
29328 RET_ENDP
29329 #undef v
29330
29331@@ -132,6 +255,26 @@ BEGIN(dec_return)
29332 movl 4(v), %edx
29333 subl $1, %eax
29334 sbbl $0, %edx
29335+
29336+#ifdef CONFIG_PAX_REFCOUNT
29337+ into
29338+1234:
29339+ _ASM_EXTABLE(1234b, 2f)
29340+#endif
29341+
29342+ movl %eax, (v)
29343+ movl %edx, 4(v)
29344+
29345+#ifdef CONFIG_PAX_REFCOUNT
29346+2:
29347+#endif
29348+
29349+RET_ENDP
29350+BEGIN(dec_return_unchecked)
29351+ movl (v), %eax
29352+ movl 4(v), %edx
29353+ subl $1, %eax
29354+ sbbl $0, %edx
29355 movl %eax, (v)
29356 movl %edx, 4(v)
29357 RET_ENDP
29358@@ -143,6 +286,13 @@ BEGIN(add_unless)
29359 adcl %edx, %edi
29360 addl (v), %eax
29361 adcl 4(v), %edx
29362+
29363+#ifdef CONFIG_PAX_REFCOUNT
29364+ into
29365+1234:
29366+ _ASM_EXTABLE(1234b, 2f)
29367+#endif
29368+
29369 cmpl %eax, %ecx
29370 je 3f
29371 1:
29372@@ -168,6 +318,13 @@ BEGIN(inc_not_zero)
29373 1:
29374 addl $1, %eax
29375 adcl $0, %edx
29376+
29377+#ifdef CONFIG_PAX_REFCOUNT
29378+ into
29379+1234:
29380+ _ASM_EXTABLE(1234b, 2f)
29381+#endif
29382+
29383 movl %eax, (v)
29384 movl %edx, 4(v)
29385 movl $1, %eax
29386@@ -186,6 +343,13 @@ BEGIN(dec_if_positive)
29387 movl 4(v), %edx
29388 subl $1, %eax
29389 sbbl $0, %edx
29390+
29391+#ifdef CONFIG_PAX_REFCOUNT
29392+ into
29393+1234:
29394+ _ASM_EXTABLE(1234b, 1f)
29395+#endif
29396+
29397 js 1f
29398 movl %eax, (v)
29399 movl %edx, 4(v)
29400diff --git a/arch/x86/lib/atomic64_cx8_32.S b/arch/x86/lib/atomic64_cx8_32.S
29401index f5cc9eb..51fa319 100644
29402--- a/arch/x86/lib/atomic64_cx8_32.S
29403+++ b/arch/x86/lib/atomic64_cx8_32.S
29404@@ -35,10 +35,20 @@ ENTRY(atomic64_read_cx8)
29405 CFI_STARTPROC
29406
29407 read64 %ecx
29408+ pax_force_retaddr
29409 ret
29410 CFI_ENDPROC
29411 ENDPROC(atomic64_read_cx8)
29412
29413+ENTRY(atomic64_read_unchecked_cx8)
29414+ CFI_STARTPROC
29415+
29416+ read64 %ecx
29417+ pax_force_retaddr
29418+ ret
29419+ CFI_ENDPROC
29420+ENDPROC(atomic64_read_unchecked_cx8)
29421+
29422 ENTRY(atomic64_set_cx8)
29423 CFI_STARTPROC
29424
29425@@ -48,10 +58,25 @@ ENTRY(atomic64_set_cx8)
29426 cmpxchg8b (%esi)
29427 jne 1b
29428
29429+ pax_force_retaddr
29430 ret
29431 CFI_ENDPROC
29432 ENDPROC(atomic64_set_cx8)
29433
29434+ENTRY(atomic64_set_unchecked_cx8)
29435+ CFI_STARTPROC
29436+
29437+1:
29438+/* we don't need LOCK_PREFIX since aligned 64-bit writes
29439+ * are atomic on 586 and newer */
29440+ cmpxchg8b (%esi)
29441+ jne 1b
29442+
29443+ pax_force_retaddr
29444+ ret
29445+ CFI_ENDPROC
29446+ENDPROC(atomic64_set_unchecked_cx8)
29447+
29448 ENTRY(atomic64_xchg_cx8)
29449 CFI_STARTPROC
29450
29451@@ -60,12 +85,13 @@ ENTRY(atomic64_xchg_cx8)
29452 cmpxchg8b (%esi)
29453 jne 1b
29454
29455+ pax_force_retaddr
29456 ret
29457 CFI_ENDPROC
29458 ENDPROC(atomic64_xchg_cx8)
29459
29460-.macro addsub_return func ins insc
29461-ENTRY(atomic64_\func\()_return_cx8)
29462+.macro addsub_return func ins insc unchecked=""
29463+ENTRY(atomic64_\func\()_return\unchecked\()_cx8)
29464 CFI_STARTPROC
29465 SAVE ebp
29466 SAVE ebx
29467@@ -82,27 +108,44 @@ ENTRY(atomic64_\func\()_return_cx8)
29468 movl %edx, %ecx
29469 \ins\()l %esi, %ebx
29470 \insc\()l %edi, %ecx
29471+
29472+.ifb \unchecked
29473+#ifdef CONFIG_PAX_REFCOUNT
29474+ into
29475+2:
29476+ _ASM_EXTABLE(2b, 3f)
29477+#endif
29478+.endif
29479+
29480 LOCK_PREFIX
29481 cmpxchg8b (%ebp)
29482 jne 1b
29483-
29484-10:
29485 movl %ebx, %eax
29486 movl %ecx, %edx
29487+
29488+.ifb \unchecked
29489+#ifdef CONFIG_PAX_REFCOUNT
29490+3:
29491+#endif
29492+.endif
29493+
29494 RESTORE edi
29495 RESTORE esi
29496 RESTORE ebx
29497 RESTORE ebp
29498+ pax_force_retaddr
29499 ret
29500 CFI_ENDPROC
29501-ENDPROC(atomic64_\func\()_return_cx8)
29502+ENDPROC(atomic64_\func\()_return\unchecked\()_cx8)
29503 .endm
29504
29505 addsub_return add add adc
29506 addsub_return sub sub sbb
29507+addsub_return add add adc _unchecked
29508+addsub_return sub sub sbb _unchecked
29509
29510-.macro incdec_return func ins insc
29511-ENTRY(atomic64_\func\()_return_cx8)
29512+.macro incdec_return func ins insc unchecked=""
29513+ENTRY(atomic64_\func\()_return\unchecked\()_cx8)
29514 CFI_STARTPROC
29515 SAVE ebx
29516
29517@@ -112,21 +155,39 @@ ENTRY(atomic64_\func\()_return_cx8)
29518 movl %edx, %ecx
29519 \ins\()l $1, %ebx
29520 \insc\()l $0, %ecx
29521+
29522+.ifb \unchecked
29523+#ifdef CONFIG_PAX_REFCOUNT
29524+ into
29525+2:
29526+ _ASM_EXTABLE(2b, 3f)
29527+#endif
29528+.endif
29529+
29530 LOCK_PREFIX
29531 cmpxchg8b (%esi)
29532 jne 1b
29533
29534-10:
29535 movl %ebx, %eax
29536 movl %ecx, %edx
29537+
29538+.ifb \unchecked
29539+#ifdef CONFIG_PAX_REFCOUNT
29540+3:
29541+#endif
29542+.endif
29543+
29544 RESTORE ebx
29545+ pax_force_retaddr
29546 ret
29547 CFI_ENDPROC
29548-ENDPROC(atomic64_\func\()_return_cx8)
29549+ENDPROC(atomic64_\func\()_return\unchecked\()_cx8)
29550 .endm
29551
29552 incdec_return inc add adc
29553 incdec_return dec sub sbb
29554+incdec_return inc add adc _unchecked
29555+incdec_return dec sub sbb _unchecked
29556
29557 ENTRY(atomic64_dec_if_positive_cx8)
29558 CFI_STARTPROC
29559@@ -138,6 +199,13 @@ ENTRY(atomic64_dec_if_positive_cx8)
29560 movl %edx, %ecx
29561 subl $1, %ebx
29562 sbb $0, %ecx
29563+
29564+#ifdef CONFIG_PAX_REFCOUNT
29565+ into
29566+1234:
29567+ _ASM_EXTABLE(1234b, 2f)
29568+#endif
29569+
29570 js 2f
29571 LOCK_PREFIX
29572 cmpxchg8b (%esi)
29573@@ -147,6 +215,7 @@ ENTRY(atomic64_dec_if_positive_cx8)
29574 movl %ebx, %eax
29575 movl %ecx, %edx
29576 RESTORE ebx
29577+ pax_force_retaddr
29578 ret
29579 CFI_ENDPROC
29580 ENDPROC(atomic64_dec_if_positive_cx8)
29581@@ -171,6 +240,13 @@ ENTRY(atomic64_add_unless_cx8)
29582 movl %edx, %ecx
29583 addl %ebp, %ebx
29584 adcl %edi, %ecx
29585+
29586+#ifdef CONFIG_PAX_REFCOUNT
29587+ into
29588+1234:
29589+ _ASM_EXTABLE(1234b, 3f)
29590+#endif
29591+
29592 LOCK_PREFIX
29593 cmpxchg8b (%esi)
29594 jne 1b
29595@@ -181,6 +257,7 @@ ENTRY(atomic64_add_unless_cx8)
29596 CFI_ADJUST_CFA_OFFSET -8
29597 RESTORE ebx
29598 RESTORE ebp
29599+ pax_force_retaddr
29600 ret
29601 4:
29602 cmpl %edx, 4(%esp)
29603@@ -203,6 +280,13 @@ ENTRY(atomic64_inc_not_zero_cx8)
29604 xorl %ecx, %ecx
29605 addl $1, %ebx
29606 adcl %edx, %ecx
29607+
29608+#ifdef CONFIG_PAX_REFCOUNT
29609+ into
29610+1234:
29611+ _ASM_EXTABLE(1234b, 3f)
29612+#endif
29613+
29614 LOCK_PREFIX
29615 cmpxchg8b (%esi)
29616 jne 1b
29617@@ -210,6 +294,7 @@ ENTRY(atomic64_inc_not_zero_cx8)
29618 movl $1, %eax
29619 3:
29620 RESTORE ebx
29621+ pax_force_retaddr
29622 ret
29623 CFI_ENDPROC
29624 ENDPROC(atomic64_inc_not_zero_cx8)
29625diff --git a/arch/x86/lib/checksum_32.S b/arch/x86/lib/checksum_32.S
29626index e78b8eee..7e173a8 100644
29627--- a/arch/x86/lib/checksum_32.S
29628+++ b/arch/x86/lib/checksum_32.S
29629@@ -29,7 +29,8 @@
29630 #include <asm/dwarf2.h>
29631 #include <asm/errno.h>
29632 #include <asm/asm.h>
29633-
29634+#include <asm/segment.h>
29635+
29636 /*
29637 * computes a partial checksum, e.g. for TCP/UDP fragments
29638 */
29639@@ -293,9 +294,24 @@ unsigned int csum_partial_copy_generic (const char *src, char *dst,
29640
29641 #define ARGBASE 16
29642 #define FP 12
29643-
29644-ENTRY(csum_partial_copy_generic)
29645+
29646+ENTRY(csum_partial_copy_generic_to_user)
29647 CFI_STARTPROC
29648+
29649+#ifdef CONFIG_PAX_MEMORY_UDEREF
29650+ pushl_cfi %gs
29651+ popl_cfi %es
29652+ jmp csum_partial_copy_generic
29653+#endif
29654+
29655+ENTRY(csum_partial_copy_generic_from_user)
29656+
29657+#ifdef CONFIG_PAX_MEMORY_UDEREF
29658+ pushl_cfi %gs
29659+ popl_cfi %ds
29660+#endif
29661+
29662+ENTRY(csum_partial_copy_generic)
29663 subl $4,%esp
29664 CFI_ADJUST_CFA_OFFSET 4
29665 pushl_cfi %edi
29666@@ -317,7 +333,7 @@ ENTRY(csum_partial_copy_generic)
29667 jmp 4f
29668 SRC(1: movw (%esi), %bx )
29669 addl $2, %esi
29670-DST( movw %bx, (%edi) )
29671+DST( movw %bx, %es:(%edi) )
29672 addl $2, %edi
29673 addw %bx, %ax
29674 adcl $0, %eax
29675@@ -329,30 +345,30 @@ DST( movw %bx, (%edi) )
29676 SRC(1: movl (%esi), %ebx )
29677 SRC( movl 4(%esi), %edx )
29678 adcl %ebx, %eax
29679-DST( movl %ebx, (%edi) )
29680+DST( movl %ebx, %es:(%edi) )
29681 adcl %edx, %eax
29682-DST( movl %edx, 4(%edi) )
29683+DST( movl %edx, %es:4(%edi) )
29684
29685 SRC( movl 8(%esi), %ebx )
29686 SRC( movl 12(%esi), %edx )
29687 adcl %ebx, %eax
29688-DST( movl %ebx, 8(%edi) )
29689+DST( movl %ebx, %es:8(%edi) )
29690 adcl %edx, %eax
29691-DST( movl %edx, 12(%edi) )
29692+DST( movl %edx, %es:12(%edi) )
29693
29694 SRC( movl 16(%esi), %ebx )
29695 SRC( movl 20(%esi), %edx )
29696 adcl %ebx, %eax
29697-DST( movl %ebx, 16(%edi) )
29698+DST( movl %ebx, %es:16(%edi) )
29699 adcl %edx, %eax
29700-DST( movl %edx, 20(%edi) )
29701+DST( movl %edx, %es:20(%edi) )
29702
29703 SRC( movl 24(%esi), %ebx )
29704 SRC( movl 28(%esi), %edx )
29705 adcl %ebx, %eax
29706-DST( movl %ebx, 24(%edi) )
29707+DST( movl %ebx, %es:24(%edi) )
29708 adcl %edx, %eax
29709-DST( movl %edx, 28(%edi) )
29710+DST( movl %edx, %es:28(%edi) )
29711
29712 lea 32(%esi), %esi
29713 lea 32(%edi), %edi
29714@@ -366,7 +382,7 @@ DST( movl %edx, 28(%edi) )
29715 shrl $2, %edx # This clears CF
29716 SRC(3: movl (%esi), %ebx )
29717 adcl %ebx, %eax
29718-DST( movl %ebx, (%edi) )
29719+DST( movl %ebx, %es:(%edi) )
29720 lea 4(%esi), %esi
29721 lea 4(%edi), %edi
29722 dec %edx
29723@@ -378,12 +394,12 @@ DST( movl %ebx, (%edi) )
29724 jb 5f
29725 SRC( movw (%esi), %cx )
29726 leal 2(%esi), %esi
29727-DST( movw %cx, (%edi) )
29728+DST( movw %cx, %es:(%edi) )
29729 leal 2(%edi), %edi
29730 je 6f
29731 shll $16,%ecx
29732 SRC(5: movb (%esi), %cl )
29733-DST( movb %cl, (%edi) )
29734+DST( movb %cl, %es:(%edi) )
29735 6: addl %ecx, %eax
29736 adcl $0, %eax
29737 7:
29738@@ -394,7 +410,7 @@ DST( movb %cl, (%edi) )
29739
29740 6001:
29741 movl ARGBASE+20(%esp), %ebx # src_err_ptr
29742- movl $-EFAULT, (%ebx)
29743+ movl $-EFAULT, %ss:(%ebx)
29744
29745 # zero the complete destination - computing the rest
29746 # is too much work
29747@@ -407,11 +423,15 @@ DST( movb %cl, (%edi) )
29748
29749 6002:
29750 movl ARGBASE+24(%esp), %ebx # dst_err_ptr
29751- movl $-EFAULT,(%ebx)
29752+ movl $-EFAULT,%ss:(%ebx)
29753 jmp 5000b
29754
29755 .previous
29756
29757+ pushl_cfi %ss
29758+ popl_cfi %ds
29759+ pushl_cfi %ss
29760+ popl_cfi %es
29761 popl_cfi %ebx
29762 CFI_RESTORE ebx
29763 popl_cfi %esi
29764@@ -421,26 +441,43 @@ DST( movb %cl, (%edi) )
29765 popl_cfi %ecx # equivalent to addl $4,%esp
29766 ret
29767 CFI_ENDPROC
29768-ENDPROC(csum_partial_copy_generic)
29769+ENDPROC(csum_partial_copy_generic_to_user)
29770
29771 #else
29772
29773 /* Version for PentiumII/PPro */
29774
29775 #define ROUND1(x) \
29776+ nop; nop; nop; \
29777 SRC(movl x(%esi), %ebx ) ; \
29778 addl %ebx, %eax ; \
29779- DST(movl %ebx, x(%edi) ) ;
29780+ DST(movl %ebx, %es:x(%edi)) ;
29781
29782 #define ROUND(x) \
29783+ nop; nop; nop; \
29784 SRC(movl x(%esi), %ebx ) ; \
29785 adcl %ebx, %eax ; \
29786- DST(movl %ebx, x(%edi) ) ;
29787+ DST(movl %ebx, %es:x(%edi)) ;
29788
29789 #define ARGBASE 12
29790-
29791-ENTRY(csum_partial_copy_generic)
29792+
29793+ENTRY(csum_partial_copy_generic_to_user)
29794 CFI_STARTPROC
29795+
29796+#ifdef CONFIG_PAX_MEMORY_UDEREF
29797+ pushl_cfi %gs
29798+ popl_cfi %es
29799+ jmp csum_partial_copy_generic
29800+#endif
29801+
29802+ENTRY(csum_partial_copy_generic_from_user)
29803+
29804+#ifdef CONFIG_PAX_MEMORY_UDEREF
29805+ pushl_cfi %gs
29806+ popl_cfi %ds
29807+#endif
29808+
29809+ENTRY(csum_partial_copy_generic)
29810 pushl_cfi %ebx
29811 CFI_REL_OFFSET ebx, 0
29812 pushl_cfi %edi
29813@@ -461,7 +498,7 @@ ENTRY(csum_partial_copy_generic)
29814 subl %ebx, %edi
29815 lea -1(%esi),%edx
29816 andl $-32,%edx
29817- lea 3f(%ebx,%ebx), %ebx
29818+ lea 3f(%ebx,%ebx,2), %ebx
29819 testl %esi, %esi
29820 jmp *%ebx
29821 1: addl $64,%esi
29822@@ -482,19 +519,19 @@ ENTRY(csum_partial_copy_generic)
29823 jb 5f
29824 SRC( movw (%esi), %dx )
29825 leal 2(%esi), %esi
29826-DST( movw %dx, (%edi) )
29827+DST( movw %dx, %es:(%edi) )
29828 leal 2(%edi), %edi
29829 je 6f
29830 shll $16,%edx
29831 5:
29832 SRC( movb (%esi), %dl )
29833-DST( movb %dl, (%edi) )
29834+DST( movb %dl, %es:(%edi) )
29835 6: addl %edx, %eax
29836 adcl $0, %eax
29837 7:
29838 .section .fixup, "ax"
29839 6001: movl ARGBASE+20(%esp), %ebx # src_err_ptr
29840- movl $-EFAULT, (%ebx)
29841+ movl $-EFAULT, %ss:(%ebx)
29842 # zero the complete destination (computing the rest is too much work)
29843 movl ARGBASE+8(%esp),%edi # dst
29844 movl ARGBASE+12(%esp),%ecx # len
29845@@ -502,10 +539,17 @@ DST( movb %dl, (%edi) )
29846 rep; stosb
29847 jmp 7b
29848 6002: movl ARGBASE+24(%esp), %ebx # dst_err_ptr
29849- movl $-EFAULT, (%ebx)
29850+ movl $-EFAULT, %ss:(%ebx)
29851 jmp 7b
29852 .previous
29853
29854+#ifdef CONFIG_PAX_MEMORY_UDEREF
29855+ pushl_cfi %ss
29856+ popl_cfi %ds
29857+ pushl_cfi %ss
29858+ popl_cfi %es
29859+#endif
29860+
29861 popl_cfi %esi
29862 CFI_RESTORE esi
29863 popl_cfi %edi
29864@@ -514,7 +558,7 @@ DST( movb %dl, (%edi) )
29865 CFI_RESTORE ebx
29866 ret
29867 CFI_ENDPROC
29868-ENDPROC(csum_partial_copy_generic)
29869+ENDPROC(csum_partial_copy_generic_to_user)
29870
29871 #undef ROUND
29872 #undef ROUND1
29873diff --git a/arch/x86/lib/clear_page_64.S b/arch/x86/lib/clear_page_64.S
29874index f2145cf..cea889d 100644
29875--- a/arch/x86/lib/clear_page_64.S
29876+++ b/arch/x86/lib/clear_page_64.S
29877@@ -11,6 +11,7 @@ ENTRY(clear_page_c)
29878 movl $4096/8,%ecx
29879 xorl %eax,%eax
29880 rep stosq
29881+ pax_force_retaddr
29882 ret
29883 CFI_ENDPROC
29884 ENDPROC(clear_page_c)
29885@@ -20,6 +21,7 @@ ENTRY(clear_page_c_e)
29886 movl $4096,%ecx
29887 xorl %eax,%eax
29888 rep stosb
29889+ pax_force_retaddr
29890 ret
29891 CFI_ENDPROC
29892 ENDPROC(clear_page_c_e)
29893@@ -43,6 +45,7 @@ ENTRY(clear_page)
29894 leaq 64(%rdi),%rdi
29895 jnz .Lloop
29896 nop
29897+ pax_force_retaddr
29898 ret
29899 CFI_ENDPROC
29900 .Lclear_page_end:
29901@@ -58,7 +61,7 @@ ENDPROC(clear_page)
29902
29903 #include <asm/cpufeature.h>
29904
29905- .section .altinstr_replacement,"ax"
29906+ .section .altinstr_replacement,"a"
29907 1: .byte 0xeb /* jmp <disp8> */
29908 .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */
29909 2: .byte 0xeb /* jmp <disp8> */
29910diff --git a/arch/x86/lib/cmpxchg16b_emu.S b/arch/x86/lib/cmpxchg16b_emu.S
29911index 40a1725..5d12ac4 100644
29912--- a/arch/x86/lib/cmpxchg16b_emu.S
29913+++ b/arch/x86/lib/cmpxchg16b_emu.S
29914@@ -8,6 +8,7 @@
29915 #include <linux/linkage.h>
29916 #include <asm/dwarf2.h>
29917 #include <asm/percpu.h>
29918+#include <asm/alternative-asm.h>
29919
29920 .text
29921
29922@@ -46,12 +47,14 @@ CFI_STARTPROC
29923 CFI_REMEMBER_STATE
29924 popfq_cfi
29925 mov $1, %al
29926+ pax_force_retaddr
29927 ret
29928
29929 CFI_RESTORE_STATE
29930 .Lnot_same:
29931 popfq_cfi
29932 xor %al,%al
29933+ pax_force_retaddr
29934 ret
29935
29936 CFI_ENDPROC
29937diff --git a/arch/x86/lib/copy_page_64.S b/arch/x86/lib/copy_page_64.S
29938index 176cca6..e0d658e 100644
29939--- a/arch/x86/lib/copy_page_64.S
29940+++ b/arch/x86/lib/copy_page_64.S
29941@@ -9,6 +9,7 @@ copy_page_rep:
29942 CFI_STARTPROC
29943 movl $4096/8, %ecx
29944 rep movsq
29945+ pax_force_retaddr
29946 ret
29947 CFI_ENDPROC
29948 ENDPROC(copy_page_rep)
29949@@ -24,8 +25,8 @@ ENTRY(copy_page)
29950 CFI_ADJUST_CFA_OFFSET 2*8
29951 movq %rbx, (%rsp)
29952 CFI_REL_OFFSET rbx, 0
29953- movq %r12, 1*8(%rsp)
29954- CFI_REL_OFFSET r12, 1*8
29955+ movq %r13, 1*8(%rsp)
29956+ CFI_REL_OFFSET r13, 1*8
29957
29958 movl $(4096/64)-5, %ecx
29959 .p2align 4
29960@@ -38,7 +39,7 @@ ENTRY(copy_page)
29961 movq 0x8*4(%rsi), %r9
29962 movq 0x8*5(%rsi), %r10
29963 movq 0x8*6(%rsi), %r11
29964- movq 0x8*7(%rsi), %r12
29965+ movq 0x8*7(%rsi), %r13
29966
29967 prefetcht0 5*64(%rsi)
29968
29969@@ -49,7 +50,7 @@ ENTRY(copy_page)
29970 movq %r9, 0x8*4(%rdi)
29971 movq %r10, 0x8*5(%rdi)
29972 movq %r11, 0x8*6(%rdi)
29973- movq %r12, 0x8*7(%rdi)
29974+ movq %r13, 0x8*7(%rdi)
29975
29976 leaq 64 (%rsi), %rsi
29977 leaq 64 (%rdi), %rdi
29978@@ -68,7 +69,7 @@ ENTRY(copy_page)
29979 movq 0x8*4(%rsi), %r9
29980 movq 0x8*5(%rsi), %r10
29981 movq 0x8*6(%rsi), %r11
29982- movq 0x8*7(%rsi), %r12
29983+ movq 0x8*7(%rsi), %r13
29984
29985 movq %rax, 0x8*0(%rdi)
29986 movq %rbx, 0x8*1(%rdi)
29987@@ -77,7 +78,7 @@ ENTRY(copy_page)
29988 movq %r9, 0x8*4(%rdi)
29989 movq %r10, 0x8*5(%rdi)
29990 movq %r11, 0x8*6(%rdi)
29991- movq %r12, 0x8*7(%rdi)
29992+ movq %r13, 0x8*7(%rdi)
29993
29994 leaq 64(%rdi), %rdi
29995 leaq 64(%rsi), %rsi
29996@@ -85,10 +86,11 @@ ENTRY(copy_page)
29997
29998 movq (%rsp), %rbx
29999 CFI_RESTORE rbx
30000- movq 1*8(%rsp), %r12
30001- CFI_RESTORE r12
30002+ movq 1*8(%rsp), %r13
30003+ CFI_RESTORE r13
30004 addq $2*8, %rsp
30005 CFI_ADJUST_CFA_OFFSET -2*8
30006+ pax_force_retaddr
30007 ret
30008 .Lcopy_page_end:
30009 CFI_ENDPROC
30010@@ -99,7 +101,7 @@ ENDPROC(copy_page)
30011
30012 #include <asm/cpufeature.h>
30013
30014- .section .altinstr_replacement,"ax"
30015+ .section .altinstr_replacement,"a"
30016 1: .byte 0xeb /* jmp <disp8> */
30017 .byte (copy_page_rep - copy_page) - (2f - 1b) /* offset */
30018 2:
30019diff --git a/arch/x86/lib/copy_user_64.S b/arch/x86/lib/copy_user_64.S
30020index dee945d..a84067b 100644
30021--- a/arch/x86/lib/copy_user_64.S
30022+++ b/arch/x86/lib/copy_user_64.S
30023@@ -18,31 +18,7 @@
30024 #include <asm/alternative-asm.h>
30025 #include <asm/asm.h>
30026 #include <asm/smap.h>
30027-
30028-/*
30029- * By placing feature2 after feature1 in altinstructions section, we logically
30030- * implement:
30031- * If CPU has feature2, jmp to alt2 is used
30032- * else if CPU has feature1, jmp to alt1 is used
30033- * else jmp to orig is used.
30034- */
30035- .macro ALTERNATIVE_JUMP feature1,feature2,orig,alt1,alt2
30036-0:
30037- .byte 0xe9 /* 32bit jump */
30038- .long \orig-1f /* by default jump to orig */
30039-1:
30040- .section .altinstr_replacement,"ax"
30041-2: .byte 0xe9 /* near jump with 32bit immediate */
30042- .long \alt1-1b /* offset */ /* or alternatively to alt1 */
30043-3: .byte 0xe9 /* near jump with 32bit immediate */
30044- .long \alt2-1b /* offset */ /* or alternatively to alt2 */
30045- .previous
30046-
30047- .section .altinstructions,"a"
30048- altinstruction_entry 0b,2b,\feature1,5,5
30049- altinstruction_entry 0b,3b,\feature2,5,5
30050- .previous
30051- .endm
30052+#include <asm/pgtable.h>
30053
30054 .macro ALIGN_DESTINATION
30055 #ifdef FIX_ALIGNMENT
30056@@ -70,52 +46,6 @@
30057 #endif
30058 .endm
30059
30060-/* Standard copy_to_user with segment limit checking */
30061-ENTRY(_copy_to_user)
30062- CFI_STARTPROC
30063- GET_THREAD_INFO(%rax)
30064- movq %rdi,%rcx
30065- addq %rdx,%rcx
30066- jc bad_to_user
30067- cmpq TI_addr_limit(%rax),%rcx
30068- ja bad_to_user
30069- ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,X86_FEATURE_ERMS, \
30070- copy_user_generic_unrolled,copy_user_generic_string, \
30071- copy_user_enhanced_fast_string
30072- CFI_ENDPROC
30073-ENDPROC(_copy_to_user)
30074-
30075-/* Standard copy_from_user with segment limit checking */
30076-ENTRY(_copy_from_user)
30077- CFI_STARTPROC
30078- GET_THREAD_INFO(%rax)
30079- movq %rsi,%rcx
30080- addq %rdx,%rcx
30081- jc bad_from_user
30082- cmpq TI_addr_limit(%rax),%rcx
30083- ja bad_from_user
30084- ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,X86_FEATURE_ERMS, \
30085- copy_user_generic_unrolled,copy_user_generic_string, \
30086- copy_user_enhanced_fast_string
30087- CFI_ENDPROC
30088-ENDPROC(_copy_from_user)
30089-
30090- .section .fixup,"ax"
30091- /* must zero dest */
30092-ENTRY(bad_from_user)
30093-bad_from_user:
30094- CFI_STARTPROC
30095- movl %edx,%ecx
30096- xorl %eax,%eax
30097- rep
30098- stosb
30099-bad_to_user:
30100- movl %edx,%eax
30101- ret
30102- CFI_ENDPROC
30103-ENDPROC(bad_from_user)
30104- .previous
30105-
30106 /*
30107 * copy_user_generic_unrolled - memory copy with exception handling.
30108 * This version is for CPUs like P4 that don't have efficient micro
30109@@ -131,6 +61,7 @@ ENDPROC(bad_from_user)
30110 */
30111 ENTRY(copy_user_generic_unrolled)
30112 CFI_STARTPROC
30113+ ASM_PAX_OPEN_USERLAND
30114 ASM_STAC
30115 cmpl $8,%edx
30116 jb 20f /* less then 8 bytes, go to byte copy loop */
30117@@ -180,6 +111,8 @@ ENTRY(copy_user_generic_unrolled)
30118 jnz 21b
30119 23: xor %eax,%eax
30120 ASM_CLAC
30121+ ASM_PAX_CLOSE_USERLAND
30122+ pax_force_retaddr
30123 ret
30124
30125 .section .fixup,"ax"
30126@@ -235,6 +168,7 @@ ENDPROC(copy_user_generic_unrolled)
30127 */
30128 ENTRY(copy_user_generic_string)
30129 CFI_STARTPROC
30130+ ASM_PAX_OPEN_USERLAND
30131 ASM_STAC
30132 cmpl $8,%edx
30133 jb 2f /* less than 8 bytes, go to byte copy loop */
30134@@ -249,6 +183,8 @@ ENTRY(copy_user_generic_string)
30135 movsb
30136 xorl %eax,%eax
30137 ASM_CLAC
30138+ ASM_PAX_CLOSE_USERLAND
30139+ pax_force_retaddr
30140 ret
30141
30142 .section .fixup,"ax"
30143@@ -276,12 +212,15 @@ ENDPROC(copy_user_generic_string)
30144 */
30145 ENTRY(copy_user_enhanced_fast_string)
30146 CFI_STARTPROC
30147+ ASM_PAX_OPEN_USERLAND
30148 ASM_STAC
30149 movl %edx,%ecx
30150 1: rep
30151 movsb
30152 xorl %eax,%eax
30153 ASM_CLAC
30154+ ASM_PAX_CLOSE_USERLAND
30155+ pax_force_retaddr
30156 ret
30157
30158 .section .fixup,"ax"
30159diff --git a/arch/x86/lib/copy_user_nocache_64.S b/arch/x86/lib/copy_user_nocache_64.S
30160index 6a4f43c..c70fb52 100644
30161--- a/arch/x86/lib/copy_user_nocache_64.S
30162+++ b/arch/x86/lib/copy_user_nocache_64.S
30163@@ -8,6 +8,7 @@
30164
30165 #include <linux/linkage.h>
30166 #include <asm/dwarf2.h>
30167+#include <asm/alternative-asm.h>
30168
30169 #define FIX_ALIGNMENT 1
30170
30171@@ -16,6 +17,7 @@
30172 #include <asm/thread_info.h>
30173 #include <asm/asm.h>
30174 #include <asm/smap.h>
30175+#include <asm/pgtable.h>
30176
30177 .macro ALIGN_DESTINATION
30178 #ifdef FIX_ALIGNMENT
30179@@ -49,6 +51,16 @@
30180 */
30181 ENTRY(__copy_user_nocache)
30182 CFI_STARTPROC
30183+
30184+#ifdef CONFIG_PAX_MEMORY_UDEREF
30185+ mov pax_user_shadow_base,%rcx
30186+ cmp %rcx,%rsi
30187+ jae 1f
30188+ add %rcx,%rsi
30189+1:
30190+#endif
30191+
30192+ ASM_PAX_OPEN_USERLAND
30193 ASM_STAC
30194 cmpl $8,%edx
30195 jb 20f /* less then 8 bytes, go to byte copy loop */
30196@@ -98,7 +110,9 @@ ENTRY(__copy_user_nocache)
30197 jnz 21b
30198 23: xorl %eax,%eax
30199 ASM_CLAC
30200+ ASM_PAX_CLOSE_USERLAND
30201 sfence
30202+ pax_force_retaddr
30203 ret
30204
30205 .section .fixup,"ax"
30206diff --git a/arch/x86/lib/csum-copy_64.S b/arch/x86/lib/csum-copy_64.S
30207index 2419d5f..fe52d0e 100644
30208--- a/arch/x86/lib/csum-copy_64.S
30209+++ b/arch/x86/lib/csum-copy_64.S
30210@@ -9,6 +9,7 @@
30211 #include <asm/dwarf2.h>
30212 #include <asm/errno.h>
30213 #include <asm/asm.h>
30214+#include <asm/alternative-asm.h>
30215
30216 /*
30217 * Checksum copy with exception handling.
30218@@ -56,8 +57,8 @@ ENTRY(csum_partial_copy_generic)
30219 CFI_ADJUST_CFA_OFFSET 7*8
30220 movq %rbx, 2*8(%rsp)
30221 CFI_REL_OFFSET rbx, 2*8
30222- movq %r12, 3*8(%rsp)
30223- CFI_REL_OFFSET r12, 3*8
30224+ movq %r15, 3*8(%rsp)
30225+ CFI_REL_OFFSET r15, 3*8
30226 movq %r14, 4*8(%rsp)
30227 CFI_REL_OFFSET r14, 4*8
30228 movq %r13, 5*8(%rsp)
30229@@ -72,16 +73,16 @@ ENTRY(csum_partial_copy_generic)
30230 movl %edx, %ecx
30231
30232 xorl %r9d, %r9d
30233- movq %rcx, %r12
30234+ movq %rcx, %r15
30235
30236- shrq $6, %r12
30237+ shrq $6, %r15
30238 jz .Lhandle_tail /* < 64 */
30239
30240 clc
30241
30242 /* main loop. clear in 64 byte blocks */
30243 /* r9: zero, r8: temp2, rbx: temp1, rax: sum, rcx: saved length */
30244- /* r11: temp3, rdx: temp4, r12 loopcnt */
30245+ /* r11: temp3, rdx: temp4, r15 loopcnt */
30246 /* r10: temp5, rbp: temp6, r14 temp7, r13 temp8 */
30247 .p2align 4
30248 .Lloop:
30249@@ -115,7 +116,7 @@ ENTRY(csum_partial_copy_generic)
30250 adcq %r14, %rax
30251 adcq %r13, %rax
30252
30253- decl %r12d
30254+ decl %r15d
30255
30256 dest
30257 movq %rbx, (%rsi)
30258@@ -210,8 +211,8 @@ ENTRY(csum_partial_copy_generic)
30259 .Lende:
30260 movq 2*8(%rsp), %rbx
30261 CFI_RESTORE rbx
30262- movq 3*8(%rsp), %r12
30263- CFI_RESTORE r12
30264+ movq 3*8(%rsp), %r15
30265+ CFI_RESTORE r15
30266 movq 4*8(%rsp), %r14
30267 CFI_RESTORE r14
30268 movq 5*8(%rsp), %r13
30269@@ -220,6 +221,7 @@ ENTRY(csum_partial_copy_generic)
30270 CFI_RESTORE rbp
30271 addq $7*8, %rsp
30272 CFI_ADJUST_CFA_OFFSET -7*8
30273+ pax_force_retaddr
30274 ret
30275 CFI_RESTORE_STATE
30276
30277diff --git a/arch/x86/lib/csum-wrappers_64.c b/arch/x86/lib/csum-wrappers_64.c
30278index 1318f75..44c30fd 100644
30279--- a/arch/x86/lib/csum-wrappers_64.c
30280+++ b/arch/x86/lib/csum-wrappers_64.c
30281@@ -52,10 +52,12 @@ csum_partial_copy_from_user(const void __user *src, void *dst,
30282 len -= 2;
30283 }
30284 }
30285+ pax_open_userland();
30286 stac();
30287- isum = csum_partial_copy_generic((__force const void *)src,
30288+ isum = csum_partial_copy_generic((const void __force_kernel *)____m(src),
30289 dst, len, isum, errp, NULL);
30290 clac();
30291+ pax_close_userland();
30292 if (unlikely(*errp))
30293 goto out_err;
30294
30295@@ -109,10 +111,12 @@ csum_partial_copy_to_user(const void *src, void __user *dst,
30296 }
30297
30298 *errp = 0;
30299+ pax_open_userland();
30300 stac();
30301- ret = csum_partial_copy_generic(src, (void __force *)dst,
30302+ ret = csum_partial_copy_generic(src, (void __force_kernel *)____m(dst),
30303 len, isum, NULL, errp);
30304 clac();
30305+ pax_close_userland();
30306 return ret;
30307 }
30308 EXPORT_SYMBOL(csum_partial_copy_to_user);
30309diff --git a/arch/x86/lib/getuser.S b/arch/x86/lib/getuser.S
30310index a451235..a74bfa3 100644
30311--- a/arch/x86/lib/getuser.S
30312+++ b/arch/x86/lib/getuser.S
30313@@ -33,17 +33,40 @@
30314 #include <asm/thread_info.h>
30315 #include <asm/asm.h>
30316 #include <asm/smap.h>
30317+#include <asm/segment.h>
30318+#include <asm/pgtable.h>
30319+#include <asm/alternative-asm.h>
30320+
30321+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
30322+#define __copyuser_seg gs;
30323+#else
30324+#define __copyuser_seg
30325+#endif
30326
30327 .text
30328 ENTRY(__get_user_1)
30329 CFI_STARTPROC
30330+
30331+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30332 GET_THREAD_INFO(%_ASM_DX)
30333 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30334 jae bad_get_user
30335+
30336+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30337+ mov pax_user_shadow_base,%_ASM_DX
30338+ cmp %_ASM_DX,%_ASM_AX
30339+ jae 1234f
30340+ add %_ASM_DX,%_ASM_AX
30341+1234:
30342+#endif
30343+
30344+#endif
30345+
30346 ASM_STAC
30347-1: movzbl (%_ASM_AX),%edx
30348+1: __copyuser_seg movzbl (%_ASM_AX),%edx
30349 xor %eax,%eax
30350 ASM_CLAC
30351+ pax_force_retaddr
30352 ret
30353 CFI_ENDPROC
30354 ENDPROC(__get_user_1)
30355@@ -51,14 +74,28 @@ ENDPROC(__get_user_1)
30356 ENTRY(__get_user_2)
30357 CFI_STARTPROC
30358 add $1,%_ASM_AX
30359+
30360+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30361 jc bad_get_user
30362 GET_THREAD_INFO(%_ASM_DX)
30363 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30364 jae bad_get_user
30365+
30366+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30367+ mov pax_user_shadow_base,%_ASM_DX
30368+ cmp %_ASM_DX,%_ASM_AX
30369+ jae 1234f
30370+ add %_ASM_DX,%_ASM_AX
30371+1234:
30372+#endif
30373+
30374+#endif
30375+
30376 ASM_STAC
30377-2: movzwl -1(%_ASM_AX),%edx
30378+2: __copyuser_seg movzwl -1(%_ASM_AX),%edx
30379 xor %eax,%eax
30380 ASM_CLAC
30381+ pax_force_retaddr
30382 ret
30383 CFI_ENDPROC
30384 ENDPROC(__get_user_2)
30385@@ -66,14 +103,28 @@ ENDPROC(__get_user_2)
30386 ENTRY(__get_user_4)
30387 CFI_STARTPROC
30388 add $3,%_ASM_AX
30389+
30390+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30391 jc bad_get_user
30392 GET_THREAD_INFO(%_ASM_DX)
30393 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30394 jae bad_get_user
30395+
30396+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30397+ mov pax_user_shadow_base,%_ASM_DX
30398+ cmp %_ASM_DX,%_ASM_AX
30399+ jae 1234f
30400+ add %_ASM_DX,%_ASM_AX
30401+1234:
30402+#endif
30403+
30404+#endif
30405+
30406 ASM_STAC
30407-3: movl -3(%_ASM_AX),%edx
30408+3: __copyuser_seg movl -3(%_ASM_AX),%edx
30409 xor %eax,%eax
30410 ASM_CLAC
30411+ pax_force_retaddr
30412 ret
30413 CFI_ENDPROC
30414 ENDPROC(__get_user_4)
30415@@ -86,10 +137,20 @@ ENTRY(__get_user_8)
30416 GET_THREAD_INFO(%_ASM_DX)
30417 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30418 jae bad_get_user
30419+
30420+#ifdef CONFIG_PAX_MEMORY_UDEREF
30421+ mov pax_user_shadow_base,%_ASM_DX
30422+ cmp %_ASM_DX,%_ASM_AX
30423+ jae 1234f
30424+ add %_ASM_DX,%_ASM_AX
30425+1234:
30426+#endif
30427+
30428 ASM_STAC
30429 4: movq -7(%_ASM_AX),%rdx
30430 xor %eax,%eax
30431 ASM_CLAC
30432+ pax_force_retaddr
30433 ret
30434 #else
30435 add $7,%_ASM_AX
30436@@ -98,10 +159,11 @@ ENTRY(__get_user_8)
30437 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30438 jae bad_get_user_8
30439 ASM_STAC
30440-4: movl -7(%_ASM_AX),%edx
30441-5: movl -3(%_ASM_AX),%ecx
30442+4: __copyuser_seg movl -7(%_ASM_AX),%edx
30443+5: __copyuser_seg movl -3(%_ASM_AX),%ecx
30444 xor %eax,%eax
30445 ASM_CLAC
30446+ pax_force_retaddr
30447 ret
30448 #endif
30449 CFI_ENDPROC
30450@@ -113,6 +175,7 @@ bad_get_user:
30451 xor %edx,%edx
30452 mov $(-EFAULT),%_ASM_AX
30453 ASM_CLAC
30454+ pax_force_retaddr
30455 ret
30456 CFI_ENDPROC
30457 END(bad_get_user)
30458@@ -124,6 +187,7 @@ bad_get_user_8:
30459 xor %ecx,%ecx
30460 mov $(-EFAULT),%_ASM_AX
30461 ASM_CLAC
30462+ pax_force_retaddr
30463 ret
30464 CFI_ENDPROC
30465 END(bad_get_user_8)
30466diff --git a/arch/x86/lib/insn.c b/arch/x86/lib/insn.c
30467index 85994f5..9929d7f 100644
30468--- a/arch/x86/lib/insn.c
30469+++ b/arch/x86/lib/insn.c
30470@@ -20,8 +20,10 @@
30471
30472 #ifdef __KERNEL__
30473 #include <linux/string.h>
30474+#include <asm/pgtable_types.h>
30475 #else
30476 #include <string.h>
30477+#define ktla_ktva(addr) addr
30478 #endif
30479 #include <asm/inat.h>
30480 #include <asm/insn.h>
30481@@ -60,9 +62,9 @@ void insn_init(struct insn *insn, const void *kaddr, int buf_len, int x86_64)
30482 buf_len = MAX_INSN_SIZE;
30483
30484 memset(insn, 0, sizeof(*insn));
30485- insn->kaddr = kaddr;
30486- insn->end_kaddr = kaddr + buf_len;
30487- insn->next_byte = kaddr;
30488+ insn->kaddr = ktla_ktva(kaddr);
30489+ insn->end_kaddr = insn->kaddr + buf_len;
30490+ insn->next_byte = insn->kaddr;
30491 insn->x86_64 = x86_64 ? 1 : 0;
30492 insn->opnd_bytes = 4;
30493 if (x86_64)
30494diff --git a/arch/x86/lib/iomap_copy_64.S b/arch/x86/lib/iomap_copy_64.S
30495index 05a95e7..326f2fa 100644
30496--- a/arch/x86/lib/iomap_copy_64.S
30497+++ b/arch/x86/lib/iomap_copy_64.S
30498@@ -17,6 +17,7 @@
30499
30500 #include <linux/linkage.h>
30501 #include <asm/dwarf2.h>
30502+#include <asm/alternative-asm.h>
30503
30504 /*
30505 * override generic version in lib/iomap_copy.c
30506@@ -25,6 +26,7 @@ ENTRY(__iowrite32_copy)
30507 CFI_STARTPROC
30508 movl %edx,%ecx
30509 rep movsd
30510+ pax_force_retaddr
30511 ret
30512 CFI_ENDPROC
30513 ENDPROC(__iowrite32_copy)
30514diff --git a/arch/x86/lib/memcpy_64.S b/arch/x86/lib/memcpy_64.S
30515index 89b53c9..97357ca 100644
30516--- a/arch/x86/lib/memcpy_64.S
30517+++ b/arch/x86/lib/memcpy_64.S
30518@@ -24,7 +24,7 @@
30519 * This gets patched over the unrolled variant (below) via the
30520 * alternative instructions framework:
30521 */
30522- .section .altinstr_replacement, "ax", @progbits
30523+ .section .altinstr_replacement, "a", @progbits
30524 .Lmemcpy_c:
30525 movq %rdi, %rax
30526 movq %rdx, %rcx
30527@@ -33,6 +33,7 @@
30528 rep movsq
30529 movl %edx, %ecx
30530 rep movsb
30531+ pax_force_retaddr
30532 ret
30533 .Lmemcpy_e:
30534 .previous
30535@@ -44,11 +45,12 @@
30536 * This gets patched over the unrolled variant (below) via the
30537 * alternative instructions framework:
30538 */
30539- .section .altinstr_replacement, "ax", @progbits
30540+ .section .altinstr_replacement, "a", @progbits
30541 .Lmemcpy_c_e:
30542 movq %rdi, %rax
30543 movq %rdx, %rcx
30544 rep movsb
30545+ pax_force_retaddr
30546 ret
30547 .Lmemcpy_e_e:
30548 .previous
30549@@ -138,6 +140,7 @@ ENTRY(memcpy)
30550 movq %r9, 1*8(%rdi)
30551 movq %r10, -2*8(%rdi, %rdx)
30552 movq %r11, -1*8(%rdi, %rdx)
30553+ pax_force_retaddr
30554 retq
30555 .p2align 4
30556 .Lless_16bytes:
30557@@ -150,6 +153,7 @@ ENTRY(memcpy)
30558 movq -1*8(%rsi, %rdx), %r9
30559 movq %r8, 0*8(%rdi)
30560 movq %r9, -1*8(%rdi, %rdx)
30561+ pax_force_retaddr
30562 retq
30563 .p2align 4
30564 .Lless_8bytes:
30565@@ -163,6 +167,7 @@ ENTRY(memcpy)
30566 movl -4(%rsi, %rdx), %r8d
30567 movl %ecx, (%rdi)
30568 movl %r8d, -4(%rdi, %rdx)
30569+ pax_force_retaddr
30570 retq
30571 .p2align 4
30572 .Lless_3bytes:
30573@@ -181,6 +186,7 @@ ENTRY(memcpy)
30574 movb %cl, (%rdi)
30575
30576 .Lend:
30577+ pax_force_retaddr
30578 retq
30579 CFI_ENDPROC
30580 ENDPROC(memcpy)
30581diff --git a/arch/x86/lib/memmove_64.S b/arch/x86/lib/memmove_64.S
30582index 9c4b530..830b77a 100644
30583--- a/arch/x86/lib/memmove_64.S
30584+++ b/arch/x86/lib/memmove_64.S
30585@@ -205,14 +205,16 @@ ENTRY(__memmove)
30586 movb (%rsi), %r11b
30587 movb %r11b, (%rdi)
30588 13:
30589+ pax_force_retaddr
30590 retq
30591 CFI_ENDPROC
30592
30593- .section .altinstr_replacement,"ax"
30594+ .section .altinstr_replacement,"a"
30595 .Lmemmove_begin_forward_efs:
30596 /* Forward moving data. */
30597 movq %rdx, %rcx
30598 rep movsb
30599+ pax_force_retaddr
30600 retq
30601 .Lmemmove_end_forward_efs:
30602 .previous
30603diff --git a/arch/x86/lib/memset_64.S b/arch/x86/lib/memset_64.S
30604index 6f44935..fbf5f6d 100644
30605--- a/arch/x86/lib/memset_64.S
30606+++ b/arch/x86/lib/memset_64.S
30607@@ -16,7 +16,7 @@
30608 *
30609 * rax original destination
30610 */
30611- .section .altinstr_replacement, "ax", @progbits
30612+ .section .altinstr_replacement, "a", @progbits
30613 .Lmemset_c:
30614 movq %rdi,%r9
30615 movq %rdx,%rcx
30616@@ -30,6 +30,7 @@
30617 movl %edx,%ecx
30618 rep stosb
30619 movq %r9,%rax
30620+ pax_force_retaddr
30621 ret
30622 .Lmemset_e:
30623 .previous
30624@@ -45,13 +46,14 @@
30625 *
30626 * rax original destination
30627 */
30628- .section .altinstr_replacement, "ax", @progbits
30629+ .section .altinstr_replacement, "a", @progbits
30630 .Lmemset_c_e:
30631 movq %rdi,%r9
30632 movb %sil,%al
30633 movq %rdx,%rcx
30634 rep stosb
30635 movq %r9,%rax
30636+ pax_force_retaddr
30637 ret
30638 .Lmemset_e_e:
30639 .previous
30640@@ -120,6 +122,7 @@ ENTRY(__memset)
30641
30642 .Lende:
30643 movq %r10,%rax
30644+ pax_force_retaddr
30645 ret
30646
30647 CFI_RESTORE_STATE
30648diff --git a/arch/x86/lib/mmx_32.c b/arch/x86/lib/mmx_32.c
30649index c9f2d9b..e7fd2c0 100644
30650--- a/arch/x86/lib/mmx_32.c
30651+++ b/arch/x86/lib/mmx_32.c
30652@@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
30653 {
30654 void *p;
30655 int i;
30656+ unsigned long cr0;
30657
30658 if (unlikely(in_interrupt()))
30659 return __memcpy(to, from, len);
30660@@ -39,44 +40,72 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
30661 kernel_fpu_begin();
30662
30663 __asm__ __volatile__ (
30664- "1: prefetch (%0)\n" /* This set is 28 bytes */
30665- " prefetch 64(%0)\n"
30666- " prefetch 128(%0)\n"
30667- " prefetch 192(%0)\n"
30668- " prefetch 256(%0)\n"
30669+ "1: prefetch (%1)\n" /* This set is 28 bytes */
30670+ " prefetch 64(%1)\n"
30671+ " prefetch 128(%1)\n"
30672+ " prefetch 192(%1)\n"
30673+ " prefetch 256(%1)\n"
30674 "2: \n"
30675 ".section .fixup, \"ax\"\n"
30676- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30677+ "3: \n"
30678+
30679+#ifdef CONFIG_PAX_KERNEXEC
30680+ " movl %%cr0, %0\n"
30681+ " movl %0, %%eax\n"
30682+ " andl $0xFFFEFFFF, %%eax\n"
30683+ " movl %%eax, %%cr0\n"
30684+#endif
30685+
30686+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30687+
30688+#ifdef CONFIG_PAX_KERNEXEC
30689+ " movl %0, %%cr0\n"
30690+#endif
30691+
30692 " jmp 2b\n"
30693 ".previous\n"
30694 _ASM_EXTABLE(1b, 3b)
30695- : : "r" (from));
30696+ : "=&r" (cr0) : "r" (from) : "ax");
30697
30698 for ( ; i > 5; i--) {
30699 __asm__ __volatile__ (
30700- "1: prefetch 320(%0)\n"
30701- "2: movq (%0), %%mm0\n"
30702- " movq 8(%0), %%mm1\n"
30703- " movq 16(%0), %%mm2\n"
30704- " movq 24(%0), %%mm3\n"
30705- " movq %%mm0, (%1)\n"
30706- " movq %%mm1, 8(%1)\n"
30707- " movq %%mm2, 16(%1)\n"
30708- " movq %%mm3, 24(%1)\n"
30709- " movq 32(%0), %%mm0\n"
30710- " movq 40(%0), %%mm1\n"
30711- " movq 48(%0), %%mm2\n"
30712- " movq 56(%0), %%mm3\n"
30713- " movq %%mm0, 32(%1)\n"
30714- " movq %%mm1, 40(%1)\n"
30715- " movq %%mm2, 48(%1)\n"
30716- " movq %%mm3, 56(%1)\n"
30717+ "1: prefetch 320(%1)\n"
30718+ "2: movq (%1), %%mm0\n"
30719+ " movq 8(%1), %%mm1\n"
30720+ " movq 16(%1), %%mm2\n"
30721+ " movq 24(%1), %%mm3\n"
30722+ " movq %%mm0, (%2)\n"
30723+ " movq %%mm1, 8(%2)\n"
30724+ " movq %%mm2, 16(%2)\n"
30725+ " movq %%mm3, 24(%2)\n"
30726+ " movq 32(%1), %%mm0\n"
30727+ " movq 40(%1), %%mm1\n"
30728+ " movq 48(%1), %%mm2\n"
30729+ " movq 56(%1), %%mm3\n"
30730+ " movq %%mm0, 32(%2)\n"
30731+ " movq %%mm1, 40(%2)\n"
30732+ " movq %%mm2, 48(%2)\n"
30733+ " movq %%mm3, 56(%2)\n"
30734 ".section .fixup, \"ax\"\n"
30735- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30736+ "3:\n"
30737+
30738+#ifdef CONFIG_PAX_KERNEXEC
30739+ " movl %%cr0, %0\n"
30740+ " movl %0, %%eax\n"
30741+ " andl $0xFFFEFFFF, %%eax\n"
30742+ " movl %%eax, %%cr0\n"
30743+#endif
30744+
30745+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30746+
30747+#ifdef CONFIG_PAX_KERNEXEC
30748+ " movl %0, %%cr0\n"
30749+#endif
30750+
30751 " jmp 2b\n"
30752 ".previous\n"
30753 _ASM_EXTABLE(1b, 3b)
30754- : : "r" (from), "r" (to) : "memory");
30755+ : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
30756
30757 from += 64;
30758 to += 64;
30759@@ -158,6 +187,7 @@ static void fast_clear_page(void *page)
30760 static void fast_copy_page(void *to, void *from)
30761 {
30762 int i;
30763+ unsigned long cr0;
30764
30765 kernel_fpu_begin();
30766
30767@@ -166,42 +196,70 @@ static void fast_copy_page(void *to, void *from)
30768 * but that is for later. -AV
30769 */
30770 __asm__ __volatile__(
30771- "1: prefetch (%0)\n"
30772- " prefetch 64(%0)\n"
30773- " prefetch 128(%0)\n"
30774- " prefetch 192(%0)\n"
30775- " prefetch 256(%0)\n"
30776+ "1: prefetch (%1)\n"
30777+ " prefetch 64(%1)\n"
30778+ " prefetch 128(%1)\n"
30779+ " prefetch 192(%1)\n"
30780+ " prefetch 256(%1)\n"
30781 "2: \n"
30782 ".section .fixup, \"ax\"\n"
30783- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30784+ "3: \n"
30785+
30786+#ifdef CONFIG_PAX_KERNEXEC
30787+ " movl %%cr0, %0\n"
30788+ " movl %0, %%eax\n"
30789+ " andl $0xFFFEFFFF, %%eax\n"
30790+ " movl %%eax, %%cr0\n"
30791+#endif
30792+
30793+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30794+
30795+#ifdef CONFIG_PAX_KERNEXEC
30796+ " movl %0, %%cr0\n"
30797+#endif
30798+
30799 " jmp 2b\n"
30800 ".previous\n"
30801- _ASM_EXTABLE(1b, 3b) : : "r" (from));
30802+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax");
30803
30804 for (i = 0; i < (4096-320)/64; i++) {
30805 __asm__ __volatile__ (
30806- "1: prefetch 320(%0)\n"
30807- "2: movq (%0), %%mm0\n"
30808- " movntq %%mm0, (%1)\n"
30809- " movq 8(%0), %%mm1\n"
30810- " movntq %%mm1, 8(%1)\n"
30811- " movq 16(%0), %%mm2\n"
30812- " movntq %%mm2, 16(%1)\n"
30813- " movq 24(%0), %%mm3\n"
30814- " movntq %%mm3, 24(%1)\n"
30815- " movq 32(%0), %%mm4\n"
30816- " movntq %%mm4, 32(%1)\n"
30817- " movq 40(%0), %%mm5\n"
30818- " movntq %%mm5, 40(%1)\n"
30819- " movq 48(%0), %%mm6\n"
30820- " movntq %%mm6, 48(%1)\n"
30821- " movq 56(%0), %%mm7\n"
30822- " movntq %%mm7, 56(%1)\n"
30823+ "1: prefetch 320(%1)\n"
30824+ "2: movq (%1), %%mm0\n"
30825+ " movntq %%mm0, (%2)\n"
30826+ " movq 8(%1), %%mm1\n"
30827+ " movntq %%mm1, 8(%2)\n"
30828+ " movq 16(%1), %%mm2\n"
30829+ " movntq %%mm2, 16(%2)\n"
30830+ " movq 24(%1), %%mm3\n"
30831+ " movntq %%mm3, 24(%2)\n"
30832+ " movq 32(%1), %%mm4\n"
30833+ " movntq %%mm4, 32(%2)\n"
30834+ " movq 40(%1), %%mm5\n"
30835+ " movntq %%mm5, 40(%2)\n"
30836+ " movq 48(%1), %%mm6\n"
30837+ " movntq %%mm6, 48(%2)\n"
30838+ " movq 56(%1), %%mm7\n"
30839+ " movntq %%mm7, 56(%2)\n"
30840 ".section .fixup, \"ax\"\n"
30841- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30842+ "3:\n"
30843+
30844+#ifdef CONFIG_PAX_KERNEXEC
30845+ " movl %%cr0, %0\n"
30846+ " movl %0, %%eax\n"
30847+ " andl $0xFFFEFFFF, %%eax\n"
30848+ " movl %%eax, %%cr0\n"
30849+#endif
30850+
30851+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30852+
30853+#ifdef CONFIG_PAX_KERNEXEC
30854+ " movl %0, %%cr0\n"
30855+#endif
30856+
30857 " jmp 2b\n"
30858 ".previous\n"
30859- _ASM_EXTABLE(1b, 3b) : : "r" (from), "r" (to) : "memory");
30860+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
30861
30862 from += 64;
30863 to += 64;
30864@@ -280,47 +338,76 @@ static void fast_clear_page(void *page)
30865 static void fast_copy_page(void *to, void *from)
30866 {
30867 int i;
30868+ unsigned long cr0;
30869
30870 kernel_fpu_begin();
30871
30872 __asm__ __volatile__ (
30873- "1: prefetch (%0)\n"
30874- " prefetch 64(%0)\n"
30875- " prefetch 128(%0)\n"
30876- " prefetch 192(%0)\n"
30877- " prefetch 256(%0)\n"
30878+ "1: prefetch (%1)\n"
30879+ " prefetch 64(%1)\n"
30880+ " prefetch 128(%1)\n"
30881+ " prefetch 192(%1)\n"
30882+ " prefetch 256(%1)\n"
30883 "2: \n"
30884 ".section .fixup, \"ax\"\n"
30885- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30886+ "3: \n"
30887+
30888+#ifdef CONFIG_PAX_KERNEXEC
30889+ " movl %%cr0, %0\n"
30890+ " movl %0, %%eax\n"
30891+ " andl $0xFFFEFFFF, %%eax\n"
30892+ " movl %%eax, %%cr0\n"
30893+#endif
30894+
30895+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30896+
30897+#ifdef CONFIG_PAX_KERNEXEC
30898+ " movl %0, %%cr0\n"
30899+#endif
30900+
30901 " jmp 2b\n"
30902 ".previous\n"
30903- _ASM_EXTABLE(1b, 3b) : : "r" (from));
30904+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax");
30905
30906 for (i = 0; i < 4096/64; i++) {
30907 __asm__ __volatile__ (
30908- "1: prefetch 320(%0)\n"
30909- "2: movq (%0), %%mm0\n"
30910- " movq 8(%0), %%mm1\n"
30911- " movq 16(%0), %%mm2\n"
30912- " movq 24(%0), %%mm3\n"
30913- " movq %%mm0, (%1)\n"
30914- " movq %%mm1, 8(%1)\n"
30915- " movq %%mm2, 16(%1)\n"
30916- " movq %%mm3, 24(%1)\n"
30917- " movq 32(%0), %%mm0\n"
30918- " movq 40(%0), %%mm1\n"
30919- " movq 48(%0), %%mm2\n"
30920- " movq 56(%0), %%mm3\n"
30921- " movq %%mm0, 32(%1)\n"
30922- " movq %%mm1, 40(%1)\n"
30923- " movq %%mm2, 48(%1)\n"
30924- " movq %%mm3, 56(%1)\n"
30925+ "1: prefetch 320(%1)\n"
30926+ "2: movq (%1), %%mm0\n"
30927+ " movq 8(%1), %%mm1\n"
30928+ " movq 16(%1), %%mm2\n"
30929+ " movq 24(%1), %%mm3\n"
30930+ " movq %%mm0, (%2)\n"
30931+ " movq %%mm1, 8(%2)\n"
30932+ " movq %%mm2, 16(%2)\n"
30933+ " movq %%mm3, 24(%2)\n"
30934+ " movq 32(%1), %%mm0\n"
30935+ " movq 40(%1), %%mm1\n"
30936+ " movq 48(%1), %%mm2\n"
30937+ " movq 56(%1), %%mm3\n"
30938+ " movq %%mm0, 32(%2)\n"
30939+ " movq %%mm1, 40(%2)\n"
30940+ " movq %%mm2, 48(%2)\n"
30941+ " movq %%mm3, 56(%2)\n"
30942 ".section .fixup, \"ax\"\n"
30943- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30944+ "3:\n"
30945+
30946+#ifdef CONFIG_PAX_KERNEXEC
30947+ " movl %%cr0, %0\n"
30948+ " movl %0, %%eax\n"
30949+ " andl $0xFFFEFFFF, %%eax\n"
30950+ " movl %%eax, %%cr0\n"
30951+#endif
30952+
30953+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30954+
30955+#ifdef CONFIG_PAX_KERNEXEC
30956+ " movl %0, %%cr0\n"
30957+#endif
30958+
30959 " jmp 2b\n"
30960 ".previous\n"
30961 _ASM_EXTABLE(1b, 3b)
30962- : : "r" (from), "r" (to) : "memory");
30963+ : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
30964
30965 from += 64;
30966 to += 64;
30967diff --git a/arch/x86/lib/msr-reg.S b/arch/x86/lib/msr-reg.S
30968index f6d13ee..d789440 100644
30969--- a/arch/x86/lib/msr-reg.S
30970+++ b/arch/x86/lib/msr-reg.S
30971@@ -3,6 +3,7 @@
30972 #include <asm/dwarf2.h>
30973 #include <asm/asm.h>
30974 #include <asm/msr.h>
30975+#include <asm/alternative-asm.h>
30976
30977 #ifdef CONFIG_X86_64
30978 /*
30979@@ -37,6 +38,7 @@ ENTRY(\op\()_safe_regs)
30980 movl %edi, 28(%r10)
30981 popq_cfi %rbp
30982 popq_cfi %rbx
30983+ pax_force_retaddr
30984 ret
30985 3:
30986 CFI_RESTORE_STATE
30987diff --git a/arch/x86/lib/putuser.S b/arch/x86/lib/putuser.S
30988index fc6ba17..14ad9a5 100644
30989--- a/arch/x86/lib/putuser.S
30990+++ b/arch/x86/lib/putuser.S
30991@@ -16,7 +16,9 @@
30992 #include <asm/errno.h>
30993 #include <asm/asm.h>
30994 #include <asm/smap.h>
30995-
30996+#include <asm/segment.h>
30997+#include <asm/pgtable.h>
30998+#include <asm/alternative-asm.h>
30999
31000 /*
31001 * __put_user_X
31002@@ -30,57 +32,125 @@
31003 * as they get called from within inline assembly.
31004 */
31005
31006-#define ENTER CFI_STARTPROC ; \
31007- GET_THREAD_INFO(%_ASM_BX)
31008-#define EXIT ASM_CLAC ; \
31009- ret ; \
31010+#define ENTER CFI_STARTPROC
31011+#define EXIT ASM_CLAC ; \
31012+ pax_force_retaddr ; \
31013+ ret ; \
31014 CFI_ENDPROC
31015
31016+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
31017+#define _DEST %_ASM_CX,%_ASM_BX
31018+#else
31019+#define _DEST %_ASM_CX
31020+#endif
31021+
31022+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
31023+#define __copyuser_seg gs;
31024+#else
31025+#define __copyuser_seg
31026+#endif
31027+
31028 .text
31029 ENTRY(__put_user_1)
31030 ENTER
31031+
31032+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
31033+ GET_THREAD_INFO(%_ASM_BX)
31034 cmp TI_addr_limit(%_ASM_BX),%_ASM_CX
31035 jae bad_put_user
31036+
31037+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
31038+ mov pax_user_shadow_base,%_ASM_BX
31039+ cmp %_ASM_BX,%_ASM_CX
31040+ jb 1234f
31041+ xor %ebx,%ebx
31042+1234:
31043+#endif
31044+
31045+#endif
31046+
31047 ASM_STAC
31048-1: movb %al,(%_ASM_CX)
31049+1: __copyuser_seg movb %al,(_DEST)
31050 xor %eax,%eax
31051 EXIT
31052 ENDPROC(__put_user_1)
31053
31054 ENTRY(__put_user_2)
31055 ENTER
31056+
31057+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
31058+ GET_THREAD_INFO(%_ASM_BX)
31059 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
31060 sub $1,%_ASM_BX
31061 cmp %_ASM_BX,%_ASM_CX
31062 jae bad_put_user
31063+
31064+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
31065+ mov pax_user_shadow_base,%_ASM_BX
31066+ cmp %_ASM_BX,%_ASM_CX
31067+ jb 1234f
31068+ xor %ebx,%ebx
31069+1234:
31070+#endif
31071+
31072+#endif
31073+
31074 ASM_STAC
31075-2: movw %ax,(%_ASM_CX)
31076+2: __copyuser_seg movw %ax,(_DEST)
31077 xor %eax,%eax
31078 EXIT
31079 ENDPROC(__put_user_2)
31080
31081 ENTRY(__put_user_4)
31082 ENTER
31083+
31084+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
31085+ GET_THREAD_INFO(%_ASM_BX)
31086 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
31087 sub $3,%_ASM_BX
31088 cmp %_ASM_BX,%_ASM_CX
31089 jae bad_put_user
31090+
31091+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
31092+ mov pax_user_shadow_base,%_ASM_BX
31093+ cmp %_ASM_BX,%_ASM_CX
31094+ jb 1234f
31095+ xor %ebx,%ebx
31096+1234:
31097+#endif
31098+
31099+#endif
31100+
31101 ASM_STAC
31102-3: movl %eax,(%_ASM_CX)
31103+3: __copyuser_seg movl %eax,(_DEST)
31104 xor %eax,%eax
31105 EXIT
31106 ENDPROC(__put_user_4)
31107
31108 ENTRY(__put_user_8)
31109 ENTER
31110+
31111+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
31112+ GET_THREAD_INFO(%_ASM_BX)
31113 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
31114 sub $7,%_ASM_BX
31115 cmp %_ASM_BX,%_ASM_CX
31116 jae bad_put_user
31117+
31118+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
31119+ mov pax_user_shadow_base,%_ASM_BX
31120+ cmp %_ASM_BX,%_ASM_CX
31121+ jb 1234f
31122+ xor %ebx,%ebx
31123+1234:
31124+#endif
31125+
31126+#endif
31127+
31128 ASM_STAC
31129-4: mov %_ASM_AX,(%_ASM_CX)
31130+4: __copyuser_seg mov %_ASM_AX,(_DEST)
31131 #ifdef CONFIG_X86_32
31132-5: movl %edx,4(%_ASM_CX)
31133+5: __copyuser_seg movl %edx,4(_DEST)
31134 #endif
31135 xor %eax,%eax
31136 EXIT
31137diff --git a/arch/x86/lib/rwsem.S b/arch/x86/lib/rwsem.S
31138index 5dff5f0..cadebf4 100644
31139--- a/arch/x86/lib/rwsem.S
31140+++ b/arch/x86/lib/rwsem.S
31141@@ -94,6 +94,7 @@ ENTRY(call_rwsem_down_read_failed)
31142 __ASM_SIZE(pop,_cfi) %__ASM_REG(dx)
31143 CFI_RESTORE __ASM_REG(dx)
31144 restore_common_regs
31145+ pax_force_retaddr
31146 ret
31147 CFI_ENDPROC
31148 ENDPROC(call_rwsem_down_read_failed)
31149@@ -104,6 +105,7 @@ ENTRY(call_rwsem_down_write_failed)
31150 movq %rax,%rdi
31151 call rwsem_down_write_failed
31152 restore_common_regs
31153+ pax_force_retaddr
31154 ret
31155 CFI_ENDPROC
31156 ENDPROC(call_rwsem_down_write_failed)
31157@@ -117,7 +119,8 @@ ENTRY(call_rwsem_wake)
31158 movq %rax,%rdi
31159 call rwsem_wake
31160 restore_common_regs
31161-1: ret
31162+1: pax_force_retaddr
31163+ ret
31164 CFI_ENDPROC
31165 ENDPROC(call_rwsem_wake)
31166
31167@@ -131,6 +134,7 @@ ENTRY(call_rwsem_downgrade_wake)
31168 __ASM_SIZE(pop,_cfi) %__ASM_REG(dx)
31169 CFI_RESTORE __ASM_REG(dx)
31170 restore_common_regs
31171+ pax_force_retaddr
31172 ret
31173 CFI_ENDPROC
31174 ENDPROC(call_rwsem_downgrade_wake)
31175diff --git a/arch/x86/lib/thunk_64.S b/arch/x86/lib/thunk_64.S
31176index b30b5eb..2b57052 100644
31177--- a/arch/x86/lib/thunk_64.S
31178+++ b/arch/x86/lib/thunk_64.S
31179@@ -9,6 +9,7 @@
31180 #include <asm/dwarf2.h>
31181 #include <asm/calling.h>
31182 #include <asm/asm.h>
31183+#include <asm/alternative-asm.h>
31184
31185 /* rdi: arg1 ... normal C conventions. rax is saved/restored. */
31186 .macro THUNK name, func, put_ret_addr_in_rdi=0
31187@@ -16,11 +17,11 @@
31188 \name:
31189 CFI_STARTPROC
31190
31191- /* this one pushes 9 elems, the next one would be %rIP */
31192- SAVE_ARGS
31193+ /* this one pushes 15+1 elems, the next one would be %rIP */
31194+ SAVE_ARGS 8
31195
31196 .if \put_ret_addr_in_rdi
31197- movq_cfi_restore 9*8, rdi
31198+ movq_cfi_restore RIP, rdi
31199 .endif
31200
31201 call \func
31202@@ -47,9 +48,10 @@
31203
31204 /* SAVE_ARGS below is used only for the .cfi directives it contains. */
31205 CFI_STARTPROC
31206- SAVE_ARGS
31207+ SAVE_ARGS 8
31208 restore:
31209- RESTORE_ARGS
31210+ RESTORE_ARGS 1,8
31211+ pax_force_retaddr
31212 ret
31213 CFI_ENDPROC
31214 _ASM_NOKPROBE(restore)
31215diff --git a/arch/x86/lib/usercopy_32.c b/arch/x86/lib/usercopy_32.c
31216index e2f5e21..4b22130 100644
31217--- a/arch/x86/lib/usercopy_32.c
31218+++ b/arch/x86/lib/usercopy_32.c
31219@@ -42,11 +42,13 @@ do { \
31220 int __d0; \
31221 might_fault(); \
31222 __asm__ __volatile__( \
31223+ __COPYUSER_SET_ES \
31224 ASM_STAC "\n" \
31225 "0: rep; stosl\n" \
31226 " movl %2,%0\n" \
31227 "1: rep; stosb\n" \
31228 "2: " ASM_CLAC "\n" \
31229+ __COPYUSER_RESTORE_ES \
31230 ".section .fixup,\"ax\"\n" \
31231 "3: lea 0(%2,%0,4),%0\n" \
31232 " jmp 2b\n" \
31233@@ -98,7 +100,7 @@ EXPORT_SYMBOL(__clear_user);
31234
31235 #ifdef CONFIG_X86_INTEL_USERCOPY
31236 static unsigned long
31237-__copy_user_intel(void __user *to, const void *from, unsigned long size)
31238+__generic_copy_to_user_intel(void __user *to, const void *from, unsigned long size)
31239 {
31240 int d0, d1;
31241 __asm__ __volatile__(
31242@@ -110,36 +112,36 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
31243 " .align 2,0x90\n"
31244 "3: movl 0(%4), %%eax\n"
31245 "4: movl 4(%4), %%edx\n"
31246- "5: movl %%eax, 0(%3)\n"
31247- "6: movl %%edx, 4(%3)\n"
31248+ "5: "__copyuser_seg" movl %%eax, 0(%3)\n"
31249+ "6: "__copyuser_seg" movl %%edx, 4(%3)\n"
31250 "7: movl 8(%4), %%eax\n"
31251 "8: movl 12(%4),%%edx\n"
31252- "9: movl %%eax, 8(%3)\n"
31253- "10: movl %%edx, 12(%3)\n"
31254+ "9: "__copyuser_seg" movl %%eax, 8(%3)\n"
31255+ "10: "__copyuser_seg" movl %%edx, 12(%3)\n"
31256 "11: movl 16(%4), %%eax\n"
31257 "12: movl 20(%4), %%edx\n"
31258- "13: movl %%eax, 16(%3)\n"
31259- "14: movl %%edx, 20(%3)\n"
31260+ "13: "__copyuser_seg" movl %%eax, 16(%3)\n"
31261+ "14: "__copyuser_seg" movl %%edx, 20(%3)\n"
31262 "15: movl 24(%4), %%eax\n"
31263 "16: movl 28(%4), %%edx\n"
31264- "17: movl %%eax, 24(%3)\n"
31265- "18: movl %%edx, 28(%3)\n"
31266+ "17: "__copyuser_seg" movl %%eax, 24(%3)\n"
31267+ "18: "__copyuser_seg" movl %%edx, 28(%3)\n"
31268 "19: movl 32(%4), %%eax\n"
31269 "20: movl 36(%4), %%edx\n"
31270- "21: movl %%eax, 32(%3)\n"
31271- "22: movl %%edx, 36(%3)\n"
31272+ "21: "__copyuser_seg" movl %%eax, 32(%3)\n"
31273+ "22: "__copyuser_seg" movl %%edx, 36(%3)\n"
31274 "23: movl 40(%4), %%eax\n"
31275 "24: movl 44(%4), %%edx\n"
31276- "25: movl %%eax, 40(%3)\n"
31277- "26: movl %%edx, 44(%3)\n"
31278+ "25: "__copyuser_seg" movl %%eax, 40(%3)\n"
31279+ "26: "__copyuser_seg" movl %%edx, 44(%3)\n"
31280 "27: movl 48(%4), %%eax\n"
31281 "28: movl 52(%4), %%edx\n"
31282- "29: movl %%eax, 48(%3)\n"
31283- "30: movl %%edx, 52(%3)\n"
31284+ "29: "__copyuser_seg" movl %%eax, 48(%3)\n"
31285+ "30: "__copyuser_seg" movl %%edx, 52(%3)\n"
31286 "31: movl 56(%4), %%eax\n"
31287 "32: movl 60(%4), %%edx\n"
31288- "33: movl %%eax, 56(%3)\n"
31289- "34: movl %%edx, 60(%3)\n"
31290+ "33: "__copyuser_seg" movl %%eax, 56(%3)\n"
31291+ "34: "__copyuser_seg" movl %%edx, 60(%3)\n"
31292 " addl $-64, %0\n"
31293 " addl $64, %4\n"
31294 " addl $64, %3\n"
31295@@ -149,10 +151,116 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
31296 " shrl $2, %0\n"
31297 " andl $3, %%eax\n"
31298 " cld\n"
31299+ __COPYUSER_SET_ES
31300 "99: rep; movsl\n"
31301 "36: movl %%eax, %0\n"
31302 "37: rep; movsb\n"
31303 "100:\n"
31304+ __COPYUSER_RESTORE_ES
31305+ ".section .fixup,\"ax\"\n"
31306+ "101: lea 0(%%eax,%0,4),%0\n"
31307+ " jmp 100b\n"
31308+ ".previous\n"
31309+ _ASM_EXTABLE(1b,100b)
31310+ _ASM_EXTABLE(2b,100b)
31311+ _ASM_EXTABLE(3b,100b)
31312+ _ASM_EXTABLE(4b,100b)
31313+ _ASM_EXTABLE(5b,100b)
31314+ _ASM_EXTABLE(6b,100b)
31315+ _ASM_EXTABLE(7b,100b)
31316+ _ASM_EXTABLE(8b,100b)
31317+ _ASM_EXTABLE(9b,100b)
31318+ _ASM_EXTABLE(10b,100b)
31319+ _ASM_EXTABLE(11b,100b)
31320+ _ASM_EXTABLE(12b,100b)
31321+ _ASM_EXTABLE(13b,100b)
31322+ _ASM_EXTABLE(14b,100b)
31323+ _ASM_EXTABLE(15b,100b)
31324+ _ASM_EXTABLE(16b,100b)
31325+ _ASM_EXTABLE(17b,100b)
31326+ _ASM_EXTABLE(18b,100b)
31327+ _ASM_EXTABLE(19b,100b)
31328+ _ASM_EXTABLE(20b,100b)
31329+ _ASM_EXTABLE(21b,100b)
31330+ _ASM_EXTABLE(22b,100b)
31331+ _ASM_EXTABLE(23b,100b)
31332+ _ASM_EXTABLE(24b,100b)
31333+ _ASM_EXTABLE(25b,100b)
31334+ _ASM_EXTABLE(26b,100b)
31335+ _ASM_EXTABLE(27b,100b)
31336+ _ASM_EXTABLE(28b,100b)
31337+ _ASM_EXTABLE(29b,100b)
31338+ _ASM_EXTABLE(30b,100b)
31339+ _ASM_EXTABLE(31b,100b)
31340+ _ASM_EXTABLE(32b,100b)
31341+ _ASM_EXTABLE(33b,100b)
31342+ _ASM_EXTABLE(34b,100b)
31343+ _ASM_EXTABLE(35b,100b)
31344+ _ASM_EXTABLE(36b,100b)
31345+ _ASM_EXTABLE(37b,100b)
31346+ _ASM_EXTABLE(99b,101b)
31347+ : "=&c"(size), "=&D" (d0), "=&S" (d1)
31348+ : "1"(to), "2"(from), "0"(size)
31349+ : "eax", "edx", "memory");
31350+ return size;
31351+}
31352+
31353+static unsigned long
31354+__generic_copy_from_user_intel(void *to, const void __user *from, unsigned long size)
31355+{
31356+ int d0, d1;
31357+ __asm__ __volatile__(
31358+ " .align 2,0x90\n"
31359+ "1: "__copyuser_seg" movl 32(%4), %%eax\n"
31360+ " cmpl $67, %0\n"
31361+ " jbe 3f\n"
31362+ "2: "__copyuser_seg" movl 64(%4), %%eax\n"
31363+ " .align 2,0x90\n"
31364+ "3: "__copyuser_seg" movl 0(%4), %%eax\n"
31365+ "4: "__copyuser_seg" movl 4(%4), %%edx\n"
31366+ "5: movl %%eax, 0(%3)\n"
31367+ "6: movl %%edx, 4(%3)\n"
31368+ "7: "__copyuser_seg" movl 8(%4), %%eax\n"
31369+ "8: "__copyuser_seg" movl 12(%4),%%edx\n"
31370+ "9: movl %%eax, 8(%3)\n"
31371+ "10: movl %%edx, 12(%3)\n"
31372+ "11: "__copyuser_seg" movl 16(%4), %%eax\n"
31373+ "12: "__copyuser_seg" movl 20(%4), %%edx\n"
31374+ "13: movl %%eax, 16(%3)\n"
31375+ "14: movl %%edx, 20(%3)\n"
31376+ "15: "__copyuser_seg" movl 24(%4), %%eax\n"
31377+ "16: "__copyuser_seg" movl 28(%4), %%edx\n"
31378+ "17: movl %%eax, 24(%3)\n"
31379+ "18: movl %%edx, 28(%3)\n"
31380+ "19: "__copyuser_seg" movl 32(%4), %%eax\n"
31381+ "20: "__copyuser_seg" movl 36(%4), %%edx\n"
31382+ "21: movl %%eax, 32(%3)\n"
31383+ "22: movl %%edx, 36(%3)\n"
31384+ "23: "__copyuser_seg" movl 40(%4), %%eax\n"
31385+ "24: "__copyuser_seg" movl 44(%4), %%edx\n"
31386+ "25: movl %%eax, 40(%3)\n"
31387+ "26: movl %%edx, 44(%3)\n"
31388+ "27: "__copyuser_seg" movl 48(%4), %%eax\n"
31389+ "28: "__copyuser_seg" movl 52(%4), %%edx\n"
31390+ "29: movl %%eax, 48(%3)\n"
31391+ "30: movl %%edx, 52(%3)\n"
31392+ "31: "__copyuser_seg" movl 56(%4), %%eax\n"
31393+ "32: "__copyuser_seg" movl 60(%4), %%edx\n"
31394+ "33: movl %%eax, 56(%3)\n"
31395+ "34: movl %%edx, 60(%3)\n"
31396+ " addl $-64, %0\n"
31397+ " addl $64, %4\n"
31398+ " addl $64, %3\n"
31399+ " cmpl $63, %0\n"
31400+ " ja 1b\n"
31401+ "35: movl %0, %%eax\n"
31402+ " shrl $2, %0\n"
31403+ " andl $3, %%eax\n"
31404+ " cld\n"
31405+ "99: rep; "__copyuser_seg" movsl\n"
31406+ "36: movl %%eax, %0\n"
31407+ "37: rep; "__copyuser_seg" movsb\n"
31408+ "100:\n"
31409 ".section .fixup,\"ax\"\n"
31410 "101: lea 0(%%eax,%0,4),%0\n"
31411 " jmp 100b\n"
31412@@ -207,41 +315,41 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
31413 int d0, d1;
31414 __asm__ __volatile__(
31415 " .align 2,0x90\n"
31416- "0: movl 32(%4), %%eax\n"
31417+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
31418 " cmpl $67, %0\n"
31419 " jbe 2f\n"
31420- "1: movl 64(%4), %%eax\n"
31421+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
31422 " .align 2,0x90\n"
31423- "2: movl 0(%4), %%eax\n"
31424- "21: movl 4(%4), %%edx\n"
31425+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
31426+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
31427 " movl %%eax, 0(%3)\n"
31428 " movl %%edx, 4(%3)\n"
31429- "3: movl 8(%4), %%eax\n"
31430- "31: movl 12(%4),%%edx\n"
31431+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
31432+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
31433 " movl %%eax, 8(%3)\n"
31434 " movl %%edx, 12(%3)\n"
31435- "4: movl 16(%4), %%eax\n"
31436- "41: movl 20(%4), %%edx\n"
31437+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
31438+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
31439 " movl %%eax, 16(%3)\n"
31440 " movl %%edx, 20(%3)\n"
31441- "10: movl 24(%4), %%eax\n"
31442- "51: movl 28(%4), %%edx\n"
31443+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
31444+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
31445 " movl %%eax, 24(%3)\n"
31446 " movl %%edx, 28(%3)\n"
31447- "11: movl 32(%4), %%eax\n"
31448- "61: movl 36(%4), %%edx\n"
31449+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
31450+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
31451 " movl %%eax, 32(%3)\n"
31452 " movl %%edx, 36(%3)\n"
31453- "12: movl 40(%4), %%eax\n"
31454- "71: movl 44(%4), %%edx\n"
31455+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
31456+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
31457 " movl %%eax, 40(%3)\n"
31458 " movl %%edx, 44(%3)\n"
31459- "13: movl 48(%4), %%eax\n"
31460- "81: movl 52(%4), %%edx\n"
31461+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
31462+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
31463 " movl %%eax, 48(%3)\n"
31464 " movl %%edx, 52(%3)\n"
31465- "14: movl 56(%4), %%eax\n"
31466- "91: movl 60(%4), %%edx\n"
31467+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
31468+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
31469 " movl %%eax, 56(%3)\n"
31470 " movl %%edx, 60(%3)\n"
31471 " addl $-64, %0\n"
31472@@ -253,9 +361,9 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
31473 " shrl $2, %0\n"
31474 " andl $3, %%eax\n"
31475 " cld\n"
31476- "6: rep; movsl\n"
31477+ "6: rep; "__copyuser_seg" movsl\n"
31478 " movl %%eax,%0\n"
31479- "7: rep; movsb\n"
31480+ "7: rep; "__copyuser_seg" movsb\n"
31481 "8:\n"
31482 ".section .fixup,\"ax\"\n"
31483 "9: lea 0(%%eax,%0,4),%0\n"
31484@@ -305,41 +413,41 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
31485
31486 __asm__ __volatile__(
31487 " .align 2,0x90\n"
31488- "0: movl 32(%4), %%eax\n"
31489+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
31490 " cmpl $67, %0\n"
31491 " jbe 2f\n"
31492- "1: movl 64(%4), %%eax\n"
31493+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
31494 " .align 2,0x90\n"
31495- "2: movl 0(%4), %%eax\n"
31496- "21: movl 4(%4), %%edx\n"
31497+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
31498+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
31499 " movnti %%eax, 0(%3)\n"
31500 " movnti %%edx, 4(%3)\n"
31501- "3: movl 8(%4), %%eax\n"
31502- "31: movl 12(%4),%%edx\n"
31503+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
31504+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
31505 " movnti %%eax, 8(%3)\n"
31506 " movnti %%edx, 12(%3)\n"
31507- "4: movl 16(%4), %%eax\n"
31508- "41: movl 20(%4), %%edx\n"
31509+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
31510+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
31511 " movnti %%eax, 16(%3)\n"
31512 " movnti %%edx, 20(%3)\n"
31513- "10: movl 24(%4), %%eax\n"
31514- "51: movl 28(%4), %%edx\n"
31515+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
31516+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
31517 " movnti %%eax, 24(%3)\n"
31518 " movnti %%edx, 28(%3)\n"
31519- "11: movl 32(%4), %%eax\n"
31520- "61: movl 36(%4), %%edx\n"
31521+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
31522+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
31523 " movnti %%eax, 32(%3)\n"
31524 " movnti %%edx, 36(%3)\n"
31525- "12: movl 40(%4), %%eax\n"
31526- "71: movl 44(%4), %%edx\n"
31527+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
31528+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
31529 " movnti %%eax, 40(%3)\n"
31530 " movnti %%edx, 44(%3)\n"
31531- "13: movl 48(%4), %%eax\n"
31532- "81: movl 52(%4), %%edx\n"
31533+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
31534+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
31535 " movnti %%eax, 48(%3)\n"
31536 " movnti %%edx, 52(%3)\n"
31537- "14: movl 56(%4), %%eax\n"
31538- "91: movl 60(%4), %%edx\n"
31539+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
31540+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
31541 " movnti %%eax, 56(%3)\n"
31542 " movnti %%edx, 60(%3)\n"
31543 " addl $-64, %0\n"
31544@@ -352,9 +460,9 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
31545 " shrl $2, %0\n"
31546 " andl $3, %%eax\n"
31547 " cld\n"
31548- "6: rep; movsl\n"
31549+ "6: rep; "__copyuser_seg" movsl\n"
31550 " movl %%eax,%0\n"
31551- "7: rep; movsb\n"
31552+ "7: rep; "__copyuser_seg" movsb\n"
31553 "8:\n"
31554 ".section .fixup,\"ax\"\n"
31555 "9: lea 0(%%eax,%0,4),%0\n"
31556@@ -399,41 +507,41 @@ static unsigned long __copy_user_intel_nocache(void *to,
31557
31558 __asm__ __volatile__(
31559 " .align 2,0x90\n"
31560- "0: movl 32(%4), %%eax\n"
31561+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
31562 " cmpl $67, %0\n"
31563 " jbe 2f\n"
31564- "1: movl 64(%4), %%eax\n"
31565+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
31566 " .align 2,0x90\n"
31567- "2: movl 0(%4), %%eax\n"
31568- "21: movl 4(%4), %%edx\n"
31569+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
31570+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
31571 " movnti %%eax, 0(%3)\n"
31572 " movnti %%edx, 4(%3)\n"
31573- "3: movl 8(%4), %%eax\n"
31574- "31: movl 12(%4),%%edx\n"
31575+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
31576+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
31577 " movnti %%eax, 8(%3)\n"
31578 " movnti %%edx, 12(%3)\n"
31579- "4: movl 16(%4), %%eax\n"
31580- "41: movl 20(%4), %%edx\n"
31581+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
31582+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
31583 " movnti %%eax, 16(%3)\n"
31584 " movnti %%edx, 20(%3)\n"
31585- "10: movl 24(%4), %%eax\n"
31586- "51: movl 28(%4), %%edx\n"
31587+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
31588+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
31589 " movnti %%eax, 24(%3)\n"
31590 " movnti %%edx, 28(%3)\n"
31591- "11: movl 32(%4), %%eax\n"
31592- "61: movl 36(%4), %%edx\n"
31593+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
31594+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
31595 " movnti %%eax, 32(%3)\n"
31596 " movnti %%edx, 36(%3)\n"
31597- "12: movl 40(%4), %%eax\n"
31598- "71: movl 44(%4), %%edx\n"
31599+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
31600+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
31601 " movnti %%eax, 40(%3)\n"
31602 " movnti %%edx, 44(%3)\n"
31603- "13: movl 48(%4), %%eax\n"
31604- "81: movl 52(%4), %%edx\n"
31605+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
31606+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
31607 " movnti %%eax, 48(%3)\n"
31608 " movnti %%edx, 52(%3)\n"
31609- "14: movl 56(%4), %%eax\n"
31610- "91: movl 60(%4), %%edx\n"
31611+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
31612+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
31613 " movnti %%eax, 56(%3)\n"
31614 " movnti %%edx, 60(%3)\n"
31615 " addl $-64, %0\n"
31616@@ -446,9 +554,9 @@ static unsigned long __copy_user_intel_nocache(void *to,
31617 " shrl $2, %0\n"
31618 " andl $3, %%eax\n"
31619 " cld\n"
31620- "6: rep; movsl\n"
31621+ "6: rep; "__copyuser_seg" movsl\n"
31622 " movl %%eax,%0\n"
31623- "7: rep; movsb\n"
31624+ "7: rep; "__copyuser_seg" movsb\n"
31625 "8:\n"
31626 ".section .fixup,\"ax\"\n"
31627 "9: lea 0(%%eax,%0,4),%0\n"
31628@@ -488,32 +596,36 @@ static unsigned long __copy_user_intel_nocache(void *to,
31629 */
31630 unsigned long __copy_user_zeroing_intel(void *to, const void __user *from,
31631 unsigned long size);
31632-unsigned long __copy_user_intel(void __user *to, const void *from,
31633+unsigned long __generic_copy_to_user_intel(void __user *to, const void *from,
31634+ unsigned long size);
31635+unsigned long __generic_copy_from_user_intel(void *to, const void __user *from,
31636 unsigned long size);
31637 unsigned long __copy_user_zeroing_intel_nocache(void *to,
31638 const void __user *from, unsigned long size);
31639 #endif /* CONFIG_X86_INTEL_USERCOPY */
31640
31641 /* Generic arbitrary sized copy. */
31642-#define __copy_user(to, from, size) \
31643+#define __copy_user(to, from, size, prefix, set, restore) \
31644 do { \
31645 int __d0, __d1, __d2; \
31646 __asm__ __volatile__( \
31647+ set \
31648 " cmp $7,%0\n" \
31649 " jbe 1f\n" \
31650 " movl %1,%0\n" \
31651 " negl %0\n" \
31652 " andl $7,%0\n" \
31653 " subl %0,%3\n" \
31654- "4: rep; movsb\n" \
31655+ "4: rep; "prefix"movsb\n" \
31656 " movl %3,%0\n" \
31657 " shrl $2,%0\n" \
31658 " andl $3,%3\n" \
31659 " .align 2,0x90\n" \
31660- "0: rep; movsl\n" \
31661+ "0: rep; "prefix"movsl\n" \
31662 " movl %3,%0\n" \
31663- "1: rep; movsb\n" \
31664+ "1: rep; "prefix"movsb\n" \
31665 "2:\n" \
31666+ restore \
31667 ".section .fixup,\"ax\"\n" \
31668 "5: addl %3,%0\n" \
31669 " jmp 2b\n" \
31670@@ -538,14 +650,14 @@ do { \
31671 " negl %0\n" \
31672 " andl $7,%0\n" \
31673 " subl %0,%3\n" \
31674- "4: rep; movsb\n" \
31675+ "4: rep; "__copyuser_seg"movsb\n" \
31676 " movl %3,%0\n" \
31677 " shrl $2,%0\n" \
31678 " andl $3,%3\n" \
31679 " .align 2,0x90\n" \
31680- "0: rep; movsl\n" \
31681+ "0: rep; "__copyuser_seg"movsl\n" \
31682 " movl %3,%0\n" \
31683- "1: rep; movsb\n" \
31684+ "1: rep; "__copyuser_seg"movsb\n" \
31685 "2:\n" \
31686 ".section .fixup,\"ax\"\n" \
31687 "5: addl %3,%0\n" \
31688@@ -572,9 +684,9 @@ unsigned long __copy_to_user_ll(void __user *to, const void *from,
31689 {
31690 stac();
31691 if (movsl_is_ok(to, from, n))
31692- __copy_user(to, from, n);
31693+ __copy_user(to, from, n, "", __COPYUSER_SET_ES, __COPYUSER_RESTORE_ES);
31694 else
31695- n = __copy_user_intel(to, from, n);
31696+ n = __generic_copy_to_user_intel(to, from, n);
31697 clac();
31698 return n;
31699 }
31700@@ -598,10 +710,9 @@ unsigned long __copy_from_user_ll_nozero(void *to, const void __user *from,
31701 {
31702 stac();
31703 if (movsl_is_ok(to, from, n))
31704- __copy_user(to, from, n);
31705+ __copy_user(to, from, n, __copyuser_seg, "", "");
31706 else
31707- n = __copy_user_intel((void __user *)to,
31708- (const void *)from, n);
31709+ n = __generic_copy_from_user_intel(to, from, n);
31710 clac();
31711 return n;
31712 }
31713@@ -632,58 +743,38 @@ unsigned long __copy_from_user_ll_nocache_nozero(void *to, const void __user *fr
31714 if (n > 64 && cpu_has_xmm2)
31715 n = __copy_user_intel_nocache(to, from, n);
31716 else
31717- __copy_user(to, from, n);
31718+ __copy_user(to, from, n, __copyuser_seg, "", "");
31719 #else
31720- __copy_user(to, from, n);
31721+ __copy_user(to, from, n, __copyuser_seg, "", "");
31722 #endif
31723 clac();
31724 return n;
31725 }
31726 EXPORT_SYMBOL(__copy_from_user_ll_nocache_nozero);
31727
31728-/**
31729- * copy_to_user: - Copy a block of data into user space.
31730- * @to: Destination address, in user space.
31731- * @from: Source address, in kernel space.
31732- * @n: Number of bytes to copy.
31733- *
31734- * Context: User context only. This function may sleep.
31735- *
31736- * Copy data from kernel space to user space.
31737- *
31738- * Returns number of bytes that could not be copied.
31739- * On success, this will be zero.
31740- */
31741-unsigned long _copy_to_user(void __user *to, const void *from, unsigned n)
31742+#ifdef CONFIG_PAX_MEMORY_UDEREF
31743+void __set_fs(mm_segment_t x)
31744 {
31745- if (access_ok(VERIFY_WRITE, to, n))
31746- n = __copy_to_user(to, from, n);
31747- return n;
31748+ switch (x.seg) {
31749+ case 0:
31750+ loadsegment(gs, 0);
31751+ break;
31752+ case TASK_SIZE_MAX:
31753+ loadsegment(gs, __USER_DS);
31754+ break;
31755+ case -1UL:
31756+ loadsegment(gs, __KERNEL_DS);
31757+ break;
31758+ default:
31759+ BUG();
31760+ }
31761 }
31762-EXPORT_SYMBOL(_copy_to_user);
31763+EXPORT_SYMBOL(__set_fs);
31764
31765-/**
31766- * copy_from_user: - Copy a block of data from user space.
31767- * @to: Destination address, in kernel space.
31768- * @from: Source address, in user space.
31769- * @n: Number of bytes to copy.
31770- *
31771- * Context: User context only. This function may sleep.
31772- *
31773- * Copy data from user space to kernel space.
31774- *
31775- * Returns number of bytes that could not be copied.
31776- * On success, this will be zero.
31777- *
31778- * If some data could not be copied, this function will pad the copied
31779- * data to the requested size using zero bytes.
31780- */
31781-unsigned long _copy_from_user(void *to, const void __user *from, unsigned n)
31782+void set_fs(mm_segment_t x)
31783 {
31784- if (access_ok(VERIFY_READ, from, n))
31785- n = __copy_from_user(to, from, n);
31786- else
31787- memset(to, 0, n);
31788- return n;
31789+ current_thread_info()->addr_limit = x;
31790+ __set_fs(x);
31791 }
31792-EXPORT_SYMBOL(_copy_from_user);
31793+EXPORT_SYMBOL(set_fs);
31794+#endif
31795diff --git a/arch/x86/lib/usercopy_64.c b/arch/x86/lib/usercopy_64.c
31796index 0a42327..7a82465 100644
31797--- a/arch/x86/lib/usercopy_64.c
31798+++ b/arch/x86/lib/usercopy_64.c
31799@@ -18,6 +18,7 @@ unsigned long __clear_user(void __user *addr, unsigned long size)
31800 might_fault();
31801 /* no memory constraint because it doesn't change any memory gcc knows
31802 about */
31803+ pax_open_userland();
31804 stac();
31805 asm volatile(
31806 " testq %[size8],%[size8]\n"
31807@@ -39,9 +40,10 @@ unsigned long __clear_user(void __user *addr, unsigned long size)
31808 _ASM_EXTABLE(0b,3b)
31809 _ASM_EXTABLE(1b,2b)
31810 : [size8] "=&c"(size), [dst] "=&D" (__d0)
31811- : [size1] "r"(size & 7), "[size8]" (size / 8), "[dst]"(addr),
31812+ : [size1] "r"(size & 7), "[size8]" (size / 8), "[dst]"(____m(addr)),
31813 [zero] "r" (0UL), [eight] "r" (8UL));
31814 clac();
31815+ pax_close_userland();
31816 return size;
31817 }
31818 EXPORT_SYMBOL(__clear_user);
31819@@ -54,12 +56,11 @@ unsigned long clear_user(void __user *to, unsigned long n)
31820 }
31821 EXPORT_SYMBOL(clear_user);
31822
31823-unsigned long copy_in_user(void __user *to, const void __user *from, unsigned len)
31824+unsigned long copy_in_user(void __user *to, const void __user *from, unsigned long len)
31825 {
31826- if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len)) {
31827- return copy_user_generic((__force void *)to, (__force void *)from, len);
31828- }
31829- return len;
31830+ if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len))
31831+ return copy_user_generic((void __force_kernel *)____m(to), (void __force_kernel *)____m(from), len);
31832+ return len;
31833 }
31834 EXPORT_SYMBOL(copy_in_user);
31835
31836@@ -69,8 +70,10 @@ EXPORT_SYMBOL(copy_in_user);
31837 * it is not necessary to optimize tail handling.
31838 */
31839 __visible unsigned long
31840-copy_user_handle_tail(char *to, char *from, unsigned len)
31841+copy_user_handle_tail(char __user *to, char __user *from, unsigned long len)
31842 {
31843+ clac();
31844+ pax_close_userland();
31845 for (; len; --len, to++) {
31846 char c;
31847
31848@@ -79,10 +82,9 @@ copy_user_handle_tail(char *to, char *from, unsigned len)
31849 if (__put_user_nocheck(c, to, sizeof(char)))
31850 break;
31851 }
31852- clac();
31853
31854 /* If the destination is a kernel buffer, we always clear the end */
31855- if (!__addr_ok(to))
31856+ if (!__addr_ok(to) && (unsigned long)to >= TASK_SIZE_MAX + pax_user_shadow_base)
31857 memset(to, 0, len);
31858 return len;
31859 }
31860diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile
31861index c4cc740..60a7362 100644
31862--- a/arch/x86/mm/Makefile
31863+++ b/arch/x86/mm/Makefile
31864@@ -35,3 +35,7 @@ obj-$(CONFIG_NUMA_EMU) += numa_emulation.o
31865 obj-$(CONFIG_MEMTEST) += memtest.o
31866
31867 obj-$(CONFIG_X86_INTEL_MPX) += mpx.o
31868+
31869+quote:="
31870+obj-$(CONFIG_X86_64) += uderef_64.o
31871+CFLAGS_uderef_64.o := $(subst $(quote),,$(CONFIG_ARCH_HWEIGHT_CFLAGS))
31872diff --git a/arch/x86/mm/extable.c b/arch/x86/mm/extable.c
31873index 903ec1e..c4166b2 100644
31874--- a/arch/x86/mm/extable.c
31875+++ b/arch/x86/mm/extable.c
31876@@ -6,12 +6,24 @@
31877 static inline unsigned long
31878 ex_insn_addr(const struct exception_table_entry *x)
31879 {
31880- return (unsigned long)&x->insn + x->insn;
31881+ unsigned long reloc = 0;
31882+
31883+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
31884+ reloc = ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31885+#endif
31886+
31887+ return (unsigned long)&x->insn + x->insn + reloc;
31888 }
31889 static inline unsigned long
31890 ex_fixup_addr(const struct exception_table_entry *x)
31891 {
31892- return (unsigned long)&x->fixup + x->fixup;
31893+ unsigned long reloc = 0;
31894+
31895+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
31896+ reloc = ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31897+#endif
31898+
31899+ return (unsigned long)&x->fixup + x->fixup + reloc;
31900 }
31901
31902 int fixup_exception(struct pt_regs *regs)
31903@@ -20,7 +32,7 @@ int fixup_exception(struct pt_regs *regs)
31904 unsigned long new_ip;
31905
31906 #ifdef CONFIG_PNPBIOS
31907- if (unlikely(SEGMENT_IS_PNP_CODE(regs->cs))) {
31908+ if (unlikely(!v8086_mode(regs) && SEGMENT_IS_PNP_CODE(regs->cs))) {
31909 extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp;
31910 extern u32 pnp_bios_is_utter_crap;
31911 pnp_bios_is_utter_crap = 1;
31912@@ -145,6 +157,13 @@ void sort_extable(struct exception_table_entry *start,
31913 i += 4;
31914 p->fixup -= i;
31915 i += 4;
31916+
31917+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
31918+ BUILD_BUG_ON(!IS_ENABLED(CONFIG_BUILDTIME_EXTABLE_SORT));
31919+ p->insn -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31920+ p->fixup -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31921+#endif
31922+
31923 }
31924 }
31925
31926diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
31927index ede025f..1ef909b 100644
31928--- a/arch/x86/mm/fault.c
31929+++ b/arch/x86/mm/fault.c
31930@@ -13,12 +13,19 @@
31931 #include <linux/hugetlb.h> /* hstate_index_to_shift */
31932 #include <linux/prefetch.h> /* prefetchw */
31933 #include <linux/context_tracking.h> /* exception_enter(), ... */
31934+#include <linux/unistd.h>
31935+#include <linux/compiler.h>
31936
31937 #include <asm/traps.h> /* dotraplinkage, ... */
31938 #include <asm/pgalloc.h> /* pgd_*(), ... */
31939 #include <asm/kmemcheck.h> /* kmemcheck_*(), ... */
31940 #include <asm/fixmap.h> /* VSYSCALL_ADDR */
31941 #include <asm/vsyscall.h> /* emulate_vsyscall */
31942+#include <asm/tlbflush.h>
31943+
31944+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
31945+#include <asm/stacktrace.h>
31946+#endif
31947
31948 #define CREATE_TRACE_POINTS
31949 #include <asm/trace/exceptions.h>
31950@@ -59,7 +66,7 @@ static nokprobe_inline int kprobes_fault(struct pt_regs *regs)
31951 int ret = 0;
31952
31953 /* kprobe_running() needs smp_processor_id() */
31954- if (kprobes_built_in() && !user_mode_vm(regs)) {
31955+ if (kprobes_built_in() && !user_mode(regs)) {
31956 preempt_disable();
31957 if (kprobe_running() && kprobe_fault_handler(regs, 14))
31958 ret = 1;
31959@@ -120,7 +127,10 @@ check_prefetch_opcode(struct pt_regs *regs, unsigned char *instr,
31960 return !instr_lo || (instr_lo>>1) == 1;
31961 case 0x00:
31962 /* Prefetch instruction is 0x0F0D or 0x0F18 */
31963- if (probe_kernel_address(instr, opcode))
31964+ if (user_mode(regs)) {
31965+ if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
31966+ return 0;
31967+ } else if (probe_kernel_address(instr, opcode))
31968 return 0;
31969
31970 *prefetch = (instr_lo == 0xF) &&
31971@@ -154,7 +164,10 @@ is_prefetch(struct pt_regs *regs, unsigned long error_code, unsigned long addr)
31972 while (instr < max_instr) {
31973 unsigned char opcode;
31974
31975- if (probe_kernel_address(instr, opcode))
31976+ if (user_mode(regs)) {
31977+ if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
31978+ break;
31979+ } else if (probe_kernel_address(instr, opcode))
31980 break;
31981
31982 instr++;
31983@@ -185,6 +198,34 @@ force_sig_info_fault(int si_signo, int si_code, unsigned long address,
31984 force_sig_info(si_signo, &info, tsk);
31985 }
31986
31987+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
31988+static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address);
31989+#endif
31990+
31991+#ifdef CONFIG_PAX_EMUTRAMP
31992+static int pax_handle_fetch_fault(struct pt_regs *regs);
31993+#endif
31994+
31995+#ifdef CONFIG_PAX_PAGEEXEC
31996+static inline pmd_t * pax_get_pmd(struct mm_struct *mm, unsigned long address)
31997+{
31998+ pgd_t *pgd;
31999+ pud_t *pud;
32000+ pmd_t *pmd;
32001+
32002+ pgd = pgd_offset(mm, address);
32003+ if (!pgd_present(*pgd))
32004+ return NULL;
32005+ pud = pud_offset(pgd, address);
32006+ if (!pud_present(*pud))
32007+ return NULL;
32008+ pmd = pmd_offset(pud, address);
32009+ if (!pmd_present(*pmd))
32010+ return NULL;
32011+ return pmd;
32012+}
32013+#endif
32014+
32015 DEFINE_SPINLOCK(pgd_lock);
32016 LIST_HEAD(pgd_list);
32017
32018@@ -235,10 +276,27 @@ void vmalloc_sync_all(void)
32019 for (address = VMALLOC_START & PMD_MASK;
32020 address >= TASK_SIZE && address < FIXADDR_TOP;
32021 address += PMD_SIZE) {
32022+
32023+#ifdef CONFIG_PAX_PER_CPU_PGD
32024+ unsigned long cpu;
32025+#else
32026 struct page *page;
32027+#endif
32028
32029 spin_lock(&pgd_lock);
32030+
32031+#ifdef CONFIG_PAX_PER_CPU_PGD
32032+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
32033+ pgd_t *pgd = get_cpu_pgd(cpu, user);
32034+ pmd_t *ret;
32035+
32036+ ret = vmalloc_sync_one(pgd, address);
32037+ if (!ret)
32038+ break;
32039+ pgd = get_cpu_pgd(cpu, kernel);
32040+#else
32041 list_for_each_entry(page, &pgd_list, lru) {
32042+ pgd_t *pgd;
32043 spinlock_t *pgt_lock;
32044 pmd_t *ret;
32045
32046@@ -246,8 +304,14 @@ void vmalloc_sync_all(void)
32047 pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
32048
32049 spin_lock(pgt_lock);
32050- ret = vmalloc_sync_one(page_address(page), address);
32051+ pgd = page_address(page);
32052+#endif
32053+
32054+ ret = vmalloc_sync_one(pgd, address);
32055+
32056+#ifndef CONFIG_PAX_PER_CPU_PGD
32057 spin_unlock(pgt_lock);
32058+#endif
32059
32060 if (!ret)
32061 break;
32062@@ -281,6 +345,12 @@ static noinline int vmalloc_fault(unsigned long address)
32063 * an interrupt in the middle of a task switch..
32064 */
32065 pgd_paddr = read_cr3();
32066+
32067+#ifdef CONFIG_PAX_PER_CPU_PGD
32068+ BUG_ON(__pa(get_cpu_pgd(smp_processor_id(), kernel)) != (pgd_paddr & __PHYSICAL_MASK));
32069+ vmalloc_sync_one(__va(pgd_paddr + PAGE_SIZE), address);
32070+#endif
32071+
32072 pmd_k = vmalloc_sync_one(__va(pgd_paddr), address);
32073 if (!pmd_k)
32074 return -1;
32075@@ -377,11 +447,25 @@ static noinline int vmalloc_fault(unsigned long address)
32076 * happen within a race in page table update. In the later
32077 * case just flush:
32078 */
32079- pgd = pgd_offset(current->active_mm, address);
32080+
32081 pgd_ref = pgd_offset_k(address);
32082 if (pgd_none(*pgd_ref))
32083 return -1;
32084
32085+#ifdef CONFIG_PAX_PER_CPU_PGD
32086+ BUG_ON(__pa(get_cpu_pgd(smp_processor_id(), kernel)) != (read_cr3() & __PHYSICAL_MASK));
32087+ pgd = pgd_offset_cpu(smp_processor_id(), user, address);
32088+ if (pgd_none(*pgd)) {
32089+ set_pgd(pgd, *pgd_ref);
32090+ arch_flush_lazy_mmu_mode();
32091+ } else {
32092+ BUG_ON(pgd_page_vaddr(*pgd) != pgd_page_vaddr(*pgd_ref));
32093+ }
32094+ pgd = pgd_offset_cpu(smp_processor_id(), kernel, address);
32095+#else
32096+ pgd = pgd_offset(current->active_mm, address);
32097+#endif
32098+
32099 if (pgd_none(*pgd)) {
32100 set_pgd(pgd, *pgd_ref);
32101 arch_flush_lazy_mmu_mode();
32102@@ -548,7 +632,7 @@ static int is_errata93(struct pt_regs *regs, unsigned long address)
32103 static int is_errata100(struct pt_regs *regs, unsigned long address)
32104 {
32105 #ifdef CONFIG_X86_64
32106- if ((regs->cs == __USER32_CS || (regs->cs & (1<<2))) && (address >> 32))
32107+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)) && (address >> 32))
32108 return 1;
32109 #endif
32110 return 0;
32111@@ -575,9 +659,9 @@ static int is_f00f_bug(struct pt_regs *regs, unsigned long address)
32112 }
32113
32114 static const char nx_warning[] = KERN_CRIT
32115-"kernel tried to execute NX-protected page - exploit attempt? (uid: %d)\n";
32116+"kernel tried to execute NX-protected page - exploit attempt? (uid: %d, task: %s, pid: %d)\n";
32117 static const char smep_warning[] = KERN_CRIT
32118-"unable to execute userspace code (SMEP?) (uid: %d)\n";
32119+"unable to execute userspace code (SMEP?) (uid: %d, task: %s, pid: %d)\n";
32120
32121 static void
32122 show_fault_oops(struct pt_regs *regs, unsigned long error_code,
32123@@ -586,7 +670,7 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code,
32124 if (!oops_may_print())
32125 return;
32126
32127- if (error_code & PF_INSTR) {
32128+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR)) {
32129 unsigned int level;
32130 pgd_t *pgd;
32131 pte_t *pte;
32132@@ -597,13 +681,25 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code,
32133 pte = lookup_address_in_pgd(pgd, address, &level);
32134
32135 if (pte && pte_present(*pte) && !pte_exec(*pte))
32136- printk(nx_warning, from_kuid(&init_user_ns, current_uid()));
32137+ printk(nx_warning, from_kuid_munged(&init_user_ns, current_uid()), current->comm, task_pid_nr(current));
32138 if (pte && pte_present(*pte) && pte_exec(*pte) &&
32139 (pgd_flags(*pgd) & _PAGE_USER) &&
32140 (__read_cr4() & X86_CR4_SMEP))
32141- printk(smep_warning, from_kuid(&init_user_ns, current_uid()));
32142+ printk(smep_warning, from_kuid(&init_user_ns, current_uid()), current->comm, task_pid_nr(current));
32143 }
32144
32145+#ifdef CONFIG_PAX_KERNEXEC
32146+ if (init_mm.start_code <= address && address < init_mm.end_code) {
32147+ if (current->signal->curr_ip)
32148+ printk(KERN_EMERG "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n",
32149+ &current->signal->curr_ip, current->comm, task_pid_nr(current),
32150+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
32151+ else
32152+ printk(KERN_EMERG "PAX: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n", current->comm, task_pid_nr(current),
32153+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
32154+ }
32155+#endif
32156+
32157 printk(KERN_ALERT "BUG: unable to handle kernel ");
32158 if (address < PAGE_SIZE)
32159 printk(KERN_CONT "NULL pointer dereference");
32160@@ -782,6 +878,22 @@ __bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code,
32161 return;
32162 }
32163 #endif
32164+
32165+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
32166+ if (pax_is_fetch_fault(regs, error_code, address)) {
32167+
32168+#ifdef CONFIG_PAX_EMUTRAMP
32169+ switch (pax_handle_fetch_fault(regs)) {
32170+ case 2:
32171+ return;
32172+ }
32173+#endif
32174+
32175+ pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
32176+ do_group_exit(SIGKILL);
32177+ }
32178+#endif
32179+
32180 /* Kernel addresses are always protection faults: */
32181 if (address >= TASK_SIZE)
32182 error_code |= PF_PROT;
32183@@ -864,7 +976,7 @@ do_sigbus(struct pt_regs *regs, unsigned long error_code, unsigned long address,
32184 if (fault & (VM_FAULT_HWPOISON|VM_FAULT_HWPOISON_LARGE)) {
32185 printk(KERN_ERR
32186 "MCE: Killing %s:%d due to hardware memory corruption fault at %lx\n",
32187- tsk->comm, tsk->pid, address);
32188+ tsk->comm, task_pid_nr(tsk), address);
32189 code = BUS_MCEERR_AR;
32190 }
32191 #endif
32192@@ -916,6 +1028,99 @@ static int spurious_fault_check(unsigned long error_code, pte_t *pte)
32193 return 1;
32194 }
32195
32196+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
32197+static int pax_handle_pageexec_fault(struct pt_regs *regs, struct mm_struct *mm, unsigned long address, unsigned long error_code)
32198+{
32199+ pte_t *pte;
32200+ pmd_t *pmd;
32201+ spinlock_t *ptl;
32202+ unsigned char pte_mask;
32203+
32204+ if ((__supported_pte_mask & _PAGE_NX) || (error_code & (PF_PROT|PF_USER)) != (PF_PROT|PF_USER) || v8086_mode(regs) ||
32205+ !(mm->pax_flags & MF_PAX_PAGEEXEC))
32206+ return 0;
32207+
32208+ /* PaX: it's our fault, let's handle it if we can */
32209+
32210+ /* PaX: take a look at read faults before acquiring any locks */
32211+ if (unlikely(!(error_code & PF_WRITE) && (regs->ip == address))) {
32212+ /* instruction fetch attempt from a protected page in user mode */
32213+ up_read(&mm->mmap_sem);
32214+
32215+#ifdef CONFIG_PAX_EMUTRAMP
32216+ switch (pax_handle_fetch_fault(regs)) {
32217+ case 2:
32218+ return 1;
32219+ }
32220+#endif
32221+
32222+ pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
32223+ do_group_exit(SIGKILL);
32224+ }
32225+
32226+ pmd = pax_get_pmd(mm, address);
32227+ if (unlikely(!pmd))
32228+ return 0;
32229+
32230+ pte = pte_offset_map_lock(mm, pmd, address, &ptl);
32231+ if (unlikely(!(pte_val(*pte) & _PAGE_PRESENT) || pte_user(*pte))) {
32232+ pte_unmap_unlock(pte, ptl);
32233+ return 0;
32234+ }
32235+
32236+ if (unlikely((error_code & PF_WRITE) && !pte_write(*pte))) {
32237+ /* write attempt to a protected page in user mode */
32238+ pte_unmap_unlock(pte, ptl);
32239+ return 0;
32240+ }
32241+
32242+#ifdef CONFIG_SMP
32243+ if (likely(address > get_limit(regs->cs) && cpu_isset(smp_processor_id(), mm->context.cpu_user_cs_mask)))
32244+#else
32245+ if (likely(address > get_limit(regs->cs)))
32246+#endif
32247+ {
32248+ set_pte(pte, pte_mkread(*pte));
32249+ __flush_tlb_one(address);
32250+ pte_unmap_unlock(pte, ptl);
32251+ up_read(&mm->mmap_sem);
32252+ return 1;
32253+ }
32254+
32255+ pte_mask = _PAGE_ACCESSED | _PAGE_USER | ((error_code & PF_WRITE) << (_PAGE_BIT_DIRTY-1));
32256+
32257+ /*
32258+ * PaX: fill DTLB with user rights and retry
32259+ */
32260+ __asm__ __volatile__ (
32261+ "orb %2,(%1)\n"
32262+#if defined(CONFIG_M586) || defined(CONFIG_M586TSC)
32263+/*
32264+ * PaX: let this uncommented 'invlpg' remind us on the behaviour of Intel's
32265+ * (and AMD's) TLBs. namely, they do not cache PTEs that would raise *any*
32266+ * page fault when examined during a TLB load attempt. this is true not only
32267+ * for PTEs holding a non-present entry but also present entries that will
32268+ * raise a page fault (such as those set up by PaX, or the copy-on-write
32269+ * mechanism). in effect it means that we do *not* need to flush the TLBs
32270+ * for our target pages since their PTEs are simply not in the TLBs at all.
32271+
32272+ * the best thing in omitting it is that we gain around 15-20% speed in the
32273+ * fast path of the page fault handler and can get rid of tracing since we
32274+ * can no longer flush unintended entries.
32275+ */
32276+ "invlpg (%0)\n"
32277+#endif
32278+ __copyuser_seg"testb $0,(%0)\n"
32279+ "xorb %3,(%1)\n"
32280+ :
32281+ : "r" (address), "r" (pte), "q" (pte_mask), "i" (_PAGE_USER)
32282+ : "memory", "cc");
32283+ pte_unmap_unlock(pte, ptl);
32284+ up_read(&mm->mmap_sem);
32285+ return 1;
32286+}
32287+#endif
32288+
32289 /*
32290 * Handle a spurious fault caused by a stale TLB entry.
32291 *
32292@@ -1001,6 +1206,9 @@ int show_unhandled_signals = 1;
32293 static inline int
32294 access_error(unsigned long error_code, struct vm_area_struct *vma)
32295 {
32296+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR) && !(vma->vm_flags & VM_EXEC))
32297+ return 1;
32298+
32299 if (error_code & PF_WRITE) {
32300 /* write, present and write, not present: */
32301 if (unlikely(!(vma->vm_flags & VM_WRITE)))
32302@@ -1035,7 +1243,7 @@ static inline bool smap_violation(int error_code, struct pt_regs *regs)
32303 if (error_code & PF_USER)
32304 return false;
32305
32306- if (!user_mode_vm(regs) && (regs->flags & X86_EFLAGS_AC))
32307+ if (!user_mode(regs) && (regs->flags & X86_EFLAGS_AC))
32308 return false;
32309
32310 return true;
32311@@ -1063,6 +1271,22 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code,
32312 tsk = current;
32313 mm = tsk->mm;
32314
32315+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
32316+ if (!user_mode(regs) && address < 2 * pax_user_shadow_base) {
32317+ if (!search_exception_tables(regs->ip)) {
32318+ printk(KERN_EMERG "PAX: please report this to pageexec@freemail.hu\n");
32319+ bad_area_nosemaphore(regs, error_code, address);
32320+ return;
32321+ }
32322+ if (address < pax_user_shadow_base) {
32323+ printk(KERN_EMERG "PAX: please report this to pageexec@freemail.hu\n");
32324+ printk(KERN_EMERG "PAX: faulting IP: %pS\n", (void *)regs->ip);
32325+ show_trace_log_lvl(NULL, NULL, (void *)regs->sp, regs->bp, KERN_EMERG);
32326+ } else
32327+ address -= pax_user_shadow_base;
32328+ }
32329+#endif
32330+
32331 /*
32332 * Detect and handle instructions that would cause a page fault for
32333 * both a tracked kernel page and a userspace page.
32334@@ -1140,7 +1364,7 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code,
32335 * User-mode registers count as a user access even for any
32336 * potential system fault or CPU buglet:
32337 */
32338- if (user_mode_vm(regs)) {
32339+ if (user_mode(regs)) {
32340 local_irq_enable();
32341 error_code |= PF_USER;
32342 flags |= FAULT_FLAG_USER;
32343@@ -1187,6 +1411,11 @@ retry:
32344 might_sleep();
32345 }
32346
32347+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
32348+ if (pax_handle_pageexec_fault(regs, mm, address, error_code))
32349+ return;
32350+#endif
32351+
32352 vma = find_vma(mm, address);
32353 if (unlikely(!vma)) {
32354 bad_area(regs, error_code, address);
32355@@ -1198,18 +1427,24 @@ retry:
32356 bad_area(regs, error_code, address);
32357 return;
32358 }
32359- if (error_code & PF_USER) {
32360- /*
32361- * Accessing the stack below %sp is always a bug.
32362- * The large cushion allows instructions like enter
32363- * and pusha to work. ("enter $65535, $31" pushes
32364- * 32 pointers and then decrements %sp by 65535.)
32365- */
32366- if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < regs->sp)) {
32367- bad_area(regs, error_code, address);
32368- return;
32369- }
32370+ /*
32371+ * Accessing the stack below %sp is always a bug.
32372+ * The large cushion allows instructions like enter
32373+ * and pusha to work. ("enter $65535, $31" pushes
32374+ * 32 pointers and then decrements %sp by 65535.)
32375+ */
32376+ if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < task_pt_regs(tsk)->sp)) {
32377+ bad_area(regs, error_code, address);
32378+ return;
32379 }
32380+
32381+#ifdef CONFIG_PAX_SEGMEXEC
32382+ if (unlikely((mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end - SEGMEXEC_TASK_SIZE - 1 < address - SEGMEXEC_TASK_SIZE - 1)) {
32383+ bad_area(regs, error_code, address);
32384+ return;
32385+ }
32386+#endif
32387+
32388 if (unlikely(expand_stack(vma, address))) {
32389 bad_area(regs, error_code, address);
32390 return;
32391@@ -1329,3 +1564,292 @@ trace_do_page_fault(struct pt_regs *regs, unsigned long error_code)
32392 }
32393 NOKPROBE_SYMBOL(trace_do_page_fault);
32394 #endif /* CONFIG_TRACING */
32395+
32396+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
32397+static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address)
32398+{
32399+ struct mm_struct *mm = current->mm;
32400+ unsigned long ip = regs->ip;
32401+
32402+ if (v8086_mode(regs))
32403+ ip = ((regs->cs & 0xffff) << 4) + (ip & 0xffff);
32404+
32405+#ifdef CONFIG_PAX_PAGEEXEC
32406+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
32407+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR))
32408+ return true;
32409+ if (!(error_code & (PF_PROT | PF_WRITE)) && ip == address)
32410+ return true;
32411+ return false;
32412+ }
32413+#endif
32414+
32415+#ifdef CONFIG_PAX_SEGMEXEC
32416+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
32417+ if (!(error_code & (PF_PROT | PF_WRITE)) && (ip + SEGMEXEC_TASK_SIZE == address))
32418+ return true;
32419+ return false;
32420+ }
32421+#endif
32422+
32423+ return false;
32424+}
32425+#endif
32426+
32427+#ifdef CONFIG_PAX_EMUTRAMP
32428+static int pax_handle_fetch_fault_32(struct pt_regs *regs)
32429+{
32430+ int err;
32431+
32432+ do { /* PaX: libffi trampoline emulation */
32433+ unsigned char mov, jmp;
32434+ unsigned int addr1, addr2;
32435+
32436+#ifdef CONFIG_X86_64
32437+ if ((regs->ip + 9) >> 32)
32438+ break;
32439+#endif
32440+
32441+ err = get_user(mov, (unsigned char __user *)regs->ip);
32442+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
32443+ err |= get_user(jmp, (unsigned char __user *)(regs->ip + 5));
32444+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
32445+
32446+ if (err)
32447+ break;
32448+
32449+ if (mov == 0xB8 && jmp == 0xE9) {
32450+ regs->ax = addr1;
32451+ regs->ip = (unsigned int)(regs->ip + addr2 + 10);
32452+ return 2;
32453+ }
32454+ } while (0);
32455+
32456+ do { /* PaX: gcc trampoline emulation #1 */
32457+ unsigned char mov1, mov2;
32458+ unsigned short jmp;
32459+ unsigned int addr1, addr2;
32460+
32461+#ifdef CONFIG_X86_64
32462+ if ((regs->ip + 11) >> 32)
32463+ break;
32464+#endif
32465+
32466+ err = get_user(mov1, (unsigned char __user *)regs->ip);
32467+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
32468+ err |= get_user(mov2, (unsigned char __user *)(regs->ip + 5));
32469+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
32470+ err |= get_user(jmp, (unsigned short __user *)(regs->ip + 10));
32471+
32472+ if (err)
32473+ break;
32474+
32475+ if (mov1 == 0xB9 && mov2 == 0xB8 && jmp == 0xE0FF) {
32476+ regs->cx = addr1;
32477+ regs->ax = addr2;
32478+ regs->ip = addr2;
32479+ return 2;
32480+ }
32481+ } while (0);
32482+
32483+ do { /* PaX: gcc trampoline emulation #2 */
32484+ unsigned char mov, jmp;
32485+ unsigned int addr1, addr2;
32486+
32487+#ifdef CONFIG_X86_64
32488+ if ((regs->ip + 9) >> 32)
32489+ break;
32490+#endif
32491+
32492+ err = get_user(mov, (unsigned char __user *)regs->ip);
32493+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
32494+ err |= get_user(jmp, (unsigned char __user *)(regs->ip + 5));
32495+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
32496+
32497+ if (err)
32498+ break;
32499+
32500+ if (mov == 0xB9 && jmp == 0xE9) {
32501+ regs->cx = addr1;
32502+ regs->ip = (unsigned int)(regs->ip + addr2 + 10);
32503+ return 2;
32504+ }
32505+ } while (0);
32506+
32507+ return 1; /* PaX in action */
32508+}
32509+
32510+#ifdef CONFIG_X86_64
32511+static int pax_handle_fetch_fault_64(struct pt_regs *regs)
32512+{
32513+ int err;
32514+
32515+ do { /* PaX: libffi trampoline emulation */
32516+ unsigned short mov1, mov2, jmp1;
32517+ unsigned char stcclc, jmp2;
32518+ unsigned long addr1, addr2;
32519+
32520+ err = get_user(mov1, (unsigned short __user *)regs->ip);
32521+ err |= get_user(addr1, (unsigned long __user *)(regs->ip + 2));
32522+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 10));
32523+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 12));
32524+ err |= get_user(stcclc, (unsigned char __user *)(regs->ip + 20));
32525+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 21));
32526+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 23));
32527+
32528+ if (err)
32529+ break;
32530+
32531+ if (mov1 == 0xBB49 && mov2 == 0xBA49 && (stcclc == 0xF8 || stcclc == 0xF9) && jmp1 == 0xFF49 && jmp2 == 0xE3) {
32532+ regs->r11 = addr1;
32533+ regs->r10 = addr2;
32534+ if (stcclc == 0xF8)
32535+ regs->flags &= ~X86_EFLAGS_CF;
32536+ else
32537+ regs->flags |= X86_EFLAGS_CF;
32538+ regs->ip = addr1;
32539+ return 2;
32540+ }
32541+ } while (0);
32542+
32543+ do { /* PaX: gcc trampoline emulation #1 */
32544+ unsigned short mov1, mov2, jmp1;
32545+ unsigned char jmp2;
32546+ unsigned int addr1;
32547+ unsigned long addr2;
32548+
32549+ err = get_user(mov1, (unsigned short __user *)regs->ip);
32550+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 2));
32551+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 6));
32552+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 8));
32553+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 16));
32554+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 18));
32555+
32556+ if (err)
32557+ break;
32558+
32559+ if (mov1 == 0xBB41 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) {
32560+ regs->r11 = addr1;
32561+ regs->r10 = addr2;
32562+ regs->ip = addr1;
32563+ return 2;
32564+ }
32565+ } while (0);
32566+
32567+ do { /* PaX: gcc trampoline emulation #2 */
32568+ unsigned short mov1, mov2, jmp1;
32569+ unsigned char jmp2;
32570+ unsigned long addr1, addr2;
32571+
32572+ err = get_user(mov1, (unsigned short __user *)regs->ip);
32573+ err |= get_user(addr1, (unsigned long __user *)(regs->ip + 2));
32574+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 10));
32575+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 12));
32576+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 20));
32577+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 22));
32578+
32579+ if (err)
32580+ break;
32581+
32582+ if (mov1 == 0xBB49 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) {
32583+ regs->r11 = addr1;
32584+ regs->r10 = addr2;
32585+ regs->ip = addr1;
32586+ return 2;
32587+ }
32588+ } while (0);
32589+
32590+ return 1; /* PaX in action */
32591+}
32592+#endif
32593+
32594+/*
32595+ * PaX: decide what to do with offenders (regs->ip = fault address)
32596+ *
32597+ * returns 1 when task should be killed
32598+ * 2 when gcc trampoline was detected
32599+ */
32600+static int pax_handle_fetch_fault(struct pt_regs *regs)
32601+{
32602+ if (v8086_mode(regs))
32603+ return 1;
32604+
32605+ if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP))
32606+ return 1;
32607+
32608+#ifdef CONFIG_X86_32
32609+ return pax_handle_fetch_fault_32(regs);
32610+#else
32611+ if (regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))
32612+ return pax_handle_fetch_fault_32(regs);
32613+ else
32614+ return pax_handle_fetch_fault_64(regs);
32615+#endif
32616+}
32617+#endif
32618+
32619+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
32620+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
32621+{
32622+ long i;
32623+
32624+ printk(KERN_ERR "PAX: bytes at PC: ");
32625+ for (i = 0; i < 20; i++) {
32626+ unsigned char c;
32627+ if (get_user(c, (unsigned char __force_user *)pc+i))
32628+ printk(KERN_CONT "?? ");
32629+ else
32630+ printk(KERN_CONT "%02x ", c);
32631+ }
32632+ printk("\n");
32633+
32634+ printk(KERN_ERR "PAX: bytes at SP-%lu: ", (unsigned long)sizeof(long));
32635+ for (i = -1; i < 80 / (long)sizeof(long); i++) {
32636+ unsigned long c;
32637+ if (get_user(c, (unsigned long __force_user *)sp+i)) {
32638+#ifdef CONFIG_X86_32
32639+ printk(KERN_CONT "???????? ");
32640+#else
32641+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)))
32642+ printk(KERN_CONT "???????? ???????? ");
32643+ else
32644+ printk(KERN_CONT "???????????????? ");
32645+#endif
32646+ } else {
32647+#ifdef CONFIG_X86_64
32648+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))) {
32649+ printk(KERN_CONT "%08x ", (unsigned int)c);
32650+ printk(KERN_CONT "%08x ", (unsigned int)(c >> 32));
32651+ } else
32652+#endif
32653+ printk(KERN_CONT "%0*lx ", 2 * (int)sizeof(long), c);
32654+ }
32655+ }
32656+ printk("\n");
32657+}
32658+#endif
32659+
32660+/**
32661+ * probe_kernel_write(): safely attempt to write to a location
32662+ * @dst: address to write to
32663+ * @src: pointer to the data that shall be written
32664+ * @size: size of the data chunk
32665+ *
32666+ * Safely write to address @dst from the buffer at @src. If a kernel fault
32667+ * happens, handle that and return -EFAULT.
32668+ */
32669+long notrace probe_kernel_write(void *dst, const void *src, size_t size)
32670+{
32671+ long ret;
32672+ mm_segment_t old_fs = get_fs();
32673+
32674+ set_fs(KERNEL_DS);
32675+ pagefault_disable();
32676+ pax_open_kernel();
32677+ ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
32678+ pax_close_kernel();
32679+ pagefault_enable();
32680+ set_fs(old_fs);
32681+
32682+ return ret ? -EFAULT : 0;
32683+}
32684diff --git a/arch/x86/mm/gup.c b/arch/x86/mm/gup.c
32685index 81bf3d2..7ef25c2 100644
32686--- a/arch/x86/mm/gup.c
32687+++ b/arch/x86/mm/gup.c
32688@@ -268,7 +268,7 @@ int __get_user_pages_fast(unsigned long start, int nr_pages, int write,
32689 addr = start;
32690 len = (unsigned long) nr_pages << PAGE_SHIFT;
32691 end = start + len;
32692- if (unlikely(!access_ok(write ? VERIFY_WRITE : VERIFY_READ,
32693+ if (unlikely(!access_ok_noprefault(write ? VERIFY_WRITE : VERIFY_READ,
32694 (void __user *)start, len)))
32695 return 0;
32696
32697@@ -344,6 +344,10 @@ int get_user_pages_fast(unsigned long start, int nr_pages, int write,
32698 goto slow_irqon;
32699 #endif
32700
32701+ if (unlikely(!access_ok_noprefault(write ? VERIFY_WRITE : VERIFY_READ,
32702+ (void __user *)start, len)))
32703+ return 0;
32704+
32705 /*
32706 * XXX: batch / limit 'nr', to avoid large irq off latency
32707 * needs some instrumenting to determine the common sizes used by
32708diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c
32709index 4500142..53a363c 100644
32710--- a/arch/x86/mm/highmem_32.c
32711+++ b/arch/x86/mm/highmem_32.c
32712@@ -45,7 +45,11 @@ void *kmap_atomic_prot(struct page *page, pgprot_t prot)
32713 idx = type + KM_TYPE_NR*smp_processor_id();
32714 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
32715 BUG_ON(!pte_none(*(kmap_pte-idx)));
32716+
32717+ pax_open_kernel();
32718 set_pte(kmap_pte-idx, mk_pte(page, prot));
32719+ pax_close_kernel();
32720+
32721 arch_flush_lazy_mmu_mode();
32722
32723 return (void *)vaddr;
32724diff --git a/arch/x86/mm/hugetlbpage.c b/arch/x86/mm/hugetlbpage.c
32725index 42982b2..7168fc3 100644
32726--- a/arch/x86/mm/hugetlbpage.c
32727+++ b/arch/x86/mm/hugetlbpage.c
32728@@ -74,23 +74,24 @@ int pud_huge(pud_t pud)
32729 #ifdef CONFIG_HUGETLB_PAGE
32730 static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
32731 unsigned long addr, unsigned long len,
32732- unsigned long pgoff, unsigned long flags)
32733+ unsigned long pgoff, unsigned long flags, unsigned long offset)
32734 {
32735 struct hstate *h = hstate_file(file);
32736 struct vm_unmapped_area_info info;
32737-
32738+
32739 info.flags = 0;
32740 info.length = len;
32741 info.low_limit = current->mm->mmap_legacy_base;
32742 info.high_limit = TASK_SIZE;
32743 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
32744 info.align_offset = 0;
32745+ info.threadstack_offset = offset;
32746 return vm_unmapped_area(&info);
32747 }
32748
32749 static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
32750 unsigned long addr0, unsigned long len,
32751- unsigned long pgoff, unsigned long flags)
32752+ unsigned long pgoff, unsigned long flags, unsigned long offset)
32753 {
32754 struct hstate *h = hstate_file(file);
32755 struct vm_unmapped_area_info info;
32756@@ -102,6 +103,7 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
32757 info.high_limit = current->mm->mmap_base;
32758 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
32759 info.align_offset = 0;
32760+ info.threadstack_offset = offset;
32761 addr = vm_unmapped_area(&info);
32762
32763 /*
32764@@ -114,6 +116,12 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
32765 VM_BUG_ON(addr != -ENOMEM);
32766 info.flags = 0;
32767 info.low_limit = TASK_UNMAPPED_BASE;
32768+
32769+#ifdef CONFIG_PAX_RANDMMAP
32770+ if (current->mm->pax_flags & MF_PAX_RANDMMAP)
32771+ info.low_limit += current->mm->delta_mmap;
32772+#endif
32773+
32774 info.high_limit = TASK_SIZE;
32775 addr = vm_unmapped_area(&info);
32776 }
32777@@ -128,10 +136,20 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
32778 struct hstate *h = hstate_file(file);
32779 struct mm_struct *mm = current->mm;
32780 struct vm_area_struct *vma;
32781+ unsigned long pax_task_size = TASK_SIZE;
32782+ unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
32783
32784 if (len & ~huge_page_mask(h))
32785 return -EINVAL;
32786- if (len > TASK_SIZE)
32787+
32788+#ifdef CONFIG_PAX_SEGMEXEC
32789+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
32790+ pax_task_size = SEGMEXEC_TASK_SIZE;
32791+#endif
32792+
32793+ pax_task_size -= PAGE_SIZE;
32794+
32795+ if (len > pax_task_size)
32796 return -ENOMEM;
32797
32798 if (flags & MAP_FIXED) {
32799@@ -140,19 +158,22 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
32800 return addr;
32801 }
32802
32803+#ifdef CONFIG_PAX_RANDMMAP
32804+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
32805+#endif
32806+
32807 if (addr) {
32808 addr = ALIGN(addr, huge_page_size(h));
32809 vma = find_vma(mm, addr);
32810- if (TASK_SIZE - len >= addr &&
32811- (!vma || addr + len <= vma->vm_start))
32812+ if (pax_task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
32813 return addr;
32814 }
32815 if (mm->get_unmapped_area == arch_get_unmapped_area)
32816 return hugetlb_get_unmapped_area_bottomup(file, addr, len,
32817- pgoff, flags);
32818+ pgoff, flags, offset);
32819 else
32820 return hugetlb_get_unmapped_area_topdown(file, addr, len,
32821- pgoff, flags);
32822+ pgoff, flags, offset);
32823 }
32824 #endif /* CONFIG_HUGETLB_PAGE */
32825
32826diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
32827index a110efc..a31a18f 100644
32828--- a/arch/x86/mm/init.c
32829+++ b/arch/x86/mm/init.c
32830@@ -4,6 +4,7 @@
32831 #include <linux/swap.h>
32832 #include <linux/memblock.h>
32833 #include <linux/bootmem.h> /* for max_low_pfn */
32834+#include <linux/tboot.h>
32835
32836 #include <asm/cacheflush.h>
32837 #include <asm/e820.h>
32838@@ -17,6 +18,8 @@
32839 #include <asm/proto.h>
32840 #include <asm/dma.h> /* for MAX_DMA_PFN */
32841 #include <asm/microcode.h>
32842+#include <asm/desc.h>
32843+#include <asm/bios_ebda.h>
32844
32845 /*
32846 * We need to define the tracepoints somewhere, and tlb.c
32847@@ -620,7 +623,18 @@ void __init init_mem_mapping(void)
32848 early_ioremap_page_table_range_init();
32849 #endif
32850
32851+#ifdef CONFIG_PAX_PER_CPU_PGD
32852+ clone_pgd_range(get_cpu_pgd(0, kernel) + KERNEL_PGD_BOUNDARY,
32853+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
32854+ KERNEL_PGD_PTRS);
32855+ clone_pgd_range(get_cpu_pgd(0, user) + KERNEL_PGD_BOUNDARY,
32856+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
32857+ KERNEL_PGD_PTRS);
32858+ load_cr3(get_cpu_pgd(0, kernel));
32859+#else
32860 load_cr3(swapper_pg_dir);
32861+#endif
32862+
32863 __flush_tlb_all();
32864
32865 early_memtest(0, max_pfn_mapped << PAGE_SHIFT);
32866@@ -636,10 +650,40 @@ void __init init_mem_mapping(void)
32867 * Access has to be given to non-kernel-ram areas as well, these contain the PCI
32868 * mmio resources as well as potential bios/acpi data regions.
32869 */
32870+
32871+#ifdef CONFIG_GRKERNSEC_KMEM
32872+static unsigned int ebda_start __read_only;
32873+static unsigned int ebda_end __read_only;
32874+#endif
32875+
32876 int devmem_is_allowed(unsigned long pagenr)
32877 {
32878- if (pagenr < 256)
32879+#ifdef CONFIG_GRKERNSEC_KMEM
32880+ /* allow BDA */
32881+ if (!pagenr)
32882 return 1;
32883+ /* allow EBDA */
32884+ if (pagenr >= ebda_start && pagenr < ebda_end)
32885+ return 1;
32886+ /* if tboot is in use, allow access to its hardcoded serial log range */
32887+ if (tboot_enabled() && ((0x60000 >> PAGE_SHIFT) <= pagenr) && (pagenr < (0x68000 >> PAGE_SHIFT)))
32888+ return 1;
32889+#else
32890+ if (!pagenr)
32891+ return 1;
32892+#ifdef CONFIG_VM86
32893+ if (pagenr < (ISA_START_ADDRESS >> PAGE_SHIFT))
32894+ return 1;
32895+#endif
32896+#endif
32897+
32898+ if ((ISA_START_ADDRESS >> PAGE_SHIFT) <= pagenr && pagenr < (ISA_END_ADDRESS >> PAGE_SHIFT))
32899+ return 1;
32900+#ifdef CONFIG_GRKERNSEC_KMEM
32901+ /* throw out everything else below 1MB */
32902+ if (pagenr <= 256)
32903+ return 0;
32904+#endif
32905 if (iomem_is_exclusive(pagenr << PAGE_SHIFT))
32906 return 0;
32907 if (!page_is_ram(pagenr))
32908@@ -685,8 +729,117 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)
32909 #endif
32910 }
32911
32912+#ifdef CONFIG_GRKERNSEC_KMEM
32913+static inline void gr_init_ebda(void)
32914+{
32915+ unsigned int ebda_addr;
32916+ unsigned int ebda_size = 0;
32917+
32918+ ebda_addr = get_bios_ebda();
32919+ if (ebda_addr) {
32920+ ebda_size = *(unsigned char *)phys_to_virt(ebda_addr);
32921+ ebda_size <<= 10;
32922+ }
32923+ if (ebda_addr && ebda_size) {
32924+ ebda_start = ebda_addr >> PAGE_SHIFT;
32925+ ebda_end = min((unsigned int)PAGE_ALIGN(ebda_addr + ebda_size), (unsigned int)0xa0000) >> PAGE_SHIFT;
32926+ } else {
32927+ ebda_start = 0x9f000 >> PAGE_SHIFT;
32928+ ebda_end = 0xa0000 >> PAGE_SHIFT;
32929+ }
32930+}
32931+#else
32932+static inline void gr_init_ebda(void) { }
32933+#endif
32934+
32935 void free_initmem(void)
32936 {
32937+#ifdef CONFIG_PAX_KERNEXEC
32938+#ifdef CONFIG_X86_32
32939+ /* PaX: limit KERNEL_CS to actual size */
32940+ unsigned long addr, limit;
32941+ struct desc_struct d;
32942+ int cpu;
32943+#else
32944+ pgd_t *pgd;
32945+ pud_t *pud;
32946+ pmd_t *pmd;
32947+ unsigned long addr, end;
32948+#endif
32949+#endif
32950+
32951+ gr_init_ebda();
32952+
32953+#ifdef CONFIG_PAX_KERNEXEC
32954+#ifdef CONFIG_X86_32
32955+ limit = paravirt_enabled() ? ktva_ktla(0xffffffff) : (unsigned long)&_etext;
32956+ limit = (limit - 1UL) >> PAGE_SHIFT;
32957+
32958+ memset(__LOAD_PHYSICAL_ADDR + PAGE_OFFSET, POISON_FREE_INITMEM, PAGE_SIZE);
32959+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
32960+ pack_descriptor(&d, get_desc_base(&get_cpu_gdt_table(cpu)[GDT_ENTRY_KERNEL_CS]), limit, 0x9B, 0xC);
32961+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEL_CS, &d, DESCTYPE_S);
32962+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEXEC_KERNEL_CS, &d, DESCTYPE_S);
32963+ }
32964+
32965+ /* PaX: make KERNEL_CS read-only */
32966+ addr = PFN_ALIGN(ktla_ktva((unsigned long)&_text));
32967+ if (!paravirt_enabled())
32968+ set_memory_ro(addr, (PFN_ALIGN(_sdata) - addr) >> PAGE_SHIFT);
32969+/*
32970+ for (addr = ktla_ktva((unsigned long)&_text); addr < (unsigned long)&_sdata; addr += PMD_SIZE) {
32971+ pgd = pgd_offset_k(addr);
32972+ pud = pud_offset(pgd, addr);
32973+ pmd = pmd_offset(pud, addr);
32974+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
32975+ }
32976+*/
32977+#ifdef CONFIG_X86_PAE
32978+ set_memory_nx(PFN_ALIGN(__init_begin), (PFN_ALIGN(__init_end) - PFN_ALIGN(__init_begin)) >> PAGE_SHIFT);
32979+/*
32980+ for (addr = (unsigned long)&__init_begin; addr < (unsigned long)&__init_end; addr += PMD_SIZE) {
32981+ pgd = pgd_offset_k(addr);
32982+ pud = pud_offset(pgd, addr);
32983+ pmd = pmd_offset(pud, addr);
32984+ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
32985+ }
32986+*/
32987+#endif
32988+
32989+#ifdef CONFIG_MODULES
32990+ set_memory_4k((unsigned long)MODULES_EXEC_VADDR, (MODULES_EXEC_END - MODULES_EXEC_VADDR) >> PAGE_SHIFT);
32991+#endif
32992+
32993+#else
32994+ /* PaX: make kernel code/rodata read-only, rest non-executable */
32995+ for (addr = __START_KERNEL_map; addr < __START_KERNEL_map + KERNEL_IMAGE_SIZE; addr += PMD_SIZE) {
32996+ pgd = pgd_offset_k(addr);
32997+ pud = pud_offset(pgd, addr);
32998+ pmd = pmd_offset(pud, addr);
32999+ if (!pmd_present(*pmd))
33000+ continue;
33001+ if ((unsigned long)_text <= addr && addr < (unsigned long)_sdata)
33002+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
33003+ else
33004+ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
33005+ }
33006+
33007+ addr = (unsigned long)__va(__pa(__START_KERNEL_map));
33008+ end = addr + KERNEL_IMAGE_SIZE;
33009+ for (; addr < end; addr += PMD_SIZE) {
33010+ pgd = pgd_offset_k(addr);
33011+ pud = pud_offset(pgd, addr);
33012+ pmd = pmd_offset(pud, addr);
33013+ if (!pmd_present(*pmd))
33014+ continue;
33015+ if ((unsigned long)__va(__pa(_text)) <= addr && addr < (unsigned long)__va(__pa(_sdata)))
33016+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
33017+ }
33018+#endif
33019+
33020+ flush_tlb_all();
33021+#endif
33022+
33023 free_init_pages("unused kernel",
33024 (unsigned long)(&__init_begin),
33025 (unsigned long)(&__init_end));
33026diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
33027index c8140e1..59257fc 100644
33028--- a/arch/x86/mm/init_32.c
33029+++ b/arch/x86/mm/init_32.c
33030@@ -62,33 +62,6 @@ static noinline int do_test_wp_bit(void);
33031 bool __read_mostly __vmalloc_start_set = false;
33032
33033 /*
33034- * Creates a middle page table and puts a pointer to it in the
33035- * given global directory entry. This only returns the gd entry
33036- * in non-PAE compilation mode, since the middle layer is folded.
33037- */
33038-static pmd_t * __init one_md_table_init(pgd_t *pgd)
33039-{
33040- pud_t *pud;
33041- pmd_t *pmd_table;
33042-
33043-#ifdef CONFIG_X86_PAE
33044- if (!(pgd_val(*pgd) & _PAGE_PRESENT)) {
33045- pmd_table = (pmd_t *)alloc_low_page();
33046- paravirt_alloc_pmd(&init_mm, __pa(pmd_table) >> PAGE_SHIFT);
33047- set_pgd(pgd, __pgd(__pa(pmd_table) | _PAGE_PRESENT));
33048- pud = pud_offset(pgd, 0);
33049- BUG_ON(pmd_table != pmd_offset(pud, 0));
33050-
33051- return pmd_table;
33052- }
33053-#endif
33054- pud = pud_offset(pgd, 0);
33055- pmd_table = pmd_offset(pud, 0);
33056-
33057- return pmd_table;
33058-}
33059-
33060-/*
33061 * Create a page table and place a pointer to it in a middle page
33062 * directory entry:
33063 */
33064@@ -98,13 +71,28 @@ static pte_t * __init one_page_table_init(pmd_t *pmd)
33065 pte_t *page_table = (pte_t *)alloc_low_page();
33066
33067 paravirt_alloc_pte(&init_mm, __pa(page_table) >> PAGE_SHIFT);
33068+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
33069+ set_pmd(pmd, __pmd(__pa(page_table) | _KERNPG_TABLE));
33070+#else
33071 set_pmd(pmd, __pmd(__pa(page_table) | _PAGE_TABLE));
33072+#endif
33073 BUG_ON(page_table != pte_offset_kernel(pmd, 0));
33074 }
33075
33076 return pte_offset_kernel(pmd, 0);
33077 }
33078
33079+static pmd_t * __init one_md_table_init(pgd_t *pgd)
33080+{
33081+ pud_t *pud;
33082+ pmd_t *pmd_table;
33083+
33084+ pud = pud_offset(pgd, 0);
33085+ pmd_table = pmd_offset(pud, 0);
33086+
33087+ return pmd_table;
33088+}
33089+
33090 pmd_t * __init populate_extra_pmd(unsigned long vaddr)
33091 {
33092 int pgd_idx = pgd_index(vaddr);
33093@@ -208,6 +196,7 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
33094 int pgd_idx, pmd_idx;
33095 unsigned long vaddr;
33096 pgd_t *pgd;
33097+ pud_t *pud;
33098 pmd_t *pmd;
33099 pte_t *pte = NULL;
33100 unsigned long count = page_table_range_init_count(start, end);
33101@@ -222,8 +211,13 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
33102 pgd = pgd_base + pgd_idx;
33103
33104 for ( ; (pgd_idx < PTRS_PER_PGD) && (vaddr != end); pgd++, pgd_idx++) {
33105- pmd = one_md_table_init(pgd);
33106- pmd = pmd + pmd_index(vaddr);
33107+ pud = pud_offset(pgd, vaddr);
33108+ pmd = pmd_offset(pud, vaddr);
33109+
33110+#ifdef CONFIG_X86_PAE
33111+ paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT);
33112+#endif
33113+
33114 for (; (pmd_idx < PTRS_PER_PMD) && (vaddr != end);
33115 pmd++, pmd_idx++) {
33116 pte = page_table_kmap_check(one_page_table_init(pmd),
33117@@ -235,11 +229,20 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
33118 }
33119 }
33120
33121-static inline int is_kernel_text(unsigned long addr)
33122+static inline int is_kernel_text(unsigned long start, unsigned long end)
33123 {
33124- if (addr >= (unsigned long)_text && addr <= (unsigned long)__init_end)
33125- return 1;
33126- return 0;
33127+ if ((start >= ktla_ktva((unsigned long)_etext) ||
33128+ end <= ktla_ktva((unsigned long)_stext)) &&
33129+ (start >= ktla_ktva((unsigned long)_einittext) ||
33130+ end <= ktla_ktva((unsigned long)_sinittext)) &&
33131+
33132+#ifdef CONFIG_ACPI_SLEEP
33133+ (start >= (unsigned long)__va(acpi_wakeup_address) + 0x4000 || end <= (unsigned long)__va(acpi_wakeup_address)) &&
33134+#endif
33135+
33136+ (start > (unsigned long)__va(0xfffff) || end <= (unsigned long)__va(0xc0000)))
33137+ return 0;
33138+ return 1;
33139 }
33140
33141 /*
33142@@ -256,9 +259,10 @@ kernel_physical_mapping_init(unsigned long start,
33143 unsigned long last_map_addr = end;
33144 unsigned long start_pfn, end_pfn;
33145 pgd_t *pgd_base = swapper_pg_dir;
33146- int pgd_idx, pmd_idx, pte_ofs;
33147+ unsigned int pgd_idx, pmd_idx, pte_ofs;
33148 unsigned long pfn;
33149 pgd_t *pgd;
33150+ pud_t *pud;
33151 pmd_t *pmd;
33152 pte_t *pte;
33153 unsigned pages_2m, pages_4k;
33154@@ -291,8 +295,13 @@ repeat:
33155 pfn = start_pfn;
33156 pgd_idx = pgd_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
33157 pgd = pgd_base + pgd_idx;
33158- for (; pgd_idx < PTRS_PER_PGD; pgd++, pgd_idx++) {
33159- pmd = one_md_table_init(pgd);
33160+ for (; pgd_idx < PTRS_PER_PGD && pfn < max_low_pfn; pgd++, pgd_idx++) {
33161+ pud = pud_offset(pgd, 0);
33162+ pmd = pmd_offset(pud, 0);
33163+
33164+#ifdef CONFIG_X86_PAE
33165+ paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT);
33166+#endif
33167
33168 if (pfn >= end_pfn)
33169 continue;
33170@@ -304,14 +313,13 @@ repeat:
33171 #endif
33172 for (; pmd_idx < PTRS_PER_PMD && pfn < end_pfn;
33173 pmd++, pmd_idx++) {
33174- unsigned int addr = pfn * PAGE_SIZE + PAGE_OFFSET;
33175+ unsigned long address = pfn * PAGE_SIZE + PAGE_OFFSET;
33176
33177 /*
33178 * Map with big pages if possible, otherwise
33179 * create normal page tables:
33180 */
33181 if (use_pse) {
33182- unsigned int addr2;
33183 pgprot_t prot = PAGE_KERNEL_LARGE;
33184 /*
33185 * first pass will use the same initial
33186@@ -322,11 +330,7 @@ repeat:
33187 _PAGE_PSE);
33188
33189 pfn &= PMD_MASK >> PAGE_SHIFT;
33190- addr2 = (pfn + PTRS_PER_PTE-1) * PAGE_SIZE +
33191- PAGE_OFFSET + PAGE_SIZE-1;
33192-
33193- if (is_kernel_text(addr) ||
33194- is_kernel_text(addr2))
33195+ if (is_kernel_text(address, address + PMD_SIZE))
33196 prot = PAGE_KERNEL_LARGE_EXEC;
33197
33198 pages_2m++;
33199@@ -343,7 +347,7 @@ repeat:
33200 pte_ofs = pte_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
33201 pte += pte_ofs;
33202 for (; pte_ofs < PTRS_PER_PTE && pfn < end_pfn;
33203- pte++, pfn++, pte_ofs++, addr += PAGE_SIZE) {
33204+ pte++, pfn++, pte_ofs++, address += PAGE_SIZE) {
33205 pgprot_t prot = PAGE_KERNEL;
33206 /*
33207 * first pass will use the same initial
33208@@ -351,7 +355,7 @@ repeat:
33209 */
33210 pgprot_t init_prot = __pgprot(PTE_IDENT_ATTR);
33211
33212- if (is_kernel_text(addr))
33213+ if (is_kernel_text(address, address + PAGE_SIZE))
33214 prot = PAGE_KERNEL_EXEC;
33215
33216 pages_4k++;
33217@@ -474,7 +478,7 @@ void __init native_pagetable_init(void)
33218
33219 pud = pud_offset(pgd, va);
33220 pmd = pmd_offset(pud, va);
33221- if (!pmd_present(*pmd))
33222+ if (!pmd_present(*pmd)) // PAX TODO || pmd_large(*pmd))
33223 break;
33224
33225 /* should not be large page here */
33226@@ -532,12 +536,10 @@ void __init early_ioremap_page_table_range_init(void)
33227
33228 static void __init pagetable_init(void)
33229 {
33230- pgd_t *pgd_base = swapper_pg_dir;
33231-
33232- permanent_kmaps_init(pgd_base);
33233+ permanent_kmaps_init(swapper_pg_dir);
33234 }
33235
33236-pteval_t __supported_pte_mask __read_mostly = ~(_PAGE_NX | _PAGE_GLOBAL);
33237+pteval_t __supported_pte_mask __read_only = ~(_PAGE_NX | _PAGE_GLOBAL);
33238 EXPORT_SYMBOL_GPL(__supported_pte_mask);
33239
33240 /* user-defined highmem size */
33241@@ -787,10 +789,10 @@ void __init mem_init(void)
33242 ((unsigned long)&__init_end -
33243 (unsigned long)&__init_begin) >> 10,
33244
33245- (unsigned long)&_etext, (unsigned long)&_edata,
33246- ((unsigned long)&_edata - (unsigned long)&_etext) >> 10,
33247+ (unsigned long)&_sdata, (unsigned long)&_edata,
33248+ ((unsigned long)&_edata - (unsigned long)&_sdata) >> 10,
33249
33250- (unsigned long)&_text, (unsigned long)&_etext,
33251+ ktla_ktva((unsigned long)&_text), ktla_ktva((unsigned long)&_etext),
33252 ((unsigned long)&_etext - (unsigned long)&_text) >> 10);
33253
33254 /*
33255@@ -884,6 +886,7 @@ void set_kernel_text_rw(void)
33256 if (!kernel_set_to_readonly)
33257 return;
33258
33259+ start = ktla_ktva(start);
33260 pr_debug("Set kernel text: %lx - %lx for read write\n",
33261 start, start+size);
33262
33263@@ -898,6 +901,7 @@ void set_kernel_text_ro(void)
33264 if (!kernel_set_to_readonly)
33265 return;
33266
33267+ start = ktla_ktva(start);
33268 pr_debug("Set kernel text: %lx - %lx for read only\n",
33269 start, start+size);
33270
33271@@ -926,6 +930,7 @@ void mark_rodata_ro(void)
33272 unsigned long start = PFN_ALIGN(_text);
33273 unsigned long size = PFN_ALIGN(_etext) - start;
33274
33275+ start = ktla_ktva(start);
33276 set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
33277 printk(KERN_INFO "Write protecting the kernel text: %luk\n",
33278 size >> 10);
33279diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
33280index 30eb05a..ae671ac 100644
33281--- a/arch/x86/mm/init_64.c
33282+++ b/arch/x86/mm/init_64.c
33283@@ -150,7 +150,7 @@ early_param("gbpages", parse_direct_gbpages_on);
33284 * around without checking the pgd every time.
33285 */
33286
33287-pteval_t __supported_pte_mask __read_mostly = ~0;
33288+pteval_t __supported_pte_mask __read_only = ~_PAGE_NX;
33289 EXPORT_SYMBOL_GPL(__supported_pte_mask);
33290
33291 int force_personality32;
33292@@ -183,7 +183,12 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
33293
33294 for (address = start; address <= end; address += PGDIR_SIZE) {
33295 const pgd_t *pgd_ref = pgd_offset_k(address);
33296+
33297+#ifdef CONFIG_PAX_PER_CPU_PGD
33298+ unsigned long cpu;
33299+#else
33300 struct page *page;
33301+#endif
33302
33303 /*
33304 * When it is called after memory hot remove, pgd_none()
33305@@ -194,6 +199,25 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
33306 continue;
33307
33308 spin_lock(&pgd_lock);
33309+
33310+#ifdef CONFIG_PAX_PER_CPU_PGD
33311+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
33312+ pgd_t *pgd = pgd_offset_cpu(cpu, user, address);
33313+
33314+ if (!pgd_none(*pgd_ref) && !pgd_none(*pgd))
33315+ BUG_ON(pgd_page_vaddr(*pgd)
33316+ != pgd_page_vaddr(*pgd_ref));
33317+
33318+ if (removed) {
33319+ if (pgd_none(*pgd_ref) && !pgd_none(*pgd))
33320+ pgd_clear(pgd);
33321+ } else {
33322+ if (pgd_none(*pgd))
33323+ set_pgd(pgd, *pgd_ref);
33324+ }
33325+
33326+ pgd = pgd_offset_cpu(cpu, kernel, address);
33327+#else
33328 list_for_each_entry(page, &pgd_list, lru) {
33329 pgd_t *pgd;
33330 spinlock_t *pgt_lock;
33331@@ -202,6 +226,7 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
33332 /* the pgt_lock only for Xen */
33333 pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
33334 spin_lock(pgt_lock);
33335+#endif
33336
33337 if (!pgd_none(*pgd_ref) && !pgd_none(*pgd))
33338 BUG_ON(pgd_page_vaddr(*pgd)
33339@@ -215,7 +240,10 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
33340 set_pgd(pgd, *pgd_ref);
33341 }
33342
33343+#ifndef CONFIG_PAX_PER_CPU_PGD
33344 spin_unlock(pgt_lock);
33345+#endif
33346+
33347 }
33348 spin_unlock(&pgd_lock);
33349 }
33350@@ -248,7 +276,7 @@ static pud_t *fill_pud(pgd_t *pgd, unsigned long vaddr)
33351 {
33352 if (pgd_none(*pgd)) {
33353 pud_t *pud = (pud_t *)spp_getpage();
33354- pgd_populate(&init_mm, pgd, pud);
33355+ pgd_populate_kernel(&init_mm, pgd, pud);
33356 if (pud != pud_offset(pgd, 0))
33357 printk(KERN_ERR "PAGETABLE BUG #00! %p <-> %p\n",
33358 pud, pud_offset(pgd, 0));
33359@@ -260,7 +288,7 @@ static pmd_t *fill_pmd(pud_t *pud, unsigned long vaddr)
33360 {
33361 if (pud_none(*pud)) {
33362 pmd_t *pmd = (pmd_t *) spp_getpage();
33363- pud_populate(&init_mm, pud, pmd);
33364+ pud_populate_kernel(&init_mm, pud, pmd);
33365 if (pmd != pmd_offset(pud, 0))
33366 printk(KERN_ERR "PAGETABLE BUG #01! %p <-> %p\n",
33367 pmd, pmd_offset(pud, 0));
33368@@ -289,7 +317,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, unsigned long vaddr, pte_t new_pte)
33369 pmd = fill_pmd(pud, vaddr);
33370 pte = fill_pte(pmd, vaddr);
33371
33372+ pax_open_kernel();
33373 set_pte(pte, new_pte);
33374+ pax_close_kernel();
33375
33376 /*
33377 * It's enough to flush this one mapping.
33378@@ -351,14 +381,12 @@ static void __init __init_extra_mapping(unsigned long phys, unsigned long size,
33379 pgd = pgd_offset_k((unsigned long)__va(phys));
33380 if (pgd_none(*pgd)) {
33381 pud = (pud_t *) spp_getpage();
33382- set_pgd(pgd, __pgd(__pa(pud) | _KERNPG_TABLE |
33383- _PAGE_USER));
33384+ set_pgd(pgd, __pgd(__pa(pud) | _PAGE_TABLE));
33385 }
33386 pud = pud_offset(pgd, (unsigned long)__va(phys));
33387 if (pud_none(*pud)) {
33388 pmd = (pmd_t *) spp_getpage();
33389- set_pud(pud, __pud(__pa(pmd) | _KERNPG_TABLE |
33390- _PAGE_USER));
33391+ set_pud(pud, __pud(__pa(pmd) | _PAGE_TABLE));
33392 }
33393 pmd = pmd_offset(pud, phys);
33394 BUG_ON(!pmd_none(*pmd));
33395@@ -599,7 +627,7 @@ phys_pud_init(pud_t *pud_page, unsigned long addr, unsigned long end,
33396 prot);
33397
33398 spin_lock(&init_mm.page_table_lock);
33399- pud_populate(&init_mm, pud, pmd);
33400+ pud_populate_kernel(&init_mm, pud, pmd);
33401 spin_unlock(&init_mm.page_table_lock);
33402 }
33403 __flush_tlb_all();
33404@@ -640,7 +668,7 @@ kernel_physical_mapping_init(unsigned long start,
33405 page_size_mask);
33406
33407 spin_lock(&init_mm.page_table_lock);
33408- pgd_populate(&init_mm, pgd, pud);
33409+ pgd_populate_kernel(&init_mm, pgd, pud);
33410 spin_unlock(&init_mm.page_table_lock);
33411 pgd_changed = true;
33412 }
33413diff --git a/arch/x86/mm/iomap_32.c b/arch/x86/mm/iomap_32.c
33414index 9ca35fc..4b2b7b7 100644
33415--- a/arch/x86/mm/iomap_32.c
33416+++ b/arch/x86/mm/iomap_32.c
33417@@ -64,7 +64,11 @@ void *kmap_atomic_prot_pfn(unsigned long pfn, pgprot_t prot)
33418 type = kmap_atomic_idx_push();
33419 idx = type + KM_TYPE_NR * smp_processor_id();
33420 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
33421+
33422+ pax_open_kernel();
33423 set_pte(kmap_pte - idx, pfn_pte(pfn, prot));
33424+ pax_close_kernel();
33425+
33426 arch_flush_lazy_mmu_mode();
33427
33428 return (void *)vaddr;
33429diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
33430index fdf617c..b9e85bc 100644
33431--- a/arch/x86/mm/ioremap.c
33432+++ b/arch/x86/mm/ioremap.c
33433@@ -56,8 +56,8 @@ static int __ioremap_check_ram(unsigned long start_pfn, unsigned long nr_pages,
33434 unsigned long i;
33435
33436 for (i = 0; i < nr_pages; ++i)
33437- if (pfn_valid(start_pfn + i) &&
33438- !PageReserved(pfn_to_page(start_pfn + i)))
33439+ if (pfn_valid(start_pfn + i) && (start_pfn + i >= 0x100 ||
33440+ !PageReserved(pfn_to_page(start_pfn + i))))
33441 return 1;
33442
33443 WARN_ONCE(1, "ioremap on RAM pfn 0x%lx\n", start_pfn);
33444@@ -283,7 +283,7 @@ EXPORT_SYMBOL(ioremap_prot);
33445 *
33446 * Caller must ensure there is only one unmapping for the same pointer.
33447 */
33448-void iounmap(volatile void __iomem *addr)
33449+void iounmap(const volatile void __iomem *addr)
33450 {
33451 struct vm_struct *p, *o;
33452
33453@@ -332,30 +332,29 @@ EXPORT_SYMBOL(iounmap);
33454 */
33455 void *xlate_dev_mem_ptr(phys_addr_t phys)
33456 {
33457- void *addr;
33458- unsigned long start = phys & PAGE_MASK;
33459-
33460 /* If page is RAM, we can use __va. Otherwise ioremap and unmap. */
33461- if (page_is_ram(start >> PAGE_SHIFT))
33462+ if (page_is_ram(phys >> PAGE_SHIFT))
33463+#ifdef CONFIG_HIGHMEM
33464+ if ((phys >> PAGE_SHIFT) < max_low_pfn)
33465+#endif
33466 return __va(phys);
33467
33468- addr = (void __force *)ioremap_cache(start, PAGE_SIZE);
33469- if (addr)
33470- addr = (void *)((unsigned long)addr | (phys & ~PAGE_MASK));
33471-
33472- return addr;
33473+ return (void __force *)ioremap_cache(phys, PAGE_SIZE);
33474 }
33475
33476 void unxlate_dev_mem_ptr(phys_addr_t phys, void *addr)
33477 {
33478 if (page_is_ram(phys >> PAGE_SHIFT))
33479+#ifdef CONFIG_HIGHMEM
33480+ if ((phys >> PAGE_SHIFT) < max_low_pfn)
33481+#endif
33482 return;
33483
33484 iounmap((void __iomem *)((unsigned long)addr & PAGE_MASK));
33485 return;
33486 }
33487
33488-static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __page_aligned_bss;
33489+static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __read_only __aligned(PAGE_SIZE);
33490
33491 static inline pmd_t * __init early_ioremap_pmd(unsigned long addr)
33492 {
33493@@ -391,8 +390,7 @@ void __init early_ioremap_init(void)
33494 early_ioremap_setup();
33495
33496 pmd = early_ioremap_pmd(fix_to_virt(FIX_BTMAP_BEGIN));
33497- memset(bm_pte, 0, sizeof(bm_pte));
33498- pmd_populate_kernel(&init_mm, pmd, bm_pte);
33499+ pmd_populate_user(&init_mm, pmd, bm_pte);
33500
33501 /*
33502 * The boot-ioremap range spans multiple pmds, for which
33503diff --git a/arch/x86/mm/kmemcheck/kmemcheck.c b/arch/x86/mm/kmemcheck/kmemcheck.c
33504index b4f2e7e..96c9c3e 100644
33505--- a/arch/x86/mm/kmemcheck/kmemcheck.c
33506+++ b/arch/x86/mm/kmemcheck/kmemcheck.c
33507@@ -628,9 +628,9 @@ bool kmemcheck_fault(struct pt_regs *regs, unsigned long address,
33508 * memory (e.g. tracked pages)? For now, we need this to avoid
33509 * invoking kmemcheck for PnP BIOS calls.
33510 */
33511- if (regs->flags & X86_VM_MASK)
33512+ if (v8086_mode(regs))
33513 return false;
33514- if (regs->cs != __KERNEL_CS)
33515+ if (regs->cs != __KERNEL_CS && regs->cs != __KERNEXEC_KERNEL_CS)
33516 return false;
33517
33518 pte = kmemcheck_pte_lookup(address);
33519diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c
33520index df4552b..12c129c 100644
33521--- a/arch/x86/mm/mmap.c
33522+++ b/arch/x86/mm/mmap.c
33523@@ -52,7 +52,7 @@ static unsigned long stack_maxrandom_size(void)
33524 * Leave an at least ~128 MB hole with possible stack randomization.
33525 */
33526 #define MIN_GAP (128*1024*1024UL + stack_maxrandom_size())
33527-#define MAX_GAP (TASK_SIZE/6*5)
33528+#define MAX_GAP (pax_task_size/6*5)
33529
33530 static int mmap_is_legacy(void)
33531 {
33532@@ -82,27 +82,40 @@ static unsigned long mmap_rnd(void)
33533 return rnd << PAGE_SHIFT;
33534 }
33535
33536-static unsigned long mmap_base(void)
33537+static unsigned long mmap_base(struct mm_struct *mm)
33538 {
33539 unsigned long gap = rlimit(RLIMIT_STACK);
33540+ unsigned long pax_task_size = TASK_SIZE;
33541+
33542+#ifdef CONFIG_PAX_SEGMEXEC
33543+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
33544+ pax_task_size = SEGMEXEC_TASK_SIZE;
33545+#endif
33546
33547 if (gap < MIN_GAP)
33548 gap = MIN_GAP;
33549 else if (gap > MAX_GAP)
33550 gap = MAX_GAP;
33551
33552- return PAGE_ALIGN(TASK_SIZE - gap - mmap_rnd());
33553+ return PAGE_ALIGN(pax_task_size - gap - mmap_rnd());
33554 }
33555
33556 /*
33557 * Bottom-up (legacy) layout on X86_32 did not support randomization, X86_64
33558 * does, but not when emulating X86_32
33559 */
33560-static unsigned long mmap_legacy_base(void)
33561+static unsigned long mmap_legacy_base(struct mm_struct *mm)
33562 {
33563- if (mmap_is_ia32())
33564+ if (mmap_is_ia32()) {
33565+
33566+#ifdef CONFIG_PAX_SEGMEXEC
33567+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
33568+ return SEGMEXEC_TASK_UNMAPPED_BASE;
33569+ else
33570+#endif
33571+
33572 return TASK_UNMAPPED_BASE;
33573- else
33574+ } else
33575 return TASK_UNMAPPED_BASE + mmap_rnd();
33576 }
33577
33578@@ -112,8 +125,15 @@ static unsigned long mmap_legacy_base(void)
33579 */
33580 void arch_pick_mmap_layout(struct mm_struct *mm)
33581 {
33582- mm->mmap_legacy_base = mmap_legacy_base();
33583- mm->mmap_base = mmap_base();
33584+ mm->mmap_legacy_base = mmap_legacy_base(mm);
33585+ mm->mmap_base = mmap_base(mm);
33586+
33587+#ifdef CONFIG_PAX_RANDMMAP
33588+ if (mm->pax_flags & MF_PAX_RANDMMAP) {
33589+ mm->mmap_legacy_base += mm->delta_mmap;
33590+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
33591+ }
33592+#endif
33593
33594 if (mmap_is_legacy()) {
33595 mm->mmap_base = mm->mmap_legacy_base;
33596diff --git a/arch/x86/mm/mmio-mod.c b/arch/x86/mm/mmio-mod.c
33597index 0057a7a..95c7edd 100644
33598--- a/arch/x86/mm/mmio-mod.c
33599+++ b/arch/x86/mm/mmio-mod.c
33600@@ -194,7 +194,7 @@ static void pre(struct kmmio_probe *p, struct pt_regs *regs,
33601 break;
33602 default:
33603 {
33604- unsigned char *ip = (unsigned char *)instptr;
33605+ unsigned char *ip = (unsigned char *)ktla_ktva(instptr);
33606 my_trace->opcode = MMIO_UNKNOWN_OP;
33607 my_trace->width = 0;
33608 my_trace->value = (*ip) << 16 | *(ip + 1) << 8 |
33609@@ -234,7 +234,7 @@ static void post(struct kmmio_probe *p, unsigned long condition,
33610 static void ioremap_trace_core(resource_size_t offset, unsigned long size,
33611 void __iomem *addr)
33612 {
33613- static atomic_t next_id;
33614+ static atomic_unchecked_t next_id;
33615 struct remap_trace *trace = kmalloc(sizeof(*trace), GFP_KERNEL);
33616 /* These are page-unaligned. */
33617 struct mmiotrace_map map = {
33618@@ -258,7 +258,7 @@ static void ioremap_trace_core(resource_size_t offset, unsigned long size,
33619 .private = trace
33620 },
33621 .phys = offset,
33622- .id = atomic_inc_return(&next_id)
33623+ .id = atomic_inc_return_unchecked(&next_id)
33624 };
33625 map.map_id = trace->id;
33626
33627@@ -290,7 +290,7 @@ void mmiotrace_ioremap(resource_size_t offset, unsigned long size,
33628 ioremap_trace_core(offset, size, addr);
33629 }
33630
33631-static void iounmap_trace_core(volatile void __iomem *addr)
33632+static void iounmap_trace_core(const volatile void __iomem *addr)
33633 {
33634 struct mmiotrace_map map = {
33635 .phys = 0,
33636@@ -328,7 +328,7 @@ not_enabled:
33637 }
33638 }
33639
33640-void mmiotrace_iounmap(volatile void __iomem *addr)
33641+void mmiotrace_iounmap(const volatile void __iomem *addr)
33642 {
33643 might_sleep();
33644 if (is_enabled()) /* recheck and proper locking in *_core() */
33645diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
33646index cd4785b..25188b6 100644
33647--- a/arch/x86/mm/numa.c
33648+++ b/arch/x86/mm/numa.c
33649@@ -499,7 +499,7 @@ static void __init numa_clear_kernel_node_hotplug(void)
33650 }
33651 }
33652
33653-static int __init numa_register_memblks(struct numa_meminfo *mi)
33654+static int __init __intentional_overflow(-1) numa_register_memblks(struct numa_meminfo *mi)
33655 {
33656 unsigned long uninitialized_var(pfn_align);
33657 int i, nid;
33658diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
33659index 536ea2f..f42c293 100644
33660--- a/arch/x86/mm/pageattr.c
33661+++ b/arch/x86/mm/pageattr.c
33662@@ -262,7 +262,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33663 */
33664 #ifdef CONFIG_PCI_BIOS
33665 if (pcibios_enabled && within(pfn, BIOS_BEGIN >> PAGE_SHIFT, BIOS_END >> PAGE_SHIFT))
33666- pgprot_val(forbidden) |= _PAGE_NX;
33667+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
33668 #endif
33669
33670 /*
33671@@ -270,9 +270,10 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33672 * Does not cover __inittext since that is gone later on. On
33673 * 64bit we do not enforce !NX on the low mapping
33674 */
33675- if (within(address, (unsigned long)_text, (unsigned long)_etext))
33676- pgprot_val(forbidden) |= _PAGE_NX;
33677+ if (within(address, ktla_ktva((unsigned long)_text), ktla_ktva((unsigned long)_etext)))
33678+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
33679
33680+#ifdef CONFIG_DEBUG_RODATA
33681 /*
33682 * The .rodata section needs to be read-only. Using the pfn
33683 * catches all aliases.
33684@@ -280,6 +281,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33685 if (within(pfn, __pa_symbol(__start_rodata) >> PAGE_SHIFT,
33686 __pa_symbol(__end_rodata) >> PAGE_SHIFT))
33687 pgprot_val(forbidden) |= _PAGE_RW;
33688+#endif
33689
33690 #if defined(CONFIG_X86_64) && defined(CONFIG_DEBUG_RODATA)
33691 /*
33692@@ -318,6 +320,13 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33693 }
33694 #endif
33695
33696+#ifdef CONFIG_PAX_KERNEXEC
33697+ if (within(pfn, __pa(ktla_ktva((unsigned long)&_text)), __pa((unsigned long)&_sdata))) {
33698+ pgprot_val(forbidden) |= _PAGE_RW;
33699+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
33700+ }
33701+#endif
33702+
33703 prot = __pgprot(pgprot_val(prot) & ~pgprot_val(forbidden));
33704
33705 return prot;
33706@@ -440,23 +449,37 @@ EXPORT_SYMBOL_GPL(slow_virt_to_phys);
33707 static void __set_pmd_pte(pte_t *kpte, unsigned long address, pte_t pte)
33708 {
33709 /* change init_mm */
33710+ pax_open_kernel();
33711 set_pte_atomic(kpte, pte);
33712+
33713 #ifdef CONFIG_X86_32
33714 if (!SHARED_KERNEL_PMD) {
33715+
33716+#ifdef CONFIG_PAX_PER_CPU_PGD
33717+ unsigned long cpu;
33718+#else
33719 struct page *page;
33720+#endif
33721
33722+#ifdef CONFIG_PAX_PER_CPU_PGD
33723+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
33724+ pgd_t *pgd = get_cpu_pgd(cpu, kernel);
33725+#else
33726 list_for_each_entry(page, &pgd_list, lru) {
33727- pgd_t *pgd;
33728+ pgd_t *pgd = (pgd_t *)page_address(page);
33729+#endif
33730+
33731 pud_t *pud;
33732 pmd_t *pmd;
33733
33734- pgd = (pgd_t *)page_address(page) + pgd_index(address);
33735+ pgd += pgd_index(address);
33736 pud = pud_offset(pgd, address);
33737 pmd = pmd_offset(pud, address);
33738 set_pte_atomic((pte_t *)pmd, pte);
33739 }
33740 }
33741 #endif
33742+ pax_close_kernel();
33743 }
33744
33745 static int
33746diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
33747index 7ac6869..c0ba541 100644
33748--- a/arch/x86/mm/pat.c
33749+++ b/arch/x86/mm/pat.c
33750@@ -89,7 +89,7 @@ static inline enum page_cache_mode get_page_memtype(struct page *pg)
33751 unsigned long pg_flags = pg->flags & _PGMT_MASK;
33752
33753 if (pg_flags == _PGMT_DEFAULT)
33754- return -1;
33755+ return _PAGE_CACHE_MODE_NUM;
33756 else if (pg_flags == _PGMT_WC)
33757 return _PAGE_CACHE_MODE_WC;
33758 else if (pg_flags == _PGMT_UC_MINUS)
33759@@ -346,7 +346,7 @@ static int reserve_ram_pages_type(u64 start, u64 end,
33760
33761 page = pfn_to_page(pfn);
33762 type = get_page_memtype(page);
33763- if (type != -1) {
33764+ if (type != _PAGE_CACHE_MODE_NUM) {
33765 pr_info("reserve_ram_pages_type failed [mem %#010Lx-%#010Lx], track 0x%x, req 0x%x\n",
33766 start, end - 1, type, req_type);
33767 if (new_type)
33768@@ -498,7 +498,7 @@ int free_memtype(u64 start, u64 end)
33769
33770 if (!entry) {
33771 printk(KERN_INFO "%s:%d freeing invalid memtype [mem %#010Lx-%#010Lx]\n",
33772- current->comm, current->pid, start, end - 1);
33773+ current->comm, task_pid_nr(current), start, end - 1);
33774 return -EINVAL;
33775 }
33776
33777@@ -532,10 +532,10 @@ static enum page_cache_mode lookup_memtype(u64 paddr)
33778 page = pfn_to_page(paddr >> PAGE_SHIFT);
33779 rettype = get_page_memtype(page);
33780 /*
33781- * -1 from get_page_memtype() implies RAM page is in its
33782+ * _PAGE_CACHE_MODE_NUM from get_page_memtype() implies RAM page is in its
33783 * default state and not reserved, and hence of type WB
33784 */
33785- if (rettype == -1)
33786+ if (rettype == _PAGE_CACHE_MODE_NUM)
33787 rettype = _PAGE_CACHE_MODE_WB;
33788
33789 return rettype;
33790@@ -628,8 +628,8 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
33791
33792 while (cursor < to) {
33793 if (!devmem_is_allowed(pfn)) {
33794- printk(KERN_INFO "Program %s tried to access /dev/mem between [mem %#010Lx-%#010Lx]\n",
33795- current->comm, from, to - 1);
33796+ printk(KERN_INFO "Program %s tried to access /dev/mem between [mem %#010Lx-%#010Lx] (%#010Lx)\n",
33797+ current->comm, from, to - 1, cursor);
33798 return 0;
33799 }
33800 cursor += PAGE_SIZE;
33801@@ -700,7 +700,7 @@ int kernel_map_sync_memtype(u64 base, unsigned long size,
33802 if (ioremap_change_attr((unsigned long)__va(base), id_sz, pcm) < 0) {
33803 printk(KERN_INFO "%s:%d ioremap_change_attr failed %s "
33804 "for [mem %#010Lx-%#010Lx]\n",
33805- current->comm, current->pid,
33806+ current->comm, task_pid_nr(current),
33807 cattr_name(pcm),
33808 base, (unsigned long long)(base + size-1));
33809 return -EINVAL;
33810@@ -735,7 +735,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
33811 pcm = lookup_memtype(paddr);
33812 if (want_pcm != pcm) {
33813 printk(KERN_WARNING "%s:%d map pfn RAM range req %s for [mem %#010Lx-%#010Lx], got %s\n",
33814- current->comm, current->pid,
33815+ current->comm, task_pid_nr(current),
33816 cattr_name(want_pcm),
33817 (unsigned long long)paddr,
33818 (unsigned long long)(paddr + size - 1),
33819@@ -757,7 +757,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
33820 free_memtype(paddr, paddr + size);
33821 printk(KERN_ERR "%s:%d map pfn expected mapping type %s"
33822 " for [mem %#010Lx-%#010Lx], got %s\n",
33823- current->comm, current->pid,
33824+ current->comm, task_pid_nr(current),
33825 cattr_name(want_pcm),
33826 (unsigned long long)paddr,
33827 (unsigned long long)(paddr + size - 1),
33828diff --git a/arch/x86/mm/pat_rbtree.c b/arch/x86/mm/pat_rbtree.c
33829index 6582adc..fcc5d0b 100644
33830--- a/arch/x86/mm/pat_rbtree.c
33831+++ b/arch/x86/mm/pat_rbtree.c
33832@@ -161,7 +161,7 @@ success:
33833
33834 failure:
33835 printk(KERN_INFO "%s:%d conflicting memory types "
33836- "%Lx-%Lx %s<->%s\n", current->comm, current->pid, start,
33837+ "%Lx-%Lx %s<->%s\n", current->comm, task_pid_nr(current), start,
33838 end, cattr_name(found_type), cattr_name(match->type));
33839 return -EBUSY;
33840 }
33841diff --git a/arch/x86/mm/pf_in.c b/arch/x86/mm/pf_in.c
33842index 9f0614d..92ae64a 100644
33843--- a/arch/x86/mm/pf_in.c
33844+++ b/arch/x86/mm/pf_in.c
33845@@ -148,7 +148,7 @@ enum reason_type get_ins_type(unsigned long ins_addr)
33846 int i;
33847 enum reason_type rv = OTHERS;
33848
33849- p = (unsigned char *)ins_addr;
33850+ p = (unsigned char *)ktla_ktva(ins_addr);
33851 p += skip_prefix(p, &prf);
33852 p += get_opcode(p, &opcode);
33853
33854@@ -168,7 +168,7 @@ static unsigned int get_ins_reg_width(unsigned long ins_addr)
33855 struct prefix_bits prf;
33856 int i;
33857
33858- p = (unsigned char *)ins_addr;
33859+ p = (unsigned char *)ktla_ktva(ins_addr);
33860 p += skip_prefix(p, &prf);
33861 p += get_opcode(p, &opcode);
33862
33863@@ -191,7 +191,7 @@ unsigned int get_ins_mem_width(unsigned long ins_addr)
33864 struct prefix_bits prf;
33865 int i;
33866
33867- p = (unsigned char *)ins_addr;
33868+ p = (unsigned char *)ktla_ktva(ins_addr);
33869 p += skip_prefix(p, &prf);
33870 p += get_opcode(p, &opcode);
33871
33872@@ -415,7 +415,7 @@ unsigned long get_ins_reg_val(unsigned long ins_addr, struct pt_regs *regs)
33873 struct prefix_bits prf;
33874 int i;
33875
33876- p = (unsigned char *)ins_addr;
33877+ p = (unsigned char *)ktla_ktva(ins_addr);
33878 p += skip_prefix(p, &prf);
33879 p += get_opcode(p, &opcode);
33880 for (i = 0; i < ARRAY_SIZE(reg_rop); i++)
33881@@ -470,7 +470,7 @@ unsigned long get_ins_imm_val(unsigned long ins_addr)
33882 struct prefix_bits prf;
33883 int i;
33884
33885- p = (unsigned char *)ins_addr;
33886+ p = (unsigned char *)ktla_ktva(ins_addr);
33887 p += skip_prefix(p, &prf);
33888 p += get_opcode(p, &opcode);
33889 for (i = 0; i < ARRAY_SIZE(imm_wop); i++)
33890diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c
33891index 7b22ada..b11e66f 100644
33892--- a/arch/x86/mm/pgtable.c
33893+++ b/arch/x86/mm/pgtable.c
33894@@ -97,10 +97,75 @@ static inline void pgd_list_del(pgd_t *pgd)
33895 list_del(&page->lru);
33896 }
33897
33898-#define UNSHARED_PTRS_PER_PGD \
33899- (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
33900+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
33901+pgdval_t clone_pgd_mask __read_only = ~_PAGE_PRESENT;
33902
33903+void __shadow_user_pgds(pgd_t *dst, const pgd_t *src)
33904+{
33905+ unsigned int count = USER_PGD_PTRS;
33906
33907+ if (!pax_user_shadow_base)
33908+ return;
33909+
33910+ while (count--)
33911+ *dst++ = __pgd((pgd_val(*src++) | (_PAGE_NX & __supported_pte_mask)) & ~_PAGE_USER);
33912+}
33913+#endif
33914+
33915+#ifdef CONFIG_PAX_PER_CPU_PGD
33916+void __clone_user_pgds(pgd_t *dst, const pgd_t *src)
33917+{
33918+ unsigned int count = USER_PGD_PTRS;
33919+
33920+ while (count--) {
33921+ pgd_t pgd;
33922+
33923+#ifdef CONFIG_X86_64
33924+ pgd = __pgd(pgd_val(*src++) | _PAGE_USER);
33925+#else
33926+ pgd = *src++;
33927+#endif
33928+
33929+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
33930+ pgd = __pgd(pgd_val(pgd) & clone_pgd_mask);
33931+#endif
33932+
33933+ *dst++ = pgd;
33934+ }
33935+
33936+}
33937+#endif
33938+
33939+#ifdef CONFIG_X86_64
33940+#define pxd_t pud_t
33941+#define pyd_t pgd_t
33942+#define paravirt_release_pxd(pfn) paravirt_release_pud(pfn)
33943+#define pgtable_pxd_page_ctor(page) true
33944+#define pgtable_pxd_page_dtor(page) do {} while (0)
33945+#define pxd_free(mm, pud) pud_free((mm), (pud))
33946+#define pyd_populate(mm, pgd, pud) pgd_populate((mm), (pgd), (pud))
33947+#define pyd_offset(mm, address) pgd_offset((mm), (address))
33948+#define PYD_SIZE PGDIR_SIZE
33949+#define mm_inc_nr_pxds(mm) do {} while (0)
33950+#define mm_dec_nr_pxds(mm) do {} while (0)
33951+#else
33952+#define pxd_t pmd_t
33953+#define pyd_t pud_t
33954+#define paravirt_release_pxd(pfn) paravirt_release_pmd(pfn)
33955+#define pgtable_pxd_page_ctor(page) pgtable_pmd_page_ctor(page)
33956+#define pgtable_pxd_page_dtor(page) pgtable_pmd_page_dtor(page)
33957+#define pxd_free(mm, pud) pmd_free((mm), (pud))
33958+#define pyd_populate(mm, pgd, pud) pud_populate((mm), (pgd), (pud))
33959+#define pyd_offset(mm, address) pud_offset((mm), (address))
33960+#define PYD_SIZE PUD_SIZE
33961+#define mm_inc_nr_pxds(mm) mm_inc_nr_pmds(mm)
33962+#define mm_dec_nr_pxds(mm) mm_dec_nr_pmds(mm)
33963+#endif
33964+
33965+#ifdef CONFIG_PAX_PER_CPU_PGD
33966+static inline void pgd_ctor(struct mm_struct *mm, pgd_t *pgd) {}
33967+static inline void pgd_dtor(pgd_t *pgd) {}
33968+#else
33969 static void pgd_set_mm(pgd_t *pgd, struct mm_struct *mm)
33970 {
33971 BUILD_BUG_ON(sizeof(virt_to_page(pgd)->index) < sizeof(mm));
33972@@ -141,6 +206,7 @@ static void pgd_dtor(pgd_t *pgd)
33973 pgd_list_del(pgd);
33974 spin_unlock(&pgd_lock);
33975 }
33976+#endif
33977
33978 /*
33979 * List of all pgd's needed for non-PAE so it can invalidate entries
33980@@ -153,7 +219,7 @@ static void pgd_dtor(pgd_t *pgd)
33981 * -- nyc
33982 */
33983
33984-#ifdef CONFIG_X86_PAE
33985+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
33986 /*
33987 * In PAE mode, we need to do a cr3 reload (=tlb flush) when
33988 * updating the top-level pagetable entries to guarantee the
33989@@ -165,7 +231,7 @@ static void pgd_dtor(pgd_t *pgd)
33990 * not shared between pagetables (!SHARED_KERNEL_PMDS), we allocate
33991 * and initialize the kernel pmds here.
33992 */
33993-#define PREALLOCATED_PMDS UNSHARED_PTRS_PER_PGD
33994+#define PREALLOCATED_PXDS (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
33995
33996 void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
33997 {
33998@@ -183,46 +249,48 @@ void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
33999 */
34000 flush_tlb_mm(mm);
34001 }
34002+#elif defined(CONFIG_X86_64) && defined(CONFIG_PAX_PER_CPU_PGD)
34003+#define PREALLOCATED_PXDS USER_PGD_PTRS
34004 #else /* !CONFIG_X86_PAE */
34005
34006 /* No need to prepopulate any pagetable entries in non-PAE modes. */
34007-#define PREALLOCATED_PMDS 0
34008+#define PREALLOCATED_PXDS 0
34009
34010 #endif /* CONFIG_X86_PAE */
34011
34012-static void free_pmds(struct mm_struct *mm, pmd_t *pmds[])
34013+static void free_pxds(struct mm_struct *mm, pxd_t *pxds[])
34014 {
34015 int i;
34016
34017- for(i = 0; i < PREALLOCATED_PMDS; i++)
34018- if (pmds[i]) {
34019- pgtable_pmd_page_dtor(virt_to_page(pmds[i]));
34020- free_page((unsigned long)pmds[i]);
34021- mm_dec_nr_pmds(mm);
34022+ for(i = 0; i < PREALLOCATED_PXDS; i++)
34023+ if (pxds[i]) {
34024+ pgtable_pxd_page_dtor(virt_to_page(pxds[i]));
34025+ free_page((unsigned long)pxds[i]);
34026+ mm_dec_nr_pxds(mm);
34027 }
34028 }
34029
34030-static int preallocate_pmds(struct mm_struct *mm, pmd_t *pmds[])
34031+static int preallocate_pxds(struct mm_struct *mm, pxd_t *pxds[])
34032 {
34033 int i;
34034 bool failed = false;
34035
34036- for(i = 0; i < PREALLOCATED_PMDS; i++) {
34037- pmd_t *pmd = (pmd_t *)__get_free_page(PGALLOC_GFP);
34038- if (!pmd)
34039+ for(i = 0; i < PREALLOCATED_PXDS; i++) {
34040+ pxd_t *pxd = (pxd_t *)__get_free_page(PGALLOC_GFP);
34041+ if (!pxd)
34042 failed = true;
34043- if (pmd && !pgtable_pmd_page_ctor(virt_to_page(pmd))) {
34044- free_page((unsigned long)pmd);
34045- pmd = NULL;
34046+ if (pxd && !pgtable_pxd_page_ctor(virt_to_page(pxd))) {
34047+ free_page((unsigned long)pxd);
34048+ pxd = NULL;
34049 failed = true;
34050 }
34051- if (pmd)
34052- mm_inc_nr_pmds(mm);
34053- pmds[i] = pmd;
34054+ if (pxd)
34055+ mm_inc_nr_pxds(mm);
34056+ pxds[i] = pxd;
34057 }
34058
34059 if (failed) {
34060- free_pmds(mm, pmds);
34061+ free_pxds(mm, pxds);
34062 return -ENOMEM;
34063 }
34064
34065@@ -235,50 +303,54 @@ static int preallocate_pmds(struct mm_struct *mm, pmd_t *pmds[])
34066 * preallocate which never got a corresponding vma will need to be
34067 * freed manually.
34068 */
34069-static void pgd_mop_up_pmds(struct mm_struct *mm, pgd_t *pgdp)
34070+static void pgd_mop_up_pxds(struct mm_struct *mm, pgd_t *pgdp)
34071 {
34072 int i;
34073
34074- for(i = 0; i < PREALLOCATED_PMDS; i++) {
34075+ for(i = 0; i < PREALLOCATED_PXDS; i++) {
34076 pgd_t pgd = pgdp[i];
34077
34078 if (pgd_val(pgd) != 0) {
34079- pmd_t *pmd = (pmd_t *)pgd_page_vaddr(pgd);
34080+ pxd_t *pxd = (pxd_t *)pgd_page_vaddr(pgd);
34081
34082- pgdp[i] = native_make_pgd(0);
34083+ set_pgd(pgdp + i, native_make_pgd(0));
34084
34085- paravirt_release_pmd(pgd_val(pgd) >> PAGE_SHIFT);
34086- pmd_free(mm, pmd);
34087- mm_dec_nr_pmds(mm);
34088+ paravirt_release_pxd(pgd_val(pgd) >> PAGE_SHIFT);
34089+ pxd_free(mm, pxd);
34090+ mm_dec_nr_pxds(mm);
34091 }
34092 }
34093 }
34094
34095-static void pgd_prepopulate_pmd(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmds[])
34096+static void pgd_prepopulate_pxd(struct mm_struct *mm, pgd_t *pgd, pxd_t *pxds[])
34097 {
34098- pud_t *pud;
34099+ pyd_t *pyd;
34100 int i;
34101
34102- if (PREALLOCATED_PMDS == 0) /* Work around gcc-3.4.x bug */
34103+ if (PREALLOCATED_PXDS == 0) /* Work around gcc-3.4.x bug */
34104 return;
34105
34106- pud = pud_offset(pgd, 0);
34107+#ifdef CONFIG_X86_64
34108+ pyd = pyd_offset(mm, 0L);
34109+#else
34110+ pyd = pyd_offset(pgd, 0L);
34111+#endif
34112
34113- for (i = 0; i < PREALLOCATED_PMDS; i++, pud++) {
34114- pmd_t *pmd = pmds[i];
34115+ for (i = 0; i < PREALLOCATED_PXDS; i++, pyd++) {
34116+ pxd_t *pxd = pxds[i];
34117
34118 if (i >= KERNEL_PGD_BOUNDARY)
34119- memcpy(pmd, (pmd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
34120- sizeof(pmd_t) * PTRS_PER_PMD);
34121+ memcpy(pxd, (pxd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
34122+ sizeof(pxd_t) * PTRS_PER_PMD);
34123
34124- pud_populate(mm, pud, pmd);
34125+ pyd_populate(mm, pyd, pxd);
34126 }
34127 }
34128
34129 pgd_t *pgd_alloc(struct mm_struct *mm)
34130 {
34131 pgd_t *pgd;
34132- pmd_t *pmds[PREALLOCATED_PMDS];
34133+ pxd_t *pxds[PREALLOCATED_PXDS];
34134
34135 pgd = (pgd_t *)__get_free_page(PGALLOC_GFP);
34136
34137@@ -287,11 +359,11 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
34138
34139 mm->pgd = pgd;
34140
34141- if (preallocate_pmds(mm, pmds) != 0)
34142+ if (preallocate_pxds(mm, pxds) != 0)
34143 goto out_free_pgd;
34144
34145 if (paravirt_pgd_alloc(mm) != 0)
34146- goto out_free_pmds;
34147+ goto out_free_pxds;
34148
34149 /*
34150 * Make sure that pre-populating the pmds is atomic with
34151@@ -301,14 +373,14 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
34152 spin_lock(&pgd_lock);
34153
34154 pgd_ctor(mm, pgd);
34155- pgd_prepopulate_pmd(mm, pgd, pmds);
34156+ pgd_prepopulate_pxd(mm, pgd, pxds);
34157
34158 spin_unlock(&pgd_lock);
34159
34160 return pgd;
34161
34162-out_free_pmds:
34163- free_pmds(mm, pmds);
34164+out_free_pxds:
34165+ free_pxds(mm, pxds);
34166 out_free_pgd:
34167 free_page((unsigned long)pgd);
34168 out:
34169@@ -317,7 +389,7 @@ out:
34170
34171 void pgd_free(struct mm_struct *mm, pgd_t *pgd)
34172 {
34173- pgd_mop_up_pmds(mm, pgd);
34174+ pgd_mop_up_pxds(mm, pgd);
34175 pgd_dtor(pgd);
34176 paravirt_pgd_free(mm, pgd);
34177 free_page((unsigned long)pgd);
34178diff --git a/arch/x86/mm/pgtable_32.c b/arch/x86/mm/pgtable_32.c
34179index 75cc097..79a097f 100644
34180--- a/arch/x86/mm/pgtable_32.c
34181+++ b/arch/x86/mm/pgtable_32.c
34182@@ -47,10 +47,13 @@ void set_pte_vaddr(unsigned long vaddr, pte_t pteval)
34183 return;
34184 }
34185 pte = pte_offset_kernel(pmd, vaddr);
34186+
34187+ pax_open_kernel();
34188 if (pte_val(pteval))
34189 set_pte_at(&init_mm, vaddr, pte, pteval);
34190 else
34191 pte_clear(&init_mm, vaddr, pte);
34192+ pax_close_kernel();
34193
34194 /*
34195 * It's enough to flush this one mapping.
34196diff --git a/arch/x86/mm/physaddr.c b/arch/x86/mm/physaddr.c
34197index e666cbb..61788c45 100644
34198--- a/arch/x86/mm/physaddr.c
34199+++ b/arch/x86/mm/physaddr.c
34200@@ -10,7 +10,7 @@
34201 #ifdef CONFIG_X86_64
34202
34203 #ifdef CONFIG_DEBUG_VIRTUAL
34204-unsigned long __phys_addr(unsigned long x)
34205+unsigned long __intentional_overflow(-1) __phys_addr(unsigned long x)
34206 {
34207 unsigned long y = x - __START_KERNEL_map;
34208
34209@@ -67,7 +67,7 @@ EXPORT_SYMBOL(__virt_addr_valid);
34210 #else
34211
34212 #ifdef CONFIG_DEBUG_VIRTUAL
34213-unsigned long __phys_addr(unsigned long x)
34214+unsigned long __intentional_overflow(-1) __phys_addr(unsigned long x)
34215 {
34216 unsigned long phys_addr = x - PAGE_OFFSET;
34217 /* VMALLOC_* aren't constants */
34218diff --git a/arch/x86/mm/setup_nx.c b/arch/x86/mm/setup_nx.c
34219index 90555bf..f5f1828 100644
34220--- a/arch/x86/mm/setup_nx.c
34221+++ b/arch/x86/mm/setup_nx.c
34222@@ -5,8 +5,10 @@
34223 #include <asm/pgtable.h>
34224 #include <asm/proto.h>
34225
34226+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
34227 static int disable_nx;
34228
34229+#ifndef CONFIG_PAX_PAGEEXEC
34230 /*
34231 * noexec = on|off
34232 *
34233@@ -28,12 +30,17 @@ static int __init noexec_setup(char *str)
34234 return 0;
34235 }
34236 early_param("noexec", noexec_setup);
34237+#endif
34238+
34239+#endif
34240
34241 void x86_configure_nx(void)
34242 {
34243+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
34244 if (cpu_has_nx && !disable_nx)
34245 __supported_pte_mask |= _PAGE_NX;
34246 else
34247+#endif
34248 __supported_pte_mask &= ~_PAGE_NX;
34249 }
34250
34251diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
34252index 3250f23..7a97ba2 100644
34253--- a/arch/x86/mm/tlb.c
34254+++ b/arch/x86/mm/tlb.c
34255@@ -45,7 +45,11 @@ void leave_mm(int cpu)
34256 BUG();
34257 if (cpumask_test_cpu(cpu, mm_cpumask(active_mm))) {
34258 cpumask_clear_cpu(cpu, mm_cpumask(active_mm));
34259+
34260+#ifndef CONFIG_PAX_PER_CPU_PGD
34261 load_cr3(swapper_pg_dir);
34262+#endif
34263+
34264 /*
34265 * This gets called in the idle path where RCU
34266 * functions differently. Tracing normally
34267diff --git a/arch/x86/mm/uderef_64.c b/arch/x86/mm/uderef_64.c
34268new file mode 100644
34269index 0000000..dace51c
34270--- /dev/null
34271+++ b/arch/x86/mm/uderef_64.c
34272@@ -0,0 +1,37 @@
34273+#include <linux/mm.h>
34274+#include <asm/pgtable.h>
34275+#include <asm/uaccess.h>
34276+
34277+#ifdef CONFIG_PAX_MEMORY_UDEREF
34278+/* PaX: due to the special call convention these functions must
34279+ * - remain leaf functions under all configurations,
34280+ * - never be called directly, only dereferenced from the wrappers.
34281+ */
34282+void __pax_open_userland(void)
34283+{
34284+ unsigned int cpu;
34285+
34286+ if (unlikely(!segment_eq(get_fs(), USER_DS)))
34287+ return;
34288+
34289+ cpu = raw_get_cpu();
34290+ BUG_ON((read_cr3() & ~PAGE_MASK) != PCID_KERNEL);
34291+ write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER | PCID_NOFLUSH);
34292+ raw_put_cpu_no_resched();
34293+}
34294+EXPORT_SYMBOL(__pax_open_userland);
34295+
34296+void __pax_close_userland(void)
34297+{
34298+ unsigned int cpu;
34299+
34300+ if (unlikely(!segment_eq(get_fs(), USER_DS)))
34301+ return;
34302+
34303+ cpu = raw_get_cpu();
34304+ BUG_ON((read_cr3() & ~PAGE_MASK) != PCID_USER);
34305+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
34306+ raw_put_cpu_no_resched();
34307+}
34308+EXPORT_SYMBOL(__pax_close_userland);
34309+#endif
34310diff --git a/arch/x86/net/bpf_jit.S b/arch/x86/net/bpf_jit.S
34311index 6440221..f84b5c7 100644
34312--- a/arch/x86/net/bpf_jit.S
34313+++ b/arch/x86/net/bpf_jit.S
34314@@ -9,6 +9,7 @@
34315 */
34316 #include <linux/linkage.h>
34317 #include <asm/dwarf2.h>
34318+#include <asm/alternative-asm.h>
34319
34320 /*
34321 * Calling convention :
34322@@ -38,6 +39,7 @@ sk_load_word_positive_offset:
34323 jle bpf_slow_path_word
34324 mov (SKBDATA,%rsi),%eax
34325 bswap %eax /* ntohl() */
34326+ pax_force_retaddr
34327 ret
34328
34329 sk_load_half:
34330@@ -55,6 +57,7 @@ sk_load_half_positive_offset:
34331 jle bpf_slow_path_half
34332 movzwl (SKBDATA,%rsi),%eax
34333 rol $8,%ax # ntohs()
34334+ pax_force_retaddr
34335 ret
34336
34337 sk_load_byte:
34338@@ -69,6 +72,7 @@ sk_load_byte_positive_offset:
34339 cmp %esi,%r9d /* if (offset >= hlen) goto bpf_slow_path_byte */
34340 jle bpf_slow_path_byte
34341 movzbl (SKBDATA,%rsi),%eax
34342+ pax_force_retaddr
34343 ret
34344
34345 /* rsi contains offset and can be scratched */
34346@@ -90,6 +94,7 @@ bpf_slow_path_word:
34347 js bpf_error
34348 mov - MAX_BPF_STACK + 32(%rbp),%eax
34349 bswap %eax
34350+ pax_force_retaddr
34351 ret
34352
34353 bpf_slow_path_half:
34354@@ -98,12 +103,14 @@ bpf_slow_path_half:
34355 mov - MAX_BPF_STACK + 32(%rbp),%ax
34356 rol $8,%ax
34357 movzwl %ax,%eax
34358+ pax_force_retaddr
34359 ret
34360
34361 bpf_slow_path_byte:
34362 bpf_slow_path_common(1)
34363 js bpf_error
34364 movzbl - MAX_BPF_STACK + 32(%rbp),%eax
34365+ pax_force_retaddr
34366 ret
34367
34368 #define sk_negative_common(SIZE) \
34369@@ -126,6 +133,7 @@ sk_load_word_negative_offset:
34370 sk_negative_common(4)
34371 mov (%rax), %eax
34372 bswap %eax
34373+ pax_force_retaddr
34374 ret
34375
34376 bpf_slow_path_half_neg:
34377@@ -137,6 +145,7 @@ sk_load_half_negative_offset:
34378 mov (%rax),%ax
34379 rol $8,%ax
34380 movzwl %ax,%eax
34381+ pax_force_retaddr
34382 ret
34383
34384 bpf_slow_path_byte_neg:
34385@@ -146,6 +155,7 @@ sk_load_byte_negative_offset:
34386 .globl sk_load_byte_negative_offset
34387 sk_negative_common(1)
34388 movzbl (%rax), %eax
34389+ pax_force_retaddr
34390 ret
34391
34392 bpf_error:
34393@@ -156,4 +166,5 @@ bpf_error:
34394 mov - MAX_BPF_STACK + 16(%rbp),%r14
34395 mov - MAX_BPF_STACK + 24(%rbp),%r15
34396 leaveq
34397+ pax_force_retaddr
34398 ret
34399diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
34400index ddeff48..877ead6 100644
34401--- a/arch/x86/net/bpf_jit_comp.c
34402+++ b/arch/x86/net/bpf_jit_comp.c
34403@@ -13,7 +13,11 @@
34404 #include <linux/if_vlan.h>
34405 #include <asm/cacheflush.h>
34406
34407+#ifdef CONFIG_GRKERNSEC_BPF_HARDEN
34408+int bpf_jit_enable __read_only;
34409+#else
34410 int bpf_jit_enable __read_mostly;
34411+#endif
34412
34413 /*
34414 * assembly code in arch/x86/net/bpf_jit.S
34415@@ -174,7 +178,9 @@ static u8 add_2reg(u8 byte, u32 dst_reg, u32 src_reg)
34416 static void jit_fill_hole(void *area, unsigned int size)
34417 {
34418 /* fill whole space with int3 instructions */
34419+ pax_open_kernel();
34420 memset(area, 0xcc, size);
34421+ pax_close_kernel();
34422 }
34423
34424 struct jit_context {
34425@@ -924,7 +930,9 @@ common_load:
34426 pr_err("bpf_jit_compile fatal error\n");
34427 return -EFAULT;
34428 }
34429+ pax_open_kernel();
34430 memcpy(image + proglen, temp, ilen);
34431+ pax_close_kernel();
34432 }
34433 proglen += ilen;
34434 addrs[i] = proglen;
34435@@ -1001,7 +1009,6 @@ void bpf_int_jit_compile(struct bpf_prog *prog)
34436
34437 if (image) {
34438 bpf_flush_icache(header, image + proglen);
34439- set_memory_ro((unsigned long)header, header->pages);
34440 prog->bpf_func = (void *)image;
34441 prog->jited = true;
34442 }
34443@@ -1014,12 +1021,8 @@ void bpf_jit_free(struct bpf_prog *fp)
34444 unsigned long addr = (unsigned long)fp->bpf_func & PAGE_MASK;
34445 struct bpf_binary_header *header = (void *)addr;
34446
34447- if (!fp->jited)
34448- goto free_filter;
34449+ if (fp->jited)
34450+ bpf_jit_binary_free(header);
34451
34452- set_memory_rw(addr, header->pages);
34453- bpf_jit_binary_free(header);
34454-
34455-free_filter:
34456 bpf_prog_unlock_free(fp);
34457 }
34458diff --git a/arch/x86/oprofile/backtrace.c b/arch/x86/oprofile/backtrace.c
34459index 5d04be5..2beeaa2 100644
34460--- a/arch/x86/oprofile/backtrace.c
34461+++ b/arch/x86/oprofile/backtrace.c
34462@@ -46,11 +46,11 @@ dump_user_backtrace_32(struct stack_frame_ia32 *head)
34463 struct stack_frame_ia32 *fp;
34464 unsigned long bytes;
34465
34466- bytes = copy_from_user_nmi(bufhead, head, sizeof(bufhead));
34467+ bytes = copy_from_user_nmi(bufhead, (const char __force_user *)head, sizeof(bufhead));
34468 if (bytes != 0)
34469 return NULL;
34470
34471- fp = (struct stack_frame_ia32 *) compat_ptr(bufhead[0].next_frame);
34472+ fp = (struct stack_frame_ia32 __force_kernel *) compat_ptr(bufhead[0].next_frame);
34473
34474 oprofile_add_trace(bufhead[0].return_address);
34475
34476@@ -92,7 +92,7 @@ static struct stack_frame *dump_user_backtrace(struct stack_frame *head)
34477 struct stack_frame bufhead[2];
34478 unsigned long bytes;
34479
34480- bytes = copy_from_user_nmi(bufhead, head, sizeof(bufhead));
34481+ bytes = copy_from_user_nmi(bufhead, (const char __force_user *)head, sizeof(bufhead));
34482 if (bytes != 0)
34483 return NULL;
34484
34485@@ -111,7 +111,7 @@ x86_backtrace(struct pt_regs * const regs, unsigned int depth)
34486 {
34487 struct stack_frame *head = (struct stack_frame *)frame_pointer(regs);
34488
34489- if (!user_mode_vm(regs)) {
34490+ if (!user_mode(regs)) {
34491 unsigned long stack = kernel_stack_pointer(regs);
34492 if (depth)
34493 dump_trace(NULL, regs, (unsigned long *)stack, 0,
34494diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c
34495index 1d2e639..f6ef82a 100644
34496--- a/arch/x86/oprofile/nmi_int.c
34497+++ b/arch/x86/oprofile/nmi_int.c
34498@@ -23,6 +23,7 @@
34499 #include <asm/nmi.h>
34500 #include <asm/msr.h>
34501 #include <asm/apic.h>
34502+#include <asm/pgtable.h>
34503
34504 #include "op_counter.h"
34505 #include "op_x86_model.h"
34506@@ -785,8 +786,11 @@ int __init op_nmi_init(struct oprofile_operations *ops)
34507 if (ret)
34508 return ret;
34509
34510- if (!model->num_virt_counters)
34511- model->num_virt_counters = model->num_counters;
34512+ if (!model->num_virt_counters) {
34513+ pax_open_kernel();
34514+ *(unsigned int *)&model->num_virt_counters = model->num_counters;
34515+ pax_close_kernel();
34516+ }
34517
34518 mux_init(ops);
34519
34520diff --git a/arch/x86/oprofile/op_model_amd.c b/arch/x86/oprofile/op_model_amd.c
34521index 50d86c0..7985318 100644
34522--- a/arch/x86/oprofile/op_model_amd.c
34523+++ b/arch/x86/oprofile/op_model_amd.c
34524@@ -519,9 +519,11 @@ static int op_amd_init(struct oprofile_operations *ops)
34525 num_counters = AMD64_NUM_COUNTERS;
34526 }
34527
34528- op_amd_spec.num_counters = num_counters;
34529- op_amd_spec.num_controls = num_counters;
34530- op_amd_spec.num_virt_counters = max(num_counters, NUM_VIRT_COUNTERS);
34531+ pax_open_kernel();
34532+ *(unsigned int *)&op_amd_spec.num_counters = num_counters;
34533+ *(unsigned int *)&op_amd_spec.num_controls = num_counters;
34534+ *(unsigned int *)&op_amd_spec.num_virt_counters = max(num_counters, NUM_VIRT_COUNTERS);
34535+ pax_close_kernel();
34536
34537 return 0;
34538 }
34539diff --git a/arch/x86/oprofile/op_model_ppro.c b/arch/x86/oprofile/op_model_ppro.c
34540index d90528e..0127e2b 100644
34541--- a/arch/x86/oprofile/op_model_ppro.c
34542+++ b/arch/x86/oprofile/op_model_ppro.c
34543@@ -19,6 +19,7 @@
34544 #include <asm/msr.h>
34545 #include <asm/apic.h>
34546 #include <asm/nmi.h>
34547+#include <asm/pgtable.h>
34548
34549 #include "op_x86_model.h"
34550 #include "op_counter.h"
34551@@ -221,8 +222,10 @@ static void arch_perfmon_setup_counters(void)
34552
34553 num_counters = min((int)eax.split.num_counters, OP_MAX_COUNTER);
34554
34555- op_arch_perfmon_spec.num_counters = num_counters;
34556- op_arch_perfmon_spec.num_controls = num_counters;
34557+ pax_open_kernel();
34558+ *(unsigned int *)&op_arch_perfmon_spec.num_counters = num_counters;
34559+ *(unsigned int *)&op_arch_perfmon_spec.num_controls = num_counters;
34560+ pax_close_kernel();
34561 }
34562
34563 static int arch_perfmon_init(struct oprofile_operations *ignore)
34564diff --git a/arch/x86/oprofile/op_x86_model.h b/arch/x86/oprofile/op_x86_model.h
34565index 71e8a67..6a313bb 100644
34566--- a/arch/x86/oprofile/op_x86_model.h
34567+++ b/arch/x86/oprofile/op_x86_model.h
34568@@ -52,7 +52,7 @@ struct op_x86_model_spec {
34569 void (*switch_ctrl)(struct op_x86_model_spec const *model,
34570 struct op_msrs const * const msrs);
34571 #endif
34572-};
34573+} __do_const;
34574
34575 struct op_counter_config;
34576
34577diff --git a/arch/x86/pci/intel_mid_pci.c b/arch/x86/pci/intel_mid_pci.c
34578index 852aa4c..71613f2 100644
34579--- a/arch/x86/pci/intel_mid_pci.c
34580+++ b/arch/x86/pci/intel_mid_pci.c
34581@@ -258,7 +258,7 @@ int __init intel_mid_pci_init(void)
34582 pci_mmcfg_late_init();
34583 pcibios_enable_irq = intel_mid_pci_irq_enable;
34584 pcibios_disable_irq = intel_mid_pci_irq_disable;
34585- pci_root_ops = intel_mid_pci_ops;
34586+ memcpy((void *)&pci_root_ops, &intel_mid_pci_ops, sizeof pci_root_ops);
34587 pci_soc_mode = 1;
34588 /* Continue with standard init */
34589 return 1;
34590diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c
34591index 5dc6ca5..25c03f5 100644
34592--- a/arch/x86/pci/irq.c
34593+++ b/arch/x86/pci/irq.c
34594@@ -51,7 +51,7 @@ struct irq_router {
34595 struct irq_router_handler {
34596 u16 vendor;
34597 int (*probe)(struct irq_router *r, struct pci_dev *router, u16 device);
34598-};
34599+} __do_const;
34600
34601 int (*pcibios_enable_irq)(struct pci_dev *dev) = pirq_enable_irq;
34602 void (*pcibios_disable_irq)(struct pci_dev *dev) = pirq_disable_irq;
34603@@ -791,7 +791,7 @@ static __init int pico_router_probe(struct irq_router *r, struct pci_dev *router
34604 return 0;
34605 }
34606
34607-static __initdata struct irq_router_handler pirq_routers[] = {
34608+static __initconst const struct irq_router_handler pirq_routers[] = {
34609 { PCI_VENDOR_ID_INTEL, intel_router_probe },
34610 { PCI_VENDOR_ID_AL, ali_router_probe },
34611 { PCI_VENDOR_ID_ITE, ite_router_probe },
34612@@ -818,7 +818,7 @@ static struct pci_dev *pirq_router_dev;
34613 static void __init pirq_find_router(struct irq_router *r)
34614 {
34615 struct irq_routing_table *rt = pirq_table;
34616- struct irq_router_handler *h;
34617+ const struct irq_router_handler *h;
34618
34619 #ifdef CONFIG_PCI_BIOS
34620 if (!rt->signature) {
34621@@ -1091,7 +1091,7 @@ static int __init fix_acer_tm360_irqrouting(const struct dmi_system_id *d)
34622 return 0;
34623 }
34624
34625-static struct dmi_system_id __initdata pciirq_dmi_table[] = {
34626+static const struct dmi_system_id __initconst pciirq_dmi_table[] = {
34627 {
34628 .callback = fix_broken_hp_bios_irq9,
34629 .ident = "HP Pavilion N5400 Series Laptop",
34630diff --git a/arch/x86/pci/pcbios.c b/arch/x86/pci/pcbios.c
34631index 9b83b90..4112152 100644
34632--- a/arch/x86/pci/pcbios.c
34633+++ b/arch/x86/pci/pcbios.c
34634@@ -79,7 +79,7 @@ union bios32 {
34635 static struct {
34636 unsigned long address;
34637 unsigned short segment;
34638-} bios32_indirect __initdata = { 0, __KERNEL_CS };
34639+} bios32_indirect __initconst = { 0, __PCIBIOS_CS };
34640
34641 /*
34642 * Returns the entry point for the given service, NULL on error
34643@@ -92,37 +92,80 @@ static unsigned long __init bios32_service(unsigned long service)
34644 unsigned long length; /* %ecx */
34645 unsigned long entry; /* %edx */
34646 unsigned long flags;
34647+ struct desc_struct d, *gdt;
34648
34649 local_irq_save(flags);
34650- __asm__("lcall *(%%edi); cld"
34651+
34652+ gdt = get_cpu_gdt_table(smp_processor_id());
34653+
34654+ pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x9B, 0xC);
34655+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S);
34656+ pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x93, 0xC);
34657+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S);
34658+
34659+ __asm__("movw %w7, %%ds; lcall *(%%edi); push %%ss; pop %%ds; cld"
34660 : "=a" (return_code),
34661 "=b" (address),
34662 "=c" (length),
34663 "=d" (entry)
34664 : "0" (service),
34665 "1" (0),
34666- "D" (&bios32_indirect));
34667+ "D" (&bios32_indirect),
34668+ "r"(__PCIBIOS_DS)
34669+ : "memory");
34670+
34671+ pax_open_kernel();
34672+ gdt[GDT_ENTRY_PCIBIOS_CS].a = 0;
34673+ gdt[GDT_ENTRY_PCIBIOS_CS].b = 0;
34674+ gdt[GDT_ENTRY_PCIBIOS_DS].a = 0;
34675+ gdt[GDT_ENTRY_PCIBIOS_DS].b = 0;
34676+ pax_close_kernel();
34677+
34678 local_irq_restore(flags);
34679
34680 switch (return_code) {
34681- case 0:
34682- return address + entry;
34683- case 0x80: /* Not present */
34684- printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service);
34685- return 0;
34686- default: /* Shouldn't happen */
34687- printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n",
34688- service, return_code);
34689+ case 0: {
34690+ int cpu;
34691+ unsigned char flags;
34692+
34693+ printk(KERN_INFO "bios32_service: base:%08lx length:%08lx entry:%08lx\n", address, length, entry);
34694+ if (address >= 0xFFFF0 || length > 0x100000 - address || length <= entry) {
34695+ printk(KERN_WARNING "bios32_service: not valid\n");
34696 return 0;
34697+ }
34698+ address = address + PAGE_OFFSET;
34699+ length += 16UL; /* some BIOSs underreport this... */
34700+ flags = 4;
34701+ if (length >= 64*1024*1024) {
34702+ length >>= PAGE_SHIFT;
34703+ flags |= 8;
34704+ }
34705+
34706+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
34707+ gdt = get_cpu_gdt_table(cpu);
34708+ pack_descriptor(&d, address, length, 0x9b, flags);
34709+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S);
34710+ pack_descriptor(&d, address, length, 0x93, flags);
34711+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S);
34712+ }
34713+ return entry;
34714+ }
34715+ case 0x80: /* Not present */
34716+ printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service);
34717+ return 0;
34718+ default: /* Shouldn't happen */
34719+ printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n",
34720+ service, return_code);
34721+ return 0;
34722 }
34723 }
34724
34725 static struct {
34726 unsigned long address;
34727 unsigned short segment;
34728-} pci_indirect = { 0, __KERNEL_CS };
34729+} pci_indirect __read_only = { 0, __PCIBIOS_CS };
34730
34731-static int pci_bios_present;
34732+static int pci_bios_present __read_only;
34733
34734 static int __init check_pcibios(void)
34735 {
34736@@ -131,11 +174,13 @@ static int __init check_pcibios(void)
34737 unsigned long flags, pcibios_entry;
34738
34739 if ((pcibios_entry = bios32_service(PCI_SERVICE))) {
34740- pci_indirect.address = pcibios_entry + PAGE_OFFSET;
34741+ pci_indirect.address = pcibios_entry;
34742
34743 local_irq_save(flags);
34744- __asm__(
34745- "lcall *(%%edi); cld\n\t"
34746+ __asm__("movw %w6, %%ds\n\t"
34747+ "lcall *%%ss:(%%edi); cld\n\t"
34748+ "push %%ss\n\t"
34749+ "pop %%ds\n\t"
34750 "jc 1f\n\t"
34751 "xor %%ah, %%ah\n"
34752 "1:"
34753@@ -144,7 +189,8 @@ static int __init check_pcibios(void)
34754 "=b" (ebx),
34755 "=c" (ecx)
34756 : "1" (PCIBIOS_PCI_BIOS_PRESENT),
34757- "D" (&pci_indirect)
34758+ "D" (&pci_indirect),
34759+ "r" (__PCIBIOS_DS)
34760 : "memory");
34761 local_irq_restore(flags);
34762
34763@@ -189,7 +235,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34764
34765 switch (len) {
34766 case 1:
34767- __asm__("lcall *(%%esi); cld\n\t"
34768+ __asm__("movw %w6, %%ds\n\t"
34769+ "lcall *%%ss:(%%esi); cld\n\t"
34770+ "push %%ss\n\t"
34771+ "pop %%ds\n\t"
34772 "jc 1f\n\t"
34773 "xor %%ah, %%ah\n"
34774 "1:"
34775@@ -198,7 +247,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34776 : "1" (PCIBIOS_READ_CONFIG_BYTE),
34777 "b" (bx),
34778 "D" ((long)reg),
34779- "S" (&pci_indirect));
34780+ "S" (&pci_indirect),
34781+ "r" (__PCIBIOS_DS));
34782 /*
34783 * Zero-extend the result beyond 8 bits, do not trust the
34784 * BIOS having done it:
34785@@ -206,7 +256,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34786 *value &= 0xff;
34787 break;
34788 case 2:
34789- __asm__("lcall *(%%esi); cld\n\t"
34790+ __asm__("movw %w6, %%ds\n\t"
34791+ "lcall *%%ss:(%%esi); cld\n\t"
34792+ "push %%ss\n\t"
34793+ "pop %%ds\n\t"
34794 "jc 1f\n\t"
34795 "xor %%ah, %%ah\n"
34796 "1:"
34797@@ -215,7 +268,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34798 : "1" (PCIBIOS_READ_CONFIG_WORD),
34799 "b" (bx),
34800 "D" ((long)reg),
34801- "S" (&pci_indirect));
34802+ "S" (&pci_indirect),
34803+ "r" (__PCIBIOS_DS));
34804 /*
34805 * Zero-extend the result beyond 16 bits, do not trust the
34806 * BIOS having done it:
34807@@ -223,7 +277,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34808 *value &= 0xffff;
34809 break;
34810 case 4:
34811- __asm__("lcall *(%%esi); cld\n\t"
34812+ __asm__("movw %w6, %%ds\n\t"
34813+ "lcall *%%ss:(%%esi); cld\n\t"
34814+ "push %%ss\n\t"
34815+ "pop %%ds\n\t"
34816 "jc 1f\n\t"
34817 "xor %%ah, %%ah\n"
34818 "1:"
34819@@ -232,7 +289,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34820 : "1" (PCIBIOS_READ_CONFIG_DWORD),
34821 "b" (bx),
34822 "D" ((long)reg),
34823- "S" (&pci_indirect));
34824+ "S" (&pci_indirect),
34825+ "r" (__PCIBIOS_DS));
34826 break;
34827 }
34828
34829@@ -256,7 +314,10 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34830
34831 switch (len) {
34832 case 1:
34833- __asm__("lcall *(%%esi); cld\n\t"
34834+ __asm__("movw %w6, %%ds\n\t"
34835+ "lcall *%%ss:(%%esi); cld\n\t"
34836+ "push %%ss\n\t"
34837+ "pop %%ds\n\t"
34838 "jc 1f\n\t"
34839 "xor %%ah, %%ah\n"
34840 "1:"
34841@@ -265,10 +326,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34842 "c" (value),
34843 "b" (bx),
34844 "D" ((long)reg),
34845- "S" (&pci_indirect));
34846+ "S" (&pci_indirect),
34847+ "r" (__PCIBIOS_DS));
34848 break;
34849 case 2:
34850- __asm__("lcall *(%%esi); cld\n\t"
34851+ __asm__("movw %w6, %%ds\n\t"
34852+ "lcall *%%ss:(%%esi); cld\n\t"
34853+ "push %%ss\n\t"
34854+ "pop %%ds\n\t"
34855 "jc 1f\n\t"
34856 "xor %%ah, %%ah\n"
34857 "1:"
34858@@ -277,10 +342,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34859 "c" (value),
34860 "b" (bx),
34861 "D" ((long)reg),
34862- "S" (&pci_indirect));
34863+ "S" (&pci_indirect),
34864+ "r" (__PCIBIOS_DS));
34865 break;
34866 case 4:
34867- __asm__("lcall *(%%esi); cld\n\t"
34868+ __asm__("movw %w6, %%ds\n\t"
34869+ "lcall *%%ss:(%%esi); cld\n\t"
34870+ "push %%ss\n\t"
34871+ "pop %%ds\n\t"
34872 "jc 1f\n\t"
34873 "xor %%ah, %%ah\n"
34874 "1:"
34875@@ -289,7 +358,8 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34876 "c" (value),
34877 "b" (bx),
34878 "D" ((long)reg),
34879- "S" (&pci_indirect));
34880+ "S" (&pci_indirect),
34881+ "r" (__PCIBIOS_DS));
34882 break;
34883 }
34884
34885@@ -394,10 +464,13 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
34886
34887 DBG("PCI: Fetching IRQ routing table... ");
34888 __asm__("push %%es\n\t"
34889+ "movw %w8, %%ds\n\t"
34890 "push %%ds\n\t"
34891 "pop %%es\n\t"
34892- "lcall *(%%esi); cld\n\t"
34893+ "lcall *%%ss:(%%esi); cld\n\t"
34894 "pop %%es\n\t"
34895+ "push %%ss\n\t"
34896+ "pop %%ds\n"
34897 "jc 1f\n\t"
34898 "xor %%ah, %%ah\n"
34899 "1:"
34900@@ -408,7 +481,8 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
34901 "1" (0),
34902 "D" ((long) &opt),
34903 "S" (&pci_indirect),
34904- "m" (opt)
34905+ "m" (opt),
34906+ "r" (__PCIBIOS_DS)
34907 : "memory");
34908 DBG("OK ret=%d, size=%d, map=%x\n", ret, opt.size, map);
34909 if (ret & 0xff00)
34910@@ -432,7 +506,10 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
34911 {
34912 int ret;
34913
34914- __asm__("lcall *(%%esi); cld\n\t"
34915+ __asm__("movw %w5, %%ds\n\t"
34916+ "lcall *%%ss:(%%esi); cld\n\t"
34917+ "push %%ss\n\t"
34918+ "pop %%ds\n"
34919 "jc 1f\n\t"
34920 "xor %%ah, %%ah\n"
34921 "1:"
34922@@ -440,7 +517,8 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
34923 : "0" (PCIBIOS_SET_PCI_HW_INT),
34924 "b" ((dev->bus->number << 8) | dev->devfn),
34925 "c" ((irq << 8) | (pin + 10)),
34926- "S" (&pci_indirect));
34927+ "S" (&pci_indirect),
34928+ "r" (__PCIBIOS_DS));
34929 return !(ret & 0xff00);
34930 }
34931 EXPORT_SYMBOL(pcibios_set_irq_routing);
34932diff --git a/arch/x86/platform/efi/efi_32.c b/arch/x86/platform/efi/efi_32.c
34933index 40e7cda..c7e6672 100644
34934--- a/arch/x86/platform/efi/efi_32.c
34935+++ b/arch/x86/platform/efi/efi_32.c
34936@@ -61,11 +61,22 @@ void __init efi_call_phys_prolog(void)
34937 {
34938 struct desc_ptr gdt_descr;
34939
34940+#ifdef CONFIG_PAX_KERNEXEC
34941+ struct desc_struct d;
34942+#endif
34943+
34944 local_irq_save(efi_rt_eflags);
34945
34946 load_cr3(initial_page_table);
34947 __flush_tlb_all();
34948
34949+#ifdef CONFIG_PAX_KERNEXEC
34950+ pack_descriptor(&d, 0, 0xFFFFF, 0x9B, 0xC);
34951+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
34952+ pack_descriptor(&d, 0, 0xFFFFF, 0x93, 0xC);
34953+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
34954+#endif
34955+
34956 gdt_descr.address = __pa(get_cpu_gdt_table(0));
34957 gdt_descr.size = GDT_SIZE - 1;
34958 load_gdt(&gdt_descr);
34959@@ -75,11 +86,24 @@ void __init efi_call_phys_epilog(void)
34960 {
34961 struct desc_ptr gdt_descr;
34962
34963+#ifdef CONFIG_PAX_KERNEXEC
34964+ struct desc_struct d;
34965+
34966+ memset(&d, 0, sizeof d);
34967+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
34968+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
34969+#endif
34970+
34971 gdt_descr.address = (unsigned long)get_cpu_gdt_table(0);
34972 gdt_descr.size = GDT_SIZE - 1;
34973 load_gdt(&gdt_descr);
34974
34975+#ifdef CONFIG_PAX_PER_CPU_PGD
34976+ load_cr3(get_cpu_pgd(smp_processor_id(), kernel));
34977+#else
34978 load_cr3(swapper_pg_dir);
34979+#endif
34980+
34981 __flush_tlb_all();
34982
34983 local_irq_restore(efi_rt_eflags);
34984diff --git a/arch/x86/platform/efi/efi_64.c b/arch/x86/platform/efi/efi_64.c
34985index 17e80d8..9fa6e41 100644
34986--- a/arch/x86/platform/efi/efi_64.c
34987+++ b/arch/x86/platform/efi/efi_64.c
34988@@ -98,6 +98,11 @@ void __init efi_call_phys_prolog(void)
34989 vaddress = (unsigned long)__va(pgd * PGDIR_SIZE);
34990 set_pgd(pgd_offset_k(pgd * PGDIR_SIZE), *pgd_offset_k(vaddress));
34991 }
34992+
34993+#ifdef CONFIG_PAX_PER_CPU_PGD
34994+ load_cr3(swapper_pg_dir);
34995+#endif
34996+
34997 __flush_tlb_all();
34998 }
34999
35000@@ -115,6 +120,11 @@ void __init efi_call_phys_epilog(void)
35001 for (pgd = 0; pgd < n_pgds; pgd++)
35002 set_pgd(pgd_offset_k(pgd * PGDIR_SIZE), save_pgd[pgd]);
35003 kfree(save_pgd);
35004+
35005+#ifdef CONFIG_PAX_PER_CPU_PGD
35006+ load_cr3(get_cpu_pgd(smp_processor_id(), kernel));
35007+#endif
35008+
35009 __flush_tlb_all();
35010 local_irq_restore(efi_flags);
35011 early_code_mapping_set_exec(0);
35012@@ -145,8 +155,23 @@ int __init efi_setup_page_tables(unsigned long pa_memmap, unsigned num_pages)
35013 unsigned npages;
35014 pgd_t *pgd;
35015
35016- if (efi_enabled(EFI_OLD_MEMMAP))
35017+ if (efi_enabled(EFI_OLD_MEMMAP)) {
35018+ /* PaX: We need to disable the NX bit in the PGD, otherwise we won't be
35019+ * able to execute the EFI services.
35020+ */
35021+ if (__supported_pte_mask & _PAGE_NX) {
35022+ unsigned long addr = (unsigned long) __va(0);
35023+ pgd_t pe = __pgd(pgd_val(*pgd_offset_k(addr)) & ~_PAGE_NX);
35024+
35025+ pr_alert("PAX: Disabling NX protection for low memory map. Try booting without \"efi=old_map\"\n");
35026+#ifdef CONFIG_PAX_PER_CPU_PGD
35027+ set_pgd(pgd_offset_cpu(0, kernel, addr), pe);
35028+#endif
35029+ set_pgd(pgd_offset_k(addr), pe);
35030+ }
35031+
35032 return 0;
35033+ }
35034
35035 efi_scratch.efi_pgt = (pgd_t *)(unsigned long)real_mode_header->trampoline_pgd;
35036 pgd = __va(efi_scratch.efi_pgt);
35037diff --git a/arch/x86/platform/efi/efi_stub_32.S b/arch/x86/platform/efi/efi_stub_32.S
35038index 040192b..7d3300f 100644
35039--- a/arch/x86/platform/efi/efi_stub_32.S
35040+++ b/arch/x86/platform/efi/efi_stub_32.S
35041@@ -6,7 +6,9 @@
35042 */
35043
35044 #include <linux/linkage.h>
35045+#include <linux/init.h>
35046 #include <asm/page_types.h>
35047+#include <asm/segment.h>
35048
35049 /*
35050 * efi_call_phys(void *, ...) is a function with variable parameters.
35051@@ -20,7 +22,7 @@
35052 * service functions will comply with gcc calling convention, too.
35053 */
35054
35055-.text
35056+__INIT
35057 ENTRY(efi_call_phys)
35058 /*
35059 * 0. The function can only be called in Linux kernel. So CS has been
35060@@ -36,10 +38,24 @@ ENTRY(efi_call_phys)
35061 * The mapping of lower virtual memory has been created in prolog and
35062 * epilog.
35063 */
35064- movl $1f, %edx
35065- subl $__PAGE_OFFSET, %edx
35066- jmp *%edx
35067+#ifdef CONFIG_PAX_KERNEXEC
35068+ movl $(__KERNEXEC_EFI_DS), %edx
35069+ mov %edx, %ds
35070+ mov %edx, %es
35071+ mov %edx, %ss
35072+ addl $2f,(1f)
35073+ ljmp *(1f)
35074+
35075+__INITDATA
35076+1: .long __LOAD_PHYSICAL_ADDR, __KERNEXEC_EFI_CS
35077+.previous
35078+
35079+2:
35080+ subl $2b,(1b)
35081+#else
35082+ jmp 1f-__PAGE_OFFSET
35083 1:
35084+#endif
35085
35086 /*
35087 * 2. Now on the top of stack is the return
35088@@ -47,14 +63,8 @@ ENTRY(efi_call_phys)
35089 * parameter 2, ..., param n. To make things easy, we save the return
35090 * address of efi_call_phys in a global variable.
35091 */
35092- popl %edx
35093- movl %edx, saved_return_addr
35094- /* get the function pointer into ECX*/
35095- popl %ecx
35096- movl %ecx, efi_rt_function_ptr
35097- movl $2f, %edx
35098- subl $__PAGE_OFFSET, %edx
35099- pushl %edx
35100+ popl (saved_return_addr)
35101+ popl (efi_rt_function_ptr)
35102
35103 /*
35104 * 3. Clear PG bit in %CR0.
35105@@ -73,9 +83,8 @@ ENTRY(efi_call_phys)
35106 /*
35107 * 5. Call the physical function.
35108 */
35109- jmp *%ecx
35110+ call *(efi_rt_function_ptr-__PAGE_OFFSET)
35111
35112-2:
35113 /*
35114 * 6. After EFI runtime service returns, control will return to
35115 * following instruction. We'd better readjust stack pointer first.
35116@@ -88,35 +97,36 @@ ENTRY(efi_call_phys)
35117 movl %cr0, %edx
35118 orl $0x80000000, %edx
35119 movl %edx, %cr0
35120- jmp 1f
35121-1:
35122+
35123 /*
35124 * 8. Now restore the virtual mode from flat mode by
35125 * adding EIP with PAGE_OFFSET.
35126 */
35127- movl $1f, %edx
35128- jmp *%edx
35129+#ifdef CONFIG_PAX_KERNEXEC
35130+ movl $(__KERNEL_DS), %edx
35131+ mov %edx, %ds
35132+ mov %edx, %es
35133+ mov %edx, %ss
35134+ ljmp $(__KERNEL_CS),$1f
35135+#else
35136+ jmp 1f+__PAGE_OFFSET
35137+#endif
35138 1:
35139
35140 /*
35141 * 9. Balance the stack. And because EAX contain the return value,
35142 * we'd better not clobber it.
35143 */
35144- leal efi_rt_function_ptr, %edx
35145- movl (%edx), %ecx
35146- pushl %ecx
35147+ pushl (efi_rt_function_ptr)
35148
35149 /*
35150- * 10. Push the saved return address onto the stack and return.
35151+ * 10. Return to the saved return address.
35152 */
35153- leal saved_return_addr, %edx
35154- movl (%edx), %ecx
35155- pushl %ecx
35156- ret
35157+ jmpl *(saved_return_addr)
35158 ENDPROC(efi_call_phys)
35159 .previous
35160
35161-.data
35162+__INITDATA
35163 saved_return_addr:
35164 .long 0
35165 efi_rt_function_ptr:
35166diff --git a/arch/x86/platform/efi/efi_stub_64.S b/arch/x86/platform/efi/efi_stub_64.S
35167index 86d0f9e..6d499f4 100644
35168--- a/arch/x86/platform/efi/efi_stub_64.S
35169+++ b/arch/x86/platform/efi/efi_stub_64.S
35170@@ -11,6 +11,7 @@
35171 #include <asm/msr.h>
35172 #include <asm/processor-flags.h>
35173 #include <asm/page_types.h>
35174+#include <asm/alternative-asm.h>
35175
35176 #define SAVE_XMM \
35177 mov %rsp, %rax; \
35178@@ -88,6 +89,7 @@ ENTRY(efi_call)
35179 RESTORE_PGT
35180 addq $48, %rsp
35181 RESTORE_XMM
35182+ pax_force_retaddr 0, 1
35183 ret
35184 ENDPROC(efi_call)
35185
35186diff --git a/arch/x86/platform/intel-mid/intel-mid.c b/arch/x86/platform/intel-mid/intel-mid.c
35187index 3005f0c..d06aeb0 100644
35188--- a/arch/x86/platform/intel-mid/intel-mid.c
35189+++ b/arch/x86/platform/intel-mid/intel-mid.c
35190@@ -63,7 +63,7 @@ enum intel_mid_timer_options intel_mid_timer_options;
35191 /* intel_mid_ops to store sub arch ops */
35192 struct intel_mid_ops *intel_mid_ops;
35193 /* getter function for sub arch ops*/
35194-static void *(*get_intel_mid_ops[])(void) = INTEL_MID_OPS_INIT;
35195+static const void *(*get_intel_mid_ops[])(void) = INTEL_MID_OPS_INIT;
35196 enum intel_mid_cpu_type __intel_mid_cpu_chip;
35197 EXPORT_SYMBOL_GPL(__intel_mid_cpu_chip);
35198
35199@@ -71,9 +71,10 @@ static void intel_mid_power_off(void)
35200 {
35201 };
35202
35203-static void intel_mid_reboot(void)
35204+static void __noreturn intel_mid_reboot(void)
35205 {
35206 intel_scu_ipc_simple_command(IPCMSG_COLD_BOOT, 0);
35207+ BUG();
35208 }
35209
35210 static unsigned long __init intel_mid_calibrate_tsc(void)
35211diff --git a/arch/x86/platform/intel-mid/intel_mid_weak_decls.h b/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
35212index 3c1c386..59a68ed 100644
35213--- a/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
35214+++ b/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
35215@@ -13,6 +13,6 @@
35216 /* For every CPU addition a new get_<cpuname>_ops interface needs
35217 * to be added.
35218 */
35219-extern void *get_penwell_ops(void);
35220-extern void *get_cloverview_ops(void);
35221-extern void *get_tangier_ops(void);
35222+extern const void *get_penwell_ops(void);
35223+extern const void *get_cloverview_ops(void);
35224+extern const void *get_tangier_ops(void);
35225diff --git a/arch/x86/platform/intel-mid/mfld.c b/arch/x86/platform/intel-mid/mfld.c
35226index 23381d2..8ddc10e 100644
35227--- a/arch/x86/platform/intel-mid/mfld.c
35228+++ b/arch/x86/platform/intel-mid/mfld.c
35229@@ -64,12 +64,12 @@ static void __init penwell_arch_setup(void)
35230 pm_power_off = mfld_power_off;
35231 }
35232
35233-void *get_penwell_ops(void)
35234+const void *get_penwell_ops(void)
35235 {
35236 return &penwell_ops;
35237 }
35238
35239-void *get_cloverview_ops(void)
35240+const void *get_cloverview_ops(void)
35241 {
35242 return &penwell_ops;
35243 }
35244diff --git a/arch/x86/platform/intel-mid/mrfl.c b/arch/x86/platform/intel-mid/mrfl.c
35245index aaca917..66eadbc 100644
35246--- a/arch/x86/platform/intel-mid/mrfl.c
35247+++ b/arch/x86/platform/intel-mid/mrfl.c
35248@@ -97,7 +97,7 @@ static struct intel_mid_ops tangier_ops = {
35249 .arch_setup = tangier_arch_setup,
35250 };
35251
35252-void *get_tangier_ops(void)
35253+const void *get_tangier_ops(void)
35254 {
35255 return &tangier_ops;
35256 }
35257diff --git a/arch/x86/platform/intel-quark/imr_selftest.c b/arch/x86/platform/intel-quark/imr_selftest.c
35258index c9a0838..fae0977 100644
35259--- a/arch/x86/platform/intel-quark/imr_selftest.c
35260+++ b/arch/x86/platform/intel-quark/imr_selftest.c
35261@@ -54,7 +54,7 @@ static void __init imr_self_test_result(int res, const char *fmt, ...)
35262 */
35263 static void __init imr_self_test(void)
35264 {
35265- phys_addr_t base = virt_to_phys(&_text);
35266+ phys_addr_t base = virt_to_phys(ktla_ktva(_text));
35267 size_t size = virt_to_phys(&__end_rodata) - base;
35268 const char *fmt_over = "overlapped IMR @ (0x%08lx - 0x%08lx)\n";
35269 int ret;
35270diff --git a/arch/x86/platform/olpc/olpc_dt.c b/arch/x86/platform/olpc/olpc_dt.c
35271index d6ee929..3637cb5 100644
35272--- a/arch/x86/platform/olpc/olpc_dt.c
35273+++ b/arch/x86/platform/olpc/olpc_dt.c
35274@@ -156,7 +156,7 @@ void * __init prom_early_alloc(unsigned long size)
35275 return res;
35276 }
35277
35278-static struct of_pdt_ops prom_olpc_ops __initdata = {
35279+static struct of_pdt_ops prom_olpc_ops __initconst = {
35280 .nextprop = olpc_dt_nextprop,
35281 .getproplen = olpc_dt_getproplen,
35282 .getproperty = olpc_dt_getproperty,
35283diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c
35284index 3e32ed5..cc0adc5 100644
35285--- a/arch/x86/power/cpu.c
35286+++ b/arch/x86/power/cpu.c
35287@@ -134,11 +134,8 @@ static void do_fpu_end(void)
35288 static void fix_processor_context(void)
35289 {
35290 int cpu = smp_processor_id();
35291- struct tss_struct *t = &per_cpu(init_tss, cpu);
35292-#ifdef CONFIG_X86_64
35293- struct desc_struct *desc = get_cpu_gdt_table(cpu);
35294- tss_desc tss;
35295-#endif
35296+ struct tss_struct *t = init_tss + cpu;
35297+
35298 set_tss_desc(cpu, t); /*
35299 * This just modifies memory; should not be
35300 * necessary. But... This is necessary, because
35301@@ -147,10 +144,6 @@ static void fix_processor_context(void)
35302 */
35303
35304 #ifdef CONFIG_X86_64
35305- memcpy(&tss, &desc[GDT_ENTRY_TSS], sizeof(tss_desc));
35306- tss.type = 0x9; /* The available 64-bit TSS (see AMD vol 2, pg 91 */
35307- write_gdt_entry(desc, GDT_ENTRY_TSS, &tss, DESC_TSS);
35308-
35309 syscall_init(); /* This sets MSR_*STAR and related */
35310 #endif
35311 load_TR_desc(); /* This does ltr */
35312diff --git a/arch/x86/realmode/init.c b/arch/x86/realmode/init.c
35313index 0b7a63d..0d0f2c2 100644
35314--- a/arch/x86/realmode/init.c
35315+++ b/arch/x86/realmode/init.c
35316@@ -68,7 +68,13 @@ void __init setup_real_mode(void)
35317 __va(real_mode_header->trampoline_header);
35318
35319 #ifdef CONFIG_X86_32
35320- trampoline_header->start = __pa_symbol(startup_32_smp);
35321+ trampoline_header->start = __pa_symbol(ktla_ktva(startup_32_smp));
35322+
35323+#ifdef CONFIG_PAX_KERNEXEC
35324+ trampoline_header->start -= LOAD_PHYSICAL_ADDR;
35325+#endif
35326+
35327+ trampoline_header->boot_cs = __BOOT_CS;
35328 trampoline_header->gdt_limit = __BOOT_DS + 7;
35329 trampoline_header->gdt_base = __pa_symbol(boot_gdt);
35330 #else
35331@@ -84,7 +90,7 @@ void __init setup_real_mode(void)
35332 *trampoline_cr4_features = __read_cr4();
35333
35334 trampoline_pgd = (u64 *) __va(real_mode_header->trampoline_pgd);
35335- trampoline_pgd[0] = init_level4_pgt[pgd_index(__PAGE_OFFSET)].pgd;
35336+ trampoline_pgd[0] = init_level4_pgt[pgd_index(__PAGE_OFFSET)].pgd & ~_PAGE_NX;
35337 trampoline_pgd[511] = init_level4_pgt[511].pgd;
35338 #endif
35339 }
35340diff --git a/arch/x86/realmode/rm/Makefile b/arch/x86/realmode/rm/Makefile
35341index 2730d77..2e4cd19 100644
35342--- a/arch/x86/realmode/rm/Makefile
35343+++ b/arch/x86/realmode/rm/Makefile
35344@@ -68,5 +68,8 @@ $(obj)/realmode.relocs: $(obj)/realmode.elf FORCE
35345
35346 KBUILD_CFLAGS := $(LINUXINCLUDE) $(REALMODE_CFLAGS) -D_SETUP -D_WAKEUP \
35347 -I$(srctree)/arch/x86/boot
35348+ifdef CONSTIFY_PLUGIN
35349+KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
35350+endif
35351 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
35352 GCOV_PROFILE := n
35353diff --git a/arch/x86/realmode/rm/header.S b/arch/x86/realmode/rm/header.S
35354index a28221d..93c40f1 100644
35355--- a/arch/x86/realmode/rm/header.S
35356+++ b/arch/x86/realmode/rm/header.S
35357@@ -30,7 +30,9 @@ GLOBAL(real_mode_header)
35358 #endif
35359 /* APM/BIOS reboot */
35360 .long pa_machine_real_restart_asm
35361-#ifdef CONFIG_X86_64
35362+#ifdef CONFIG_X86_32
35363+ .long __KERNEL_CS
35364+#else
35365 .long __KERNEL32_CS
35366 #endif
35367 END(real_mode_header)
35368diff --git a/arch/x86/realmode/rm/reboot.S b/arch/x86/realmode/rm/reboot.S
35369index d66c607..3def845 100644
35370--- a/arch/x86/realmode/rm/reboot.S
35371+++ b/arch/x86/realmode/rm/reboot.S
35372@@ -27,6 +27,10 @@ ENTRY(machine_real_restart_asm)
35373 lgdtl pa_tr_gdt
35374
35375 /* Disable paging to drop us out of long mode */
35376+ movl %cr4, %eax
35377+ andl $~X86_CR4_PCIDE, %eax
35378+ movl %eax, %cr4
35379+
35380 movl %cr0, %eax
35381 andl $~X86_CR0_PG, %eax
35382 movl %eax, %cr0
35383diff --git a/arch/x86/realmode/rm/trampoline_32.S b/arch/x86/realmode/rm/trampoline_32.S
35384index 48ddd76..c26749f 100644
35385--- a/arch/x86/realmode/rm/trampoline_32.S
35386+++ b/arch/x86/realmode/rm/trampoline_32.S
35387@@ -24,6 +24,12 @@
35388 #include <asm/page_types.h>
35389 #include "realmode.h"
35390
35391+#ifdef CONFIG_PAX_KERNEXEC
35392+#define ta(X) (X)
35393+#else
35394+#define ta(X) (pa_ ## X)
35395+#endif
35396+
35397 .text
35398 .code16
35399
35400@@ -38,8 +44,6 @@ ENTRY(trampoline_start)
35401
35402 cli # We should be safe anyway
35403
35404- movl tr_start, %eax # where we need to go
35405-
35406 movl $0xA5A5A5A5, trampoline_status
35407 # write marker for master knows we're running
35408
35409@@ -55,7 +59,7 @@ ENTRY(trampoline_start)
35410 movw $1, %dx # protected mode (PE) bit
35411 lmsw %dx # into protected mode
35412
35413- ljmpl $__BOOT_CS, $pa_startup_32
35414+ ljmpl *(trampoline_header)
35415
35416 .section ".text32","ax"
35417 .code32
35418@@ -66,7 +70,7 @@ ENTRY(startup_32) # note: also used from wakeup_asm.S
35419 .balign 8
35420 GLOBAL(trampoline_header)
35421 tr_start: .space 4
35422- tr_gdt_pad: .space 2
35423+ tr_boot_cs: .space 2
35424 tr_gdt: .space 6
35425 END(trampoline_header)
35426
35427diff --git a/arch/x86/realmode/rm/trampoline_64.S b/arch/x86/realmode/rm/trampoline_64.S
35428index dac7b20..72dbaca 100644
35429--- a/arch/x86/realmode/rm/trampoline_64.S
35430+++ b/arch/x86/realmode/rm/trampoline_64.S
35431@@ -93,6 +93,7 @@ ENTRY(startup_32)
35432 movl %edx, %gs
35433
35434 movl pa_tr_cr4, %eax
35435+ andl $~X86_CR4_PCIDE, %eax
35436 movl %eax, %cr4 # Enable PAE mode
35437
35438 # Setup trampoline 4 level pagetables
35439@@ -106,7 +107,7 @@ ENTRY(startup_32)
35440 wrmsr
35441
35442 # Enable paging and in turn activate Long Mode
35443- movl $(X86_CR0_PG | X86_CR0_WP | X86_CR0_PE), %eax
35444+ movl $(X86_CR0_PG | X86_CR0_PE), %eax
35445 movl %eax, %cr0
35446
35447 /*
35448diff --git a/arch/x86/realmode/rm/wakeup_asm.S b/arch/x86/realmode/rm/wakeup_asm.S
35449index 9e7e147..25a4158 100644
35450--- a/arch/x86/realmode/rm/wakeup_asm.S
35451+++ b/arch/x86/realmode/rm/wakeup_asm.S
35452@@ -126,11 +126,10 @@ ENTRY(wakeup_start)
35453 lgdtl pmode_gdt
35454
35455 /* This really couldn't... */
35456- movl pmode_entry, %eax
35457 movl pmode_cr0, %ecx
35458 movl %ecx, %cr0
35459- ljmpl $__KERNEL_CS, $pa_startup_32
35460- /* -> jmp *%eax in trampoline_32.S */
35461+
35462+ ljmpl *pmode_entry
35463 #else
35464 jmp trampoline_start
35465 #endif
35466diff --git a/arch/x86/tools/Makefile b/arch/x86/tools/Makefile
35467index 604a37e..e49702a 100644
35468--- a/arch/x86/tools/Makefile
35469+++ b/arch/x86/tools/Makefile
35470@@ -37,7 +37,7 @@ $(obj)/test_get_len.o: $(srctree)/arch/x86/lib/insn.c $(srctree)/arch/x86/lib/in
35471
35472 $(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
35473
35474-HOST_EXTRACFLAGS += -I$(srctree)/tools/include
35475+HOST_EXTRACFLAGS += -I$(srctree)/tools/include -ggdb
35476 hostprogs-y += relocs
35477 relocs-objs := relocs_32.o relocs_64.o relocs_common.o
35478 PHONY += relocs
35479diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c
35480index 0c2fae8..88036b7 100644
35481--- a/arch/x86/tools/relocs.c
35482+++ b/arch/x86/tools/relocs.c
35483@@ -1,5 +1,7 @@
35484 /* This is included from relocs_32/64.c */
35485
35486+#include "../../../include/generated/autoconf.h"
35487+
35488 #define ElfW(type) _ElfW(ELF_BITS, type)
35489 #define _ElfW(bits, type) __ElfW(bits, type)
35490 #define __ElfW(bits, type) Elf##bits##_##type
35491@@ -11,6 +13,7 @@
35492 #define Elf_Sym ElfW(Sym)
35493
35494 static Elf_Ehdr ehdr;
35495+static Elf_Phdr *phdr;
35496
35497 struct relocs {
35498 uint32_t *offset;
35499@@ -386,9 +389,39 @@ static void read_ehdr(FILE *fp)
35500 }
35501 }
35502
35503+static void read_phdrs(FILE *fp)
35504+{
35505+ unsigned int i;
35506+
35507+ phdr = calloc(ehdr.e_phnum, sizeof(Elf_Phdr));
35508+ if (!phdr) {
35509+ die("Unable to allocate %d program headers\n",
35510+ ehdr.e_phnum);
35511+ }
35512+ if (fseek(fp, ehdr.e_phoff, SEEK_SET) < 0) {
35513+ die("Seek to %d failed: %s\n",
35514+ ehdr.e_phoff, strerror(errno));
35515+ }
35516+ if (fread(phdr, sizeof(*phdr), ehdr.e_phnum, fp) != ehdr.e_phnum) {
35517+ die("Cannot read ELF program headers: %s\n",
35518+ strerror(errno));
35519+ }
35520+ for(i = 0; i < ehdr.e_phnum; i++) {
35521+ phdr[i].p_type = elf_word_to_cpu(phdr[i].p_type);
35522+ phdr[i].p_offset = elf_off_to_cpu(phdr[i].p_offset);
35523+ phdr[i].p_vaddr = elf_addr_to_cpu(phdr[i].p_vaddr);
35524+ phdr[i].p_paddr = elf_addr_to_cpu(phdr[i].p_paddr);
35525+ phdr[i].p_filesz = elf_word_to_cpu(phdr[i].p_filesz);
35526+ phdr[i].p_memsz = elf_word_to_cpu(phdr[i].p_memsz);
35527+ phdr[i].p_flags = elf_word_to_cpu(phdr[i].p_flags);
35528+ phdr[i].p_align = elf_word_to_cpu(phdr[i].p_align);
35529+ }
35530+
35531+}
35532+
35533 static void read_shdrs(FILE *fp)
35534 {
35535- int i;
35536+ unsigned int i;
35537 Elf_Shdr shdr;
35538
35539 secs = calloc(ehdr.e_shnum, sizeof(struct section));
35540@@ -423,7 +456,7 @@ static void read_shdrs(FILE *fp)
35541
35542 static void read_strtabs(FILE *fp)
35543 {
35544- int i;
35545+ unsigned int i;
35546 for (i = 0; i < ehdr.e_shnum; i++) {
35547 struct section *sec = &secs[i];
35548 if (sec->shdr.sh_type != SHT_STRTAB) {
35549@@ -448,7 +481,7 @@ static void read_strtabs(FILE *fp)
35550
35551 static void read_symtabs(FILE *fp)
35552 {
35553- int i,j;
35554+ unsigned int i,j;
35555 for (i = 0; i < ehdr.e_shnum; i++) {
35556 struct section *sec = &secs[i];
35557 if (sec->shdr.sh_type != SHT_SYMTAB) {
35558@@ -479,9 +512,11 @@ static void read_symtabs(FILE *fp)
35559 }
35560
35561
35562-static void read_relocs(FILE *fp)
35563+static void read_relocs(FILE *fp, int use_real_mode)
35564 {
35565- int i,j;
35566+ unsigned int i,j;
35567+ uint32_t base;
35568+
35569 for (i = 0; i < ehdr.e_shnum; i++) {
35570 struct section *sec = &secs[i];
35571 if (sec->shdr.sh_type != SHT_REL_TYPE) {
35572@@ -501,9 +536,22 @@ static void read_relocs(FILE *fp)
35573 die("Cannot read symbol table: %s\n",
35574 strerror(errno));
35575 }
35576+ base = 0;
35577+
35578+#ifdef CONFIG_X86_32
35579+ for (j = 0; !use_real_mode && j < ehdr.e_phnum; j++) {
35580+ if (phdr[j].p_type != PT_LOAD )
35581+ continue;
35582+ 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)
35583+ continue;
35584+ base = CONFIG_PAGE_OFFSET + phdr[j].p_paddr - phdr[j].p_vaddr;
35585+ break;
35586+ }
35587+#endif
35588+
35589 for (j = 0; j < sec->shdr.sh_size/sizeof(Elf_Rel); j++) {
35590 Elf_Rel *rel = &sec->reltab[j];
35591- rel->r_offset = elf_addr_to_cpu(rel->r_offset);
35592+ rel->r_offset = elf_addr_to_cpu(rel->r_offset) + base;
35593 rel->r_info = elf_xword_to_cpu(rel->r_info);
35594 #if (SHT_REL_TYPE == SHT_RELA)
35595 rel->r_addend = elf_xword_to_cpu(rel->r_addend);
35596@@ -515,7 +563,7 @@ static void read_relocs(FILE *fp)
35597
35598 static void print_absolute_symbols(void)
35599 {
35600- int i;
35601+ unsigned int i;
35602 const char *format;
35603
35604 if (ELF_BITS == 64)
35605@@ -528,7 +576,7 @@ static void print_absolute_symbols(void)
35606 for (i = 0; i < ehdr.e_shnum; i++) {
35607 struct section *sec = &secs[i];
35608 char *sym_strtab;
35609- int j;
35610+ unsigned int j;
35611
35612 if (sec->shdr.sh_type != SHT_SYMTAB) {
35613 continue;
35614@@ -555,7 +603,7 @@ static void print_absolute_symbols(void)
35615
35616 static void print_absolute_relocs(void)
35617 {
35618- int i, printed = 0;
35619+ unsigned int i, printed = 0;
35620 const char *format;
35621
35622 if (ELF_BITS == 64)
35623@@ -568,7 +616,7 @@ static void print_absolute_relocs(void)
35624 struct section *sec_applies, *sec_symtab;
35625 char *sym_strtab;
35626 Elf_Sym *sh_symtab;
35627- int j;
35628+ unsigned int j;
35629 if (sec->shdr.sh_type != SHT_REL_TYPE) {
35630 continue;
35631 }
35632@@ -645,13 +693,13 @@ static void add_reloc(struct relocs *r, uint32_t offset)
35633 static void walk_relocs(int (*process)(struct section *sec, Elf_Rel *rel,
35634 Elf_Sym *sym, const char *symname))
35635 {
35636- int i;
35637+ unsigned int i;
35638 /* Walk through the relocations */
35639 for (i = 0; i < ehdr.e_shnum; i++) {
35640 char *sym_strtab;
35641 Elf_Sym *sh_symtab;
35642 struct section *sec_applies, *sec_symtab;
35643- int j;
35644+ unsigned int j;
35645 struct section *sec = &secs[i];
35646
35647 if (sec->shdr.sh_type != SHT_REL_TYPE) {
35648@@ -830,6 +878,23 @@ static int do_reloc32(struct section *sec, Elf_Rel *rel, Elf_Sym *sym,
35649 {
35650 unsigned r_type = ELF32_R_TYPE(rel->r_info);
35651 int shn_abs = (sym->st_shndx == SHN_ABS) && !is_reloc(S_REL, symname);
35652+ char *sym_strtab = sec->link->link->strtab;
35653+
35654+ /* Don't relocate actual per-cpu variables, they are absolute indices, not addresses */
35655+ if (!strcmp(sec_name(sym->st_shndx), ".data..percpu") && strcmp(sym_name(sym_strtab, sym), "__per_cpu_load"))
35656+ return 0;
35657+
35658+#ifdef CONFIG_PAX_KERNEXEC
35659+ /* Don't relocate actual code, they are relocated implicitly by the base address of KERNEL_CS */
35660+ if (!strcmp(sec_name(sym->st_shndx), ".text.end") && !strcmp(sym_name(sym_strtab, sym), "_etext"))
35661+ return 0;
35662+ if (!strcmp(sec_name(sym->st_shndx), ".init.text"))
35663+ return 0;
35664+ if (!strcmp(sec_name(sym->st_shndx), ".exit.text"))
35665+ return 0;
35666+ if (!strcmp(sec_name(sym->st_shndx), ".text") && strcmp(sym_name(sym_strtab, sym), "__LOAD_PHYSICAL_ADDR"))
35667+ return 0;
35668+#endif
35669
35670 switch (r_type) {
35671 case R_386_NONE:
35672@@ -968,7 +1033,7 @@ static int write32_as_text(uint32_t v, FILE *f)
35673
35674 static void emit_relocs(int as_text, int use_real_mode)
35675 {
35676- int i;
35677+ unsigned int i;
35678 int (*write_reloc)(uint32_t, FILE *) = write32;
35679 int (*do_reloc)(struct section *sec, Elf_Rel *rel, Elf_Sym *sym,
35680 const char *symname);
35681@@ -1078,10 +1143,11 @@ void process(FILE *fp, int use_real_mode, int as_text,
35682 {
35683 regex_init(use_real_mode);
35684 read_ehdr(fp);
35685+ read_phdrs(fp);
35686 read_shdrs(fp);
35687 read_strtabs(fp);
35688 read_symtabs(fp);
35689- read_relocs(fp);
35690+ read_relocs(fp, use_real_mode);
35691 if (ELF_BITS == 64)
35692 percpu_init();
35693 if (show_absolute_syms) {
35694diff --git a/arch/x86/um/mem_32.c b/arch/x86/um/mem_32.c
35695index f40281e..92728c9 100644
35696--- a/arch/x86/um/mem_32.c
35697+++ b/arch/x86/um/mem_32.c
35698@@ -21,7 +21,7 @@ static int __init gate_vma_init(void)
35699 gate_vma.vm_start = FIXADDR_USER_START;
35700 gate_vma.vm_end = FIXADDR_USER_END;
35701 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
35702- gate_vma.vm_page_prot = __P101;
35703+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
35704
35705 return 0;
35706 }
35707diff --git a/arch/x86/um/tls_32.c b/arch/x86/um/tls_32.c
35708index 80ffa5b..a33bd15 100644
35709--- a/arch/x86/um/tls_32.c
35710+++ b/arch/x86/um/tls_32.c
35711@@ -260,7 +260,7 @@ out:
35712 if (unlikely(task == current &&
35713 !t->arch.tls_array[idx - GDT_ENTRY_TLS_MIN].flushed)) {
35714 printk(KERN_ERR "get_tls_entry: task with pid %d got here "
35715- "without flushed TLS.", current->pid);
35716+ "without flushed TLS.", task_pid_nr(current));
35717 }
35718
35719 return 0;
35720diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile
35721index 8533c96..ff98c52 100644
35722--- a/arch/x86/vdso/Makefile
35723+++ b/arch/x86/vdso/Makefile
35724@@ -175,7 +175,7 @@ quiet_cmd_vdso = VDSO $@
35725 -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) && \
35726 sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'
35727
35728-VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=sysv) \
35729+VDSO_LDFLAGS = -fPIC -shared -Wl,--no-undefined $(call cc-ldoption, -Wl$(comma)--hash-style=sysv) \
35730 $(call cc-ldoption, -Wl$(comma)--build-id) -Wl,-Bsymbolic $(LTO_CFLAGS)
35731 GCOV_PROFILE := n
35732
35733diff --git a/arch/x86/vdso/vdso2c.h b/arch/x86/vdso/vdso2c.h
35734index 0224987..c7d65a5 100644
35735--- a/arch/x86/vdso/vdso2c.h
35736+++ b/arch/x86/vdso/vdso2c.h
35737@@ -12,7 +12,7 @@ static void BITSFUNC(go)(void *raw_addr, size_t raw_len,
35738 unsigned long load_size = -1; /* Work around bogus warning */
35739 unsigned long mapping_size;
35740 ELF(Ehdr) *hdr = (ELF(Ehdr) *)raw_addr;
35741- int i;
35742+ unsigned int i;
35743 unsigned long j;
35744 ELF(Shdr) *symtab_hdr = NULL, *strtab_hdr, *secstrings_hdr,
35745 *alt_sec = NULL;
35746diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c
35747index e904c27..b9eaa03 100644
35748--- a/arch/x86/vdso/vdso32-setup.c
35749+++ b/arch/x86/vdso/vdso32-setup.c
35750@@ -14,6 +14,7 @@
35751 #include <asm/cpufeature.h>
35752 #include <asm/processor.h>
35753 #include <asm/vdso.h>
35754+#include <asm/mman.h>
35755
35756 #ifdef CONFIG_COMPAT_VDSO
35757 #define VDSO_DEFAULT 0
35758diff --git a/arch/x86/vdso/vma.c b/arch/x86/vdso/vma.c
35759index 1c9f750..cfddb1a 100644
35760--- a/arch/x86/vdso/vma.c
35761+++ b/arch/x86/vdso/vma.c
35762@@ -19,10 +19,7 @@
35763 #include <asm/page.h>
35764 #include <asm/hpet.h>
35765 #include <asm/desc.h>
35766-
35767-#if defined(CONFIG_X86_64)
35768-unsigned int __read_mostly vdso64_enabled = 1;
35769-#endif
35770+#include <asm/mman.h>
35771
35772 void __init init_vdso_image(const struct vdso_image *image)
35773 {
35774@@ -101,6 +98,11 @@ static int map_vdso(const struct vdso_image *image, bool calculate_addr)
35775 .pages = no_pages,
35776 };
35777
35778+#ifdef CONFIG_PAX_RANDMMAP
35779+ if (mm->pax_flags & MF_PAX_RANDMMAP)
35780+ calculate_addr = false;
35781+#endif
35782+
35783 if (calculate_addr) {
35784 addr = vdso_addr(current->mm->start_stack,
35785 image->size - image->sym_vvar_start);
35786@@ -111,14 +113,14 @@ static int map_vdso(const struct vdso_image *image, bool calculate_addr)
35787 down_write(&mm->mmap_sem);
35788
35789 addr = get_unmapped_area(NULL, addr,
35790- image->size - image->sym_vvar_start, 0, 0);
35791+ image->size - image->sym_vvar_start, 0, MAP_EXECUTABLE);
35792 if (IS_ERR_VALUE(addr)) {
35793 ret = addr;
35794 goto up_fail;
35795 }
35796
35797 text_start = addr - image->sym_vvar_start;
35798- current->mm->context.vdso = (void __user *)text_start;
35799+ mm->context.vdso = text_start;
35800
35801 /*
35802 * MAYWRITE to allow gdb to COW and set breakpoints
35803@@ -163,15 +165,12 @@ static int map_vdso(const struct vdso_image *image, bool calculate_addr)
35804 hpet_address >> PAGE_SHIFT,
35805 PAGE_SIZE,
35806 pgprot_noncached(PAGE_READONLY));
35807-
35808- if (ret)
35809- goto up_fail;
35810 }
35811 #endif
35812
35813 up_fail:
35814 if (ret)
35815- current->mm->context.vdso = NULL;
35816+ current->mm->context.vdso = 0;
35817
35818 up_write(&mm->mmap_sem);
35819 return ret;
35820@@ -191,8 +190,8 @@ static int load_vdso32(void)
35821
35822 if (selected_vdso32->sym_VDSO32_SYSENTER_RETURN)
35823 current_thread_info()->sysenter_return =
35824- current->mm->context.vdso +
35825- selected_vdso32->sym_VDSO32_SYSENTER_RETURN;
35826+ (void __force_user *)(current->mm->context.vdso +
35827+ selected_vdso32->sym_VDSO32_SYSENTER_RETURN);
35828
35829 return 0;
35830 }
35831@@ -201,9 +200,6 @@ static int load_vdso32(void)
35832 #ifdef CONFIG_X86_64
35833 int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
35834 {
35835- if (!vdso64_enabled)
35836- return 0;
35837-
35838 return map_vdso(&vdso_image_64, true);
35839 }
35840
35841@@ -212,12 +208,8 @@ int compat_arch_setup_additional_pages(struct linux_binprm *bprm,
35842 int uses_interp)
35843 {
35844 #ifdef CONFIG_X86_X32_ABI
35845- if (test_thread_flag(TIF_X32)) {
35846- if (!vdso64_enabled)
35847- return 0;
35848-
35849+ if (test_thread_flag(TIF_X32))
35850 return map_vdso(&vdso_image_x32, true);
35851- }
35852 #endif
35853
35854 return load_vdso32();
35855@@ -231,15 +223,6 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
35856 #endif
35857
35858 #ifdef CONFIG_X86_64
35859-static __init int vdso_setup(char *s)
35860-{
35861- vdso64_enabled = simple_strtoul(s, NULL, 0);
35862- return 0;
35863-}
35864-__setup("vdso=", vdso_setup);
35865-#endif
35866-
35867-#ifdef CONFIG_X86_64
35868 static void vgetcpu_cpu_init(void *arg)
35869 {
35870 int cpu = smp_processor_id();
35871diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig
35872index e88fda8..76ce7ce 100644
35873--- a/arch/x86/xen/Kconfig
35874+++ b/arch/x86/xen/Kconfig
35875@@ -9,6 +9,7 @@ config XEN
35876 select XEN_HAVE_PVMMU
35877 depends on X86_64 || (X86_32 && X86_PAE)
35878 depends on X86_TSC
35879+ depends on !GRKERNSEC_CONFIG_AUTO || GRKERNSEC_CONFIG_VIRT_XEN
35880 help
35881 This is the Linux Xen port. Enabling this will allow the
35882 kernel to boot in a paravirtualized environment under the
35883diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
35884index 5240f56..0c12163 100644
35885--- a/arch/x86/xen/enlighten.c
35886+++ b/arch/x86/xen/enlighten.c
35887@@ -125,8 +125,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
35888
35889 struct shared_info xen_dummy_shared_info;
35890
35891-void *xen_initial_gdt;
35892-
35893 RESERVE_BRK(shared_info_page_brk, PAGE_SIZE);
35894 __read_mostly int xen_have_vector_callback;
35895 EXPORT_SYMBOL_GPL(xen_have_vector_callback);
35896@@ -544,8 +542,7 @@ static void xen_load_gdt(const struct desc_ptr *dtr)
35897 {
35898 unsigned long va = dtr->address;
35899 unsigned int size = dtr->size + 1;
35900- unsigned pages = (size + PAGE_SIZE - 1) / PAGE_SIZE;
35901- unsigned long frames[pages];
35902+ unsigned long frames[65536 / PAGE_SIZE];
35903 int f;
35904
35905 /*
35906@@ -593,8 +590,7 @@ static void __init xen_load_gdt_boot(const struct desc_ptr *dtr)
35907 {
35908 unsigned long va = dtr->address;
35909 unsigned int size = dtr->size + 1;
35910- unsigned pages = (size + PAGE_SIZE - 1) / PAGE_SIZE;
35911- unsigned long frames[pages];
35912+ unsigned long frames[(GDT_SIZE + PAGE_SIZE - 1) / PAGE_SIZE];
35913 int f;
35914
35915 /*
35916@@ -602,7 +598,7 @@ static void __init xen_load_gdt_boot(const struct desc_ptr *dtr)
35917 * 8-byte entries, or 16 4k pages..
35918 */
35919
35920- BUG_ON(size > 65536);
35921+ BUG_ON(size > GDT_SIZE);
35922 BUG_ON(va & ~PAGE_MASK);
35923
35924 for (f = 0; va < dtr->address + size; va += PAGE_SIZE, f++) {
35925@@ -991,7 +987,7 @@ static u32 xen_safe_apic_wait_icr_idle(void)
35926 return 0;
35927 }
35928
35929-static void set_xen_basic_apic_ops(void)
35930+static void __init set_xen_basic_apic_ops(void)
35931 {
35932 apic->read = xen_apic_read;
35933 apic->write = xen_apic_write;
35934@@ -1308,30 +1304,30 @@ static const struct pv_apic_ops xen_apic_ops __initconst = {
35935 #endif
35936 };
35937
35938-static void xen_reboot(int reason)
35939+static __noreturn void xen_reboot(int reason)
35940 {
35941 struct sched_shutdown r = { .reason = reason };
35942
35943- if (HYPERVISOR_sched_op(SCHEDOP_shutdown, &r))
35944- BUG();
35945+ HYPERVISOR_sched_op(SCHEDOP_shutdown, &r);
35946+ BUG();
35947 }
35948
35949-static void xen_restart(char *msg)
35950+static __noreturn void xen_restart(char *msg)
35951 {
35952 xen_reboot(SHUTDOWN_reboot);
35953 }
35954
35955-static void xen_emergency_restart(void)
35956+static __noreturn void xen_emergency_restart(void)
35957 {
35958 xen_reboot(SHUTDOWN_reboot);
35959 }
35960
35961-static void xen_machine_halt(void)
35962+static __noreturn void xen_machine_halt(void)
35963 {
35964 xen_reboot(SHUTDOWN_poweroff);
35965 }
35966
35967-static void xen_machine_power_off(void)
35968+static __noreturn void xen_machine_power_off(void)
35969 {
35970 if (pm_power_off)
35971 pm_power_off();
35972@@ -1484,8 +1480,11 @@ static void __ref xen_setup_gdt(int cpu)
35973 pv_cpu_ops.write_gdt_entry = xen_write_gdt_entry_boot;
35974 pv_cpu_ops.load_gdt = xen_load_gdt_boot;
35975
35976- setup_stack_canary_segment(0);
35977- switch_to_new_gdt(0);
35978+ setup_stack_canary_segment(cpu);
35979+#ifdef CONFIG_X86_64
35980+ load_percpu_segment(cpu);
35981+#endif
35982+ switch_to_new_gdt(cpu);
35983
35984 pv_cpu_ops.write_gdt_entry = xen_write_gdt_entry;
35985 pv_cpu_ops.load_gdt = xen_load_gdt;
35986@@ -1600,7 +1599,17 @@ asmlinkage __visible void __init xen_start_kernel(void)
35987 __userpte_alloc_gfp &= ~__GFP_HIGHMEM;
35988
35989 /* Work out if we support NX */
35990- x86_configure_nx();
35991+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
35992+ if ((cpuid_eax(0x80000000) & 0xffff0000) == 0x80000000 &&
35993+ (cpuid_edx(0x80000001) & (1U << (X86_FEATURE_NX & 31)))) {
35994+ unsigned l, h;
35995+
35996+ __supported_pte_mask |= _PAGE_NX;
35997+ rdmsr(MSR_EFER, l, h);
35998+ l |= EFER_NX;
35999+ wrmsr(MSR_EFER, l, h);
36000+ }
36001+#endif
36002
36003 /* Get mfn list */
36004 xen_build_dynamic_phys_to_machine();
36005@@ -1628,13 +1637,6 @@ asmlinkage __visible void __init xen_start_kernel(void)
36006
36007 machine_ops = xen_machine_ops;
36008
36009- /*
36010- * The only reliable way to retain the initial address of the
36011- * percpu gdt_page is to remember it here, so we can go and
36012- * mark it RW later, when the initial percpu area is freed.
36013- */
36014- xen_initial_gdt = &per_cpu(gdt_page, 0);
36015-
36016 xen_smp_init();
36017
36018 #ifdef CONFIG_ACPI_NUMA
36019diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
36020index adca9e2..cdba9d1 100644
36021--- a/arch/x86/xen/mmu.c
36022+++ b/arch/x86/xen/mmu.c
36023@@ -379,7 +379,7 @@ static pteval_t pte_mfn_to_pfn(pteval_t val)
36024 return val;
36025 }
36026
36027-static pteval_t pte_pfn_to_mfn(pteval_t val)
36028+static pteval_t __intentional_overflow(-1) pte_pfn_to_mfn(pteval_t val)
36029 {
36030 if (val & _PAGE_PRESENT) {
36031 unsigned long pfn = (val & PTE_PFN_MASK) >> PAGE_SHIFT;
36032@@ -1835,7 +1835,11 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn)
36033 * L3_k[511] -> level2_fixmap_pgt */
36034 convert_pfn_mfn(level3_kernel_pgt);
36035
36036+ convert_pfn_mfn(level3_vmalloc_start_pgt);
36037+ convert_pfn_mfn(level3_vmalloc_end_pgt);
36038+ convert_pfn_mfn(level3_vmemmap_pgt);
36039 /* L3_k[511][506] -> level1_fixmap_pgt */
36040+ /* L3_k[511][507] -> level1_vsyscall_pgt */
36041 convert_pfn_mfn(level2_fixmap_pgt);
36042 }
36043 /* We get [511][511] and have Xen's version of level2_kernel_pgt */
36044@@ -1860,11 +1864,18 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn)
36045 set_page_prot(init_level4_pgt, PAGE_KERNEL_RO);
36046 set_page_prot(level3_ident_pgt, PAGE_KERNEL_RO);
36047 set_page_prot(level3_kernel_pgt, PAGE_KERNEL_RO);
36048+ set_page_prot(level3_vmalloc_start_pgt, PAGE_KERNEL_RO);
36049+ set_page_prot(level3_vmalloc_end_pgt, PAGE_KERNEL_RO);
36050+ set_page_prot(level3_vmemmap_pgt, PAGE_KERNEL_RO);
36051 set_page_prot(level3_user_vsyscall, PAGE_KERNEL_RO);
36052 set_page_prot(level2_ident_pgt, PAGE_KERNEL_RO);
36053+ set_page_prot(level2_vmemmap_pgt, PAGE_KERNEL_RO);
36054 set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO);
36055 set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO);
36056- set_page_prot(level1_fixmap_pgt, PAGE_KERNEL_RO);
36057+ set_page_prot(level1_fixmap_pgt[0], PAGE_KERNEL_RO);
36058+ set_page_prot(level1_fixmap_pgt[1], PAGE_KERNEL_RO);
36059+ set_page_prot(level1_fixmap_pgt[2], PAGE_KERNEL_RO);
36060+ set_page_prot(level1_vsyscall_pgt, PAGE_KERNEL_RO);
36061
36062 /* Pin down new L4 */
36063 pin_pagetable_pfn(MMUEXT_PIN_L4_TABLE,
36064@@ -2048,6 +2059,7 @@ static void __init xen_post_allocator_init(void)
36065 pv_mmu_ops.set_pud = xen_set_pud;
36066 #if PAGETABLE_LEVELS == 4
36067 pv_mmu_ops.set_pgd = xen_set_pgd;
36068+ pv_mmu_ops.set_pgd_batched = xen_set_pgd;
36069 #endif
36070
36071 /* This will work as long as patching hasn't happened yet
36072@@ -2126,6 +2138,7 @@ static const struct pv_mmu_ops xen_mmu_ops __initconst = {
36073 .pud_val = PV_CALLEE_SAVE(xen_pud_val),
36074 .make_pud = PV_CALLEE_SAVE(xen_make_pud),
36075 .set_pgd = xen_set_pgd_hyper,
36076+ .set_pgd_batched = xen_set_pgd_hyper,
36077
36078 .alloc_pud = xen_alloc_pmd_init,
36079 .release_pud = xen_release_pmd_init,
36080diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
36081index 08e8489..b1e182f 100644
36082--- a/arch/x86/xen/smp.c
36083+++ b/arch/x86/xen/smp.c
36084@@ -288,17 +288,13 @@ static void __init xen_smp_prepare_boot_cpu(void)
36085
36086 if (xen_pv_domain()) {
36087 if (!xen_feature(XENFEAT_writable_page_tables))
36088- /* We've switched to the "real" per-cpu gdt, so make
36089- * sure the old memory can be recycled. */
36090- make_lowmem_page_readwrite(xen_initial_gdt);
36091-
36092 #ifdef CONFIG_X86_32
36093 /*
36094 * Xen starts us with XEN_FLAT_RING1_DS, but linux code
36095 * expects __USER_DS
36096 */
36097- loadsegment(ds, __USER_DS);
36098- loadsegment(es, __USER_DS);
36099+ loadsegment(ds, __KERNEL_DS);
36100+ loadsegment(es, __KERNEL_DS);
36101 #endif
36102
36103 xen_filter_cpu_maps();
36104@@ -379,7 +375,7 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
36105 #ifdef CONFIG_X86_32
36106 /* Note: PVH is not yet supported on x86_32. */
36107 ctxt->user_regs.fs = __KERNEL_PERCPU;
36108- ctxt->user_regs.gs = __KERNEL_STACK_CANARY;
36109+ savesegment(gs, ctxt->user_regs.gs);
36110 #endif
36111 memset(&ctxt->fpu_ctxt, 0, sizeof(ctxt->fpu_ctxt));
36112
36113@@ -387,8 +383,8 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
36114 ctxt->user_regs.eip = (unsigned long)cpu_bringup_and_idle;
36115 ctxt->flags = VGCF_IN_KERNEL;
36116 ctxt->user_regs.eflags = 0x1000; /* IOPL_RING1 */
36117- ctxt->user_regs.ds = __USER_DS;
36118- ctxt->user_regs.es = __USER_DS;
36119+ ctxt->user_regs.ds = __KERNEL_DS;
36120+ ctxt->user_regs.es = __KERNEL_DS;
36121 ctxt->user_regs.ss = __KERNEL_DS;
36122
36123 xen_copy_trap_info(ctxt->trap_ctxt);
36124@@ -446,14 +442,13 @@ static int xen_cpu_up(unsigned int cpu, struct task_struct *idle)
36125 int rc;
36126
36127 per_cpu(current_task, cpu) = idle;
36128+ per_cpu(current_tinfo, cpu) = &idle->tinfo;
36129 #ifdef CONFIG_X86_32
36130 irq_ctx_init(cpu);
36131 #else
36132 clear_tsk_thread_flag(idle, TIF_FORK);
36133 #endif
36134- per_cpu(kernel_stack, cpu) =
36135- (unsigned long)task_stack_page(idle) -
36136- KERNEL_STACK_OFFSET + THREAD_SIZE;
36137+ per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(idle) - 16 + THREAD_SIZE;
36138
36139 xen_setup_runstate_info(cpu);
36140 xen_setup_timer(cpu);
36141@@ -732,7 +727,7 @@ static const struct smp_ops xen_smp_ops __initconst = {
36142
36143 void __init xen_smp_init(void)
36144 {
36145- smp_ops = xen_smp_ops;
36146+ memcpy((void *)&smp_ops, &xen_smp_ops, sizeof smp_ops);
36147 xen_fill_possible_map();
36148 }
36149
36150diff --git a/arch/x86/xen/xen-asm_32.S b/arch/x86/xen/xen-asm_32.S
36151index fd92a64..1f72641 100644
36152--- a/arch/x86/xen/xen-asm_32.S
36153+++ b/arch/x86/xen/xen-asm_32.S
36154@@ -99,7 +99,7 @@ ENTRY(xen_iret)
36155 pushw %fs
36156 movl $(__KERNEL_PERCPU), %eax
36157 movl %eax, %fs
36158- movl %fs:xen_vcpu, %eax
36159+ mov PER_CPU_VAR(xen_vcpu), %eax
36160 POP_FS
36161 #else
36162 movl %ss:xen_vcpu, %eax
36163diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S
36164index 674b2225..f1f5dc1 100644
36165--- a/arch/x86/xen/xen-head.S
36166+++ b/arch/x86/xen/xen-head.S
36167@@ -39,6 +39,17 @@ ENTRY(startup_xen)
36168 #ifdef CONFIG_X86_32
36169 mov %esi,xen_start_info
36170 mov $init_thread_union+THREAD_SIZE,%esp
36171+#ifdef CONFIG_SMP
36172+ movl $cpu_gdt_table,%edi
36173+ movl $__per_cpu_load,%eax
36174+ movw %ax,__KERNEL_PERCPU + 2(%edi)
36175+ rorl $16,%eax
36176+ movb %al,__KERNEL_PERCPU + 4(%edi)
36177+ movb %ah,__KERNEL_PERCPU + 7(%edi)
36178+ movl $__per_cpu_end - 1,%eax
36179+ subl $__per_cpu_start,%eax
36180+ movw %ax,__KERNEL_PERCPU + 0(%edi)
36181+#endif
36182 #else
36183 mov %rsi,xen_start_info
36184 mov $init_thread_union+THREAD_SIZE,%rsp
36185diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h
36186index 9e195c6..523ed36 100644
36187--- a/arch/x86/xen/xen-ops.h
36188+++ b/arch/x86/xen/xen-ops.h
36189@@ -16,8 +16,6 @@ void xen_syscall_target(void);
36190 void xen_syscall32_target(void);
36191 #endif
36192
36193-extern void *xen_initial_gdt;
36194-
36195 struct trap_info;
36196 void xen_copy_trap_info(struct trap_info *traps);
36197
36198diff --git a/arch/xtensa/variants/dc232b/include/variant/core.h b/arch/xtensa/variants/dc232b/include/variant/core.h
36199index 525bd3d..ef888b1 100644
36200--- a/arch/xtensa/variants/dc232b/include/variant/core.h
36201+++ b/arch/xtensa/variants/dc232b/include/variant/core.h
36202@@ -119,9 +119,9 @@
36203 ----------------------------------------------------------------------*/
36204
36205 #define XCHAL_ICACHE_LINESIZE 32 /* I-cache line size in bytes */
36206-#define XCHAL_DCACHE_LINESIZE 32 /* D-cache line size in bytes */
36207 #define XCHAL_ICACHE_LINEWIDTH 5 /* log2(I line size in bytes) */
36208 #define XCHAL_DCACHE_LINEWIDTH 5 /* log2(D line size in bytes) */
36209+#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
36210
36211 #define XCHAL_ICACHE_SIZE 16384 /* I-cache size in bytes or 0 */
36212 #define XCHAL_DCACHE_SIZE 16384 /* D-cache size in bytes or 0 */
36213diff --git a/arch/xtensa/variants/fsf/include/variant/core.h b/arch/xtensa/variants/fsf/include/variant/core.h
36214index 2f33760..835e50a 100644
36215--- a/arch/xtensa/variants/fsf/include/variant/core.h
36216+++ b/arch/xtensa/variants/fsf/include/variant/core.h
36217@@ -11,6 +11,7 @@
36218 #ifndef _XTENSA_CORE_H
36219 #define _XTENSA_CORE_H
36220
36221+#include <linux/const.h>
36222
36223 /****************************************************************************
36224 Parameters Useful for Any Code, USER or PRIVILEGED
36225@@ -112,9 +113,9 @@
36226 ----------------------------------------------------------------------*/
36227
36228 #define XCHAL_ICACHE_LINESIZE 16 /* I-cache line size in bytes */
36229-#define XCHAL_DCACHE_LINESIZE 16 /* D-cache line size in bytes */
36230 #define XCHAL_ICACHE_LINEWIDTH 4 /* log2(I line size in bytes) */
36231 #define XCHAL_DCACHE_LINEWIDTH 4 /* log2(D line size in bytes) */
36232+#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
36233
36234 #define XCHAL_ICACHE_SIZE 8192 /* I-cache size in bytes or 0 */
36235 #define XCHAL_DCACHE_SIZE 8192 /* D-cache size in bytes or 0 */
36236diff --git a/block/bio.c b/block/bio.c
36237index f66a4ea..73ddf55 100644
36238--- a/block/bio.c
36239+++ b/block/bio.c
36240@@ -1172,7 +1172,7 @@ struct bio *bio_copy_user_iov(struct request_queue *q,
36241 /*
36242 * Overflow, abort
36243 */
36244- if (end < start)
36245+ if (end < start || end - start > INT_MAX - nr_pages)
36246 return ERR_PTR(-EINVAL);
36247
36248 nr_pages += end - start;
36249@@ -1297,7 +1297,7 @@ struct bio *bio_map_user_iov(struct request_queue *q,
36250 /*
36251 * Overflow, abort
36252 */
36253- if (end < start)
36254+ if (end < start || end - start > INT_MAX - nr_pages)
36255 return ERR_PTR(-EINVAL);
36256
36257 nr_pages += end - start;
36258diff --git a/block/blk-iopoll.c b/block/blk-iopoll.c
36259index 0736729..2ec3b48 100644
36260--- a/block/blk-iopoll.c
36261+++ b/block/blk-iopoll.c
36262@@ -74,7 +74,7 @@ void blk_iopoll_complete(struct blk_iopoll *iop)
36263 }
36264 EXPORT_SYMBOL(blk_iopoll_complete);
36265
36266-static void blk_iopoll_softirq(struct softirq_action *h)
36267+static __latent_entropy void blk_iopoll_softirq(void)
36268 {
36269 struct list_head *list = this_cpu_ptr(&blk_cpu_iopoll);
36270 int rearm = 0, budget = blk_iopoll_budget;
36271diff --git a/block/blk-map.c b/block/blk-map.c
36272index b8d2725..08c52b0 100644
36273--- a/block/blk-map.c
36274+++ b/block/blk-map.c
36275@@ -192,7 +192,7 @@ int blk_rq_map_kern(struct request_queue *q, struct request *rq, void *kbuf,
36276 if (!len || !kbuf)
36277 return -EINVAL;
36278
36279- do_copy = !blk_rq_aligned(q, addr, len) || object_is_on_stack(kbuf);
36280+ do_copy = !blk_rq_aligned(q, addr, len) || object_starts_on_stack(kbuf);
36281 if (do_copy)
36282 bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
36283 else
36284diff --git a/block/blk-softirq.c b/block/blk-softirq.c
36285index 53b1737..08177d2e 100644
36286--- a/block/blk-softirq.c
36287+++ b/block/blk-softirq.c
36288@@ -18,7 +18,7 @@ static DEFINE_PER_CPU(struct list_head, blk_cpu_done);
36289 * Softirq action handler - move entries to local list and loop over them
36290 * while passing them to the queue registered handler.
36291 */
36292-static void blk_done_softirq(struct softirq_action *h)
36293+static __latent_entropy void blk_done_softirq(void)
36294 {
36295 struct list_head *cpu_list, local_list;
36296
36297diff --git a/block/bsg.c b/block/bsg.c
36298index d214e92..9649863 100644
36299--- a/block/bsg.c
36300+++ b/block/bsg.c
36301@@ -140,16 +140,24 @@ static int blk_fill_sgv4_hdr_rq(struct request_queue *q, struct request *rq,
36302 struct sg_io_v4 *hdr, struct bsg_device *bd,
36303 fmode_t has_write_perm)
36304 {
36305+ unsigned char tmpcmd[sizeof(rq->__cmd)];
36306+ unsigned char *cmdptr;
36307+
36308 if (hdr->request_len > BLK_MAX_CDB) {
36309 rq->cmd = kzalloc(hdr->request_len, GFP_KERNEL);
36310 if (!rq->cmd)
36311 return -ENOMEM;
36312- }
36313+ cmdptr = rq->cmd;
36314+ } else
36315+ cmdptr = tmpcmd;
36316
36317- if (copy_from_user(rq->cmd, (void __user *)(unsigned long)hdr->request,
36318+ if (copy_from_user(cmdptr, (void __user *)(unsigned long)hdr->request,
36319 hdr->request_len))
36320 return -EFAULT;
36321
36322+ if (cmdptr != rq->cmd)
36323+ memcpy(rq->cmd, cmdptr, hdr->request_len);
36324+
36325 if (hdr->subprotocol == BSG_SUB_PROTOCOL_SCSI_CMD) {
36326 if (blk_verify_command(rq->cmd, has_write_perm))
36327 return -EPERM;
36328diff --git a/block/compat_ioctl.c b/block/compat_ioctl.c
36329index f678c73..f35aa18 100644
36330--- a/block/compat_ioctl.c
36331+++ b/block/compat_ioctl.c
36332@@ -156,7 +156,7 @@ static int compat_cdrom_generic_command(struct block_device *bdev, fmode_t mode,
36333 cgc = compat_alloc_user_space(sizeof(*cgc));
36334 cgc32 = compat_ptr(arg);
36335
36336- if (copy_in_user(&cgc->cmd, &cgc32->cmd, sizeof(cgc->cmd)) ||
36337+ if (copy_in_user(cgc->cmd, cgc32->cmd, sizeof(cgc->cmd)) ||
36338 get_user(data, &cgc32->buffer) ||
36339 put_user(compat_ptr(data), &cgc->buffer) ||
36340 copy_in_user(&cgc->buflen, &cgc32->buflen,
36341@@ -341,7 +341,7 @@ static int compat_fd_ioctl(struct block_device *bdev, fmode_t mode,
36342 err |= __get_user(f->spec1, &uf->spec1);
36343 err |= __get_user(f->fmt_gap, &uf->fmt_gap);
36344 err |= __get_user(name, &uf->name);
36345- f->name = compat_ptr(name);
36346+ f->name = (void __force_kernel *)compat_ptr(name);
36347 if (err) {
36348 err = -EFAULT;
36349 goto out;
36350diff --git a/block/genhd.c b/block/genhd.c
36351index ea982ea..86e0f9e 100644
36352--- a/block/genhd.c
36353+++ b/block/genhd.c
36354@@ -469,21 +469,24 @@ static char *bdevt_str(dev_t devt, char *buf)
36355
36356 /*
36357 * Register device numbers dev..(dev+range-1)
36358- * range must be nonzero
36359+ * Noop if @range is zero.
36360 * The hash chain is sorted on range, so that subranges can override.
36361 */
36362 void blk_register_region(dev_t devt, unsigned long range, struct module *module,
36363 struct kobject *(*probe)(dev_t, int *, void *),
36364 int (*lock)(dev_t, void *), void *data)
36365 {
36366- kobj_map(bdev_map, devt, range, module, probe, lock, data);
36367+ if (range)
36368+ kobj_map(bdev_map, devt, range, module, probe, lock, data);
36369 }
36370
36371 EXPORT_SYMBOL(blk_register_region);
36372
36373+/* undo blk_register_region(), noop if @range is zero */
36374 void blk_unregister_region(dev_t devt, unsigned long range)
36375 {
36376- kobj_unmap(bdev_map, devt, range);
36377+ if (range)
36378+ kobj_unmap(bdev_map, devt, range);
36379 }
36380
36381 EXPORT_SYMBOL(blk_unregister_region);
36382diff --git a/block/partitions/efi.c b/block/partitions/efi.c
36383index 26cb624..a49c3a5 100644
36384--- a/block/partitions/efi.c
36385+++ b/block/partitions/efi.c
36386@@ -293,14 +293,14 @@ static gpt_entry *alloc_read_gpt_entries(struct parsed_partitions *state,
36387 if (!gpt)
36388 return NULL;
36389
36390+ if (!le32_to_cpu(gpt->num_partition_entries))
36391+ return NULL;
36392+ pte = kcalloc(le32_to_cpu(gpt->num_partition_entries), le32_to_cpu(gpt->sizeof_partition_entry), GFP_KERNEL);
36393+ if (!pte)
36394+ return NULL;
36395+
36396 count = le32_to_cpu(gpt->num_partition_entries) *
36397 le32_to_cpu(gpt->sizeof_partition_entry);
36398- if (!count)
36399- return NULL;
36400- pte = kmalloc(count, GFP_KERNEL);
36401- if (!pte)
36402- return NULL;
36403-
36404 if (read_lba(state, le64_to_cpu(gpt->partition_entry_lba),
36405 (u8 *) pte, count) < count) {
36406 kfree(pte);
36407diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
36408index e1f71c3..02d295a 100644
36409--- a/block/scsi_ioctl.c
36410+++ b/block/scsi_ioctl.c
36411@@ -67,7 +67,7 @@ static int scsi_get_bus(struct request_queue *q, int __user *p)
36412 return put_user(0, p);
36413 }
36414
36415-static int sg_get_timeout(struct request_queue *q)
36416+static int __intentional_overflow(-1) sg_get_timeout(struct request_queue *q)
36417 {
36418 return jiffies_to_clock_t(q->sg_timeout);
36419 }
36420@@ -227,8 +227,20 @@ EXPORT_SYMBOL(blk_verify_command);
36421 static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq,
36422 struct sg_io_hdr *hdr, fmode_t mode)
36423 {
36424- if (copy_from_user(rq->cmd, hdr->cmdp, hdr->cmd_len))
36425+ unsigned char tmpcmd[sizeof(rq->__cmd)];
36426+ unsigned char *cmdptr;
36427+
36428+ if (rq->cmd != rq->__cmd)
36429+ cmdptr = rq->cmd;
36430+ else
36431+ cmdptr = tmpcmd;
36432+
36433+ if (copy_from_user(cmdptr, hdr->cmdp, hdr->cmd_len))
36434 return -EFAULT;
36435+
36436+ if (cmdptr != rq->cmd)
36437+ memcpy(rq->cmd, cmdptr, hdr->cmd_len);
36438+
36439 if (blk_verify_command(rq->cmd, mode & FMODE_WRITE))
36440 return -EPERM;
36441
36442@@ -422,6 +434,8 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
36443 int err;
36444 unsigned int in_len, out_len, bytes, opcode, cmdlen;
36445 char *buffer = NULL, sense[SCSI_SENSE_BUFFERSIZE];
36446+ unsigned char tmpcmd[sizeof(rq->__cmd)];
36447+ unsigned char *cmdptr;
36448
36449 if (!sic)
36450 return -EINVAL;
36451@@ -460,9 +474,18 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
36452 */
36453 err = -EFAULT;
36454 rq->cmd_len = cmdlen;
36455- if (copy_from_user(rq->cmd, sic->data, cmdlen))
36456+
36457+ if (rq->cmd != rq->__cmd)
36458+ cmdptr = rq->cmd;
36459+ else
36460+ cmdptr = tmpcmd;
36461+
36462+ if (copy_from_user(cmdptr, sic->data, cmdlen))
36463 goto error;
36464
36465+ if (rq->cmd != cmdptr)
36466+ memcpy(rq->cmd, cmdptr, cmdlen);
36467+
36468 if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len))
36469 goto error;
36470
36471diff --git a/crypto/cryptd.c b/crypto/cryptd.c
36472index 650afac1..f3307de 100644
36473--- a/crypto/cryptd.c
36474+++ b/crypto/cryptd.c
36475@@ -63,7 +63,7 @@ struct cryptd_blkcipher_ctx {
36476
36477 struct cryptd_blkcipher_request_ctx {
36478 crypto_completion_t complete;
36479-};
36480+} __no_const;
36481
36482 struct cryptd_hash_ctx {
36483 struct crypto_shash *child;
36484@@ -80,7 +80,7 @@ struct cryptd_aead_ctx {
36485
36486 struct cryptd_aead_request_ctx {
36487 crypto_completion_t complete;
36488-};
36489+} __no_const;
36490
36491 static void cryptd_queue_worker(struct work_struct *work);
36492
36493diff --git a/crypto/pcrypt.c b/crypto/pcrypt.c
36494index c305d41..a96de79 100644
36495--- a/crypto/pcrypt.c
36496+++ b/crypto/pcrypt.c
36497@@ -440,7 +440,7 @@ static int pcrypt_sysfs_add(struct padata_instance *pinst, const char *name)
36498 int ret;
36499
36500 pinst->kobj.kset = pcrypt_kset;
36501- ret = kobject_add(&pinst->kobj, NULL, name);
36502+ ret = kobject_add(&pinst->kobj, NULL, "%s", name);
36503 if (!ret)
36504 kobject_uevent(&pinst->kobj, KOBJ_ADD);
36505
36506diff --git a/crypto/zlib.c b/crypto/zlib.c
36507index 0eefa9d..0fa3d29 100644
36508--- a/crypto/zlib.c
36509+++ b/crypto/zlib.c
36510@@ -95,10 +95,10 @@ static int zlib_compress_setup(struct crypto_pcomp *tfm, void *params,
36511 zlib_comp_exit(ctx);
36512
36513 window_bits = tb[ZLIB_COMP_WINDOWBITS]
36514- ? nla_get_u32(tb[ZLIB_COMP_WINDOWBITS])
36515+ ? nla_get_s32(tb[ZLIB_COMP_WINDOWBITS])
36516 : MAX_WBITS;
36517 mem_level = tb[ZLIB_COMP_MEMLEVEL]
36518- ? nla_get_u32(tb[ZLIB_COMP_MEMLEVEL])
36519+ ? nla_get_s32(tb[ZLIB_COMP_MEMLEVEL])
36520 : DEF_MEM_LEVEL;
36521
36522 workspacesize = zlib_deflate_workspacesize(window_bits, mem_level);
36523diff --git a/drivers/acpi/acpica/hwxfsleep.c b/drivers/acpi/acpica/hwxfsleep.c
36524index 3b37676..898edfa 100644
36525--- a/drivers/acpi/acpica/hwxfsleep.c
36526+++ b/drivers/acpi/acpica/hwxfsleep.c
36527@@ -63,11 +63,12 @@ static acpi_status acpi_hw_sleep_dispatch(u8 sleep_state, u32 function_id);
36528 /* Legacy functions are optional, based upon ACPI_REDUCED_HARDWARE */
36529
36530 static struct acpi_sleep_functions acpi_sleep_dispatch[] = {
36531- {ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_sleep),
36532- acpi_hw_extended_sleep},
36533- {ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake_prep),
36534- acpi_hw_extended_wake_prep},
36535- {ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake), acpi_hw_extended_wake}
36536+ {.legacy_function = ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_sleep),
36537+ .extended_function = acpi_hw_extended_sleep},
36538+ {.legacy_function = ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake_prep),
36539+ .extended_function = acpi_hw_extended_wake_prep},
36540+ {.legacy_function = ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake),
36541+ .extended_function = acpi_hw_extended_wake}
36542 };
36543
36544 /*
36545diff --git a/drivers/acpi/apei/apei-internal.h b/drivers/acpi/apei/apei-internal.h
36546index 16129c7..8b675cd 100644
36547--- a/drivers/acpi/apei/apei-internal.h
36548+++ b/drivers/acpi/apei/apei-internal.h
36549@@ -19,7 +19,7 @@ typedef int (*apei_exec_ins_func_t)(struct apei_exec_context *ctx,
36550 struct apei_exec_ins_type {
36551 u32 flags;
36552 apei_exec_ins_func_t run;
36553-};
36554+} __do_const;
36555
36556 struct apei_exec_context {
36557 u32 ip;
36558diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
36559index e82d097..0c855c1 100644
36560--- a/drivers/acpi/apei/ghes.c
36561+++ b/drivers/acpi/apei/ghes.c
36562@@ -478,7 +478,7 @@ static void __ghes_print_estatus(const char *pfx,
36563 const struct acpi_hest_generic *generic,
36564 const struct acpi_hest_generic_status *estatus)
36565 {
36566- static atomic_t seqno;
36567+ static atomic_unchecked_t seqno;
36568 unsigned int curr_seqno;
36569 char pfx_seq[64];
36570
36571@@ -489,7 +489,7 @@ static void __ghes_print_estatus(const char *pfx,
36572 else
36573 pfx = KERN_ERR;
36574 }
36575- curr_seqno = atomic_inc_return(&seqno);
36576+ curr_seqno = atomic_inc_return_unchecked(&seqno);
36577 snprintf(pfx_seq, sizeof(pfx_seq), "%s{%u}" HW_ERR, pfx, curr_seqno);
36578 printk("%s""Hardware error from APEI Generic Hardware Error Source: %d\n",
36579 pfx_seq, generic->header.source_id);
36580diff --git a/drivers/acpi/bgrt.c b/drivers/acpi/bgrt.c
36581index a83e3c6..c3d617f 100644
36582--- a/drivers/acpi/bgrt.c
36583+++ b/drivers/acpi/bgrt.c
36584@@ -86,8 +86,10 @@ static int __init bgrt_init(void)
36585 if (!bgrt_image)
36586 return -ENODEV;
36587
36588- bin_attr_image.private = bgrt_image;
36589- bin_attr_image.size = bgrt_image_size;
36590+ pax_open_kernel();
36591+ *(void **)&bin_attr_image.private = bgrt_image;
36592+ *(size_t *)&bin_attr_image.size = bgrt_image_size;
36593+ pax_close_kernel();
36594
36595 bgrt_kobj = kobject_create_and_add("bgrt", acpi_kobj);
36596 if (!bgrt_kobj)
36597diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c
36598index 9b693d5..8953d54 100644
36599--- a/drivers/acpi/blacklist.c
36600+++ b/drivers/acpi/blacklist.c
36601@@ -51,7 +51,7 @@ struct acpi_blacklist_item {
36602 u32 is_critical_error;
36603 };
36604
36605-static struct dmi_system_id acpi_osi_dmi_table[] __initdata;
36606+static const struct dmi_system_id acpi_osi_dmi_table[] __initconst;
36607
36608 /*
36609 * POLICY: If *anything* doesn't work, put it on the blacklist.
36610@@ -163,7 +163,7 @@ static int __init dmi_disable_osi_win8(const struct dmi_system_id *d)
36611 return 0;
36612 }
36613
36614-static struct dmi_system_id acpi_osi_dmi_table[] __initdata = {
36615+static const struct dmi_system_id acpi_osi_dmi_table[] __initconst = {
36616 {
36617 .callback = dmi_disable_osi_vista,
36618 .ident = "Fujitsu Siemens",
36619diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
36620index 8b67bd0..b59593e 100644
36621--- a/drivers/acpi/bus.c
36622+++ b/drivers/acpi/bus.c
36623@@ -67,7 +67,7 @@ static int set_copy_dsdt(const struct dmi_system_id *id)
36624 }
36625 #endif
36626
36627-static struct dmi_system_id dsdt_dmi_table[] __initdata = {
36628+static const struct dmi_system_id dsdt_dmi_table[] __initconst = {
36629 /*
36630 * Invoke DSDT corruption work-around on all Toshiba Satellite.
36631 * https://bugzilla.kernel.org/show_bug.cgi?id=14679
36632@@ -83,7 +83,7 @@ static struct dmi_system_id dsdt_dmi_table[] __initdata = {
36633 {}
36634 };
36635 #else
36636-static struct dmi_system_id dsdt_dmi_table[] __initdata = {
36637+static const struct dmi_system_id dsdt_dmi_table[] __initconst = {
36638 {}
36639 };
36640 #endif
36641diff --git a/drivers/acpi/custom_method.c b/drivers/acpi/custom_method.c
36642index c68e724..e863008 100644
36643--- a/drivers/acpi/custom_method.c
36644+++ b/drivers/acpi/custom_method.c
36645@@ -29,6 +29,10 @@ static ssize_t cm_write(struct file *file, const char __user * user_buf,
36646 struct acpi_table_header table;
36647 acpi_status status;
36648
36649+#ifdef CONFIG_GRKERNSEC_KMEM
36650+ return -EPERM;
36651+#endif
36652+
36653 if (!(*ppos)) {
36654 /* parse the table header to get the table length */
36655 if (count <= sizeof(struct acpi_table_header))
36656diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c
36657index 735db11..91e07ff 100644
36658--- a/drivers/acpi/device_pm.c
36659+++ b/drivers/acpi/device_pm.c
36660@@ -1025,6 +1025,8 @@ EXPORT_SYMBOL_GPL(acpi_subsys_freeze);
36661
36662 #endif /* CONFIG_PM_SLEEP */
36663
36664+static void acpi_dev_pm_detach(struct device *dev, bool power_off);
36665+
36666 static struct dev_pm_domain acpi_general_pm_domain = {
36667 .ops = {
36668 .runtime_suspend = acpi_subsys_runtime_suspend,
36669@@ -1041,6 +1043,7 @@ static struct dev_pm_domain acpi_general_pm_domain = {
36670 .restore_early = acpi_subsys_resume_early,
36671 #endif
36672 },
36673+ .detach = acpi_dev_pm_detach
36674 };
36675
36676 /**
36677@@ -1110,7 +1113,6 @@ int acpi_dev_pm_attach(struct device *dev, bool power_on)
36678 acpi_device_wakeup(adev, ACPI_STATE_S0, false);
36679 }
36680
36681- dev->pm_domain->detach = acpi_dev_pm_detach;
36682 return 0;
36683 }
36684 EXPORT_SYMBOL_GPL(acpi_dev_pm_attach);
36685diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
36686index a8dd2f7..e15950e 100644
36687--- a/drivers/acpi/ec.c
36688+++ b/drivers/acpi/ec.c
36689@@ -1242,7 +1242,7 @@ static int ec_clear_on_resume(const struct dmi_system_id *id)
36690 return 0;
36691 }
36692
36693-static struct dmi_system_id ec_dmi_table[] __initdata = {
36694+static const struct dmi_system_id ec_dmi_table[] __initconst = {
36695 {
36696 ec_skip_dsdt_scan, "Compal JFL92", {
36697 DMI_MATCH(DMI_BIOS_VENDOR, "COMPAL"),
36698diff --git a/drivers/acpi/pci_slot.c b/drivers/acpi/pci_slot.c
36699index 139d9e4..9a9d799 100644
36700--- a/drivers/acpi/pci_slot.c
36701+++ b/drivers/acpi/pci_slot.c
36702@@ -195,7 +195,7 @@ static int do_sta_before_sun(const struct dmi_system_id *d)
36703 return 0;
36704 }
36705
36706-static struct dmi_system_id acpi_pci_slot_dmi_table[] __initdata = {
36707+static const struct dmi_system_id acpi_pci_slot_dmi_table[] __initconst = {
36708 /*
36709 * Fujitsu Primequest machines will return 1023 to indicate an
36710 * error if the _SUN method is evaluated on SxFy objects that
36711diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c
36712index d9f7158..168e742 100644
36713--- a/drivers/acpi/processor_driver.c
36714+++ b/drivers/acpi/processor_driver.c
36715@@ -159,7 +159,7 @@ static int acpi_cpu_soft_notify(struct notifier_block *nfb,
36716 return NOTIFY_OK;
36717 }
36718
36719-static struct notifier_block __refdata acpi_cpu_notifier = {
36720+static struct notifier_block __refconst acpi_cpu_notifier = {
36721 .notifier_call = acpi_cpu_soft_notify,
36722 };
36723
36724diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
36725index f98db0b..8309c83 100644
36726--- a/drivers/acpi/processor_idle.c
36727+++ b/drivers/acpi/processor_idle.c
36728@@ -912,7 +912,7 @@ static int acpi_processor_setup_cpuidle_states(struct acpi_processor *pr)
36729 {
36730 int i, count = CPUIDLE_DRIVER_STATE_START;
36731 struct acpi_processor_cx *cx;
36732- struct cpuidle_state *state;
36733+ cpuidle_state_no_const *state;
36734 struct cpuidle_driver *drv = &acpi_idle_driver;
36735
36736 if (!pr->flags.power_setup_done)
36737diff --git a/drivers/acpi/processor_pdc.c b/drivers/acpi/processor_pdc.c
36738index e5dd808..1eceed1 100644
36739--- a/drivers/acpi/processor_pdc.c
36740+++ b/drivers/acpi/processor_pdc.c
36741@@ -176,7 +176,7 @@ static int __init set_no_mwait(const struct dmi_system_id *id)
36742 return 0;
36743 }
36744
36745-static struct dmi_system_id processor_idle_dmi_table[] __initdata = {
36746+static const struct dmi_system_id processor_idle_dmi_table[] __initconst = {
36747 {
36748 set_no_mwait, "Extensa 5220", {
36749 DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies LTD"),
36750diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
36751index 7f251dd..47b262c 100644
36752--- a/drivers/acpi/sleep.c
36753+++ b/drivers/acpi/sleep.c
36754@@ -148,7 +148,7 @@ static int __init init_nvs_nosave(const struct dmi_system_id *d)
36755 return 0;
36756 }
36757
36758-static struct dmi_system_id acpisleep_dmi_table[] __initdata = {
36759+static const struct dmi_system_id acpisleep_dmi_table[] __initconst = {
36760 {
36761 .callback = init_old_suspend_ordering,
36762 .ident = "Abit KN9 (nForce4 variant)",
36763diff --git a/drivers/acpi/sysfs.c b/drivers/acpi/sysfs.c
36764index 13e577c..cef11ee 100644
36765--- a/drivers/acpi/sysfs.c
36766+++ b/drivers/acpi/sysfs.c
36767@@ -423,11 +423,11 @@ static u32 num_counters;
36768 static struct attribute **all_attrs;
36769 static u32 acpi_gpe_count;
36770
36771-static struct attribute_group interrupt_stats_attr_group = {
36772+static attribute_group_no_const interrupt_stats_attr_group = {
36773 .name = "interrupts",
36774 };
36775
36776-static struct kobj_attribute *counter_attrs;
36777+static kobj_attribute_no_const *counter_attrs;
36778
36779 static void delete_gpe_attr_array(void)
36780 {
36781diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
36782index d24fa19..782f1e6 100644
36783--- a/drivers/acpi/thermal.c
36784+++ b/drivers/acpi/thermal.c
36785@@ -1209,7 +1209,7 @@ static int thermal_psv(const struct dmi_system_id *d) {
36786 return 0;
36787 }
36788
36789-static struct dmi_system_id thermal_dmi_table[] __initdata = {
36790+static const struct dmi_system_id thermal_dmi_table[] __initconst = {
36791 /*
36792 * Award BIOS on this AOpen makes thermal control almost worthless.
36793 * http://bugzilla.kernel.org/show_bug.cgi?id=8842
36794diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
36795index 26eb70c..4d66ddf 100644
36796--- a/drivers/acpi/video.c
36797+++ b/drivers/acpi/video.c
36798@@ -418,7 +418,7 @@ static int __init video_disable_native_backlight(const struct dmi_system_id *d)
36799 return 0;
36800 }
36801
36802-static struct dmi_system_id video_dmi_table[] __initdata = {
36803+static const struct dmi_system_id video_dmi_table[] __initconst = {
36804 /*
36805 * Broken _BQC workaround http://bugzilla.kernel.org/show_bug.cgi?id=13121
36806 */
36807diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
36808index 287c4ba..6a600bc 100644
36809--- a/drivers/ata/libahci.c
36810+++ b/drivers/ata/libahci.c
36811@@ -1252,7 +1252,7 @@ int ahci_kick_engine(struct ata_port *ap)
36812 }
36813 EXPORT_SYMBOL_GPL(ahci_kick_engine);
36814
36815-static int ahci_exec_polled_cmd(struct ata_port *ap, int pmp,
36816+static int __intentional_overflow(-1) ahci_exec_polled_cmd(struct ata_port *ap, int pmp,
36817 struct ata_taskfile *tf, int is_cmd, u16 flags,
36818 unsigned long timeout_msec)
36819 {
36820diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
36821index 87b4b7f..d876fbd 100644
36822--- a/drivers/ata/libata-core.c
36823+++ b/drivers/ata/libata-core.c
36824@@ -99,7 +99,7 @@ static unsigned int ata_dev_set_xfermode(struct ata_device *dev);
36825 static void ata_dev_xfermask(struct ata_device *dev);
36826 static unsigned long ata_dev_blacklisted(const struct ata_device *dev);
36827
36828-atomic_t ata_print_id = ATOMIC_INIT(0);
36829+atomic_unchecked_t ata_print_id = ATOMIC_INIT(0);
36830
36831 struct ata_force_param {
36832 const char *name;
36833@@ -4780,7 +4780,7 @@ void ata_qc_free(struct ata_queued_cmd *qc)
36834 struct ata_port *ap;
36835 unsigned int tag;
36836
36837- WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36838+ BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36839 ap = qc->ap;
36840
36841 qc->flags = 0;
36842@@ -4797,7 +4797,7 @@ void __ata_qc_complete(struct ata_queued_cmd *qc)
36843 struct ata_port *ap;
36844 struct ata_link *link;
36845
36846- WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36847+ BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36848 WARN_ON_ONCE(!(qc->flags & ATA_QCFLAG_ACTIVE));
36849 ap = qc->ap;
36850 link = qc->dev->link;
36851@@ -5901,6 +5901,7 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
36852 return;
36853
36854 spin_lock(&lock);
36855+ pax_open_kernel();
36856
36857 for (cur = ops->inherits; cur; cur = cur->inherits) {
36858 void **inherit = (void **)cur;
36859@@ -5914,8 +5915,9 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
36860 if (IS_ERR(*pp))
36861 *pp = NULL;
36862
36863- ops->inherits = NULL;
36864+ *(struct ata_port_operations **)&ops->inherits = NULL;
36865
36866+ pax_close_kernel();
36867 spin_unlock(&lock);
36868 }
36869
36870@@ -6111,7 +6113,7 @@ int ata_host_register(struct ata_host *host, struct scsi_host_template *sht)
36871
36872 /* give ports names and add SCSI hosts */
36873 for (i = 0; i < host->n_ports; i++) {
36874- host->ports[i]->print_id = atomic_inc_return(&ata_print_id);
36875+ host->ports[i]->print_id = atomic_inc_return_unchecked(&ata_print_id);
36876 host->ports[i]->local_port_no = i + 1;
36877 }
36878
36879diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
36880index b061ba2..fdcd85f 100644
36881--- a/drivers/ata/libata-scsi.c
36882+++ b/drivers/ata/libata-scsi.c
36883@@ -4172,7 +4172,7 @@ int ata_sas_port_init(struct ata_port *ap)
36884
36885 if (rc)
36886 return rc;
36887- ap->print_id = atomic_inc_return(&ata_print_id);
36888+ ap->print_id = atomic_inc_return_unchecked(&ata_print_id);
36889 return 0;
36890 }
36891 EXPORT_SYMBOL_GPL(ata_sas_port_init);
36892diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h
36893index f840ca1..edd6ef3 100644
36894--- a/drivers/ata/libata.h
36895+++ b/drivers/ata/libata.h
36896@@ -53,7 +53,7 @@ enum {
36897 ATA_DNXFER_QUIET = (1 << 31),
36898 };
36899
36900-extern atomic_t ata_print_id;
36901+extern atomic_unchecked_t ata_print_id;
36902 extern int atapi_passthru16;
36903 extern int libata_fua;
36904 extern int libata_noacpi;
36905diff --git a/drivers/ata/pata_arasan_cf.c b/drivers/ata/pata_arasan_cf.c
36906index a9b0c82..207d97d 100644
36907--- a/drivers/ata/pata_arasan_cf.c
36908+++ b/drivers/ata/pata_arasan_cf.c
36909@@ -865,7 +865,9 @@ static int arasan_cf_probe(struct platform_device *pdev)
36910 /* Handle platform specific quirks */
36911 if (quirk) {
36912 if (quirk & CF_BROKEN_PIO) {
36913- ap->ops->set_piomode = NULL;
36914+ pax_open_kernel();
36915+ *(void **)&ap->ops->set_piomode = NULL;
36916+ pax_close_kernel();
36917 ap->pio_mask = 0;
36918 }
36919 if (quirk & CF_BROKEN_MWDMA)
36920diff --git a/drivers/atm/adummy.c b/drivers/atm/adummy.c
36921index f9b983a..887b9d8 100644
36922--- a/drivers/atm/adummy.c
36923+++ b/drivers/atm/adummy.c
36924@@ -114,7 +114,7 @@ adummy_send(struct atm_vcc *vcc, struct sk_buff *skb)
36925 vcc->pop(vcc, skb);
36926 else
36927 dev_kfree_skb_any(skb);
36928- atomic_inc(&vcc->stats->tx);
36929+ atomic_inc_unchecked(&vcc->stats->tx);
36930
36931 return 0;
36932 }
36933diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c
36934index f1a9198..f466a4a 100644
36935--- a/drivers/atm/ambassador.c
36936+++ b/drivers/atm/ambassador.c
36937@@ -454,7 +454,7 @@ static void tx_complete (amb_dev * dev, tx_out * tx) {
36938 PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
36939
36940 // VC layer stats
36941- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
36942+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
36943
36944 // free the descriptor
36945 kfree (tx_descr);
36946@@ -495,7 +495,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
36947 dump_skb ("<<<", vc, skb);
36948
36949 // VC layer stats
36950- atomic_inc(&atm_vcc->stats->rx);
36951+ atomic_inc_unchecked(&atm_vcc->stats->rx);
36952 __net_timestamp(skb);
36953 // end of our responsibility
36954 atm_vcc->push (atm_vcc, skb);
36955@@ -510,7 +510,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
36956 } else {
36957 PRINTK (KERN_INFO, "dropped over-size frame");
36958 // should we count this?
36959- atomic_inc(&atm_vcc->stats->rx_drop);
36960+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
36961 }
36962
36963 } else {
36964@@ -1338,7 +1338,7 @@ static int amb_send (struct atm_vcc * atm_vcc, struct sk_buff * skb) {
36965 }
36966
36967 if (check_area (skb->data, skb->len)) {
36968- atomic_inc(&atm_vcc->stats->tx_err);
36969+ atomic_inc_unchecked(&atm_vcc->stats->tx_err);
36970 return -ENOMEM; // ?
36971 }
36972
36973diff --git a/drivers/atm/atmtcp.c b/drivers/atm/atmtcp.c
36974index 480fa6f..947067c 100644
36975--- a/drivers/atm/atmtcp.c
36976+++ b/drivers/atm/atmtcp.c
36977@@ -206,7 +206,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
36978 if (vcc->pop) vcc->pop(vcc,skb);
36979 else dev_kfree_skb(skb);
36980 if (dev_data) return 0;
36981- atomic_inc(&vcc->stats->tx_err);
36982+ atomic_inc_unchecked(&vcc->stats->tx_err);
36983 return -ENOLINK;
36984 }
36985 size = skb->len+sizeof(struct atmtcp_hdr);
36986@@ -214,7 +214,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
36987 if (!new_skb) {
36988 if (vcc->pop) vcc->pop(vcc,skb);
36989 else dev_kfree_skb(skb);
36990- atomic_inc(&vcc->stats->tx_err);
36991+ atomic_inc_unchecked(&vcc->stats->tx_err);
36992 return -ENOBUFS;
36993 }
36994 hdr = (void *) skb_put(new_skb,sizeof(struct atmtcp_hdr));
36995@@ -225,8 +225,8 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
36996 if (vcc->pop) vcc->pop(vcc,skb);
36997 else dev_kfree_skb(skb);
36998 out_vcc->push(out_vcc,new_skb);
36999- atomic_inc(&vcc->stats->tx);
37000- atomic_inc(&out_vcc->stats->rx);
37001+ atomic_inc_unchecked(&vcc->stats->tx);
37002+ atomic_inc_unchecked(&out_vcc->stats->rx);
37003 return 0;
37004 }
37005
37006@@ -300,7 +300,7 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
37007 read_unlock(&vcc_sklist_lock);
37008 if (!out_vcc) {
37009 result = -EUNATCH;
37010- atomic_inc(&vcc->stats->tx_err);
37011+ atomic_inc_unchecked(&vcc->stats->tx_err);
37012 goto done;
37013 }
37014 skb_pull(skb,sizeof(struct atmtcp_hdr));
37015@@ -312,8 +312,8 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
37016 __net_timestamp(new_skb);
37017 skb_copy_from_linear_data(skb, skb_put(new_skb, skb->len), skb->len);
37018 out_vcc->push(out_vcc,new_skb);
37019- atomic_inc(&vcc->stats->tx);
37020- atomic_inc(&out_vcc->stats->rx);
37021+ atomic_inc_unchecked(&vcc->stats->tx);
37022+ atomic_inc_unchecked(&out_vcc->stats->rx);
37023 done:
37024 if (vcc->pop) vcc->pop(vcc,skb);
37025 else dev_kfree_skb(skb);
37026diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c
37027index 6339efd..2b441d5 100644
37028--- a/drivers/atm/eni.c
37029+++ b/drivers/atm/eni.c
37030@@ -525,7 +525,7 @@ static int rx_aal0(struct atm_vcc *vcc)
37031 DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n",
37032 vcc->dev->number);
37033 length = 0;
37034- atomic_inc(&vcc->stats->rx_err);
37035+ atomic_inc_unchecked(&vcc->stats->rx_err);
37036 }
37037 else {
37038 length = ATM_CELL_SIZE-1; /* no HEC */
37039@@ -580,7 +580,7 @@ static int rx_aal5(struct atm_vcc *vcc)
37040 size);
37041 }
37042 eff = length = 0;
37043- atomic_inc(&vcc->stats->rx_err);
37044+ atomic_inc_unchecked(&vcc->stats->rx_err);
37045 }
37046 else {
37047 size = (descr & MID_RED_COUNT)*(ATM_CELL_PAYLOAD >> 2);
37048@@ -597,7 +597,7 @@ static int rx_aal5(struct atm_vcc *vcc)
37049 "(VCI=%d,length=%ld,size=%ld (descr 0x%lx))\n",
37050 vcc->dev->number,vcc->vci,length,size << 2,descr);
37051 length = eff = 0;
37052- atomic_inc(&vcc->stats->rx_err);
37053+ atomic_inc_unchecked(&vcc->stats->rx_err);
37054 }
37055 }
37056 skb = eff ? atm_alloc_charge(vcc,eff << 2,GFP_ATOMIC) : NULL;
37057@@ -770,7 +770,7 @@ rx_dequeued++;
37058 vcc->push(vcc,skb);
37059 pushed++;
37060 }
37061- atomic_inc(&vcc->stats->rx);
37062+ atomic_inc_unchecked(&vcc->stats->rx);
37063 }
37064 wake_up(&eni_dev->rx_wait);
37065 }
37066@@ -1230,7 +1230,7 @@ static void dequeue_tx(struct atm_dev *dev)
37067 DMA_TO_DEVICE);
37068 if (vcc->pop) vcc->pop(vcc,skb);
37069 else dev_kfree_skb_irq(skb);
37070- atomic_inc(&vcc->stats->tx);
37071+ atomic_inc_unchecked(&vcc->stats->tx);
37072 wake_up(&eni_dev->tx_wait);
37073 dma_complete++;
37074 }
37075diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
37076index 82f2ae0..f205c02 100644
37077--- a/drivers/atm/firestream.c
37078+++ b/drivers/atm/firestream.c
37079@@ -749,7 +749,7 @@ static void process_txdone_queue (struct fs_dev *dev, struct queue *q)
37080 }
37081 }
37082
37083- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
37084+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
37085
37086 fs_dprintk (FS_DEBUG_TXMEM, "i");
37087 fs_dprintk (FS_DEBUG_ALLOC, "Free t-skb: %p\n", skb);
37088@@ -816,7 +816,7 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
37089 #endif
37090 skb_put (skb, qe->p1 & 0xffff);
37091 ATM_SKB(skb)->vcc = atm_vcc;
37092- atomic_inc(&atm_vcc->stats->rx);
37093+ atomic_inc_unchecked(&atm_vcc->stats->rx);
37094 __net_timestamp(skb);
37095 fs_dprintk (FS_DEBUG_ALLOC, "Free rec-skb: %p (pushed)\n", skb);
37096 atm_vcc->push (atm_vcc, skb);
37097@@ -837,12 +837,12 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
37098 kfree (pe);
37099 }
37100 if (atm_vcc)
37101- atomic_inc(&atm_vcc->stats->rx_drop);
37102+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
37103 break;
37104 case 0x1f: /* Reassembly abort: no buffers. */
37105 /* Silently increment error counter. */
37106 if (atm_vcc)
37107- atomic_inc(&atm_vcc->stats->rx_drop);
37108+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
37109 break;
37110 default: /* Hmm. Haven't written the code to handle the others yet... -- REW */
37111 printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n",
37112diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
37113index 75dde90..4309ead 100644
37114--- a/drivers/atm/fore200e.c
37115+++ b/drivers/atm/fore200e.c
37116@@ -932,9 +932,9 @@ fore200e_tx_irq(struct fore200e* fore200e)
37117 #endif
37118 /* check error condition */
37119 if (*entry->status & STATUS_ERROR)
37120- atomic_inc(&vcc->stats->tx_err);
37121+ atomic_inc_unchecked(&vcc->stats->tx_err);
37122 else
37123- atomic_inc(&vcc->stats->tx);
37124+ atomic_inc_unchecked(&vcc->stats->tx);
37125 }
37126 }
37127
37128@@ -1083,7 +1083,7 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
37129 if (skb == NULL) {
37130 DPRINTK(2, "unable to alloc new skb, rx PDU length = %d\n", pdu_len);
37131
37132- atomic_inc(&vcc->stats->rx_drop);
37133+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37134 return -ENOMEM;
37135 }
37136
37137@@ -1126,14 +1126,14 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
37138
37139 dev_kfree_skb_any(skb);
37140
37141- atomic_inc(&vcc->stats->rx_drop);
37142+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37143 return -ENOMEM;
37144 }
37145
37146 ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
37147
37148 vcc->push(vcc, skb);
37149- atomic_inc(&vcc->stats->rx);
37150+ atomic_inc_unchecked(&vcc->stats->rx);
37151
37152 ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
37153
37154@@ -1211,7 +1211,7 @@ fore200e_rx_irq(struct fore200e* fore200e)
37155 DPRINTK(2, "damaged PDU on %d.%d.%d\n",
37156 fore200e->atm_dev->number,
37157 entry->rpd->atm_header.vpi, entry->rpd->atm_header.vci);
37158- atomic_inc(&vcc->stats->rx_err);
37159+ atomic_inc_unchecked(&vcc->stats->rx_err);
37160 }
37161 }
37162
37163@@ -1656,7 +1656,7 @@ fore200e_send(struct atm_vcc *vcc, struct sk_buff *skb)
37164 goto retry_here;
37165 }
37166
37167- atomic_inc(&vcc->stats->tx_err);
37168+ atomic_inc_unchecked(&vcc->stats->tx_err);
37169
37170 fore200e->tx_sat++;
37171 DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n",
37172diff --git a/drivers/atm/he.c b/drivers/atm/he.c
37173index 93dca2e..c5daa69 100644
37174--- a/drivers/atm/he.c
37175+++ b/drivers/atm/he.c
37176@@ -1692,7 +1692,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
37177
37178 if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
37179 hprintk("HBUF_ERR! (cid 0x%x)\n", cid);
37180- atomic_inc(&vcc->stats->rx_drop);
37181+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37182 goto return_host_buffers;
37183 }
37184
37185@@ -1719,7 +1719,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
37186 RBRQ_LEN_ERR(he_dev->rbrq_head)
37187 ? "LEN_ERR" : "",
37188 vcc->vpi, vcc->vci);
37189- atomic_inc(&vcc->stats->rx_err);
37190+ atomic_inc_unchecked(&vcc->stats->rx_err);
37191 goto return_host_buffers;
37192 }
37193
37194@@ -1771,7 +1771,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
37195 vcc->push(vcc, skb);
37196 spin_lock(&he_dev->global_lock);
37197
37198- atomic_inc(&vcc->stats->rx);
37199+ atomic_inc_unchecked(&vcc->stats->rx);
37200
37201 return_host_buffers:
37202 ++pdus_assembled;
37203@@ -2097,7 +2097,7 @@ __enqueue_tpd(struct he_dev *he_dev, struct he_tpd *tpd, unsigned cid)
37204 tpd->vcc->pop(tpd->vcc, tpd->skb);
37205 else
37206 dev_kfree_skb_any(tpd->skb);
37207- atomic_inc(&tpd->vcc->stats->tx_err);
37208+ atomic_inc_unchecked(&tpd->vcc->stats->tx_err);
37209 }
37210 dma_pool_free(he_dev->tpd_pool, tpd, TPD_ADDR(tpd->status));
37211 return;
37212@@ -2509,7 +2509,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
37213 vcc->pop(vcc, skb);
37214 else
37215 dev_kfree_skb_any(skb);
37216- atomic_inc(&vcc->stats->tx_err);
37217+ atomic_inc_unchecked(&vcc->stats->tx_err);
37218 return -EINVAL;
37219 }
37220
37221@@ -2520,7 +2520,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
37222 vcc->pop(vcc, skb);
37223 else
37224 dev_kfree_skb_any(skb);
37225- atomic_inc(&vcc->stats->tx_err);
37226+ atomic_inc_unchecked(&vcc->stats->tx_err);
37227 return -EINVAL;
37228 }
37229 #endif
37230@@ -2532,7 +2532,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
37231 vcc->pop(vcc, skb);
37232 else
37233 dev_kfree_skb_any(skb);
37234- atomic_inc(&vcc->stats->tx_err);
37235+ atomic_inc_unchecked(&vcc->stats->tx_err);
37236 spin_unlock_irqrestore(&he_dev->global_lock, flags);
37237 return -ENOMEM;
37238 }
37239@@ -2574,7 +2574,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
37240 vcc->pop(vcc, skb);
37241 else
37242 dev_kfree_skb_any(skb);
37243- atomic_inc(&vcc->stats->tx_err);
37244+ atomic_inc_unchecked(&vcc->stats->tx_err);
37245 spin_unlock_irqrestore(&he_dev->global_lock, flags);
37246 return -ENOMEM;
37247 }
37248@@ -2605,7 +2605,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
37249 __enqueue_tpd(he_dev, tpd, cid);
37250 spin_unlock_irqrestore(&he_dev->global_lock, flags);
37251
37252- atomic_inc(&vcc->stats->tx);
37253+ atomic_inc_unchecked(&vcc->stats->tx);
37254
37255 return 0;
37256 }
37257diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c
37258index 527bbd5..96570c8 100644
37259--- a/drivers/atm/horizon.c
37260+++ b/drivers/atm/horizon.c
37261@@ -1018,7 +1018,7 @@ static void rx_schedule (hrz_dev * dev, int irq) {
37262 {
37263 struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
37264 // VC layer stats
37265- atomic_inc(&vcc->stats->rx);
37266+ atomic_inc_unchecked(&vcc->stats->rx);
37267 __net_timestamp(skb);
37268 // end of our responsibility
37269 vcc->push (vcc, skb);
37270@@ -1170,7 +1170,7 @@ static void tx_schedule (hrz_dev * const dev, int irq) {
37271 dev->tx_iovec = NULL;
37272
37273 // VC layer stats
37274- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
37275+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
37276
37277 // free the skb
37278 hrz_kfree_skb (skb);
37279diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c
37280index 074616b..d6b3d5f 100644
37281--- a/drivers/atm/idt77252.c
37282+++ b/drivers/atm/idt77252.c
37283@@ -811,7 +811,7 @@ drain_scq(struct idt77252_dev *card, struct vc_map *vc)
37284 else
37285 dev_kfree_skb(skb);
37286
37287- atomic_inc(&vcc->stats->tx);
37288+ atomic_inc_unchecked(&vcc->stats->tx);
37289 }
37290
37291 atomic_dec(&scq->used);
37292@@ -1073,13 +1073,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37293 if ((sb = dev_alloc_skb(64)) == NULL) {
37294 printk("%s: Can't allocate buffers for aal0.\n",
37295 card->name);
37296- atomic_add(i, &vcc->stats->rx_drop);
37297+ atomic_add_unchecked(i, &vcc->stats->rx_drop);
37298 break;
37299 }
37300 if (!atm_charge(vcc, sb->truesize)) {
37301 RXPRINTK("%s: atm_charge() dropped aal0 packets.\n",
37302 card->name);
37303- atomic_add(i - 1, &vcc->stats->rx_drop);
37304+ atomic_add_unchecked(i - 1, &vcc->stats->rx_drop);
37305 dev_kfree_skb(sb);
37306 break;
37307 }
37308@@ -1096,7 +1096,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37309 ATM_SKB(sb)->vcc = vcc;
37310 __net_timestamp(sb);
37311 vcc->push(vcc, sb);
37312- atomic_inc(&vcc->stats->rx);
37313+ atomic_inc_unchecked(&vcc->stats->rx);
37314
37315 cell += ATM_CELL_PAYLOAD;
37316 }
37317@@ -1133,13 +1133,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37318 "(CDC: %08x)\n",
37319 card->name, len, rpp->len, readl(SAR_REG_CDC));
37320 recycle_rx_pool_skb(card, rpp);
37321- atomic_inc(&vcc->stats->rx_err);
37322+ atomic_inc_unchecked(&vcc->stats->rx_err);
37323 return;
37324 }
37325 if (stat & SAR_RSQE_CRC) {
37326 RXPRINTK("%s: AAL5 CRC error.\n", card->name);
37327 recycle_rx_pool_skb(card, rpp);
37328- atomic_inc(&vcc->stats->rx_err);
37329+ atomic_inc_unchecked(&vcc->stats->rx_err);
37330 return;
37331 }
37332 if (skb_queue_len(&rpp->queue) > 1) {
37333@@ -1150,7 +1150,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37334 RXPRINTK("%s: Can't alloc RX skb.\n",
37335 card->name);
37336 recycle_rx_pool_skb(card, rpp);
37337- atomic_inc(&vcc->stats->rx_err);
37338+ atomic_inc_unchecked(&vcc->stats->rx_err);
37339 return;
37340 }
37341 if (!atm_charge(vcc, skb->truesize)) {
37342@@ -1169,7 +1169,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37343 __net_timestamp(skb);
37344
37345 vcc->push(vcc, skb);
37346- atomic_inc(&vcc->stats->rx);
37347+ atomic_inc_unchecked(&vcc->stats->rx);
37348
37349 return;
37350 }
37351@@ -1191,7 +1191,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37352 __net_timestamp(skb);
37353
37354 vcc->push(vcc, skb);
37355- atomic_inc(&vcc->stats->rx);
37356+ atomic_inc_unchecked(&vcc->stats->rx);
37357
37358 if (skb->truesize > SAR_FB_SIZE_3)
37359 add_rx_skb(card, 3, SAR_FB_SIZE_3, 1);
37360@@ -1302,14 +1302,14 @@ idt77252_rx_raw(struct idt77252_dev *card)
37361 if (vcc->qos.aal != ATM_AAL0) {
37362 RPRINTK("%s: raw cell for non AAL0 vc %u.%u\n",
37363 card->name, vpi, vci);
37364- atomic_inc(&vcc->stats->rx_drop);
37365+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37366 goto drop;
37367 }
37368
37369 if ((sb = dev_alloc_skb(64)) == NULL) {
37370 printk("%s: Can't allocate buffers for AAL0.\n",
37371 card->name);
37372- atomic_inc(&vcc->stats->rx_err);
37373+ atomic_inc_unchecked(&vcc->stats->rx_err);
37374 goto drop;
37375 }
37376
37377@@ -1328,7 +1328,7 @@ idt77252_rx_raw(struct idt77252_dev *card)
37378 ATM_SKB(sb)->vcc = vcc;
37379 __net_timestamp(sb);
37380 vcc->push(vcc, sb);
37381- atomic_inc(&vcc->stats->rx);
37382+ atomic_inc_unchecked(&vcc->stats->rx);
37383
37384 drop:
37385 skb_pull(queue, 64);
37386@@ -1953,13 +1953,13 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
37387
37388 if (vc == NULL) {
37389 printk("%s: NULL connection in send().\n", card->name);
37390- atomic_inc(&vcc->stats->tx_err);
37391+ atomic_inc_unchecked(&vcc->stats->tx_err);
37392 dev_kfree_skb(skb);
37393 return -EINVAL;
37394 }
37395 if (!test_bit(VCF_TX, &vc->flags)) {
37396 printk("%s: Trying to transmit on a non-tx VC.\n", card->name);
37397- atomic_inc(&vcc->stats->tx_err);
37398+ atomic_inc_unchecked(&vcc->stats->tx_err);
37399 dev_kfree_skb(skb);
37400 return -EINVAL;
37401 }
37402@@ -1971,14 +1971,14 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
37403 break;
37404 default:
37405 printk("%s: Unsupported AAL: %d\n", card->name, vcc->qos.aal);
37406- atomic_inc(&vcc->stats->tx_err);
37407+ atomic_inc_unchecked(&vcc->stats->tx_err);
37408 dev_kfree_skb(skb);
37409 return -EINVAL;
37410 }
37411
37412 if (skb_shinfo(skb)->nr_frags != 0) {
37413 printk("%s: No scatter-gather yet.\n", card->name);
37414- atomic_inc(&vcc->stats->tx_err);
37415+ atomic_inc_unchecked(&vcc->stats->tx_err);
37416 dev_kfree_skb(skb);
37417 return -EINVAL;
37418 }
37419@@ -1986,7 +1986,7 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
37420
37421 err = queue_skb(card, vc, skb, oam);
37422 if (err) {
37423- atomic_inc(&vcc->stats->tx_err);
37424+ atomic_inc_unchecked(&vcc->stats->tx_err);
37425 dev_kfree_skb(skb);
37426 return err;
37427 }
37428@@ -2009,7 +2009,7 @@ idt77252_send_oam(struct atm_vcc *vcc, void *cell, int flags)
37429 skb = dev_alloc_skb(64);
37430 if (!skb) {
37431 printk("%s: Out of memory in send_oam().\n", card->name);
37432- atomic_inc(&vcc->stats->tx_err);
37433+ atomic_inc_unchecked(&vcc->stats->tx_err);
37434 return -ENOMEM;
37435 }
37436 atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
37437diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c
37438index 924f8e2..3375a3e 100644
37439--- a/drivers/atm/iphase.c
37440+++ b/drivers/atm/iphase.c
37441@@ -1145,7 +1145,7 @@ static int rx_pkt(struct atm_dev *dev)
37442 status = (u_short) (buf_desc_ptr->desc_mode);
37443 if (status & (RX_CER | RX_PTE | RX_OFL))
37444 {
37445- atomic_inc(&vcc->stats->rx_err);
37446+ atomic_inc_unchecked(&vcc->stats->rx_err);
37447 IF_ERR(printk("IA: bad packet, dropping it");)
37448 if (status & RX_CER) {
37449 IF_ERR(printk(" cause: packet CRC error\n");)
37450@@ -1168,7 +1168,7 @@ static int rx_pkt(struct atm_dev *dev)
37451 len = dma_addr - buf_addr;
37452 if (len > iadev->rx_buf_sz) {
37453 printk("Over %d bytes sdu received, dropped!!!\n", iadev->rx_buf_sz);
37454- atomic_inc(&vcc->stats->rx_err);
37455+ atomic_inc_unchecked(&vcc->stats->rx_err);
37456 goto out_free_desc;
37457 }
37458
37459@@ -1318,7 +1318,7 @@ static void rx_dle_intr(struct atm_dev *dev)
37460 ia_vcc = INPH_IA_VCC(vcc);
37461 if (ia_vcc == NULL)
37462 {
37463- atomic_inc(&vcc->stats->rx_err);
37464+ atomic_inc_unchecked(&vcc->stats->rx_err);
37465 atm_return(vcc, skb->truesize);
37466 dev_kfree_skb_any(skb);
37467 goto INCR_DLE;
37468@@ -1330,7 +1330,7 @@ static void rx_dle_intr(struct atm_dev *dev)
37469 if ((length > iadev->rx_buf_sz) || (length >
37470 (skb->len - sizeof(struct cpcs_trailer))))
37471 {
37472- atomic_inc(&vcc->stats->rx_err);
37473+ atomic_inc_unchecked(&vcc->stats->rx_err);
37474 IF_ERR(printk("rx_dle_intr: Bad AAL5 trailer %d (skb len %d)",
37475 length, skb->len);)
37476 atm_return(vcc, skb->truesize);
37477@@ -1346,7 +1346,7 @@ static void rx_dle_intr(struct atm_dev *dev)
37478
37479 IF_RX(printk("rx_dle_intr: skb push");)
37480 vcc->push(vcc,skb);
37481- atomic_inc(&vcc->stats->rx);
37482+ atomic_inc_unchecked(&vcc->stats->rx);
37483 iadev->rx_pkt_cnt++;
37484 }
37485 INCR_DLE:
37486@@ -2828,15 +2828,15 @@ static int ia_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg)
37487 {
37488 struct k_sonet_stats *stats;
37489 stats = &PRIV(_ia_dev[board])->sonet_stats;
37490- printk("section_bip: %d\n", atomic_read(&stats->section_bip));
37491- printk("line_bip : %d\n", atomic_read(&stats->line_bip));
37492- printk("path_bip : %d\n", atomic_read(&stats->path_bip));
37493- printk("line_febe : %d\n", atomic_read(&stats->line_febe));
37494- printk("path_febe : %d\n", atomic_read(&stats->path_febe));
37495- printk("corr_hcs : %d\n", atomic_read(&stats->corr_hcs));
37496- printk("uncorr_hcs : %d\n", atomic_read(&stats->uncorr_hcs));
37497- printk("tx_cells : %d\n", atomic_read(&stats->tx_cells));
37498- printk("rx_cells : %d\n", atomic_read(&stats->rx_cells));
37499+ printk("section_bip: %d\n", atomic_read_unchecked(&stats->section_bip));
37500+ printk("line_bip : %d\n", atomic_read_unchecked(&stats->line_bip));
37501+ printk("path_bip : %d\n", atomic_read_unchecked(&stats->path_bip));
37502+ printk("line_febe : %d\n", atomic_read_unchecked(&stats->line_febe));
37503+ printk("path_febe : %d\n", atomic_read_unchecked(&stats->path_febe));
37504+ printk("corr_hcs : %d\n", atomic_read_unchecked(&stats->corr_hcs));
37505+ printk("uncorr_hcs : %d\n", atomic_read_unchecked(&stats->uncorr_hcs));
37506+ printk("tx_cells : %d\n", atomic_read_unchecked(&stats->tx_cells));
37507+ printk("rx_cells : %d\n", atomic_read_unchecked(&stats->rx_cells));
37508 }
37509 ia_cmds.status = 0;
37510 break;
37511@@ -2941,7 +2941,7 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
37512 if ((desc == 0) || (desc > iadev->num_tx_desc))
37513 {
37514 IF_ERR(printk(DEV_LABEL "invalid desc for send: %d\n", desc);)
37515- atomic_inc(&vcc->stats->tx);
37516+ atomic_inc_unchecked(&vcc->stats->tx);
37517 if (vcc->pop)
37518 vcc->pop(vcc, skb);
37519 else
37520@@ -3046,14 +3046,14 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
37521 ATM_DESC(skb) = vcc->vci;
37522 skb_queue_tail(&iadev->tx_dma_q, skb);
37523
37524- atomic_inc(&vcc->stats->tx);
37525+ atomic_inc_unchecked(&vcc->stats->tx);
37526 iadev->tx_pkt_cnt++;
37527 /* Increment transaction counter */
37528 writel(2, iadev->dma+IPHASE5575_TX_COUNTER);
37529
37530 #if 0
37531 /* add flow control logic */
37532- if (atomic_read(&vcc->stats->tx) % 20 == 0) {
37533+ if (atomic_read_unchecked(&vcc->stats->tx) % 20 == 0) {
37534 if (iavcc->vc_desc_cnt > 10) {
37535 vcc->tx_quota = vcc->tx_quota * 3 / 4;
37536 printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota );
37537diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c
37538index ce43ae3..969de38 100644
37539--- a/drivers/atm/lanai.c
37540+++ b/drivers/atm/lanai.c
37541@@ -1295,7 +1295,7 @@ static void lanai_send_one_aal5(struct lanai_dev *lanai,
37542 vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0);
37543 lanai_endtx(lanai, lvcc);
37544 lanai_free_skb(lvcc->tx.atmvcc, skb);
37545- atomic_inc(&lvcc->tx.atmvcc->stats->tx);
37546+ atomic_inc_unchecked(&lvcc->tx.atmvcc->stats->tx);
37547 }
37548
37549 /* Try to fill the buffer - don't call unless there is backlog */
37550@@ -1418,7 +1418,7 @@ static void vcc_rx_aal5(struct lanai_vcc *lvcc, int endptr)
37551 ATM_SKB(skb)->vcc = lvcc->rx.atmvcc;
37552 __net_timestamp(skb);
37553 lvcc->rx.atmvcc->push(lvcc->rx.atmvcc, skb);
37554- atomic_inc(&lvcc->rx.atmvcc->stats->rx);
37555+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx);
37556 out:
37557 lvcc->rx.buf.ptr = end;
37558 cardvcc_write(lvcc, endptr, vcc_rxreadptr);
37559@@ -1659,7 +1659,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37560 DPRINTK("(itf %d) got RX service entry 0x%X for non-AAL5 "
37561 "vcc %d\n", lanai->number, (unsigned int) s, vci);
37562 lanai->stats.service_rxnotaal5++;
37563- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37564+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37565 return 0;
37566 }
37567 if (likely(!(s & (SERVICE_TRASH | SERVICE_STREAM | SERVICE_CRCERR)))) {
37568@@ -1671,7 +1671,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37569 int bytes;
37570 read_unlock(&vcc_sklist_lock);
37571 DPRINTK("got trashed rx pdu on vci %d\n", vci);
37572- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37573+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37574 lvcc->stats.x.aal5.service_trash++;
37575 bytes = (SERVICE_GET_END(s) * 16) -
37576 (((unsigned long) lvcc->rx.buf.ptr) -
37577@@ -1683,7 +1683,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37578 }
37579 if (s & SERVICE_STREAM) {
37580 read_unlock(&vcc_sklist_lock);
37581- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37582+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37583 lvcc->stats.x.aal5.service_stream++;
37584 printk(KERN_ERR DEV_LABEL "(itf %d): Got AAL5 stream "
37585 "PDU on VCI %d!\n", lanai->number, vci);
37586@@ -1691,7 +1691,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37587 return 0;
37588 }
37589 DPRINTK("got rx crc error on vci %d\n", vci);
37590- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37591+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37592 lvcc->stats.x.aal5.service_rxcrc++;
37593 lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4];
37594 cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr);
37595diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c
37596index b7e1cc0..eb336bfe 100644
37597--- a/drivers/atm/nicstar.c
37598+++ b/drivers/atm/nicstar.c
37599@@ -1640,7 +1640,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37600 if ((vc = (vc_map *) vcc->dev_data) == NULL) {
37601 printk("nicstar%d: vcc->dev_data == NULL on ns_send().\n",
37602 card->index);
37603- atomic_inc(&vcc->stats->tx_err);
37604+ atomic_inc_unchecked(&vcc->stats->tx_err);
37605 dev_kfree_skb_any(skb);
37606 return -EINVAL;
37607 }
37608@@ -1648,7 +1648,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37609 if (!vc->tx) {
37610 printk("nicstar%d: Trying to transmit on a non-tx VC.\n",
37611 card->index);
37612- atomic_inc(&vcc->stats->tx_err);
37613+ atomic_inc_unchecked(&vcc->stats->tx_err);
37614 dev_kfree_skb_any(skb);
37615 return -EINVAL;
37616 }
37617@@ -1656,14 +1656,14 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37618 if (vcc->qos.aal != ATM_AAL5 && vcc->qos.aal != ATM_AAL0) {
37619 printk("nicstar%d: Only AAL0 and AAL5 are supported.\n",
37620 card->index);
37621- atomic_inc(&vcc->stats->tx_err);
37622+ atomic_inc_unchecked(&vcc->stats->tx_err);
37623 dev_kfree_skb_any(skb);
37624 return -EINVAL;
37625 }
37626
37627 if (skb_shinfo(skb)->nr_frags != 0) {
37628 printk("nicstar%d: No scatter-gather yet.\n", card->index);
37629- atomic_inc(&vcc->stats->tx_err);
37630+ atomic_inc_unchecked(&vcc->stats->tx_err);
37631 dev_kfree_skb_any(skb);
37632 return -EINVAL;
37633 }
37634@@ -1711,11 +1711,11 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37635 }
37636
37637 if (push_scqe(card, vc, scq, &scqe, skb) != 0) {
37638- atomic_inc(&vcc->stats->tx_err);
37639+ atomic_inc_unchecked(&vcc->stats->tx_err);
37640 dev_kfree_skb_any(skb);
37641 return -EIO;
37642 }
37643- atomic_inc(&vcc->stats->tx);
37644+ atomic_inc_unchecked(&vcc->stats->tx);
37645
37646 return 0;
37647 }
37648@@ -2032,14 +2032,14 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37649 printk
37650 ("nicstar%d: Can't allocate buffers for aal0.\n",
37651 card->index);
37652- atomic_add(i, &vcc->stats->rx_drop);
37653+ atomic_add_unchecked(i, &vcc->stats->rx_drop);
37654 break;
37655 }
37656 if (!atm_charge(vcc, sb->truesize)) {
37657 RXPRINTK
37658 ("nicstar%d: atm_charge() dropped aal0 packets.\n",
37659 card->index);
37660- atomic_add(i - 1, &vcc->stats->rx_drop); /* already increased by 1 */
37661+ atomic_add_unchecked(i - 1, &vcc->stats->rx_drop); /* already increased by 1 */
37662 dev_kfree_skb_any(sb);
37663 break;
37664 }
37665@@ -2054,7 +2054,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37666 ATM_SKB(sb)->vcc = vcc;
37667 __net_timestamp(sb);
37668 vcc->push(vcc, sb);
37669- atomic_inc(&vcc->stats->rx);
37670+ atomic_inc_unchecked(&vcc->stats->rx);
37671 cell += ATM_CELL_PAYLOAD;
37672 }
37673
37674@@ -2071,7 +2071,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37675 if (iovb == NULL) {
37676 printk("nicstar%d: Out of iovec buffers.\n",
37677 card->index);
37678- atomic_inc(&vcc->stats->rx_drop);
37679+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37680 recycle_rx_buf(card, skb);
37681 return;
37682 }
37683@@ -2095,7 +2095,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37684 small or large buffer itself. */
37685 } else if (NS_PRV_IOVCNT(iovb) >= NS_MAX_IOVECS) {
37686 printk("nicstar%d: received too big AAL5 SDU.\n", card->index);
37687- atomic_inc(&vcc->stats->rx_err);
37688+ atomic_inc_unchecked(&vcc->stats->rx_err);
37689 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
37690 NS_MAX_IOVECS);
37691 NS_PRV_IOVCNT(iovb) = 0;
37692@@ -2115,7 +2115,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37693 ("nicstar%d: Expected a small buffer, and this is not one.\n",
37694 card->index);
37695 which_list(card, skb);
37696- atomic_inc(&vcc->stats->rx_err);
37697+ atomic_inc_unchecked(&vcc->stats->rx_err);
37698 recycle_rx_buf(card, skb);
37699 vc->rx_iov = NULL;
37700 recycle_iov_buf(card, iovb);
37701@@ -2128,7 +2128,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37702 ("nicstar%d: Expected a large buffer, and this is not one.\n",
37703 card->index);
37704 which_list(card, skb);
37705- atomic_inc(&vcc->stats->rx_err);
37706+ atomic_inc_unchecked(&vcc->stats->rx_err);
37707 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
37708 NS_PRV_IOVCNT(iovb));
37709 vc->rx_iov = NULL;
37710@@ -2151,7 +2151,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37711 printk(" - PDU size mismatch.\n");
37712 else
37713 printk(".\n");
37714- atomic_inc(&vcc->stats->rx_err);
37715+ atomic_inc_unchecked(&vcc->stats->rx_err);
37716 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
37717 NS_PRV_IOVCNT(iovb));
37718 vc->rx_iov = NULL;
37719@@ -2165,7 +2165,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37720 /* skb points to a small buffer */
37721 if (!atm_charge(vcc, skb->truesize)) {
37722 push_rxbufs(card, skb);
37723- atomic_inc(&vcc->stats->rx_drop);
37724+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37725 } else {
37726 skb_put(skb, len);
37727 dequeue_sm_buf(card, skb);
37728@@ -2175,7 +2175,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37729 ATM_SKB(skb)->vcc = vcc;
37730 __net_timestamp(skb);
37731 vcc->push(vcc, skb);
37732- atomic_inc(&vcc->stats->rx);
37733+ atomic_inc_unchecked(&vcc->stats->rx);
37734 }
37735 } else if (NS_PRV_IOVCNT(iovb) == 2) { /* One small plus one large buffer */
37736 struct sk_buff *sb;
37737@@ -2186,7 +2186,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37738 if (len <= NS_SMBUFSIZE) {
37739 if (!atm_charge(vcc, sb->truesize)) {
37740 push_rxbufs(card, sb);
37741- atomic_inc(&vcc->stats->rx_drop);
37742+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37743 } else {
37744 skb_put(sb, len);
37745 dequeue_sm_buf(card, sb);
37746@@ -2196,7 +2196,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37747 ATM_SKB(sb)->vcc = vcc;
37748 __net_timestamp(sb);
37749 vcc->push(vcc, sb);
37750- atomic_inc(&vcc->stats->rx);
37751+ atomic_inc_unchecked(&vcc->stats->rx);
37752 }
37753
37754 push_rxbufs(card, skb);
37755@@ -2205,7 +2205,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37756
37757 if (!atm_charge(vcc, skb->truesize)) {
37758 push_rxbufs(card, skb);
37759- atomic_inc(&vcc->stats->rx_drop);
37760+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37761 } else {
37762 dequeue_lg_buf(card, skb);
37763 #ifdef NS_USE_DESTRUCTORS
37764@@ -2218,7 +2218,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37765 ATM_SKB(skb)->vcc = vcc;
37766 __net_timestamp(skb);
37767 vcc->push(vcc, skb);
37768- atomic_inc(&vcc->stats->rx);
37769+ atomic_inc_unchecked(&vcc->stats->rx);
37770 }
37771
37772 push_rxbufs(card, sb);
37773@@ -2239,7 +2239,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37774 printk
37775 ("nicstar%d: Out of huge buffers.\n",
37776 card->index);
37777- atomic_inc(&vcc->stats->rx_drop);
37778+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37779 recycle_iovec_rx_bufs(card,
37780 (struct iovec *)
37781 iovb->data,
37782@@ -2290,7 +2290,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37783 card->hbpool.count++;
37784 } else
37785 dev_kfree_skb_any(hb);
37786- atomic_inc(&vcc->stats->rx_drop);
37787+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37788 } else {
37789 /* Copy the small buffer to the huge buffer */
37790 sb = (struct sk_buff *)iov->iov_base;
37791@@ -2327,7 +2327,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37792 #endif /* NS_USE_DESTRUCTORS */
37793 __net_timestamp(hb);
37794 vcc->push(vcc, hb);
37795- atomic_inc(&vcc->stats->rx);
37796+ atomic_inc_unchecked(&vcc->stats->rx);
37797 }
37798 }
37799
37800diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
37801index 74e18b0..f16afa0 100644
37802--- a/drivers/atm/solos-pci.c
37803+++ b/drivers/atm/solos-pci.c
37804@@ -838,7 +838,7 @@ static void solos_bh(unsigned long card_arg)
37805 }
37806 atm_charge(vcc, skb->truesize);
37807 vcc->push(vcc, skb);
37808- atomic_inc(&vcc->stats->rx);
37809+ atomic_inc_unchecked(&vcc->stats->rx);
37810 break;
37811
37812 case PKT_STATUS:
37813@@ -1116,7 +1116,7 @@ static uint32_t fpga_tx(struct solos_card *card)
37814 vcc = SKB_CB(oldskb)->vcc;
37815
37816 if (vcc) {
37817- atomic_inc(&vcc->stats->tx);
37818+ atomic_inc_unchecked(&vcc->stats->tx);
37819 solos_pop(vcc, oldskb);
37820 } else {
37821 dev_kfree_skb_irq(oldskb);
37822diff --git a/drivers/atm/suni.c b/drivers/atm/suni.c
37823index 0215934..ce9f5b1 100644
37824--- a/drivers/atm/suni.c
37825+++ b/drivers/atm/suni.c
37826@@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock);
37827
37828
37829 #define ADD_LIMITED(s,v) \
37830- atomic_add((v),&stats->s); \
37831- if (atomic_read(&stats->s) < 0) atomic_set(&stats->s,INT_MAX);
37832+ atomic_add_unchecked((v),&stats->s); \
37833+ if (atomic_read_unchecked(&stats->s) < 0) atomic_set_unchecked(&stats->s,INT_MAX);
37834
37835
37836 static void suni_hz(unsigned long from_timer)
37837diff --git a/drivers/atm/uPD98402.c b/drivers/atm/uPD98402.c
37838index 5120a96..e2572bd 100644
37839--- a/drivers/atm/uPD98402.c
37840+++ b/drivers/atm/uPD98402.c
37841@@ -42,7 +42,7 @@ static int fetch_stats(struct atm_dev *dev,struct sonet_stats __user *arg,int ze
37842 struct sonet_stats tmp;
37843 int error = 0;
37844
37845- atomic_add(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs);
37846+ atomic_add_unchecked(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs);
37847 sonet_copy_stats(&PRIV(dev)->sonet_stats,&tmp);
37848 if (arg) error = copy_to_user(arg,&tmp,sizeof(tmp));
37849 if (zero && !error) {
37850@@ -161,9 +161,9 @@ static int uPD98402_ioctl(struct atm_dev *dev,unsigned int cmd,void __user *arg)
37851
37852
37853 #define ADD_LIMITED(s,v) \
37854- { atomic_add(GET(v),&PRIV(dev)->sonet_stats.s); \
37855- if (atomic_read(&PRIV(dev)->sonet_stats.s) < 0) \
37856- atomic_set(&PRIV(dev)->sonet_stats.s,INT_MAX); }
37857+ { atomic_add_unchecked(GET(v),&PRIV(dev)->sonet_stats.s); \
37858+ if (atomic_read_unchecked(&PRIV(dev)->sonet_stats.s) < 0) \
37859+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.s,INT_MAX); }
37860
37861
37862 static void stat_event(struct atm_dev *dev)
37863@@ -194,7 +194,7 @@ static void uPD98402_int(struct atm_dev *dev)
37864 if (reason & uPD98402_INT_PFM) stat_event(dev);
37865 if (reason & uPD98402_INT_PCO) {
37866 (void) GET(PCOCR); /* clear interrupt cause */
37867- atomic_add(GET(HECCT),
37868+ atomic_add_unchecked(GET(HECCT),
37869 &PRIV(dev)->sonet_stats.uncorr_hcs);
37870 }
37871 if ((reason & uPD98402_INT_RFO) &&
37872@@ -222,9 +222,9 @@ static int uPD98402_start(struct atm_dev *dev)
37873 PUT(~(uPD98402_INT_PFM | uPD98402_INT_ALM | uPD98402_INT_RFO |
37874 uPD98402_INT_LOS),PIMR); /* enable them */
37875 (void) fetch_stats(dev,NULL,1); /* clear kernel counters */
37876- atomic_set(&PRIV(dev)->sonet_stats.corr_hcs,-1);
37877- atomic_set(&PRIV(dev)->sonet_stats.tx_cells,-1);
37878- atomic_set(&PRIV(dev)->sonet_stats.rx_cells,-1);
37879+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.corr_hcs,-1);
37880+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.tx_cells,-1);
37881+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.rx_cells,-1);
37882 return 0;
37883 }
37884
37885diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c
37886index cecfb94..87009ec 100644
37887--- a/drivers/atm/zatm.c
37888+++ b/drivers/atm/zatm.c
37889@@ -459,7 +459,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
37890 }
37891 if (!size) {
37892 dev_kfree_skb_irq(skb);
37893- if (vcc) atomic_inc(&vcc->stats->rx_err);
37894+ if (vcc) atomic_inc_unchecked(&vcc->stats->rx_err);
37895 continue;
37896 }
37897 if (!atm_charge(vcc,skb->truesize)) {
37898@@ -469,7 +469,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
37899 skb->len = size;
37900 ATM_SKB(skb)->vcc = vcc;
37901 vcc->push(vcc,skb);
37902- atomic_inc(&vcc->stats->rx);
37903+ atomic_inc_unchecked(&vcc->stats->rx);
37904 }
37905 zout(pos & 0xffff,MTA(mbx));
37906 #if 0 /* probably a stupid idea */
37907@@ -733,7 +733,7 @@ if (*ZATM_PRV_DSC(skb) != (uPD98401_TXPD_V | uPD98401_TXPD_DP |
37908 skb_queue_head(&zatm_vcc->backlog,skb);
37909 break;
37910 }
37911- atomic_inc(&vcc->stats->tx);
37912+ atomic_inc_unchecked(&vcc->stats->tx);
37913 wake_up(&zatm_vcc->tx_wait);
37914 }
37915
37916diff --git a/drivers/base/bus.c b/drivers/base/bus.c
37917index 79bc203..fa3945b 100644
37918--- a/drivers/base/bus.c
37919+++ b/drivers/base/bus.c
37920@@ -1126,7 +1126,7 @@ int subsys_interface_register(struct subsys_interface *sif)
37921 return -EINVAL;
37922
37923 mutex_lock(&subsys->p->mutex);
37924- list_add_tail(&sif->node, &subsys->p->interfaces);
37925+ pax_list_add_tail((struct list_head *)&sif->node, &subsys->p->interfaces);
37926 if (sif->add_dev) {
37927 subsys_dev_iter_init(&iter, subsys, NULL, NULL);
37928 while ((dev = subsys_dev_iter_next(&iter)))
37929@@ -1151,7 +1151,7 @@ void subsys_interface_unregister(struct subsys_interface *sif)
37930 subsys = sif->subsys;
37931
37932 mutex_lock(&subsys->p->mutex);
37933- list_del_init(&sif->node);
37934+ pax_list_del_init((struct list_head *)&sif->node);
37935 if (sif->remove_dev) {
37936 subsys_dev_iter_init(&iter, subsys, NULL, NULL);
37937 while ((dev = subsys_dev_iter_next(&iter)))
37938diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c
37939index 25798db..15f130e 100644
37940--- a/drivers/base/devtmpfs.c
37941+++ b/drivers/base/devtmpfs.c
37942@@ -354,7 +354,7 @@ int devtmpfs_mount(const char *mntdir)
37943 if (!thread)
37944 return 0;
37945
37946- err = sys_mount("devtmpfs", (char *)mntdir, "devtmpfs", MS_SILENT, NULL);
37947+ err = sys_mount((char __force_user *)"devtmpfs", (char __force_user *)mntdir, (char __force_user *)"devtmpfs", MS_SILENT, NULL);
37948 if (err)
37949 printk(KERN_INFO "devtmpfs: error mounting %i\n", err);
37950 else
37951@@ -380,11 +380,11 @@ static int devtmpfsd(void *p)
37952 *err = sys_unshare(CLONE_NEWNS);
37953 if (*err)
37954 goto out;
37955- *err = sys_mount("devtmpfs", "/", "devtmpfs", MS_SILENT, options);
37956+ *err = sys_mount((char __force_user *)"devtmpfs", (char __force_user *)"/", (char __force_user *)"devtmpfs", MS_SILENT, (char __force_user *)options);
37957 if (*err)
37958 goto out;
37959- sys_chdir("/.."); /* will traverse into overmounted root */
37960- sys_chroot(".");
37961+ sys_chdir((char __force_user *)"/.."); /* will traverse into overmounted root */
37962+ sys_chroot((char __force_user *)".");
37963 complete(&setup_done);
37964 while (1) {
37965 spin_lock(&req_lock);
37966diff --git a/drivers/base/node.c b/drivers/base/node.c
37967index 36fabe43..8cfc112 100644
37968--- a/drivers/base/node.c
37969+++ b/drivers/base/node.c
37970@@ -615,7 +615,7 @@ static ssize_t print_nodes_state(enum node_states state, char *buf)
37971 struct node_attr {
37972 struct device_attribute attr;
37973 enum node_states state;
37974-};
37975+} __do_const;
37976
37977 static ssize_t show_node_state(struct device *dev,
37978 struct device_attribute *attr, char *buf)
37979diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
37980index 45937f8..b9a342e 100644
37981--- a/drivers/base/power/domain.c
37982+++ b/drivers/base/power/domain.c
37983@@ -1698,7 +1698,7 @@ int pm_genpd_attach_cpuidle(struct generic_pm_domain *genpd, int state)
37984 {
37985 struct cpuidle_driver *cpuidle_drv;
37986 struct gpd_cpuidle_data *cpuidle_data;
37987- struct cpuidle_state *idle_state;
37988+ cpuidle_state_no_const *idle_state;
37989 int ret = 0;
37990
37991 if (IS_ERR_OR_NULL(genpd) || state < 0)
37992@@ -1766,7 +1766,7 @@ int pm_genpd_name_attach_cpuidle(const char *name, int state)
37993 int pm_genpd_detach_cpuidle(struct generic_pm_domain *genpd)
37994 {
37995 struct gpd_cpuidle_data *cpuidle_data;
37996- struct cpuidle_state *idle_state;
37997+ cpuidle_state_no_const *idle_state;
37998 int ret = 0;
37999
38000 if (IS_ERR_OR_NULL(genpd))
38001@@ -2195,7 +2195,10 @@ int genpd_dev_pm_attach(struct device *dev)
38002 return ret;
38003 }
38004
38005- dev->pm_domain->detach = genpd_dev_pm_detach;
38006+ pax_open_kernel();
38007+ *(void **)&dev->pm_domain->detach = genpd_dev_pm_detach;
38008+ pax_close_kernel();
38009+
38010 pm_genpd_poweron(pd);
38011
38012 return 0;
38013diff --git a/drivers/base/power/sysfs.c b/drivers/base/power/sysfs.c
38014index d2be3f9..0a3167a 100644
38015--- a/drivers/base/power/sysfs.c
38016+++ b/drivers/base/power/sysfs.c
38017@@ -181,7 +181,7 @@ static ssize_t rtpm_status_show(struct device *dev,
38018 return -EIO;
38019 }
38020 }
38021- return sprintf(buf, p);
38022+ return sprintf(buf, "%s", p);
38023 }
38024
38025 static DEVICE_ATTR(runtime_status, 0444, rtpm_status_show, NULL);
38026diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c
38027index aab7158..b172db2 100644
38028--- a/drivers/base/power/wakeup.c
38029+++ b/drivers/base/power/wakeup.c
38030@@ -32,14 +32,14 @@ static bool pm_abort_suspend __read_mostly;
38031 * They need to be modified together atomically, so it's better to use one
38032 * atomic variable to hold them both.
38033 */
38034-static atomic_t combined_event_count = ATOMIC_INIT(0);
38035+static atomic_unchecked_t combined_event_count = ATOMIC_INIT(0);
38036
38037 #define IN_PROGRESS_BITS (sizeof(int) * 4)
38038 #define MAX_IN_PROGRESS ((1 << IN_PROGRESS_BITS) - 1)
38039
38040 static void split_counters(unsigned int *cnt, unsigned int *inpr)
38041 {
38042- unsigned int comb = atomic_read(&combined_event_count);
38043+ unsigned int comb = atomic_read_unchecked(&combined_event_count);
38044
38045 *cnt = (comb >> IN_PROGRESS_BITS);
38046 *inpr = comb & MAX_IN_PROGRESS;
38047@@ -404,7 +404,7 @@ static void wakeup_source_activate(struct wakeup_source *ws)
38048 ws->start_prevent_time = ws->last_time;
38049
38050 /* Increment the counter of events in progress. */
38051- cec = atomic_inc_return(&combined_event_count);
38052+ cec = atomic_inc_return_unchecked(&combined_event_count);
38053
38054 trace_wakeup_source_activate(ws->name, cec);
38055 }
38056@@ -530,7 +530,7 @@ static void wakeup_source_deactivate(struct wakeup_source *ws)
38057 * Increment the counter of registered wakeup events and decrement the
38058 * couter of wakeup events in progress simultaneously.
38059 */
38060- cec = atomic_add_return(MAX_IN_PROGRESS, &combined_event_count);
38061+ cec = atomic_add_return_unchecked(MAX_IN_PROGRESS, &combined_event_count);
38062 trace_wakeup_source_deactivate(ws->name, cec);
38063
38064 split_counters(&cnt, &inpr);
38065diff --git a/drivers/base/syscore.c b/drivers/base/syscore.c
38066index 8d98a32..61d3165 100644
38067--- a/drivers/base/syscore.c
38068+++ b/drivers/base/syscore.c
38069@@ -22,7 +22,7 @@ static DEFINE_MUTEX(syscore_ops_lock);
38070 void register_syscore_ops(struct syscore_ops *ops)
38071 {
38072 mutex_lock(&syscore_ops_lock);
38073- list_add_tail(&ops->node, &syscore_ops_list);
38074+ pax_list_add_tail((struct list_head *)&ops->node, &syscore_ops_list);
38075 mutex_unlock(&syscore_ops_lock);
38076 }
38077 EXPORT_SYMBOL_GPL(register_syscore_ops);
38078@@ -34,7 +34,7 @@ EXPORT_SYMBOL_GPL(register_syscore_ops);
38079 void unregister_syscore_ops(struct syscore_ops *ops)
38080 {
38081 mutex_lock(&syscore_ops_lock);
38082- list_del(&ops->node);
38083+ pax_list_del((struct list_head *)&ops->node);
38084 mutex_unlock(&syscore_ops_lock);
38085 }
38086 EXPORT_SYMBOL_GPL(unregister_syscore_ops);
38087diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
38088index ff20f19..018f1da 100644
38089--- a/drivers/block/cciss.c
38090+++ b/drivers/block/cciss.c
38091@@ -3008,7 +3008,7 @@ static void start_io(ctlr_info_t *h)
38092 while (!list_empty(&h->reqQ)) {
38093 c = list_entry(h->reqQ.next, CommandList_struct, list);
38094 /* can't do anything if fifo is full */
38095- if ((h->access.fifo_full(h))) {
38096+ if ((h->access->fifo_full(h))) {
38097 dev_warn(&h->pdev->dev, "fifo full\n");
38098 break;
38099 }
38100@@ -3018,7 +3018,7 @@ static void start_io(ctlr_info_t *h)
38101 h->Qdepth--;
38102
38103 /* Tell the controller execute command */
38104- h->access.submit_command(h, c);
38105+ h->access->submit_command(h, c);
38106
38107 /* Put job onto the completed Q */
38108 addQ(&h->cmpQ, c);
38109@@ -3444,17 +3444,17 @@ startio:
38110
38111 static inline unsigned long get_next_completion(ctlr_info_t *h)
38112 {
38113- return h->access.command_completed(h);
38114+ return h->access->command_completed(h);
38115 }
38116
38117 static inline int interrupt_pending(ctlr_info_t *h)
38118 {
38119- return h->access.intr_pending(h);
38120+ return h->access->intr_pending(h);
38121 }
38122
38123 static inline long interrupt_not_for_us(ctlr_info_t *h)
38124 {
38125- return ((h->access.intr_pending(h) == 0) ||
38126+ return ((h->access->intr_pending(h) == 0) ||
38127 (h->interrupts_enabled == 0));
38128 }
38129
38130@@ -3487,7 +3487,7 @@ static inline u32 next_command(ctlr_info_t *h)
38131 u32 a;
38132
38133 if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
38134- return h->access.command_completed(h);
38135+ return h->access->command_completed(h);
38136
38137 if ((*(h->reply_pool_head) & 1) == (h->reply_pool_wraparound)) {
38138 a = *(h->reply_pool_head); /* Next cmd in ring buffer */
38139@@ -4044,7 +4044,7 @@ static void cciss_put_controller_into_performant_mode(ctlr_info_t *h)
38140 trans_support & CFGTBL_Trans_use_short_tags);
38141
38142 /* Change the access methods to the performant access methods */
38143- h->access = SA5_performant_access;
38144+ h->access = &SA5_performant_access;
38145 h->transMethod = CFGTBL_Trans_Performant;
38146
38147 return;
38148@@ -4318,7 +4318,7 @@ static int cciss_pci_init(ctlr_info_t *h)
38149 if (prod_index < 0)
38150 return -ENODEV;
38151 h->product_name = products[prod_index].product_name;
38152- h->access = *(products[prod_index].access);
38153+ h->access = products[prod_index].access;
38154
38155 if (cciss_board_disabled(h)) {
38156 dev_warn(&h->pdev->dev, "controller appears to be disabled\n");
38157@@ -5050,7 +5050,7 @@ reinit_after_soft_reset:
38158 }
38159
38160 /* make sure the board interrupts are off */
38161- h->access.set_intr_mask(h, CCISS_INTR_OFF);
38162+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
38163 rc = cciss_request_irq(h, do_cciss_msix_intr, do_cciss_intx);
38164 if (rc)
38165 goto clean2;
38166@@ -5100,7 +5100,7 @@ reinit_after_soft_reset:
38167 * fake ones to scoop up any residual completions.
38168 */
38169 spin_lock_irqsave(&h->lock, flags);
38170- h->access.set_intr_mask(h, CCISS_INTR_OFF);
38171+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
38172 spin_unlock_irqrestore(&h->lock, flags);
38173 free_irq(h->intr[h->intr_mode], h);
38174 rc = cciss_request_irq(h, cciss_msix_discard_completions,
38175@@ -5120,9 +5120,9 @@ reinit_after_soft_reset:
38176 dev_info(&h->pdev->dev, "Board READY.\n");
38177 dev_info(&h->pdev->dev,
38178 "Waiting for stale completions to drain.\n");
38179- h->access.set_intr_mask(h, CCISS_INTR_ON);
38180+ h->access->set_intr_mask(h, CCISS_INTR_ON);
38181 msleep(10000);
38182- h->access.set_intr_mask(h, CCISS_INTR_OFF);
38183+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
38184
38185 rc = controller_reset_failed(h->cfgtable);
38186 if (rc)
38187@@ -5145,7 +5145,7 @@ reinit_after_soft_reset:
38188 cciss_scsi_setup(h);
38189
38190 /* Turn the interrupts on so we can service requests */
38191- h->access.set_intr_mask(h, CCISS_INTR_ON);
38192+ h->access->set_intr_mask(h, CCISS_INTR_ON);
38193
38194 /* Get the firmware version */
38195 inq_buff = kzalloc(sizeof(InquiryData_struct), GFP_KERNEL);
38196@@ -5217,7 +5217,7 @@ static void cciss_shutdown(struct pci_dev *pdev)
38197 kfree(flush_buf);
38198 if (return_code != IO_OK)
38199 dev_warn(&h->pdev->dev, "Error flushing cache\n");
38200- h->access.set_intr_mask(h, CCISS_INTR_OFF);
38201+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
38202 free_irq(h->intr[h->intr_mode], h);
38203 }
38204
38205diff --git a/drivers/block/cciss.h b/drivers/block/cciss.h
38206index 7fda30e..2f27946 100644
38207--- a/drivers/block/cciss.h
38208+++ b/drivers/block/cciss.h
38209@@ -101,7 +101,7 @@ struct ctlr_info
38210 /* information about each logical volume */
38211 drive_info_struct *drv[CISS_MAX_LUN];
38212
38213- struct access_method access;
38214+ struct access_method *access;
38215
38216 /* queue and queue Info */
38217 struct list_head reqQ;
38218@@ -402,27 +402,27 @@ static bool SA5_performant_intr_pending(ctlr_info_t *h)
38219 }
38220
38221 static struct access_method SA5_access = {
38222- SA5_submit_command,
38223- SA5_intr_mask,
38224- SA5_fifo_full,
38225- SA5_intr_pending,
38226- SA5_completed,
38227+ .submit_command = SA5_submit_command,
38228+ .set_intr_mask = SA5_intr_mask,
38229+ .fifo_full = SA5_fifo_full,
38230+ .intr_pending = SA5_intr_pending,
38231+ .command_completed = SA5_completed,
38232 };
38233
38234 static struct access_method SA5B_access = {
38235- SA5_submit_command,
38236- SA5B_intr_mask,
38237- SA5_fifo_full,
38238- SA5B_intr_pending,
38239- SA5_completed,
38240+ .submit_command = SA5_submit_command,
38241+ .set_intr_mask = SA5B_intr_mask,
38242+ .fifo_full = SA5_fifo_full,
38243+ .intr_pending = SA5B_intr_pending,
38244+ .command_completed = SA5_completed,
38245 };
38246
38247 static struct access_method SA5_performant_access = {
38248- SA5_submit_command,
38249- SA5_performant_intr_mask,
38250- SA5_fifo_full,
38251- SA5_performant_intr_pending,
38252- SA5_performant_completed,
38253+ .submit_command = SA5_submit_command,
38254+ .set_intr_mask = SA5_performant_intr_mask,
38255+ .fifo_full = SA5_fifo_full,
38256+ .intr_pending = SA5_performant_intr_pending,
38257+ .command_completed = SA5_performant_completed,
38258 };
38259
38260 struct board_type {
38261diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
38262index 2b94403..fd6ad1f 100644
38263--- a/drivers/block/cpqarray.c
38264+++ b/drivers/block/cpqarray.c
38265@@ -404,7 +404,7 @@ static int cpqarray_register_ctlr(int i, struct pci_dev *pdev)
38266 if (register_blkdev(COMPAQ_SMART2_MAJOR+i, hba[i]->devname)) {
38267 goto Enomem4;
38268 }
38269- hba[i]->access.set_intr_mask(hba[i], 0);
38270+ hba[i]->access->set_intr_mask(hba[i], 0);
38271 if (request_irq(hba[i]->intr, do_ida_intr,
38272 IRQF_DISABLED|IRQF_SHARED, hba[i]->devname, hba[i]))
38273 {
38274@@ -459,7 +459,7 @@ static int cpqarray_register_ctlr(int i, struct pci_dev *pdev)
38275 add_timer(&hba[i]->timer);
38276
38277 /* Enable IRQ now that spinlock and rate limit timer are set up */
38278- hba[i]->access.set_intr_mask(hba[i], FIFO_NOT_EMPTY);
38279+ hba[i]->access->set_intr_mask(hba[i], FIFO_NOT_EMPTY);
38280
38281 for(j=0; j<NWD; j++) {
38282 struct gendisk *disk = ida_gendisk[i][j];
38283@@ -694,7 +694,7 @@ DBGINFO(
38284 for(i=0; i<NR_PRODUCTS; i++) {
38285 if (board_id == products[i].board_id) {
38286 c->product_name = products[i].product_name;
38287- c->access = *(products[i].access);
38288+ c->access = products[i].access;
38289 break;
38290 }
38291 }
38292@@ -792,7 +792,7 @@ static int cpqarray_eisa_detect(void)
38293 hba[ctlr]->intr = intr;
38294 sprintf(hba[ctlr]->devname, "ida%d", nr_ctlr);
38295 hba[ctlr]->product_name = products[j].product_name;
38296- hba[ctlr]->access = *(products[j].access);
38297+ hba[ctlr]->access = products[j].access;
38298 hba[ctlr]->ctlr = ctlr;
38299 hba[ctlr]->board_id = board_id;
38300 hba[ctlr]->pci_dev = NULL; /* not PCI */
38301@@ -978,7 +978,7 @@ static void start_io(ctlr_info_t *h)
38302
38303 while((c = h->reqQ) != NULL) {
38304 /* Can't do anything if we're busy */
38305- if (h->access.fifo_full(h) == 0)
38306+ if (h->access->fifo_full(h) == 0)
38307 return;
38308
38309 /* Get the first entry from the request Q */
38310@@ -986,7 +986,7 @@ static void start_io(ctlr_info_t *h)
38311 h->Qdepth--;
38312
38313 /* Tell the controller to do our bidding */
38314- h->access.submit_command(h, c);
38315+ h->access->submit_command(h, c);
38316
38317 /* Get onto the completion Q */
38318 addQ(&h->cmpQ, c);
38319@@ -1048,7 +1048,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
38320 unsigned long flags;
38321 __u32 a,a1;
38322
38323- istat = h->access.intr_pending(h);
38324+ istat = h->access->intr_pending(h);
38325 /* Is this interrupt for us? */
38326 if (istat == 0)
38327 return IRQ_NONE;
38328@@ -1059,7 +1059,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
38329 */
38330 spin_lock_irqsave(IDA_LOCK(h->ctlr), flags);
38331 if (istat & FIFO_NOT_EMPTY) {
38332- while((a = h->access.command_completed(h))) {
38333+ while((a = h->access->command_completed(h))) {
38334 a1 = a; a &= ~3;
38335 if ((c = h->cmpQ) == NULL)
38336 {
38337@@ -1448,11 +1448,11 @@ static int sendcmd(
38338 /*
38339 * Disable interrupt
38340 */
38341- info_p->access.set_intr_mask(info_p, 0);
38342+ info_p->access->set_intr_mask(info_p, 0);
38343 /* Make sure there is room in the command FIFO */
38344 /* Actually it should be completely empty at this time. */
38345 for (i = 200000; i > 0; i--) {
38346- temp = info_p->access.fifo_full(info_p);
38347+ temp = info_p->access->fifo_full(info_p);
38348 if (temp != 0) {
38349 break;
38350 }
38351@@ -1465,7 +1465,7 @@ DBG(
38352 /*
38353 * Send the cmd
38354 */
38355- info_p->access.submit_command(info_p, c);
38356+ info_p->access->submit_command(info_p, c);
38357 complete = pollcomplete(ctlr);
38358
38359 pci_unmap_single(info_p->pci_dev, (dma_addr_t) c->req.sg[0].addr,
38360@@ -1548,9 +1548,9 @@ static int revalidate_allvol(ctlr_info_t *host)
38361 * we check the new geometry. Then turn interrupts back on when
38362 * we're done.
38363 */
38364- host->access.set_intr_mask(host, 0);
38365+ host->access->set_intr_mask(host, 0);
38366 getgeometry(ctlr);
38367- host->access.set_intr_mask(host, FIFO_NOT_EMPTY);
38368+ host->access->set_intr_mask(host, FIFO_NOT_EMPTY);
38369
38370 for(i=0; i<NWD; i++) {
38371 struct gendisk *disk = ida_gendisk[ctlr][i];
38372@@ -1590,7 +1590,7 @@ static int pollcomplete(int ctlr)
38373 /* Wait (up to 2 seconds) for a command to complete */
38374
38375 for (i = 200000; i > 0; i--) {
38376- done = hba[ctlr]->access.command_completed(hba[ctlr]);
38377+ done = hba[ctlr]->access->command_completed(hba[ctlr]);
38378 if (done == 0) {
38379 udelay(10); /* a short fixed delay */
38380 } else
38381diff --git a/drivers/block/cpqarray.h b/drivers/block/cpqarray.h
38382index be73e9d..7fbf140 100644
38383--- a/drivers/block/cpqarray.h
38384+++ b/drivers/block/cpqarray.h
38385@@ -99,7 +99,7 @@ struct ctlr_info {
38386 drv_info_t drv[NWD];
38387 struct proc_dir_entry *proc;
38388
38389- struct access_method access;
38390+ struct access_method *access;
38391
38392 cmdlist_t *reqQ;
38393 cmdlist_t *cmpQ;
38394diff --git a/drivers/block/drbd/drbd_bitmap.c b/drivers/block/drbd/drbd_bitmap.c
38395index 434c77d..6d3219a 100644
38396--- a/drivers/block/drbd/drbd_bitmap.c
38397+++ b/drivers/block/drbd/drbd_bitmap.c
38398@@ -1036,7 +1036,7 @@ static void bm_page_io_async(struct drbd_bm_aio_ctx *ctx, int page_nr) __must_ho
38399 submit_bio(rw, bio);
38400 /* this should not count as user activity and cause the
38401 * resync to throttle -- see drbd_rs_should_slow_down(). */
38402- atomic_add(len >> 9, &device->rs_sect_ev);
38403+ atomic_add_unchecked(len >> 9, &device->rs_sect_ev);
38404 }
38405 }
38406
38407diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
38408index b905e98..0812ed8 100644
38409--- a/drivers/block/drbd/drbd_int.h
38410+++ b/drivers/block/drbd/drbd_int.h
38411@@ -385,7 +385,7 @@ struct drbd_epoch {
38412 struct drbd_connection *connection;
38413 struct list_head list;
38414 unsigned int barrier_nr;
38415- atomic_t epoch_size; /* increased on every request added. */
38416+ atomic_unchecked_t epoch_size; /* increased on every request added. */
38417 atomic_t active; /* increased on every req. added, and dec on every finished. */
38418 unsigned long flags;
38419 };
38420@@ -946,7 +946,7 @@ struct drbd_device {
38421 unsigned int al_tr_number;
38422 int al_tr_cycle;
38423 wait_queue_head_t seq_wait;
38424- atomic_t packet_seq;
38425+ atomic_unchecked_t packet_seq;
38426 unsigned int peer_seq;
38427 spinlock_t peer_seq_lock;
38428 unsigned long comm_bm_set; /* communicated number of set bits. */
38429@@ -955,8 +955,8 @@ struct drbd_device {
38430 struct mutex own_state_mutex;
38431 struct mutex *state_mutex; /* either own_state_mutex or first_peer_device(device)->connection->cstate_mutex */
38432 char congestion_reason; /* Why we where congested... */
38433- atomic_t rs_sect_in; /* for incoming resync data rate, SyncTarget */
38434- atomic_t rs_sect_ev; /* for submitted resync data rate, both */
38435+ atomic_unchecked_t rs_sect_in; /* for incoming resync data rate, SyncTarget */
38436+ atomic_unchecked_t rs_sect_ev; /* for submitted resync data rate, both */
38437 int rs_last_sect_ev; /* counter to compare with */
38438 int rs_last_events; /* counter of read or write "events" (unit sectors)
38439 * on the lower level device when we last looked. */
38440diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
38441index 1fc8342..7e7742b 100644
38442--- a/drivers/block/drbd/drbd_main.c
38443+++ b/drivers/block/drbd/drbd_main.c
38444@@ -1328,7 +1328,7 @@ static int _drbd_send_ack(struct drbd_peer_device *peer_device, enum drbd_packet
38445 p->sector = sector;
38446 p->block_id = block_id;
38447 p->blksize = blksize;
38448- p->seq_num = cpu_to_be32(atomic_inc_return(&peer_device->device->packet_seq));
38449+ p->seq_num = cpu_to_be32(atomic_inc_return_unchecked(&peer_device->device->packet_seq));
38450 return drbd_send_command(peer_device, sock, cmd, sizeof(*p), NULL, 0);
38451 }
38452
38453@@ -1634,7 +1634,7 @@ int drbd_send_dblock(struct drbd_peer_device *peer_device, struct drbd_request *
38454 return -EIO;
38455 p->sector = cpu_to_be64(req->i.sector);
38456 p->block_id = (unsigned long)req;
38457- p->seq_num = cpu_to_be32(atomic_inc_return(&device->packet_seq));
38458+ p->seq_num = cpu_to_be32(atomic_inc_return_unchecked(&device->packet_seq));
38459 dp_flags = bio_flags_to_wire(peer_device->connection, req->master_bio->bi_rw);
38460 if (device->state.conn >= C_SYNC_SOURCE &&
38461 device->state.conn <= C_PAUSED_SYNC_T)
38462@@ -1915,8 +1915,8 @@ void drbd_init_set_defaults(struct drbd_device *device)
38463 atomic_set(&device->unacked_cnt, 0);
38464 atomic_set(&device->local_cnt, 0);
38465 atomic_set(&device->pp_in_use_by_net, 0);
38466- atomic_set(&device->rs_sect_in, 0);
38467- atomic_set(&device->rs_sect_ev, 0);
38468+ atomic_set_unchecked(&device->rs_sect_in, 0);
38469+ atomic_set_unchecked(&device->rs_sect_ev, 0);
38470 atomic_set(&device->ap_in_flight, 0);
38471 atomic_set(&device->md_io.in_use, 0);
38472
38473@@ -2684,8 +2684,8 @@ void drbd_destroy_connection(struct kref *kref)
38474 struct drbd_connection *connection = container_of(kref, struct drbd_connection, kref);
38475 struct drbd_resource *resource = connection->resource;
38476
38477- if (atomic_read(&connection->current_epoch->epoch_size) != 0)
38478- drbd_err(connection, "epoch_size:%d\n", atomic_read(&connection->current_epoch->epoch_size));
38479+ if (atomic_read_unchecked(&connection->current_epoch->epoch_size) != 0)
38480+ drbd_err(connection, "epoch_size:%d\n", atomic_read_unchecked(&connection->current_epoch->epoch_size));
38481 kfree(connection->current_epoch);
38482
38483 idr_destroy(&connection->peer_devices);
38484diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
38485index 74df8cf..e41fc24 100644
38486--- a/drivers/block/drbd/drbd_nl.c
38487+++ b/drivers/block/drbd/drbd_nl.c
38488@@ -3637,13 +3637,13 @@ finish:
38489
38490 void drbd_bcast_event(struct drbd_device *device, const struct sib_info *sib)
38491 {
38492- static atomic_t drbd_genl_seq = ATOMIC_INIT(2); /* two. */
38493+ static atomic_unchecked_t drbd_genl_seq = ATOMIC_INIT(2); /* two. */
38494 struct sk_buff *msg;
38495 struct drbd_genlmsghdr *d_out;
38496 unsigned seq;
38497 int err = -ENOMEM;
38498
38499- seq = atomic_inc_return(&drbd_genl_seq);
38500+ seq = atomic_inc_return_unchecked(&drbd_genl_seq);
38501 msg = genlmsg_new(NLMSG_GOODSIZE, GFP_NOIO);
38502 if (!msg)
38503 goto failed;
38504diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
38505index cee2035..22f66bd 100644
38506--- a/drivers/block/drbd/drbd_receiver.c
38507+++ b/drivers/block/drbd/drbd_receiver.c
38508@@ -870,7 +870,7 @@ int drbd_connected(struct drbd_peer_device *peer_device)
38509 struct drbd_device *device = peer_device->device;
38510 int err;
38511
38512- atomic_set(&device->packet_seq, 0);
38513+ atomic_set_unchecked(&device->packet_seq, 0);
38514 device->peer_seq = 0;
38515
38516 device->state_mutex = peer_device->connection->agreed_pro_version < 100 ?
38517@@ -1233,7 +1233,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_connection *connectio
38518 do {
38519 next_epoch = NULL;
38520
38521- epoch_size = atomic_read(&epoch->epoch_size);
38522+ epoch_size = atomic_read_unchecked(&epoch->epoch_size);
38523
38524 switch (ev & ~EV_CLEANUP) {
38525 case EV_PUT:
38526@@ -1273,7 +1273,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_connection *connectio
38527 rv = FE_DESTROYED;
38528 } else {
38529 epoch->flags = 0;
38530- atomic_set(&epoch->epoch_size, 0);
38531+ atomic_set_unchecked(&epoch->epoch_size, 0);
38532 /* atomic_set(&epoch->active, 0); is already zero */
38533 if (rv == FE_STILL_LIVE)
38534 rv = FE_RECYCLED;
38535@@ -1550,7 +1550,7 @@ static int receive_Barrier(struct drbd_connection *connection, struct packet_inf
38536 conn_wait_active_ee_empty(connection);
38537 drbd_flush(connection);
38538
38539- if (atomic_read(&connection->current_epoch->epoch_size)) {
38540+ if (atomic_read_unchecked(&connection->current_epoch->epoch_size)) {
38541 epoch = kmalloc(sizeof(struct drbd_epoch), GFP_NOIO);
38542 if (epoch)
38543 break;
38544@@ -1564,11 +1564,11 @@ static int receive_Barrier(struct drbd_connection *connection, struct packet_inf
38545 }
38546
38547 epoch->flags = 0;
38548- atomic_set(&epoch->epoch_size, 0);
38549+ atomic_set_unchecked(&epoch->epoch_size, 0);
38550 atomic_set(&epoch->active, 0);
38551
38552 spin_lock(&connection->epoch_lock);
38553- if (atomic_read(&connection->current_epoch->epoch_size)) {
38554+ if (atomic_read_unchecked(&connection->current_epoch->epoch_size)) {
38555 list_add(&epoch->list, &connection->current_epoch->list);
38556 connection->current_epoch = epoch;
38557 connection->epochs++;
38558@@ -1802,7 +1802,7 @@ static int recv_resync_read(struct drbd_peer_device *peer_device, sector_t secto
38559 list_add_tail(&peer_req->w.list, &device->sync_ee);
38560 spin_unlock_irq(&device->resource->req_lock);
38561
38562- atomic_add(pi->size >> 9, &device->rs_sect_ev);
38563+ atomic_add_unchecked(pi->size >> 9, &device->rs_sect_ev);
38564 if (drbd_submit_peer_request(device, peer_req, WRITE, DRBD_FAULT_RS_WR) == 0)
38565 return 0;
38566
38567@@ -1900,7 +1900,7 @@ static int receive_RSDataReply(struct drbd_connection *connection, struct packet
38568 drbd_send_ack_dp(peer_device, P_NEG_ACK, p, pi->size);
38569 }
38570
38571- atomic_add(pi->size >> 9, &device->rs_sect_in);
38572+ atomic_add_unchecked(pi->size >> 9, &device->rs_sect_in);
38573
38574 return err;
38575 }
38576@@ -2290,7 +2290,7 @@ static int receive_Data(struct drbd_connection *connection, struct packet_info *
38577
38578 err = wait_for_and_update_peer_seq(peer_device, peer_seq);
38579 drbd_send_ack_dp(peer_device, P_NEG_ACK, p, pi->size);
38580- atomic_inc(&connection->current_epoch->epoch_size);
38581+ atomic_inc_unchecked(&connection->current_epoch->epoch_size);
38582 err2 = drbd_drain_block(peer_device, pi->size);
38583 if (!err)
38584 err = err2;
38585@@ -2334,7 +2334,7 @@ static int receive_Data(struct drbd_connection *connection, struct packet_info *
38586
38587 spin_lock(&connection->epoch_lock);
38588 peer_req->epoch = connection->current_epoch;
38589- atomic_inc(&peer_req->epoch->epoch_size);
38590+ atomic_inc_unchecked(&peer_req->epoch->epoch_size);
38591 atomic_inc(&peer_req->epoch->active);
38592 spin_unlock(&connection->epoch_lock);
38593
38594@@ -2479,7 +2479,7 @@ bool drbd_rs_c_min_rate_throttle(struct drbd_device *device)
38595
38596 curr_events = (int)part_stat_read(&disk->part0, sectors[0]) +
38597 (int)part_stat_read(&disk->part0, sectors[1]) -
38598- atomic_read(&device->rs_sect_ev);
38599+ atomic_read_unchecked(&device->rs_sect_ev);
38600
38601 if (atomic_read(&device->ap_actlog_cnt)
38602 || curr_events - device->rs_last_events > 64) {
38603@@ -2618,7 +2618,7 @@ static int receive_DataRequest(struct drbd_connection *connection, struct packet
38604 device->use_csums = true;
38605 } else if (pi->cmd == P_OV_REPLY) {
38606 /* track progress, we may need to throttle */
38607- atomic_add(size >> 9, &device->rs_sect_in);
38608+ atomic_add_unchecked(size >> 9, &device->rs_sect_in);
38609 peer_req->w.cb = w_e_end_ov_reply;
38610 dec_rs_pending(device);
38611 /* drbd_rs_begin_io done when we sent this request,
38612@@ -2691,7 +2691,7 @@ static int receive_DataRequest(struct drbd_connection *connection, struct packet
38613 goto out_free_e;
38614
38615 submit_for_resync:
38616- atomic_add(size >> 9, &device->rs_sect_ev);
38617+ atomic_add_unchecked(size >> 9, &device->rs_sect_ev);
38618
38619 submit:
38620 update_receiver_timing_details(connection, drbd_submit_peer_request);
38621@@ -4564,7 +4564,7 @@ struct data_cmd {
38622 int expect_payload;
38623 size_t pkt_size;
38624 int (*fn)(struct drbd_connection *, struct packet_info *);
38625-};
38626+} __do_const;
38627
38628 static struct data_cmd drbd_cmd_handler[] = {
38629 [P_DATA] = { 1, sizeof(struct p_data), receive_Data },
38630@@ -4678,7 +4678,7 @@ static void conn_disconnect(struct drbd_connection *connection)
38631 if (!list_empty(&connection->current_epoch->list))
38632 drbd_err(connection, "ASSERTION FAILED: connection->current_epoch->list not empty\n");
38633 /* ok, no more ee's on the fly, it is safe to reset the epoch_size */
38634- atomic_set(&connection->current_epoch->epoch_size, 0);
38635+ atomic_set_unchecked(&connection->current_epoch->epoch_size, 0);
38636 connection->send.seen_any_write_yet = false;
38637
38638 drbd_info(connection, "Connection closed\n");
38639@@ -5182,7 +5182,7 @@ static int got_IsInSync(struct drbd_connection *connection, struct packet_info *
38640 put_ldev(device);
38641 }
38642 dec_rs_pending(device);
38643- atomic_add(blksize >> 9, &device->rs_sect_in);
38644+ atomic_add_unchecked(blksize >> 9, &device->rs_sect_in);
38645
38646 return 0;
38647 }
38648@@ -5470,7 +5470,7 @@ static int connection_finish_peer_reqs(struct drbd_connection *connection)
38649 struct asender_cmd {
38650 size_t pkt_size;
38651 int (*fn)(struct drbd_connection *connection, struct packet_info *);
38652-};
38653+} __do_const;
38654
38655 static struct asender_cmd asender_tbl[] = {
38656 [P_PING] = { 0, got_Ping },
38657diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c
38658index d0fae55..4469096 100644
38659--- a/drivers/block/drbd/drbd_worker.c
38660+++ b/drivers/block/drbd/drbd_worker.c
38661@@ -408,7 +408,7 @@ static int read_for_csum(struct drbd_peer_device *peer_device, sector_t sector,
38662 list_add_tail(&peer_req->w.list, &device->read_ee);
38663 spin_unlock_irq(&device->resource->req_lock);
38664
38665- atomic_add(size >> 9, &device->rs_sect_ev);
38666+ atomic_add_unchecked(size >> 9, &device->rs_sect_ev);
38667 if (drbd_submit_peer_request(device, peer_req, READ, DRBD_FAULT_RS_RD) == 0)
38668 return 0;
38669
38670@@ -553,7 +553,7 @@ static int drbd_rs_number_requests(struct drbd_device *device)
38671 unsigned int sect_in; /* Number of sectors that came in since the last turn */
38672 int number, mxb;
38673
38674- sect_in = atomic_xchg(&device->rs_sect_in, 0);
38675+ sect_in = atomic_xchg_unchecked(&device->rs_sect_in, 0);
38676 device->rs_in_flight -= sect_in;
38677
38678 rcu_read_lock();
38679@@ -1595,8 +1595,8 @@ void drbd_rs_controller_reset(struct drbd_device *device)
38680 struct gendisk *disk = device->ldev->backing_bdev->bd_contains->bd_disk;
38681 struct fifo_buffer *plan;
38682
38683- atomic_set(&device->rs_sect_in, 0);
38684- atomic_set(&device->rs_sect_ev, 0);
38685+ atomic_set_unchecked(&device->rs_sect_in, 0);
38686+ atomic_set_unchecked(&device->rs_sect_ev, 0);
38687 device->rs_in_flight = 0;
38688 device->rs_last_events =
38689 (int)part_stat_read(&disk->part0, sectors[0]) +
38690diff --git a/drivers/block/loop.c b/drivers/block/loop.c
38691index 773e964..e85af00 100644
38692--- a/drivers/block/loop.c
38693+++ b/drivers/block/loop.c
38694@@ -234,7 +234,7 @@ static int __do_lo_send_write(struct file *file,
38695
38696 file_start_write(file);
38697 set_fs(get_ds());
38698- bw = file->f_op->write(file, buf, len, &pos);
38699+ bw = file->f_op->write(file, (const char __force_user *)buf, len, &pos);
38700 set_fs(old_fs);
38701 file_end_write(file);
38702 if (likely(bw == len))
38703diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
38704index 09e628da..7607aaa 100644
38705--- a/drivers/block/pktcdvd.c
38706+++ b/drivers/block/pktcdvd.c
38707@@ -108,7 +108,7 @@ static int pkt_seq_show(struct seq_file *m, void *p);
38708
38709 static sector_t get_zone(sector_t sector, struct pktcdvd_device *pd)
38710 {
38711- return (sector + pd->offset) & ~(sector_t)(pd->settings.size - 1);
38712+ return (sector + pd->offset) & ~(sector_t)(pd->settings.size - 1UL);
38713 }
38714
38715 /*
38716@@ -1890,7 +1890,7 @@ static noinline_for_stack int pkt_probe_settings(struct pktcdvd_device *pd)
38717 return -EROFS;
38718 }
38719 pd->settings.fp = ti.fp;
38720- pd->offset = (be32_to_cpu(ti.track_start) << 2) & (pd->settings.size - 1);
38721+ pd->offset = (be32_to_cpu(ti.track_start) << 2) & (pd->settings.size - 1UL);
38722
38723 if (ti.nwa_v) {
38724 pd->nwa = be32_to_cpu(ti.next_writable);
38725diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
38726index b67066d..515b7f4 100644
38727--- a/drivers/block/rbd.c
38728+++ b/drivers/block/rbd.c
38729@@ -64,7 +64,7 @@
38730 * If the counter is already at its maximum value returns
38731 * -EINVAL without updating it.
38732 */
38733-static int atomic_inc_return_safe(atomic_t *v)
38734+static int __intentional_overflow(-1) atomic_inc_return_safe(atomic_t *v)
38735 {
38736 unsigned int counter;
38737
38738diff --git a/drivers/block/smart1,2.h b/drivers/block/smart1,2.h
38739index e5565fb..71be10b4 100644
38740--- a/drivers/block/smart1,2.h
38741+++ b/drivers/block/smart1,2.h
38742@@ -108,11 +108,11 @@ static unsigned long smart4_intr_pending(ctlr_info_t *h)
38743 }
38744
38745 static struct access_method smart4_access = {
38746- smart4_submit_command,
38747- smart4_intr_mask,
38748- smart4_fifo_full,
38749- smart4_intr_pending,
38750- smart4_completed,
38751+ .submit_command = smart4_submit_command,
38752+ .set_intr_mask = smart4_intr_mask,
38753+ .fifo_full = smart4_fifo_full,
38754+ .intr_pending = smart4_intr_pending,
38755+ .command_completed = smart4_completed,
38756 };
38757
38758 /*
38759@@ -144,11 +144,11 @@ static unsigned long smart2_intr_pending(ctlr_info_t *h)
38760 }
38761
38762 static struct access_method smart2_access = {
38763- smart2_submit_command,
38764- smart2_intr_mask,
38765- smart2_fifo_full,
38766- smart2_intr_pending,
38767- smart2_completed,
38768+ .submit_command = smart2_submit_command,
38769+ .set_intr_mask = smart2_intr_mask,
38770+ .fifo_full = smart2_fifo_full,
38771+ .intr_pending = smart2_intr_pending,
38772+ .command_completed = smart2_completed,
38773 };
38774
38775 /*
38776@@ -180,11 +180,11 @@ static unsigned long smart2e_intr_pending(ctlr_info_t *h)
38777 }
38778
38779 static struct access_method smart2e_access = {
38780- smart2e_submit_command,
38781- smart2e_intr_mask,
38782- smart2e_fifo_full,
38783- smart2e_intr_pending,
38784- smart2e_completed,
38785+ .submit_command = smart2e_submit_command,
38786+ .set_intr_mask = smart2e_intr_mask,
38787+ .fifo_full = smart2e_fifo_full,
38788+ .intr_pending = smart2e_intr_pending,
38789+ .command_completed = smart2e_completed,
38790 };
38791
38792 /*
38793@@ -270,9 +270,9 @@ static unsigned long smart1_intr_pending(ctlr_info_t *h)
38794 }
38795
38796 static struct access_method smart1_access = {
38797- smart1_submit_command,
38798- smart1_intr_mask,
38799- smart1_fifo_full,
38800- smart1_intr_pending,
38801- smart1_completed,
38802+ .submit_command = smart1_submit_command,
38803+ .set_intr_mask = smart1_intr_mask,
38804+ .fifo_full = smart1_fifo_full,
38805+ .intr_pending = smart1_intr_pending,
38806+ .command_completed = smart1_completed,
38807 };
38808diff --git a/drivers/bluetooth/btwilink.c b/drivers/bluetooth/btwilink.c
38809index 55c135b..9f8d60c 100644
38810--- a/drivers/bluetooth/btwilink.c
38811+++ b/drivers/bluetooth/btwilink.c
38812@@ -288,7 +288,7 @@ static int ti_st_send_frame(struct hci_dev *hdev, struct sk_buff *skb)
38813
38814 static int bt_ti_probe(struct platform_device *pdev)
38815 {
38816- static struct ti_st *hst;
38817+ struct ti_st *hst;
38818 struct hci_dev *hdev;
38819 int err;
38820
38821diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
38822index 5d28a45..a538f90 100644
38823--- a/drivers/cdrom/cdrom.c
38824+++ b/drivers/cdrom/cdrom.c
38825@@ -610,7 +610,6 @@ int register_cdrom(struct cdrom_device_info *cdi)
38826 ENSURE(reset, CDC_RESET);
38827 ENSURE(generic_packet, CDC_GENERIC_PACKET);
38828 cdi->mc_flags = 0;
38829- cdo->n_minors = 0;
38830 cdi->options = CDO_USE_FFLAGS;
38831
38832 if (autoclose == 1 && CDROM_CAN(CDC_CLOSE_TRAY))
38833@@ -630,8 +629,11 @@ int register_cdrom(struct cdrom_device_info *cdi)
38834 else
38835 cdi->cdda_method = CDDA_OLD;
38836
38837- if (!cdo->generic_packet)
38838- cdo->generic_packet = cdrom_dummy_generic_packet;
38839+ if (!cdo->generic_packet) {
38840+ pax_open_kernel();
38841+ *(void **)&cdo->generic_packet = cdrom_dummy_generic_packet;
38842+ pax_close_kernel();
38843+ }
38844
38845 cd_dbg(CD_REG_UNREG, "drive \"/dev/%s\" registered\n", cdi->name);
38846 mutex_lock(&cdrom_mutex);
38847@@ -652,7 +654,6 @@ void unregister_cdrom(struct cdrom_device_info *cdi)
38848 if (cdi->exit)
38849 cdi->exit(cdi);
38850
38851- cdi->ops->n_minors--;
38852 cd_dbg(CD_REG_UNREG, "drive \"/dev/%s\" unregistered\n", cdi->name);
38853 }
38854
38855@@ -2126,7 +2127,7 @@ static int cdrom_read_cdda_old(struct cdrom_device_info *cdi, __u8 __user *ubuf,
38856 */
38857 nr = nframes;
38858 do {
38859- cgc.buffer = kmalloc(CD_FRAMESIZE_RAW * nr, GFP_KERNEL);
38860+ cgc.buffer = kzalloc(CD_FRAMESIZE_RAW * nr, GFP_KERNEL);
38861 if (cgc.buffer)
38862 break;
38863
38864@@ -3434,7 +3435,7 @@ static int cdrom_print_info(const char *header, int val, char *info,
38865 struct cdrom_device_info *cdi;
38866 int ret;
38867
38868- ret = scnprintf(info + *pos, max_size - *pos, header);
38869+ ret = scnprintf(info + *pos, max_size - *pos, "%s", header);
38870 if (!ret)
38871 return 1;
38872
38873diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c
38874index 584bc31..e64a12c 100644
38875--- a/drivers/cdrom/gdrom.c
38876+++ b/drivers/cdrom/gdrom.c
38877@@ -491,7 +491,6 @@ static struct cdrom_device_ops gdrom_ops = {
38878 .audio_ioctl = gdrom_audio_ioctl,
38879 .capability = CDC_MULTI_SESSION | CDC_MEDIA_CHANGED |
38880 CDC_RESET | CDC_DRIVE_STATUS | CDC_CD_R,
38881- .n_minors = 1,
38882 };
38883
38884 static int gdrom_bdops_open(struct block_device *bdev, fmode_t mode)
38885diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
38886index a4af822..ed58cd1 100644
38887--- a/drivers/char/Kconfig
38888+++ b/drivers/char/Kconfig
38889@@ -17,7 +17,8 @@ config DEVMEM
38890
38891 config DEVKMEM
38892 bool "/dev/kmem virtual device support"
38893- default y
38894+ default n
38895+ depends on !GRKERNSEC_KMEM
38896 help
38897 Say Y here if you want to support the /dev/kmem device. The
38898 /dev/kmem device is rarely used, but can be used for certain
38899@@ -586,6 +587,7 @@ config DEVPORT
38900 bool
38901 depends on !M68K
38902 depends on ISA || PCI
38903+ depends on !GRKERNSEC_KMEM
38904 default y
38905
38906 source "drivers/s390/char/Kconfig"
38907diff --git a/drivers/char/agp/compat_ioctl.c b/drivers/char/agp/compat_ioctl.c
38908index a48e05b..6bac831 100644
38909--- a/drivers/char/agp/compat_ioctl.c
38910+++ b/drivers/char/agp/compat_ioctl.c
38911@@ -108,7 +108,7 @@ static int compat_agpioc_reserve_wrap(struct agp_file_private *priv, void __user
38912 return -ENOMEM;
38913 }
38914
38915- if (copy_from_user(usegment, (void __user *) ureserve.seg_list,
38916+ if (copy_from_user(usegment, (void __force_user *) ureserve.seg_list,
38917 sizeof(*usegment) * ureserve.seg_count)) {
38918 kfree(usegment);
38919 kfree(ksegment);
38920diff --git a/drivers/char/agp/frontend.c b/drivers/char/agp/frontend.c
38921index 09f17eb..8531d2f 100644
38922--- a/drivers/char/agp/frontend.c
38923+++ b/drivers/char/agp/frontend.c
38924@@ -806,7 +806,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
38925 if (copy_from_user(&reserve, arg, sizeof(struct agp_region)))
38926 return -EFAULT;
38927
38928- if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment))
38929+ if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment_priv))
38930 return -EFAULT;
38931
38932 client = agp_find_client_by_pid(reserve.pid);
38933@@ -836,7 +836,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
38934 if (segment == NULL)
38935 return -ENOMEM;
38936
38937- if (copy_from_user(segment, (void __user *) reserve.seg_list,
38938+ if (copy_from_user(segment, (void __force_user *) reserve.seg_list,
38939 sizeof(struct agp_segment) * reserve.seg_count)) {
38940 kfree(segment);
38941 return -EFAULT;
38942diff --git a/drivers/char/genrtc.c b/drivers/char/genrtc.c
38943index 4f94375..413694e 100644
38944--- a/drivers/char/genrtc.c
38945+++ b/drivers/char/genrtc.c
38946@@ -273,6 +273,7 @@ static int gen_rtc_ioctl(struct file *file,
38947 switch (cmd) {
38948
38949 case RTC_PLL_GET:
38950+ memset(&pll, 0, sizeof(pll));
38951 if (get_rtc_pll(&pll))
38952 return -EINVAL;
38953 else
38954diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
38955index 5c0baa9..44011b1 100644
38956--- a/drivers/char/hpet.c
38957+++ b/drivers/char/hpet.c
38958@@ -575,7 +575,7 @@ static inline unsigned long hpet_time_div(struct hpets *hpets,
38959 }
38960
38961 static int
38962-hpet_ioctl_common(struct hpet_dev *devp, int cmd, unsigned long arg,
38963+hpet_ioctl_common(struct hpet_dev *devp, unsigned int cmd, unsigned long arg,
38964 struct hpet_info *info)
38965 {
38966 struct hpet_timer __iomem *timer;
38967diff --git a/drivers/char/i8k.c b/drivers/char/i8k.c
38968index 24cc4ed..f9807cf 100644
38969--- a/drivers/char/i8k.c
38970+++ b/drivers/char/i8k.c
38971@@ -788,7 +788,7 @@ static const struct i8k_config_data i8k_config_data[] = {
38972 },
38973 };
38974
38975-static struct dmi_system_id i8k_dmi_table[] __initdata = {
38976+static const struct dmi_system_id i8k_dmi_table[] __initconst = {
38977 {
38978 .ident = "Dell Inspiron",
38979 .matches = {
38980diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
38981index 9bb5928..57a7801 100644
38982--- a/drivers/char/ipmi/ipmi_msghandler.c
38983+++ b/drivers/char/ipmi/ipmi_msghandler.c
38984@@ -436,7 +436,7 @@ struct ipmi_smi {
38985 struct proc_dir_entry *proc_dir;
38986 char proc_dir_name[10];
38987
38988- atomic_t stats[IPMI_NUM_STATS];
38989+ atomic_unchecked_t stats[IPMI_NUM_STATS];
38990
38991 /*
38992 * run_to_completion duplicate of smb_info, smi_info
38993@@ -468,9 +468,9 @@ static LIST_HEAD(smi_watchers);
38994 static DEFINE_MUTEX(smi_watchers_mutex);
38995
38996 #define ipmi_inc_stat(intf, stat) \
38997- atomic_inc(&(intf)->stats[IPMI_STAT_ ## stat])
38998+ atomic_inc_unchecked(&(intf)->stats[IPMI_STAT_ ## stat])
38999 #define ipmi_get_stat(intf, stat) \
39000- ((unsigned int) atomic_read(&(intf)->stats[IPMI_STAT_ ## stat]))
39001+ ((unsigned int) atomic_read_unchecked(&(intf)->stats[IPMI_STAT_ ## stat]))
39002
39003 static char *addr_src_to_str[] = { "invalid", "hotmod", "hardcoded", "SPMI",
39004 "ACPI", "SMBIOS", "PCI",
39005@@ -2828,7 +2828,7 @@ int ipmi_register_smi(struct ipmi_smi_handlers *handlers,
39006 INIT_LIST_HEAD(&intf->cmd_rcvrs);
39007 init_waitqueue_head(&intf->waitq);
39008 for (i = 0; i < IPMI_NUM_STATS; i++)
39009- atomic_set(&intf->stats[i], 0);
39010+ atomic_set_unchecked(&intf->stats[i], 0);
39011
39012 intf->proc_dir = NULL;
39013
39014diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
39015index 518585c..6c985cef 100644
39016--- a/drivers/char/ipmi/ipmi_si_intf.c
39017+++ b/drivers/char/ipmi/ipmi_si_intf.c
39018@@ -289,7 +289,7 @@ struct smi_info {
39019 unsigned char slave_addr;
39020
39021 /* Counters and things for the proc filesystem. */
39022- atomic_t stats[SI_NUM_STATS];
39023+ atomic_unchecked_t stats[SI_NUM_STATS];
39024
39025 struct task_struct *thread;
39026
39027@@ -298,9 +298,9 @@ struct smi_info {
39028 };
39029
39030 #define smi_inc_stat(smi, stat) \
39031- atomic_inc(&(smi)->stats[SI_STAT_ ## stat])
39032+ atomic_inc_unchecked(&(smi)->stats[SI_STAT_ ## stat])
39033 #define smi_get_stat(smi, stat) \
39034- ((unsigned int) atomic_read(&(smi)->stats[SI_STAT_ ## stat]))
39035+ ((unsigned int) atomic_read_unchecked(&(smi)->stats[SI_STAT_ ## stat]))
39036
39037 #define SI_MAX_PARMS 4
39038
39039@@ -3498,7 +3498,7 @@ static int try_smi_init(struct smi_info *new_smi)
39040 atomic_set(&new_smi->req_events, 0);
39041 new_smi->run_to_completion = false;
39042 for (i = 0; i < SI_NUM_STATS; i++)
39043- atomic_set(&new_smi->stats[i], 0);
39044+ atomic_set_unchecked(&new_smi->stats[i], 0);
39045
39046 new_smi->interrupt_disabled = true;
39047 atomic_set(&new_smi->need_watch, 0);
39048diff --git a/drivers/char/mem.c b/drivers/char/mem.c
39049index 297110c..3f69b43 100644
39050--- a/drivers/char/mem.c
39051+++ b/drivers/char/mem.c
39052@@ -18,6 +18,7 @@
39053 #include <linux/raw.h>
39054 #include <linux/tty.h>
39055 #include <linux/capability.h>
39056+#include <linux/security.h>
39057 #include <linux/ptrace.h>
39058 #include <linux/device.h>
39059 #include <linux/highmem.h>
39060@@ -36,6 +37,10 @@
39061
39062 #define DEVPORT_MINOR 4
39063
39064+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
39065+extern const struct file_operations grsec_fops;
39066+#endif
39067+
39068 static inline unsigned long size_inside_page(unsigned long start,
39069 unsigned long size)
39070 {
39071@@ -67,9 +72,13 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
39072
39073 while (cursor < to) {
39074 if (!devmem_is_allowed(pfn)) {
39075+#ifdef CONFIG_GRKERNSEC_KMEM
39076+ gr_handle_mem_readwrite(from, to);
39077+#else
39078 printk(KERN_INFO
39079 "Program %s tried to access /dev/mem between %Lx->%Lx.\n",
39080 current->comm, from, to);
39081+#endif
39082 return 0;
39083 }
39084 cursor += PAGE_SIZE;
39085@@ -77,6 +86,11 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
39086 }
39087 return 1;
39088 }
39089+#elif defined(CONFIG_GRKERNSEC_KMEM)
39090+static inline int range_is_allowed(unsigned long pfn, unsigned long size)
39091+{
39092+ return 0;
39093+}
39094 #else
39095 static inline int range_is_allowed(unsigned long pfn, unsigned long size)
39096 {
39097@@ -124,7 +138,8 @@ static ssize_t read_mem(struct file *file, char __user *buf,
39098 #endif
39099
39100 while (count > 0) {
39101- unsigned long remaining;
39102+ unsigned long remaining = 0;
39103+ char *temp;
39104
39105 sz = size_inside_page(p, count);
39106
39107@@ -140,7 +155,24 @@ static ssize_t read_mem(struct file *file, char __user *buf,
39108 if (!ptr)
39109 return -EFAULT;
39110
39111- remaining = copy_to_user(buf, ptr, sz);
39112+#ifdef CONFIG_PAX_USERCOPY
39113+ temp = kmalloc(sz, GFP_KERNEL|GFP_USERCOPY);
39114+ if (!temp) {
39115+ unxlate_dev_mem_ptr(p, ptr);
39116+ return -ENOMEM;
39117+ }
39118+ remaining = probe_kernel_read(temp, ptr, sz);
39119+#else
39120+ temp = ptr;
39121+#endif
39122+
39123+ if (!remaining)
39124+ remaining = copy_to_user(buf, temp, sz);
39125+
39126+#ifdef CONFIG_PAX_USERCOPY
39127+ kfree(temp);
39128+#endif
39129+
39130 unxlate_dev_mem_ptr(p, ptr);
39131 if (remaining)
39132 return -EFAULT;
39133@@ -380,9 +412,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
39134 size_t count, loff_t *ppos)
39135 {
39136 unsigned long p = *ppos;
39137- ssize_t low_count, read, sz;
39138+ ssize_t low_count, read, sz, err = 0;
39139 char *kbuf; /* k-addr because vread() takes vmlist_lock rwlock */
39140- int err = 0;
39141
39142 read = 0;
39143 if (p < (unsigned long) high_memory) {
39144@@ -404,6 +435,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
39145 }
39146 #endif
39147 while (low_count > 0) {
39148+ char *temp;
39149+
39150 sz = size_inside_page(p, low_count);
39151
39152 /*
39153@@ -413,7 +446,23 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
39154 */
39155 kbuf = xlate_dev_kmem_ptr((void *)p);
39156
39157- if (copy_to_user(buf, kbuf, sz))
39158+#ifdef CONFIG_PAX_USERCOPY
39159+ temp = kmalloc(sz, GFP_KERNEL|GFP_USERCOPY);
39160+ if (!temp)
39161+ return -ENOMEM;
39162+ err = probe_kernel_read(temp, kbuf, sz);
39163+#else
39164+ temp = kbuf;
39165+#endif
39166+
39167+ if (!err)
39168+ err = copy_to_user(buf, temp, sz);
39169+
39170+#ifdef CONFIG_PAX_USERCOPY
39171+ kfree(temp);
39172+#endif
39173+
39174+ if (err)
39175 return -EFAULT;
39176 buf += sz;
39177 p += sz;
39178@@ -804,6 +853,9 @@ static const struct memdev {
39179 #ifdef CONFIG_PRINTK
39180 [11] = { "kmsg", 0644, &kmsg_fops, 0 },
39181 #endif
39182+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
39183+ [13] = { "grsec",S_IRUSR | S_IWUGO, &grsec_fops, 0 },
39184+#endif
39185 };
39186
39187 static int memory_open(struct inode *inode, struct file *filp)
39188@@ -865,7 +917,7 @@ static int __init chr_dev_init(void)
39189 continue;
39190
39191 device_create(mem_class, NULL, MKDEV(MEM_MAJOR, minor),
39192- NULL, devlist[minor].name);
39193+ NULL, "%s", devlist[minor].name);
39194 }
39195
39196 return tty_init();
39197diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c
39198index 9df78e2..01ba9ae 100644
39199--- a/drivers/char/nvram.c
39200+++ b/drivers/char/nvram.c
39201@@ -247,7 +247,7 @@ static ssize_t nvram_read(struct file *file, char __user *buf,
39202
39203 spin_unlock_irq(&rtc_lock);
39204
39205- if (copy_to_user(buf, contents, tmp - contents))
39206+ if (tmp - contents > sizeof(contents) || copy_to_user(buf, contents, tmp - contents))
39207 return -EFAULT;
39208
39209 *ppos = i;
39210diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
39211index 0ea9986..e7b07e4 100644
39212--- a/drivers/char/pcmcia/synclink_cs.c
39213+++ b/drivers/char/pcmcia/synclink_cs.c
39214@@ -2345,7 +2345,7 @@ static void mgslpc_close(struct tty_struct *tty, struct file * filp)
39215
39216 if (debug_level >= DEBUG_LEVEL_INFO)
39217 printk("%s(%d):mgslpc_close(%s) entry, count=%d\n",
39218- __FILE__, __LINE__, info->device_name, port->count);
39219+ __FILE__, __LINE__, info->device_name, atomic_read(&port->count));
39220
39221 if (tty_port_close_start(port, tty, filp) == 0)
39222 goto cleanup;
39223@@ -2363,7 +2363,7 @@ static void mgslpc_close(struct tty_struct *tty, struct file * filp)
39224 cleanup:
39225 if (debug_level >= DEBUG_LEVEL_INFO)
39226 printk("%s(%d):mgslpc_close(%s) exit, count=%d\n", __FILE__, __LINE__,
39227- tty->driver->name, port->count);
39228+ tty->driver->name, atomic_read(&port->count));
39229 }
39230
39231 /* Wait until the transmitter is empty.
39232@@ -2505,7 +2505,7 @@ static int mgslpc_open(struct tty_struct *tty, struct file * filp)
39233
39234 if (debug_level >= DEBUG_LEVEL_INFO)
39235 printk("%s(%d):mgslpc_open(%s), old ref count = %d\n",
39236- __FILE__, __LINE__, tty->driver->name, port->count);
39237+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
39238
39239 /* If port is closing, signal caller to try again */
39240 if (port->flags & ASYNC_CLOSING){
39241@@ -2525,11 +2525,11 @@ static int mgslpc_open(struct tty_struct *tty, struct file * filp)
39242 goto cleanup;
39243 }
39244 spin_lock(&port->lock);
39245- port->count++;
39246+ atomic_inc(&port->count);
39247 spin_unlock(&port->lock);
39248 spin_unlock_irqrestore(&info->netlock, flags);
39249
39250- if (port->count == 1) {
39251+ if (atomic_read(&port->count) == 1) {
39252 /* 1st open on this device, init hardware */
39253 retval = startup(info, tty);
39254 if (retval < 0)
39255@@ -3918,7 +3918,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
39256 unsigned short new_crctype;
39257
39258 /* return error if TTY interface open */
39259- if (info->port.count)
39260+ if (atomic_read(&info->port.count))
39261 return -EBUSY;
39262
39263 switch (encoding)
39264@@ -4022,7 +4022,7 @@ static int hdlcdev_open(struct net_device *dev)
39265
39266 /* arbitrate between network and tty opens */
39267 spin_lock_irqsave(&info->netlock, flags);
39268- if (info->port.count != 0 || info->netcount != 0) {
39269+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
39270 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
39271 spin_unlock_irqrestore(&info->netlock, flags);
39272 return -EBUSY;
39273@@ -4112,7 +4112,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
39274 printk("%s:hdlcdev_ioctl(%s)\n", __FILE__, dev->name);
39275
39276 /* return error if TTY interface open */
39277- if (info->port.count)
39278+ if (atomic_read(&info->port.count))
39279 return -EBUSY;
39280
39281 if (cmd != SIOCWANDEV)
39282diff --git a/drivers/char/random.c b/drivers/char/random.c
39283index 9cd6968..6416f00 100644
39284--- a/drivers/char/random.c
39285+++ b/drivers/char/random.c
39286@@ -289,9 +289,6 @@
39287 /*
39288 * To allow fractional bits to be tracked, the entropy_count field is
39289 * denominated in units of 1/8th bits.
39290- *
39291- * 2*(ENTROPY_SHIFT + log2(poolbits)) must <= 31, or the multiply in
39292- * credit_entropy_bits() needs to be 64 bits wide.
39293 */
39294 #define ENTROPY_SHIFT 3
39295 #define ENTROPY_BITS(r) ((r)->entropy_count >> ENTROPY_SHIFT)
39296@@ -439,9 +436,9 @@ struct entropy_store {
39297 };
39298
39299 static void push_to_pool(struct work_struct *work);
39300-static __u32 input_pool_data[INPUT_POOL_WORDS];
39301-static __u32 blocking_pool_data[OUTPUT_POOL_WORDS];
39302-static __u32 nonblocking_pool_data[OUTPUT_POOL_WORDS];
39303+static __u32 input_pool_data[INPUT_POOL_WORDS] __latent_entropy;
39304+static __u32 blocking_pool_data[OUTPUT_POOL_WORDS] __latent_entropy;
39305+static __u32 nonblocking_pool_data[OUTPUT_POOL_WORDS] __latent_entropy;
39306
39307 static struct entropy_store input_pool = {
39308 .poolinfo = &poolinfo_table[0],
39309@@ -635,7 +632,7 @@ retry:
39310 /* The +2 corresponds to the /4 in the denominator */
39311
39312 do {
39313- unsigned int anfrac = min(pnfrac, pool_size/2);
39314+ u64 anfrac = min(pnfrac, pool_size/2);
39315 unsigned int add =
39316 ((pool_size - entropy_count)*anfrac*3) >> s;
39317
39318@@ -1207,7 +1204,7 @@ static ssize_t extract_entropy_user(struct entropy_store *r, void __user *buf,
39319
39320 extract_buf(r, tmp);
39321 i = min_t(int, nbytes, EXTRACT_SIZE);
39322- if (copy_to_user(buf, tmp, i)) {
39323+ if (i > sizeof(tmp) || copy_to_user(buf, tmp, i)) {
39324 ret = -EFAULT;
39325 break;
39326 }
39327@@ -1590,7 +1587,7 @@ static char sysctl_bootid[16];
39328 static int proc_do_uuid(struct ctl_table *table, int write,
39329 void __user *buffer, size_t *lenp, loff_t *ppos)
39330 {
39331- struct ctl_table fake_table;
39332+ ctl_table_no_const fake_table;
39333 unsigned char buf[64], tmp_uuid[16], *uuid;
39334
39335 uuid = table->data;
39336@@ -1620,7 +1617,7 @@ static int proc_do_uuid(struct ctl_table *table, int write,
39337 static int proc_do_entropy(struct ctl_table *table, int write,
39338 void __user *buffer, size_t *lenp, loff_t *ppos)
39339 {
39340- struct ctl_table fake_table;
39341+ ctl_table_no_const fake_table;
39342 int entropy_count;
39343
39344 entropy_count = *(int *)table->data >> ENTROPY_SHIFT;
39345diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
39346index e496dae..3db53b6 100644
39347--- a/drivers/char/sonypi.c
39348+++ b/drivers/char/sonypi.c
39349@@ -54,6 +54,7 @@
39350
39351 #include <asm/uaccess.h>
39352 #include <asm/io.h>
39353+#include <asm/local.h>
39354
39355 #include <linux/sonypi.h>
39356
39357@@ -490,7 +491,7 @@ static struct sonypi_device {
39358 spinlock_t fifo_lock;
39359 wait_queue_head_t fifo_proc_list;
39360 struct fasync_struct *fifo_async;
39361- int open_count;
39362+ local_t open_count;
39363 int model;
39364 struct input_dev *input_jog_dev;
39365 struct input_dev *input_key_dev;
39366@@ -892,7 +893,7 @@ static int sonypi_misc_fasync(int fd, struct file *filp, int on)
39367 static int sonypi_misc_release(struct inode *inode, struct file *file)
39368 {
39369 mutex_lock(&sonypi_device.lock);
39370- sonypi_device.open_count--;
39371+ local_dec(&sonypi_device.open_count);
39372 mutex_unlock(&sonypi_device.lock);
39373 return 0;
39374 }
39375@@ -901,9 +902,9 @@ static int sonypi_misc_open(struct inode *inode, struct file *file)
39376 {
39377 mutex_lock(&sonypi_device.lock);
39378 /* Flush input queue on first open */
39379- if (!sonypi_device.open_count)
39380+ if (!local_read(&sonypi_device.open_count))
39381 kfifo_reset(&sonypi_device.fifo);
39382- sonypi_device.open_count++;
39383+ local_inc(&sonypi_device.open_count);
39384 mutex_unlock(&sonypi_device.lock);
39385
39386 return 0;
39387@@ -1491,7 +1492,7 @@ static struct platform_driver sonypi_driver = {
39388
39389 static struct platform_device *sonypi_platform_device;
39390
39391-static struct dmi_system_id __initdata sonypi_dmi_table[] = {
39392+static const struct dmi_system_id __initconst sonypi_dmi_table[] = {
39393 {
39394 .ident = "Sony Vaio",
39395 .matches = {
39396diff --git a/drivers/char/tpm/tpm_acpi.c b/drivers/char/tpm/tpm_acpi.c
39397index 565a947..dcdc06e 100644
39398--- a/drivers/char/tpm/tpm_acpi.c
39399+++ b/drivers/char/tpm/tpm_acpi.c
39400@@ -98,11 +98,12 @@ int read_log(struct tpm_bios_log *log)
39401 virt = acpi_os_map_iomem(start, len);
39402 if (!virt) {
39403 kfree(log->bios_event_log);
39404+ log->bios_event_log = NULL;
39405 printk("%s: ERROR - Unable to map memory\n", __func__);
39406 return -EIO;
39407 }
39408
39409- memcpy_fromio(log->bios_event_log, virt, len);
39410+ memcpy_fromio(log->bios_event_log, (const char __force_kernel *)virt, len);
39411
39412 acpi_os_unmap_iomem(virt, len);
39413 return 0;
39414diff --git a/drivers/char/tpm/tpm_eventlog.c b/drivers/char/tpm/tpm_eventlog.c
39415index 3a56a13..f8cbd25 100644
39416--- a/drivers/char/tpm/tpm_eventlog.c
39417+++ b/drivers/char/tpm/tpm_eventlog.c
39418@@ -95,7 +95,7 @@ static void *tpm_bios_measurements_start(struct seq_file *m, loff_t *pos)
39419 event = addr;
39420
39421 if ((event->event_type == 0 && event->event_size == 0) ||
39422- ((addr + sizeof(struct tcpa_event) + event->event_size) >= limit))
39423+ (event->event_size >= limit - addr - sizeof(struct tcpa_event)))
39424 return NULL;
39425
39426 return addr;
39427@@ -120,7 +120,7 @@ static void *tpm_bios_measurements_next(struct seq_file *m, void *v,
39428 return NULL;
39429
39430 if ((event->event_type == 0 && event->event_size == 0) ||
39431- ((v + sizeof(struct tcpa_event) + event->event_size) >= limit))
39432+ (event->event_size >= limit - v - sizeof(struct tcpa_event)))
39433 return NULL;
39434
39435 (*pos)++;
39436@@ -213,7 +213,8 @@ static int tpm_binary_bios_measurements_show(struct seq_file *m, void *v)
39437 int i;
39438
39439 for (i = 0; i < sizeof(struct tcpa_event) + event->event_size; i++)
39440- seq_putc(m, data[i]);
39441+ if (!seq_putc(m, data[i]))
39442+ return -EFAULT;
39443
39444 return 0;
39445 }
39446diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
39447index 72d7028..1586601 100644
39448--- a/drivers/char/virtio_console.c
39449+++ b/drivers/char/virtio_console.c
39450@@ -685,7 +685,7 @@ static ssize_t fill_readbuf(struct port *port, char __user *out_buf,
39451 if (to_user) {
39452 ssize_t ret;
39453
39454- ret = copy_to_user(out_buf, buf->buf + buf->offset, out_count);
39455+ ret = copy_to_user((char __force_user *)out_buf, buf->buf + buf->offset, out_count);
39456 if (ret)
39457 return -EFAULT;
39458 } else {
39459@@ -789,7 +789,7 @@ static ssize_t port_fops_read(struct file *filp, char __user *ubuf,
39460 if (!port_has_data(port) && !port->host_connected)
39461 return 0;
39462
39463- return fill_readbuf(port, ubuf, count, true);
39464+ return fill_readbuf(port, (char __force_kernel *)ubuf, count, true);
39465 }
39466
39467 static int wait_port_writable(struct port *port, bool nonblock)
39468diff --git a/drivers/clk/clk-composite.c b/drivers/clk/clk-composite.c
39469index 956b7e5..b655045 100644
39470--- a/drivers/clk/clk-composite.c
39471+++ b/drivers/clk/clk-composite.c
39472@@ -197,7 +197,7 @@ struct clk *clk_register_composite(struct device *dev, const char *name,
39473 struct clk *clk;
39474 struct clk_init_data init;
39475 struct clk_composite *composite;
39476- struct clk_ops *clk_composite_ops;
39477+ clk_ops_no_const *clk_composite_ops;
39478
39479 composite = kzalloc(sizeof(*composite), GFP_KERNEL);
39480 if (!composite) {
39481diff --git a/drivers/clk/hisilicon/clk-hi3620.c b/drivers/clk/hisilicon/clk-hi3620.c
39482index 2e4f6d4..b4cf487 100644
39483--- a/drivers/clk/hisilicon/clk-hi3620.c
39484+++ b/drivers/clk/hisilicon/clk-hi3620.c
39485@@ -38,44 +38,44 @@
39486 #include "clk.h"
39487
39488 /* clock parent list */
39489-static const char *timer0_mux_p[] __initconst = { "osc32k", "timerclk01", };
39490-static const char *timer1_mux_p[] __initconst = { "osc32k", "timerclk01", };
39491-static const char *timer2_mux_p[] __initconst = { "osc32k", "timerclk23", };
39492-static const char *timer3_mux_p[] __initconst = { "osc32k", "timerclk23", };
39493-static const char *timer4_mux_p[] __initconst = { "osc32k", "timerclk45", };
39494-static const char *timer5_mux_p[] __initconst = { "osc32k", "timerclk45", };
39495-static const char *timer6_mux_p[] __initconst = { "osc32k", "timerclk67", };
39496-static const char *timer7_mux_p[] __initconst = { "osc32k", "timerclk67", };
39497-static const char *timer8_mux_p[] __initconst = { "osc32k", "timerclk89", };
39498-static const char *timer9_mux_p[] __initconst = { "osc32k", "timerclk89", };
39499-static const char *uart0_mux_p[] __initconst = { "osc26m", "pclk", };
39500-static const char *uart1_mux_p[] __initconst = { "osc26m", "pclk", };
39501-static const char *uart2_mux_p[] __initconst = { "osc26m", "pclk", };
39502-static const char *uart3_mux_p[] __initconst = { "osc26m", "pclk", };
39503-static const char *uart4_mux_p[] __initconst = { "osc26m", "pclk", };
39504-static const char *spi0_mux_p[] __initconst = { "osc26m", "rclk_cfgaxi", };
39505-static const char *spi1_mux_p[] __initconst = { "osc26m", "rclk_cfgaxi", };
39506-static const char *spi2_mux_p[] __initconst = { "osc26m", "rclk_cfgaxi", };
39507+static const char * const timer0_mux_p[] __initconst = { "osc32k", "timerclk01", };
39508+static const char * const timer1_mux_p[] __initconst = { "osc32k", "timerclk01", };
39509+static const char * const timer2_mux_p[] __initconst = { "osc32k", "timerclk23", };
39510+static const char * const timer3_mux_p[] __initconst = { "osc32k", "timerclk23", };
39511+static const char * const timer4_mux_p[] __initconst = { "osc32k", "timerclk45", };
39512+static const char * const timer5_mux_p[] __initconst = { "osc32k", "timerclk45", };
39513+static const char * const timer6_mux_p[] __initconst = { "osc32k", "timerclk67", };
39514+static const char * const timer7_mux_p[] __initconst = { "osc32k", "timerclk67", };
39515+static const char * const timer8_mux_p[] __initconst = { "osc32k", "timerclk89", };
39516+static const char * const timer9_mux_p[] __initconst = { "osc32k", "timerclk89", };
39517+static const char * const uart0_mux_p[] __initconst = { "osc26m", "pclk", };
39518+static const char * const uart1_mux_p[] __initconst = { "osc26m", "pclk", };
39519+static const char * const uart2_mux_p[] __initconst = { "osc26m", "pclk", };
39520+static const char * const uart3_mux_p[] __initconst = { "osc26m", "pclk", };
39521+static const char * const uart4_mux_p[] __initconst = { "osc26m", "pclk", };
39522+static const char * const spi0_mux_p[] __initconst = { "osc26m", "rclk_cfgaxi", };
39523+static const char * const spi1_mux_p[] __initconst = { "osc26m", "rclk_cfgaxi", };
39524+static const char * const spi2_mux_p[] __initconst = { "osc26m", "rclk_cfgaxi", };
39525 /* share axi parent */
39526-static const char *saxi_mux_p[] __initconst = { "armpll3", "armpll2", };
39527-static const char *pwm0_mux_p[] __initconst = { "osc32k", "osc26m", };
39528-static const char *pwm1_mux_p[] __initconst = { "osc32k", "osc26m", };
39529-static const char *sd_mux_p[] __initconst = { "armpll2", "armpll3", };
39530-static const char *mmc1_mux_p[] __initconst = { "armpll2", "armpll3", };
39531-static const char *mmc1_mux2_p[] __initconst = { "osc26m", "mmc1_div", };
39532-static const char *g2d_mux_p[] __initconst = { "armpll2", "armpll3", };
39533-static const char *venc_mux_p[] __initconst = { "armpll2", "armpll3", };
39534-static const char *vdec_mux_p[] __initconst = { "armpll2", "armpll3", };
39535-static const char *vpp_mux_p[] __initconst = { "armpll2", "armpll3", };
39536-static const char *edc0_mux_p[] __initconst = { "armpll2", "armpll3", };
39537-static const char *ldi0_mux_p[] __initconst = { "armpll2", "armpll4",
39538+static const char * const saxi_mux_p[] __initconst = { "armpll3", "armpll2", };
39539+static const char * const pwm0_mux_p[] __initconst = { "osc32k", "osc26m", };
39540+static const char * const pwm1_mux_p[] __initconst = { "osc32k", "osc26m", };
39541+static const char * const sd_mux_p[] __initconst = { "armpll2", "armpll3", };
39542+static const char * const mmc1_mux_p[] __initconst = { "armpll2", "armpll3", };
39543+static const char * const mmc1_mux2_p[] __initconst = { "osc26m", "mmc1_div", };
39544+static const char * const g2d_mux_p[] __initconst = { "armpll2", "armpll3", };
39545+static const char * const venc_mux_p[] __initconst = { "armpll2", "armpll3", };
39546+static const char * const vdec_mux_p[] __initconst = { "armpll2", "armpll3", };
39547+static const char * const vpp_mux_p[] __initconst = { "armpll2", "armpll3", };
39548+static const char * const edc0_mux_p[] __initconst = { "armpll2", "armpll3", };
39549+static const char * const ldi0_mux_p[] __initconst = { "armpll2", "armpll4",
39550 "armpll3", "armpll5", };
39551-static const char *edc1_mux_p[] __initconst = { "armpll2", "armpll3", };
39552-static const char *ldi1_mux_p[] __initconst = { "armpll2", "armpll4",
39553+static const char * const edc1_mux_p[] __initconst = { "armpll2", "armpll3", };
39554+static const char * const ldi1_mux_p[] __initconst = { "armpll2", "armpll4",
39555 "armpll3", "armpll5", };
39556-static const char *rclk_hsic_p[] __initconst = { "armpll3", "armpll2", };
39557-static const char *mmc2_mux_p[] __initconst = { "armpll2", "armpll3", };
39558-static const char *mmc3_mux_p[] __initconst = { "armpll2", "armpll3", };
39559+static const char * const rclk_hsic_p[] __initconst = { "armpll3", "armpll2", };
39560+static const char * const mmc2_mux_p[] __initconst = { "armpll2", "armpll3", };
39561+static const char * const mmc3_mux_p[] __initconst = { "armpll2", "armpll3", };
39562
39563
39564 /* fixed rate clocks */
39565diff --git a/drivers/clk/hisilicon/clk-hix5hd2.c b/drivers/clk/hisilicon/clk-hix5hd2.c
39566index 3f369c6..05f9ffd 100644
39567--- a/drivers/clk/hisilicon/clk-hix5hd2.c
39568+++ b/drivers/clk/hisilicon/clk-hix5hd2.c
39569@@ -46,15 +46,15 @@ static struct hisi_fixed_rate_clock hix5hd2_fixed_rate_clks[] __initdata = {
39570 { HIX5HD2_FIXED_83M, "83m", NULL, CLK_IS_ROOT, 83333333, },
39571 };
39572
39573-static const char *sfc_mux_p[] __initconst = {
39574+static const char * const sfc_mux_p[] __initconst = {
39575 "24m", "150m", "200m", "100m", "75m", };
39576 static u32 sfc_mux_table[] = {0, 4, 5, 6, 7};
39577
39578-static const char *sdio_mux_p[] __initconst = {
39579+static const char * const sdio_mux_p[] __initconst = {
39580 "75m", "100m", "50m", "15m", };
39581 static u32 sdio_mux_table[] = {0, 1, 2, 3};
39582
39583-static const char *fephy_mux_p[] __initconst = { "25m", "125m"};
39584+static const char * const fephy_mux_p[] __initconst = { "25m", "125m"};
39585 static u32 fephy_mux_table[] = {0, 1};
39586
39587
39588diff --git a/drivers/clk/rockchip/clk-rk3188.c b/drivers/clk/rockchip/clk-rk3188.c
39589index 7eb684c..147c6fc 100644
39590--- a/drivers/clk/rockchip/clk-rk3188.c
39591+++ b/drivers/clk/rockchip/clk-rk3188.c
39592@@ -704,7 +704,7 @@ static struct rockchip_clk_branch rk3188_clk_branches[] __initdata = {
39593 GATE(ACLK_GPS, "aclk_gps", "aclk_peri", 0, RK2928_CLKGATE_CON(8), 13, GFLAGS),
39594 };
39595
39596-static const char *rk3188_critical_clocks[] __initconst = {
39597+static const char * const rk3188_critical_clocks[] __initconst = {
39598 "aclk_cpu",
39599 "aclk_peri",
39600 "hclk_peri",
39601diff --git a/drivers/clk/rockchip/clk-rk3288.c b/drivers/clk/rockchip/clk-rk3288.c
39602index 05d7a0b..4fc131c 100644
39603--- a/drivers/clk/rockchip/clk-rk3288.c
39604+++ b/drivers/clk/rockchip/clk-rk3288.c
39605@@ -771,7 +771,7 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = {
39606 GATE(0, "pclk_isp_in", "ext_isp", 0, RK3288_CLKGATE_CON(16), 3, GFLAGS),
39607 };
39608
39609-static const char *rk3288_critical_clocks[] __initconst = {
39610+static const char * const rk3288_critical_clocks[] __initconst = {
39611 "aclk_cpu",
39612 "aclk_peri",
39613 "hclk_peri",
39614diff --git a/drivers/clk/rockchip/clk.h b/drivers/clk/rockchip/clk.h
39615index 58d2e3b..0c21b0d 100644
39616--- a/drivers/clk/rockchip/clk.h
39617+++ b/drivers/clk/rockchip/clk.h
39618@@ -182,7 +182,7 @@ struct clk *rockchip_clk_register_mmc(const char *name,
39619 const char **parent_names, u8 num_parents,
39620 void __iomem *reg, int shift);
39621
39622-#define PNAME(x) static const char *x[] __initconst
39623+#define PNAME(x) static const char * const x[] __initconst
39624
39625 enum rockchip_clk_branch_type {
39626 branch_composite,
39627diff --git a/drivers/clk/samsung/clk.h b/drivers/clk/samsung/clk.h
39628index e4c7538..99c50cd 100644
39629--- a/drivers/clk/samsung/clk.h
39630+++ b/drivers/clk/samsung/clk.h
39631@@ -260,7 +260,7 @@ struct samsung_gate_clock {
39632 #define GATE_DA(_id, dname, cname, pname, o, b, f, gf, a) \
39633 __GATE(_id, dname, cname, pname, o, b, f, gf, a)
39634
39635-#define PNAME(x) static const char *x[] __initdata
39636+#define PNAME(x) static const char * const x[] __initconst
39637
39638 /**
39639 * struct samsung_clk_reg_dump: register dump of clock controller registers.
39640diff --git a/drivers/clk/socfpga/clk-gate.c b/drivers/clk/socfpga/clk-gate.c
39641index dd3a78c..386d49c 100644
39642--- a/drivers/clk/socfpga/clk-gate.c
39643+++ b/drivers/clk/socfpga/clk-gate.c
39644@@ -22,6 +22,7 @@
39645 #include <linux/mfd/syscon.h>
39646 #include <linux/of.h>
39647 #include <linux/regmap.h>
39648+#include <asm/pgtable.h>
39649
39650 #include "clk.h"
39651
39652@@ -174,7 +175,7 @@ static int socfpga_clk_prepare(struct clk_hw *hwclk)
39653 return 0;
39654 }
39655
39656-static struct clk_ops gateclk_ops = {
39657+static clk_ops_no_const gateclk_ops __read_only = {
39658 .prepare = socfpga_clk_prepare,
39659 .recalc_rate = socfpga_clk_recalc_rate,
39660 .get_parent = socfpga_clk_get_parent,
39661@@ -208,8 +209,10 @@ static void __init __socfpga_gate_init(struct device_node *node,
39662 socfpga_clk->hw.reg = clk_mgr_base_addr + clk_gate[0];
39663 socfpga_clk->hw.bit_idx = clk_gate[1];
39664
39665- gateclk_ops.enable = clk_gate_ops.enable;
39666- gateclk_ops.disable = clk_gate_ops.disable;
39667+ pax_open_kernel();
39668+ *(void **)&gateclk_ops.enable = clk_gate_ops.enable;
39669+ *(void **)&gateclk_ops.disable = clk_gate_ops.disable;
39670+ pax_close_kernel();
39671 }
39672
39673 rc = of_property_read_u32(node, "fixed-divider", &fixed_div);
39674diff --git a/drivers/clk/socfpga/clk-pll.c b/drivers/clk/socfpga/clk-pll.c
39675index de6da95..c98278b 100644
39676--- a/drivers/clk/socfpga/clk-pll.c
39677+++ b/drivers/clk/socfpga/clk-pll.c
39678@@ -21,6 +21,7 @@
39679 #include <linux/io.h>
39680 #include <linux/of.h>
39681 #include <linux/of_address.h>
39682+#include <asm/pgtable.h>
39683
39684 #include "clk.h"
39685
39686@@ -76,7 +77,7 @@ static u8 clk_pll_get_parent(struct clk_hw *hwclk)
39687 CLK_MGR_PLL_CLK_SRC_MASK;
39688 }
39689
39690-static struct clk_ops clk_pll_ops = {
39691+static clk_ops_no_const clk_pll_ops __read_only = {
39692 .recalc_rate = clk_pll_recalc_rate,
39693 .get_parent = clk_pll_get_parent,
39694 };
39695@@ -120,8 +121,10 @@ static __init struct clk *__socfpga_pll_init(struct device_node *node,
39696 pll_clk->hw.hw.init = &init;
39697
39698 pll_clk->hw.bit_idx = SOCFPGA_PLL_EXT_ENA;
39699- clk_pll_ops.enable = clk_gate_ops.enable;
39700- clk_pll_ops.disable = clk_gate_ops.disable;
39701+ pax_open_kernel();
39702+ *(void **)&clk_pll_ops.enable = clk_gate_ops.enable;
39703+ *(void **)&clk_pll_ops.disable = clk_gate_ops.disable;
39704+ pax_close_kernel();
39705
39706 clk = clk_register(NULL, &pll_clk->hw.hw);
39707 if (WARN_ON(IS_ERR(clk))) {
39708diff --git a/drivers/clk/ti/composite.c b/drivers/clk/ti/composite.c
39709index 3654f61..81abe81 100644
39710--- a/drivers/clk/ti/composite.c
39711+++ b/drivers/clk/ti/composite.c
39712@@ -69,7 +69,7 @@ struct component_clk {
39713 struct list_head link;
39714 };
39715
39716-static const char * __initconst component_clk_types[] = {
39717+static const char * const __initconst component_clk_types[] = {
39718 "gate", "divider", "mux"
39719 };
39720
39721diff --git a/drivers/clk/zynq/clkc.c b/drivers/clk/zynq/clkc.c
39722index f870aad..04ba1e4 100644
39723--- a/drivers/clk/zynq/clkc.c
39724+++ b/drivers/clk/zynq/clkc.c
39725@@ -85,22 +85,22 @@ static DEFINE_SPINLOCK(canmioclk_lock);
39726 static DEFINE_SPINLOCK(dbgclk_lock);
39727 static DEFINE_SPINLOCK(aperclk_lock);
39728
39729-static const char *armpll_parents[] __initconst = {"armpll_int", "ps_clk"};
39730-static const char *ddrpll_parents[] __initconst = {"ddrpll_int", "ps_clk"};
39731-static const char *iopll_parents[] __initconst = {"iopll_int", "ps_clk"};
39732-static const char *gem0_mux_parents[] __initconst = {"gem0_div1", "dummy_name"};
39733-static const char *gem1_mux_parents[] __initconst = {"gem1_div1", "dummy_name"};
39734-static const char *can0_mio_mux2_parents[] __initconst = {"can0_gate",
39735+static const char * const armpll_parents[] __initconst = {"armpll_int", "ps_clk"};
39736+static const char * const ddrpll_parents[] __initconst = {"ddrpll_int", "ps_clk"};
39737+static const char * const iopll_parents[] __initconst = {"iopll_int", "ps_clk"};
39738+static const char * gem0_mux_parents[] __initdata = {"gem0_div1", "dummy_name"};
39739+static const char * gem1_mux_parents[] __initdata = {"gem1_div1", "dummy_name"};
39740+static const char * const can0_mio_mux2_parents[] __initconst = {"can0_gate",
39741 "can0_mio_mux"};
39742-static const char *can1_mio_mux2_parents[] __initconst = {"can1_gate",
39743+static const char * const can1_mio_mux2_parents[] __initconst = {"can1_gate",
39744 "can1_mio_mux"};
39745-static const char *dbg_emio_mux_parents[] __initconst = {"dbg_div",
39746+static const char * dbg_emio_mux_parents[] __initdata = {"dbg_div",
39747 "dummy_name"};
39748
39749-static const char *dbgtrc_emio_input_names[] __initconst = {"trace_emio_clk"};
39750-static const char *gem0_emio_input_names[] __initconst = {"gem0_emio_clk"};
39751-static const char *gem1_emio_input_names[] __initconst = {"gem1_emio_clk"};
39752-static const char *swdt_ext_clk_input_names[] __initconst = {"swdt_ext_clk"};
39753+static const char * const dbgtrc_emio_input_names[] __initconst = {"trace_emio_clk"};
39754+static const char * const gem0_emio_input_names[] __initconst = {"gem0_emio_clk"};
39755+static const char * const gem1_emio_input_names[] __initconst = {"gem1_emio_clk"};
39756+static const char * const swdt_ext_clk_input_names[] __initconst = {"swdt_ext_clk"};
39757
39758 static void __init zynq_clk_register_fclk(enum zynq_clk fclk,
39759 const char *clk_name, void __iomem *fclk_ctrl_reg,
39760diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c
39761index b0c18ed..1713a80 100644
39762--- a/drivers/cpufreq/acpi-cpufreq.c
39763+++ b/drivers/cpufreq/acpi-cpufreq.c
39764@@ -675,8 +675,11 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
39765 data->acpi_data = per_cpu_ptr(acpi_perf_data, cpu);
39766 per_cpu(acfreq_data, cpu) = data;
39767
39768- if (cpu_has(c, X86_FEATURE_CONSTANT_TSC))
39769- acpi_cpufreq_driver.flags |= CPUFREQ_CONST_LOOPS;
39770+ if (cpu_has(c, X86_FEATURE_CONSTANT_TSC)) {
39771+ pax_open_kernel();
39772+ *(u8 *)&acpi_cpufreq_driver.flags |= CPUFREQ_CONST_LOOPS;
39773+ pax_close_kernel();
39774+ }
39775
39776 result = acpi_processor_register_performance(data->acpi_data, cpu);
39777 if (result)
39778@@ -809,7 +812,9 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
39779 policy->cur = acpi_cpufreq_guess_freq(data, policy->cpu);
39780 break;
39781 case ACPI_ADR_SPACE_FIXED_HARDWARE:
39782- acpi_cpufreq_driver.get = get_cur_freq_on_cpu;
39783+ pax_open_kernel();
39784+ *(void **)&acpi_cpufreq_driver.get = get_cur_freq_on_cpu;
39785+ pax_close_kernel();
39786 break;
39787 default:
39788 break;
39789@@ -903,8 +908,10 @@ static void __init acpi_cpufreq_boost_init(void)
39790 if (!msrs)
39791 return;
39792
39793- acpi_cpufreq_driver.boost_supported = true;
39794- acpi_cpufreq_driver.boost_enabled = boost_state(0);
39795+ pax_open_kernel();
39796+ *(bool *)&acpi_cpufreq_driver.boost_supported = true;
39797+ *(bool *)&acpi_cpufreq_driver.boost_enabled = boost_state(0);
39798+ pax_close_kernel();
39799
39800 cpu_notifier_register_begin();
39801
39802diff --git a/drivers/cpufreq/cpufreq-dt.c b/drivers/cpufreq/cpufreq-dt.c
39803index bab67db..91af7e3 100644
39804--- a/drivers/cpufreq/cpufreq-dt.c
39805+++ b/drivers/cpufreq/cpufreq-dt.c
39806@@ -392,7 +392,9 @@ static int dt_cpufreq_probe(struct platform_device *pdev)
39807 if (!IS_ERR(cpu_reg))
39808 regulator_put(cpu_reg);
39809
39810- dt_cpufreq_driver.driver_data = dev_get_platdata(&pdev->dev);
39811+ pax_open_kernel();
39812+ *(void **)&dt_cpufreq_driver.driver_data = dev_get_platdata(&pdev->dev);
39813+ pax_close_kernel();
39814
39815 ret = cpufreq_register_driver(&dt_cpufreq_driver);
39816 if (ret)
39817diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
39818index 8ae655c..3141442 100644
39819--- a/drivers/cpufreq/cpufreq.c
39820+++ b/drivers/cpufreq/cpufreq.c
39821@@ -2108,7 +2108,7 @@ void cpufreq_unregister_governor(struct cpufreq_governor *governor)
39822 }
39823
39824 mutex_lock(&cpufreq_governor_mutex);
39825- list_del(&governor->governor_list);
39826+ pax_list_del(&governor->governor_list);
39827 mutex_unlock(&cpufreq_governor_mutex);
39828 return;
39829 }
39830@@ -2323,7 +2323,7 @@ static int cpufreq_cpu_callback(struct notifier_block *nfb,
39831 return NOTIFY_OK;
39832 }
39833
39834-static struct notifier_block __refdata cpufreq_cpu_notifier = {
39835+static struct notifier_block cpufreq_cpu_notifier = {
39836 .notifier_call = cpufreq_cpu_callback,
39837 };
39838
39839@@ -2363,13 +2363,17 @@ int cpufreq_boost_trigger_state(int state)
39840 return 0;
39841
39842 write_lock_irqsave(&cpufreq_driver_lock, flags);
39843- cpufreq_driver->boost_enabled = state;
39844+ pax_open_kernel();
39845+ *(bool *)&cpufreq_driver->boost_enabled = state;
39846+ pax_close_kernel();
39847 write_unlock_irqrestore(&cpufreq_driver_lock, flags);
39848
39849 ret = cpufreq_driver->set_boost(state);
39850 if (ret) {
39851 write_lock_irqsave(&cpufreq_driver_lock, flags);
39852- cpufreq_driver->boost_enabled = !state;
39853+ pax_open_kernel();
39854+ *(bool *)&cpufreq_driver->boost_enabled = !state;
39855+ pax_close_kernel();
39856 write_unlock_irqrestore(&cpufreq_driver_lock, flags);
39857
39858 pr_err("%s: Cannot %s BOOST\n",
39859@@ -2434,16 +2438,22 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data)
39860 cpufreq_driver = driver_data;
39861 write_unlock_irqrestore(&cpufreq_driver_lock, flags);
39862
39863- if (driver_data->setpolicy)
39864- driver_data->flags |= CPUFREQ_CONST_LOOPS;
39865+ if (driver_data->setpolicy) {
39866+ pax_open_kernel();
39867+ *(u8 *)&driver_data->flags |= CPUFREQ_CONST_LOOPS;
39868+ pax_close_kernel();
39869+ }
39870
39871 if (cpufreq_boost_supported()) {
39872 /*
39873 * Check if driver provides function to enable boost -
39874 * if not, use cpufreq_boost_set_sw as default
39875 */
39876- if (!cpufreq_driver->set_boost)
39877- cpufreq_driver->set_boost = cpufreq_boost_set_sw;
39878+ if (!cpufreq_driver->set_boost) {
39879+ pax_open_kernel();
39880+ *(void **)&cpufreq_driver->set_boost = cpufreq_boost_set_sw;
39881+ pax_close_kernel();
39882+ }
39883
39884 ret = cpufreq_sysfs_create_file(&boost.attr);
39885 if (ret) {
39886diff --git a/drivers/cpufreq/cpufreq_governor.c b/drivers/cpufreq/cpufreq_governor.c
39887index 1b44496..b80ff5e 100644
39888--- a/drivers/cpufreq/cpufreq_governor.c
39889+++ b/drivers/cpufreq/cpufreq_governor.c
39890@@ -245,7 +245,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
39891 struct dbs_data *dbs_data;
39892 struct od_cpu_dbs_info_s *od_dbs_info = NULL;
39893 struct cs_cpu_dbs_info_s *cs_dbs_info = NULL;
39894- struct od_ops *od_ops = NULL;
39895+ const struct od_ops *od_ops = NULL;
39896 struct od_dbs_tuners *od_tuners = NULL;
39897 struct cs_dbs_tuners *cs_tuners = NULL;
39898 struct cpu_dbs_common_info *cpu_cdbs;
39899@@ -311,7 +311,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
39900
39901 if ((cdata->governor == GOV_CONSERVATIVE) &&
39902 (!policy->governor->initialized)) {
39903- struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39904+ const struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39905
39906 cpufreq_register_notifier(cs_ops->notifier_block,
39907 CPUFREQ_TRANSITION_NOTIFIER);
39908@@ -331,7 +331,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
39909
39910 if ((dbs_data->cdata->governor == GOV_CONSERVATIVE) &&
39911 (policy->governor->initialized == 1)) {
39912- struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39913+ const struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39914
39915 cpufreq_unregister_notifier(cs_ops->notifier_block,
39916 CPUFREQ_TRANSITION_NOTIFIER);
39917diff --git a/drivers/cpufreq/cpufreq_governor.h b/drivers/cpufreq/cpufreq_governor.h
39918index cc401d1..8197340 100644
39919--- a/drivers/cpufreq/cpufreq_governor.h
39920+++ b/drivers/cpufreq/cpufreq_governor.h
39921@@ -212,7 +212,7 @@ struct common_dbs_data {
39922 void (*exit)(struct dbs_data *dbs_data);
39923
39924 /* Governor specific ops, see below */
39925- void *gov_ops;
39926+ const void *gov_ops;
39927 };
39928
39929 /* Governor Per policy data */
39930@@ -232,7 +232,7 @@ struct od_ops {
39931 unsigned int (*powersave_bias_target)(struct cpufreq_policy *policy,
39932 unsigned int freq_next, unsigned int relation);
39933 void (*freq_increase)(struct cpufreq_policy *policy, unsigned int freq);
39934-};
39935+} __no_const;
39936
39937 struct cs_ops {
39938 struct notifier_block *notifier_block;
39939diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c
39940index ad3f38f..8f086cd 100644
39941--- a/drivers/cpufreq/cpufreq_ondemand.c
39942+++ b/drivers/cpufreq/cpufreq_ondemand.c
39943@@ -524,7 +524,7 @@ static void od_exit(struct dbs_data *dbs_data)
39944
39945 define_get_cpu_dbs_routines(od_cpu_dbs_info);
39946
39947-static struct od_ops od_ops = {
39948+static struct od_ops od_ops __read_only = {
39949 .powersave_bias_init_cpu = ondemand_powersave_bias_init_cpu,
39950 .powersave_bias_target = generic_powersave_bias_target,
39951 .freq_increase = dbs_freq_increase,
39952@@ -579,14 +579,18 @@ void od_register_powersave_bias_handler(unsigned int (*f)
39953 (struct cpufreq_policy *, unsigned int, unsigned int),
39954 unsigned int powersave_bias)
39955 {
39956- od_ops.powersave_bias_target = f;
39957+ pax_open_kernel();
39958+ *(void **)&od_ops.powersave_bias_target = f;
39959+ pax_close_kernel();
39960 od_set_powersave_bias(powersave_bias);
39961 }
39962 EXPORT_SYMBOL_GPL(od_register_powersave_bias_handler);
39963
39964 void od_unregister_powersave_bias_handler(void)
39965 {
39966- od_ops.powersave_bias_target = generic_powersave_bias_target;
39967+ pax_open_kernel();
39968+ *(void **)&od_ops.powersave_bias_target = generic_powersave_bias_target;
39969+ pax_close_kernel();
39970 od_set_powersave_bias(0);
39971 }
39972 EXPORT_SYMBOL_GPL(od_unregister_powersave_bias_handler);
39973diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
39974index 872c577..5fb3c20 100644
39975--- a/drivers/cpufreq/intel_pstate.c
39976+++ b/drivers/cpufreq/intel_pstate.c
39977@@ -133,10 +133,10 @@ struct pstate_funcs {
39978 struct cpu_defaults {
39979 struct pstate_adjust_policy pid_policy;
39980 struct pstate_funcs funcs;
39981-};
39982+} __do_const;
39983
39984 static struct pstate_adjust_policy pid_params;
39985-static struct pstate_funcs pstate_funcs;
39986+static struct pstate_funcs *pstate_funcs;
39987 static int hwp_active;
39988
39989 struct perf_limits {
39990@@ -690,18 +690,18 @@ static void intel_pstate_set_pstate(struct cpudata *cpu, int pstate)
39991
39992 cpu->pstate.current_pstate = pstate;
39993
39994- pstate_funcs.set(cpu, pstate);
39995+ pstate_funcs->set(cpu, pstate);
39996 }
39997
39998 static void intel_pstate_get_cpu_pstates(struct cpudata *cpu)
39999 {
40000- cpu->pstate.min_pstate = pstate_funcs.get_min();
40001- cpu->pstate.max_pstate = pstate_funcs.get_max();
40002- cpu->pstate.turbo_pstate = pstate_funcs.get_turbo();
40003- cpu->pstate.scaling = pstate_funcs.get_scaling();
40004+ cpu->pstate.min_pstate = pstate_funcs->get_min();
40005+ cpu->pstate.max_pstate = pstate_funcs->get_max();
40006+ cpu->pstate.turbo_pstate = pstate_funcs->get_turbo();
40007+ cpu->pstate.scaling = pstate_funcs->get_scaling();
40008
40009- if (pstate_funcs.get_vid)
40010- pstate_funcs.get_vid(cpu);
40011+ if (pstate_funcs->get_vid)
40012+ pstate_funcs->get_vid(cpu);
40013 intel_pstate_set_pstate(cpu, cpu->pstate.min_pstate);
40014 }
40015
40016@@ -1030,9 +1030,9 @@ static int intel_pstate_msrs_not_valid(void)
40017 rdmsrl(MSR_IA32_APERF, aperf);
40018 rdmsrl(MSR_IA32_MPERF, mperf);
40019
40020- if (!pstate_funcs.get_max() ||
40021- !pstate_funcs.get_min() ||
40022- !pstate_funcs.get_turbo())
40023+ if (!pstate_funcs->get_max() ||
40024+ !pstate_funcs->get_min() ||
40025+ !pstate_funcs->get_turbo())
40026 return -ENODEV;
40027
40028 rdmsrl(MSR_IA32_APERF, tmp);
40029@@ -1046,7 +1046,7 @@ static int intel_pstate_msrs_not_valid(void)
40030 return 0;
40031 }
40032
40033-static void copy_pid_params(struct pstate_adjust_policy *policy)
40034+static void copy_pid_params(const struct pstate_adjust_policy *policy)
40035 {
40036 pid_params.sample_rate_ms = policy->sample_rate_ms;
40037 pid_params.p_gain_pct = policy->p_gain_pct;
40038@@ -1058,12 +1058,7 @@ static void copy_pid_params(struct pstate_adjust_policy *policy)
40039
40040 static void copy_cpu_funcs(struct pstate_funcs *funcs)
40041 {
40042- pstate_funcs.get_max = funcs->get_max;
40043- pstate_funcs.get_min = funcs->get_min;
40044- pstate_funcs.get_turbo = funcs->get_turbo;
40045- pstate_funcs.get_scaling = funcs->get_scaling;
40046- pstate_funcs.set = funcs->set;
40047- pstate_funcs.get_vid = funcs->get_vid;
40048+ pstate_funcs = funcs;
40049 }
40050
40051 #if IS_ENABLED(CONFIG_ACPI)
40052diff --git a/drivers/cpufreq/p4-clockmod.c b/drivers/cpufreq/p4-clockmod.c
40053index 529cfd9..0e28fff 100644
40054--- a/drivers/cpufreq/p4-clockmod.c
40055+++ b/drivers/cpufreq/p4-clockmod.c
40056@@ -134,10 +134,14 @@ static unsigned int cpufreq_p4_get_frequency(struct cpuinfo_x86 *c)
40057 case 0x0F: /* Core Duo */
40058 case 0x16: /* Celeron Core */
40059 case 0x1C: /* Atom */
40060- p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
40061+ pax_open_kernel();
40062+ *(u8 *)&p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
40063+ pax_close_kernel();
40064 return speedstep_get_frequency(SPEEDSTEP_CPU_PCORE);
40065 case 0x0D: /* Pentium M (Dothan) */
40066- p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
40067+ pax_open_kernel();
40068+ *(u8 *)&p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
40069+ pax_close_kernel();
40070 /* fall through */
40071 case 0x09: /* Pentium M (Banias) */
40072 return speedstep_get_frequency(SPEEDSTEP_CPU_PM);
40073@@ -149,7 +153,9 @@ static unsigned int cpufreq_p4_get_frequency(struct cpuinfo_x86 *c)
40074
40075 /* on P-4s, the TSC runs with constant frequency independent whether
40076 * throttling is active or not. */
40077- p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
40078+ pax_open_kernel();
40079+ *(u8 *)&p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
40080+ pax_close_kernel();
40081
40082 if (speedstep_detect_processor() == SPEEDSTEP_CPU_P4M) {
40083 printk(KERN_WARNING PFX "Warning: Pentium 4-M detected. "
40084diff --git a/drivers/cpufreq/sparc-us3-cpufreq.c b/drivers/cpufreq/sparc-us3-cpufreq.c
40085index 9bb42ba..b01b4a2 100644
40086--- a/drivers/cpufreq/sparc-us3-cpufreq.c
40087+++ b/drivers/cpufreq/sparc-us3-cpufreq.c
40088@@ -18,14 +18,12 @@
40089 #include <asm/head.h>
40090 #include <asm/timer.h>
40091
40092-static struct cpufreq_driver *cpufreq_us3_driver;
40093-
40094 struct us3_freq_percpu_info {
40095 struct cpufreq_frequency_table table[4];
40096 };
40097
40098 /* Indexed by cpu number. */
40099-static struct us3_freq_percpu_info *us3_freq_table;
40100+static struct us3_freq_percpu_info us3_freq_table[NR_CPUS];
40101
40102 /* UltraSPARC-III has three dividers: 1, 2, and 32. These are controlled
40103 * in the Safari config register.
40104@@ -156,16 +154,27 @@ static int __init us3_freq_cpu_init(struct cpufreq_policy *policy)
40105
40106 static int us3_freq_cpu_exit(struct cpufreq_policy *policy)
40107 {
40108- if (cpufreq_us3_driver)
40109- us3_freq_target(policy, 0);
40110+ us3_freq_target(policy, 0);
40111
40112 return 0;
40113 }
40114
40115+static int __init us3_freq_init(void);
40116+static void __exit us3_freq_exit(void);
40117+
40118+static struct cpufreq_driver cpufreq_us3_driver = {
40119+ .init = us3_freq_cpu_init,
40120+ .verify = cpufreq_generic_frequency_table_verify,
40121+ .target_index = us3_freq_target,
40122+ .get = us3_freq_get,
40123+ .exit = us3_freq_cpu_exit,
40124+ .name = "UltraSPARC-III",
40125+
40126+};
40127+
40128 static int __init us3_freq_init(void)
40129 {
40130 unsigned long manuf, impl, ver;
40131- int ret;
40132
40133 if (tlb_type != cheetah && tlb_type != cheetah_plus)
40134 return -ENODEV;
40135@@ -178,55 +187,15 @@ static int __init us3_freq_init(void)
40136 (impl == CHEETAH_IMPL ||
40137 impl == CHEETAH_PLUS_IMPL ||
40138 impl == JAGUAR_IMPL ||
40139- impl == PANTHER_IMPL)) {
40140- struct cpufreq_driver *driver;
40141-
40142- ret = -ENOMEM;
40143- driver = kzalloc(sizeof(*driver), GFP_KERNEL);
40144- if (!driver)
40145- goto err_out;
40146-
40147- us3_freq_table = kzalloc((NR_CPUS * sizeof(*us3_freq_table)),
40148- GFP_KERNEL);
40149- if (!us3_freq_table)
40150- goto err_out;
40151-
40152- driver->init = us3_freq_cpu_init;
40153- driver->verify = cpufreq_generic_frequency_table_verify;
40154- driver->target_index = us3_freq_target;
40155- driver->get = us3_freq_get;
40156- driver->exit = us3_freq_cpu_exit;
40157- strcpy(driver->name, "UltraSPARC-III");
40158-
40159- cpufreq_us3_driver = driver;
40160- ret = cpufreq_register_driver(driver);
40161- if (ret)
40162- goto err_out;
40163-
40164- return 0;
40165-
40166-err_out:
40167- if (driver) {
40168- kfree(driver);
40169- cpufreq_us3_driver = NULL;
40170- }
40171- kfree(us3_freq_table);
40172- us3_freq_table = NULL;
40173- return ret;
40174- }
40175+ impl == PANTHER_IMPL))
40176+ return cpufreq_register_driver(&cpufreq_us3_driver);
40177
40178 return -ENODEV;
40179 }
40180
40181 static void __exit us3_freq_exit(void)
40182 {
40183- if (cpufreq_us3_driver) {
40184- cpufreq_unregister_driver(cpufreq_us3_driver);
40185- kfree(cpufreq_us3_driver);
40186- cpufreq_us3_driver = NULL;
40187- kfree(us3_freq_table);
40188- us3_freq_table = NULL;
40189- }
40190+ cpufreq_unregister_driver(&cpufreq_us3_driver);
40191 }
40192
40193 MODULE_AUTHOR("David S. Miller <davem@redhat.com>");
40194diff --git a/drivers/cpufreq/speedstep-centrino.c b/drivers/cpufreq/speedstep-centrino.c
40195index 7d4a315..21bb886 100644
40196--- a/drivers/cpufreq/speedstep-centrino.c
40197+++ b/drivers/cpufreq/speedstep-centrino.c
40198@@ -351,8 +351,11 @@ static int centrino_cpu_init(struct cpufreq_policy *policy)
40199 !cpu_has(cpu, X86_FEATURE_EST))
40200 return -ENODEV;
40201
40202- if (cpu_has(cpu, X86_FEATURE_CONSTANT_TSC))
40203- centrino_driver.flags |= CPUFREQ_CONST_LOOPS;
40204+ if (cpu_has(cpu, X86_FEATURE_CONSTANT_TSC)) {
40205+ pax_open_kernel();
40206+ *(u8 *)&centrino_driver.flags |= CPUFREQ_CONST_LOOPS;
40207+ pax_close_kernel();
40208+ }
40209
40210 if (policy->cpu != 0)
40211 return -ENODEV;
40212diff --git a/drivers/cpuidle/driver.c b/drivers/cpuidle/driver.c
40213index 2697e87..c32476c 100644
40214--- a/drivers/cpuidle/driver.c
40215+++ b/drivers/cpuidle/driver.c
40216@@ -194,7 +194,7 @@ static int poll_idle(struct cpuidle_device *dev,
40217
40218 static void poll_idle_init(struct cpuidle_driver *drv)
40219 {
40220- struct cpuidle_state *state = &drv->states[0];
40221+ cpuidle_state_no_const *state = &drv->states[0];
40222
40223 snprintf(state->name, CPUIDLE_NAME_LEN, "POLL");
40224 snprintf(state->desc, CPUIDLE_DESC_LEN, "CPUIDLE CORE POLL IDLE");
40225diff --git a/drivers/cpuidle/governor.c b/drivers/cpuidle/governor.c
40226index fb9f511..213e6cc 100644
40227--- a/drivers/cpuidle/governor.c
40228+++ b/drivers/cpuidle/governor.c
40229@@ -87,7 +87,7 @@ int cpuidle_register_governor(struct cpuidle_governor *gov)
40230 mutex_lock(&cpuidle_lock);
40231 if (__cpuidle_find_governor(gov->name) == NULL) {
40232 ret = 0;
40233- list_add_tail(&gov->governor_list, &cpuidle_governors);
40234+ pax_list_add_tail((struct list_head *)&gov->governor_list, &cpuidle_governors);
40235 if (!cpuidle_curr_governor ||
40236 cpuidle_curr_governor->rating < gov->rating)
40237 cpuidle_switch_governor(gov);
40238diff --git a/drivers/cpuidle/sysfs.c b/drivers/cpuidle/sysfs.c
40239index 832a2c3..1794080 100644
40240--- a/drivers/cpuidle/sysfs.c
40241+++ b/drivers/cpuidle/sysfs.c
40242@@ -135,7 +135,7 @@ static struct attribute *cpuidle_switch_attrs[] = {
40243 NULL
40244 };
40245
40246-static struct attribute_group cpuidle_attr_group = {
40247+static attribute_group_no_const cpuidle_attr_group = {
40248 .attrs = cpuidle_default_attrs,
40249 .name = "cpuidle",
40250 };
40251diff --git a/drivers/crypto/caam/caamhash.c b/drivers/crypto/caam/caamhash.c
40252index f347ab7..08b0da2 100644
40253--- a/drivers/crypto/caam/caamhash.c
40254+++ b/drivers/crypto/caam/caamhash.c
40255@@ -1543,6 +1543,8 @@ static int ahash_init(struct ahash_request *req)
40256
40257 state->current_buf = 0;
40258 state->buf_dma = 0;
40259+ state->buflen_0 = 0;
40260+ state->buflen_1 = 0;
40261
40262 return 0;
40263 }
40264diff --git a/drivers/crypto/caam/caamrng.c b/drivers/crypto/caam/caamrng.c
40265index ae31e55..a48dc25 100644
40266--- a/drivers/crypto/caam/caamrng.c
40267+++ b/drivers/crypto/caam/caamrng.c
40268@@ -56,7 +56,7 @@
40269
40270 /* Buffer, its dma address and lock */
40271 struct buf_data {
40272- u8 buf[RN_BUF_SIZE];
40273+ u8 buf[RN_BUF_SIZE] ____cacheline_aligned;
40274 dma_addr_t addr;
40275 struct completion filled;
40276 u32 hw_desc[DESC_JOB_O_LEN];
40277diff --git a/drivers/crypto/hifn_795x.c b/drivers/crypto/hifn_795x.c
40278index 8d2a772..33826c9 100644
40279--- a/drivers/crypto/hifn_795x.c
40280+++ b/drivers/crypto/hifn_795x.c
40281@@ -51,7 +51,7 @@ module_param_string(hifn_pll_ref, hifn_pll_ref, sizeof(hifn_pll_ref), 0444);
40282 MODULE_PARM_DESC(hifn_pll_ref,
40283 "PLL reference clock (pci[freq] or ext[freq], default ext)");
40284
40285-static atomic_t hifn_dev_number;
40286+static atomic_unchecked_t hifn_dev_number;
40287
40288 #define ACRYPTO_OP_DECRYPT 0
40289 #define ACRYPTO_OP_ENCRYPT 1
40290@@ -2577,7 +2577,7 @@ static int hifn_probe(struct pci_dev *pdev, const struct pci_device_id *id)
40291 goto err_out_disable_pci_device;
40292
40293 snprintf(name, sizeof(name), "hifn%d",
40294- atomic_inc_return(&hifn_dev_number)-1);
40295+ atomic_inc_return_unchecked(&hifn_dev_number)-1);
40296
40297 err = pci_request_regions(pdev, name);
40298 if (err)
40299diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
40300index 30b538d8..1610d75 100644
40301--- a/drivers/devfreq/devfreq.c
40302+++ b/drivers/devfreq/devfreq.c
40303@@ -673,7 +673,7 @@ int devfreq_add_governor(struct devfreq_governor *governor)
40304 goto err_out;
40305 }
40306
40307- list_add(&governor->node, &devfreq_governor_list);
40308+ pax_list_add((struct list_head *)&governor->node, &devfreq_governor_list);
40309
40310 list_for_each_entry(devfreq, &devfreq_list, node) {
40311 int ret = 0;
40312@@ -761,7 +761,7 @@ int devfreq_remove_governor(struct devfreq_governor *governor)
40313 }
40314 }
40315
40316- list_del(&governor->node);
40317+ pax_list_del((struct list_head *)&governor->node);
40318 err_out:
40319 mutex_unlock(&devfreq_list_lock);
40320
40321diff --git a/drivers/dma/sh/shdma-base.c b/drivers/dma/sh/shdma-base.c
40322index 8ee383d..736b5de 100644
40323--- a/drivers/dma/sh/shdma-base.c
40324+++ b/drivers/dma/sh/shdma-base.c
40325@@ -228,8 +228,8 @@ static int shdma_alloc_chan_resources(struct dma_chan *chan)
40326 schan->slave_id = -EINVAL;
40327 }
40328
40329- schan->desc = kcalloc(NR_DESCS_PER_CHANNEL,
40330- sdev->desc_size, GFP_KERNEL);
40331+ schan->desc = kcalloc(sdev->desc_size,
40332+ NR_DESCS_PER_CHANNEL, GFP_KERNEL);
40333 if (!schan->desc) {
40334 ret = -ENOMEM;
40335 goto edescalloc;
40336diff --git a/drivers/dma/sh/shdmac.c b/drivers/dma/sh/shdmac.c
40337index 9f1d4c7..fceff78 100644
40338--- a/drivers/dma/sh/shdmac.c
40339+++ b/drivers/dma/sh/shdmac.c
40340@@ -513,7 +513,7 @@ static int sh_dmae_nmi_handler(struct notifier_block *self,
40341 return ret;
40342 }
40343
40344-static struct notifier_block sh_dmae_nmi_notifier __read_mostly = {
40345+static struct notifier_block sh_dmae_nmi_notifier = {
40346 .notifier_call = sh_dmae_nmi_handler,
40347
40348 /* Run before NMI debug handler and KGDB */
40349diff --git a/drivers/edac/edac_device.c b/drivers/edac/edac_device.c
40350index 592af5f..bb1d583 100644
40351--- a/drivers/edac/edac_device.c
40352+++ b/drivers/edac/edac_device.c
40353@@ -477,9 +477,9 @@ void edac_device_reset_delay_period(struct edac_device_ctl_info *edac_dev,
40354 */
40355 int edac_device_alloc_index(void)
40356 {
40357- static atomic_t device_indexes = ATOMIC_INIT(0);
40358+ static atomic_unchecked_t device_indexes = ATOMIC_INIT(0);
40359
40360- return atomic_inc_return(&device_indexes) - 1;
40361+ return atomic_inc_return_unchecked(&device_indexes) - 1;
40362 }
40363 EXPORT_SYMBOL_GPL(edac_device_alloc_index);
40364
40365diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c
40366index c84eecb..4d7381d 100644
40367--- a/drivers/edac/edac_mc_sysfs.c
40368+++ b/drivers/edac/edac_mc_sysfs.c
40369@@ -154,7 +154,7 @@ static const char * const edac_caps[] = {
40370 struct dev_ch_attribute {
40371 struct device_attribute attr;
40372 int channel;
40373-};
40374+} __do_const;
40375
40376 #define DEVICE_CHANNEL(_name, _mode, _show, _store, _var) \
40377 static struct dev_ch_attribute dev_attr_legacy_##_name = \
40378@@ -1009,15 +1009,17 @@ int edac_create_sysfs_mci_device(struct mem_ctl_info *mci)
40379 }
40380
40381 if (mci->set_sdram_scrub_rate || mci->get_sdram_scrub_rate) {
40382+ pax_open_kernel();
40383 if (mci->get_sdram_scrub_rate) {
40384- dev_attr_sdram_scrub_rate.attr.mode |= S_IRUGO;
40385- dev_attr_sdram_scrub_rate.show = &mci_sdram_scrub_rate_show;
40386+ *(umode_t *)&dev_attr_sdram_scrub_rate.attr.mode |= S_IRUGO;
40387+ *(void **)&dev_attr_sdram_scrub_rate.show = &mci_sdram_scrub_rate_show;
40388 }
40389
40390 if (mci->set_sdram_scrub_rate) {
40391- dev_attr_sdram_scrub_rate.attr.mode |= S_IWUSR;
40392- dev_attr_sdram_scrub_rate.store = &mci_sdram_scrub_rate_store;
40393+ *(umode_t *)&dev_attr_sdram_scrub_rate.attr.mode |= S_IWUSR;
40394+ *(void **)&dev_attr_sdram_scrub_rate.store = &mci_sdram_scrub_rate_store;
40395 }
40396+ pax_close_kernel();
40397
40398 err = device_create_file(&mci->dev, &dev_attr_sdram_scrub_rate);
40399 if (err) {
40400diff --git a/drivers/edac/edac_pci.c b/drivers/edac/edac_pci.c
40401index 2cf44b4d..6dd2dc7 100644
40402--- a/drivers/edac/edac_pci.c
40403+++ b/drivers/edac/edac_pci.c
40404@@ -29,7 +29,7 @@
40405
40406 static DEFINE_MUTEX(edac_pci_ctls_mutex);
40407 static LIST_HEAD(edac_pci_list);
40408-static atomic_t pci_indexes = ATOMIC_INIT(0);
40409+static atomic_unchecked_t pci_indexes = ATOMIC_INIT(0);
40410
40411 /*
40412 * edac_pci_alloc_ctl_info
40413@@ -315,7 +315,7 @@ EXPORT_SYMBOL_GPL(edac_pci_reset_delay_period);
40414 */
40415 int edac_pci_alloc_index(void)
40416 {
40417- return atomic_inc_return(&pci_indexes) - 1;
40418+ return atomic_inc_return_unchecked(&pci_indexes) - 1;
40419 }
40420 EXPORT_SYMBOL_GPL(edac_pci_alloc_index);
40421
40422diff --git a/drivers/edac/edac_pci_sysfs.c b/drivers/edac/edac_pci_sysfs.c
40423index 24d877f..4e30133 100644
40424--- a/drivers/edac/edac_pci_sysfs.c
40425+++ b/drivers/edac/edac_pci_sysfs.c
40426@@ -23,8 +23,8 @@ static int edac_pci_log_pe = 1; /* log PCI parity errors */
40427 static int edac_pci_log_npe = 1; /* log PCI non-parity error errors */
40428 static int edac_pci_poll_msec = 1000; /* one second workq period */
40429
40430-static atomic_t pci_parity_count = ATOMIC_INIT(0);
40431-static atomic_t pci_nonparity_count = ATOMIC_INIT(0);
40432+static atomic_unchecked_t pci_parity_count = ATOMIC_INIT(0);
40433+static atomic_unchecked_t pci_nonparity_count = ATOMIC_INIT(0);
40434
40435 static struct kobject *edac_pci_top_main_kobj;
40436 static atomic_t edac_pci_sysfs_refcount = ATOMIC_INIT(0);
40437@@ -232,7 +232,7 @@ struct edac_pci_dev_attribute {
40438 void *value;
40439 ssize_t(*show) (void *, char *);
40440 ssize_t(*store) (void *, const char *, size_t);
40441-};
40442+} __do_const;
40443
40444 /* Set of show/store abstract level functions for PCI Parity object */
40445 static ssize_t edac_pci_dev_show(struct kobject *kobj, struct attribute *attr,
40446@@ -576,7 +576,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
40447 edac_printk(KERN_CRIT, EDAC_PCI,
40448 "Signaled System Error on %s\n",
40449 pci_name(dev));
40450- atomic_inc(&pci_nonparity_count);
40451+ atomic_inc_unchecked(&pci_nonparity_count);
40452 }
40453
40454 if (status & (PCI_STATUS_PARITY)) {
40455@@ -584,7 +584,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
40456 "Master Data Parity Error on %s\n",
40457 pci_name(dev));
40458
40459- atomic_inc(&pci_parity_count);
40460+ atomic_inc_unchecked(&pci_parity_count);
40461 }
40462
40463 if (status & (PCI_STATUS_DETECTED_PARITY)) {
40464@@ -592,7 +592,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
40465 "Detected Parity Error on %s\n",
40466 pci_name(dev));
40467
40468- atomic_inc(&pci_parity_count);
40469+ atomic_inc_unchecked(&pci_parity_count);
40470 }
40471 }
40472
40473@@ -615,7 +615,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
40474 edac_printk(KERN_CRIT, EDAC_PCI, "Bridge "
40475 "Signaled System Error on %s\n",
40476 pci_name(dev));
40477- atomic_inc(&pci_nonparity_count);
40478+ atomic_inc_unchecked(&pci_nonparity_count);
40479 }
40480
40481 if (status & (PCI_STATUS_PARITY)) {
40482@@ -623,7 +623,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
40483 "Master Data Parity Error on "
40484 "%s\n", pci_name(dev));
40485
40486- atomic_inc(&pci_parity_count);
40487+ atomic_inc_unchecked(&pci_parity_count);
40488 }
40489
40490 if (status & (PCI_STATUS_DETECTED_PARITY)) {
40491@@ -631,7 +631,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
40492 "Detected Parity Error on %s\n",
40493 pci_name(dev));
40494
40495- atomic_inc(&pci_parity_count);
40496+ atomic_inc_unchecked(&pci_parity_count);
40497 }
40498 }
40499 }
40500@@ -669,7 +669,7 @@ void edac_pci_do_parity_check(void)
40501 if (!check_pci_errors)
40502 return;
40503
40504- before_count = atomic_read(&pci_parity_count);
40505+ before_count = atomic_read_unchecked(&pci_parity_count);
40506
40507 /* scan all PCI devices looking for a Parity Error on devices and
40508 * bridges.
40509@@ -681,7 +681,7 @@ void edac_pci_do_parity_check(void)
40510 /* Only if operator has selected panic on PCI Error */
40511 if (edac_pci_get_panic_on_pe()) {
40512 /* If the count is different 'after' from 'before' */
40513- if (before_count != atomic_read(&pci_parity_count))
40514+ if (before_count != atomic_read_unchecked(&pci_parity_count))
40515 panic("EDAC: PCI Parity Error");
40516 }
40517 }
40518diff --git a/drivers/edac/mce_amd.h b/drivers/edac/mce_amd.h
40519index c2359a1..8bd119d 100644
40520--- a/drivers/edac/mce_amd.h
40521+++ b/drivers/edac/mce_amd.h
40522@@ -74,7 +74,7 @@ struct amd_decoder_ops {
40523 bool (*mc0_mce)(u16, u8);
40524 bool (*mc1_mce)(u16, u8);
40525 bool (*mc2_mce)(u16, u8);
40526-};
40527+} __no_const;
40528
40529 void amd_report_gart_errors(bool);
40530 void amd_register_ecc_decoder(void (*f)(int, struct mce *));
40531diff --git a/drivers/firewire/core-card.c b/drivers/firewire/core-card.c
40532index 57ea7f4..af06b76 100644
40533--- a/drivers/firewire/core-card.c
40534+++ b/drivers/firewire/core-card.c
40535@@ -528,9 +528,9 @@ void fw_card_initialize(struct fw_card *card,
40536 const struct fw_card_driver *driver,
40537 struct device *device)
40538 {
40539- static atomic_t index = ATOMIC_INIT(-1);
40540+ static atomic_unchecked_t index = ATOMIC_INIT(-1);
40541
40542- card->index = atomic_inc_return(&index);
40543+ card->index = atomic_inc_return_unchecked(&index);
40544 card->driver = driver;
40545 card->device = device;
40546 card->current_tlabel = 0;
40547@@ -680,7 +680,7 @@ EXPORT_SYMBOL_GPL(fw_card_release);
40548
40549 void fw_core_remove_card(struct fw_card *card)
40550 {
40551- struct fw_card_driver dummy_driver = dummy_driver_template;
40552+ fw_card_driver_no_const dummy_driver = dummy_driver_template;
40553
40554 card->driver->update_phy_reg(card, 4,
40555 PHY_LINK_ACTIVE | PHY_CONTENDER, 0);
40556diff --git a/drivers/firewire/core-device.c b/drivers/firewire/core-device.c
40557index f9e3aee..269dbdb 100644
40558--- a/drivers/firewire/core-device.c
40559+++ b/drivers/firewire/core-device.c
40560@@ -256,7 +256,7 @@ EXPORT_SYMBOL(fw_device_enable_phys_dma);
40561 struct config_rom_attribute {
40562 struct device_attribute attr;
40563 u32 key;
40564-};
40565+} __do_const;
40566
40567 static ssize_t show_immediate(struct device *dev,
40568 struct device_attribute *dattr, char *buf)
40569diff --git a/drivers/firewire/core-transaction.c b/drivers/firewire/core-transaction.c
40570index d6a09b9..18e90dd 100644
40571--- a/drivers/firewire/core-transaction.c
40572+++ b/drivers/firewire/core-transaction.c
40573@@ -38,6 +38,7 @@
40574 #include <linux/timer.h>
40575 #include <linux/types.h>
40576 #include <linux/workqueue.h>
40577+#include <linux/sched.h>
40578
40579 #include <asm/byteorder.h>
40580
40581diff --git a/drivers/firewire/core.h b/drivers/firewire/core.h
40582index e1480ff6..1a429bd 100644
40583--- a/drivers/firewire/core.h
40584+++ b/drivers/firewire/core.h
40585@@ -111,6 +111,7 @@ struct fw_card_driver {
40586
40587 int (*stop_iso)(struct fw_iso_context *ctx);
40588 };
40589+typedef struct fw_card_driver __no_const fw_card_driver_no_const;
40590
40591 void fw_card_initialize(struct fw_card *card,
40592 const struct fw_card_driver *driver, struct device *device);
40593diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c
40594index f51d376..b118e40 100644
40595--- a/drivers/firewire/ohci.c
40596+++ b/drivers/firewire/ohci.c
40597@@ -2049,10 +2049,12 @@ static void bus_reset_work(struct work_struct *work)
40598 be32_to_cpu(ohci->next_header));
40599 }
40600
40601+#ifndef CONFIG_GRKERNSEC
40602 if (param_remote_dma) {
40603 reg_write(ohci, OHCI1394_PhyReqFilterHiSet, ~0);
40604 reg_write(ohci, OHCI1394_PhyReqFilterLoSet, ~0);
40605 }
40606+#endif
40607
40608 spin_unlock_irq(&ohci->lock);
40609
40610@@ -2584,8 +2586,10 @@ static int ohci_enable_phys_dma(struct fw_card *card,
40611 unsigned long flags;
40612 int n, ret = 0;
40613
40614+#ifndef CONFIG_GRKERNSEC
40615 if (param_remote_dma)
40616 return 0;
40617+#endif
40618
40619 /*
40620 * FIXME: Make sure this bitmask is cleared when we clear the busReset
40621diff --git a/drivers/firmware/dmi-id.c b/drivers/firmware/dmi-id.c
40622index 94a58a0..f5eba42 100644
40623--- a/drivers/firmware/dmi-id.c
40624+++ b/drivers/firmware/dmi-id.c
40625@@ -16,7 +16,7 @@
40626 struct dmi_device_attribute{
40627 struct device_attribute dev_attr;
40628 int field;
40629-};
40630+} __do_const;
40631 #define to_dmi_dev_attr(_dev_attr) \
40632 container_of(_dev_attr, struct dmi_device_attribute, dev_attr)
40633
40634diff --git a/drivers/firmware/efi/cper.c b/drivers/firmware/efi/cper.c
40635index 4fd9961..52d60ce 100644
40636--- a/drivers/firmware/efi/cper.c
40637+++ b/drivers/firmware/efi/cper.c
40638@@ -44,12 +44,12 @@ static char rcd_decode_str[CPER_REC_LEN];
40639 */
40640 u64 cper_next_record_id(void)
40641 {
40642- static atomic64_t seq;
40643+ static atomic64_unchecked_t seq;
40644
40645- if (!atomic64_read(&seq))
40646- atomic64_set(&seq, ((u64)get_seconds()) << 32);
40647+ if (!atomic64_read_unchecked(&seq))
40648+ atomic64_set_unchecked(&seq, ((u64)get_seconds()) << 32);
40649
40650- return atomic64_inc_return(&seq);
40651+ return atomic64_inc_return_unchecked(&seq);
40652 }
40653 EXPORT_SYMBOL_GPL(cper_next_record_id);
40654
40655diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
40656index 3061bb8..92b5fcc 100644
40657--- a/drivers/firmware/efi/efi.c
40658+++ b/drivers/firmware/efi/efi.c
40659@@ -160,14 +160,16 @@ static struct attribute_group efi_subsys_attr_group = {
40660 };
40661
40662 static struct efivars generic_efivars;
40663-static struct efivar_operations generic_ops;
40664+static efivar_operations_no_const generic_ops __read_only;
40665
40666 static int generic_ops_register(void)
40667 {
40668- generic_ops.get_variable = efi.get_variable;
40669- generic_ops.set_variable = efi.set_variable;
40670- generic_ops.get_next_variable = efi.get_next_variable;
40671- generic_ops.query_variable_store = efi_query_variable_store;
40672+ pax_open_kernel();
40673+ *(void **)&generic_ops.get_variable = efi.get_variable;
40674+ *(void **)&generic_ops.set_variable = efi.set_variable;
40675+ *(void **)&generic_ops.get_next_variable = efi.get_next_variable;
40676+ *(void **)&generic_ops.query_variable_store = efi_query_variable_store;
40677+ pax_close_kernel();
40678
40679 return efivars_register(&generic_efivars, &generic_ops, efi_kobj);
40680 }
40681diff --git a/drivers/firmware/efi/efivars.c b/drivers/firmware/efi/efivars.c
40682index 7b2e049..a253334 100644
40683--- a/drivers/firmware/efi/efivars.c
40684+++ b/drivers/firmware/efi/efivars.c
40685@@ -589,7 +589,7 @@ efivar_create_sysfs_entry(struct efivar_entry *new_var)
40686 static int
40687 create_efivars_bin_attributes(void)
40688 {
40689- struct bin_attribute *attr;
40690+ bin_attribute_no_const *attr;
40691 int error;
40692
40693 /* new_var */
40694diff --git a/drivers/firmware/efi/runtime-map.c b/drivers/firmware/efi/runtime-map.c
40695index 87b8e3b..c4afb35 100644
40696--- a/drivers/firmware/efi/runtime-map.c
40697+++ b/drivers/firmware/efi/runtime-map.c
40698@@ -97,7 +97,7 @@ static void map_release(struct kobject *kobj)
40699 kfree(entry);
40700 }
40701
40702-static struct kobj_type __refdata map_ktype = {
40703+static const struct kobj_type __refconst map_ktype = {
40704 .sysfs_ops = &map_attr_ops,
40705 .default_attrs = def_attrs,
40706 .release = map_release,
40707diff --git a/drivers/firmware/google/gsmi.c b/drivers/firmware/google/gsmi.c
40708index f1ab05e..ab51228 100644
40709--- a/drivers/firmware/google/gsmi.c
40710+++ b/drivers/firmware/google/gsmi.c
40711@@ -709,7 +709,7 @@ static u32 __init hash_oem_table_id(char s[8])
40712 return local_hash_64(input, 32);
40713 }
40714
40715-static struct dmi_system_id gsmi_dmi_table[] __initdata = {
40716+static const struct dmi_system_id gsmi_dmi_table[] __initconst = {
40717 {
40718 .ident = "Google Board",
40719 .matches = {
40720diff --git a/drivers/firmware/google/memconsole.c b/drivers/firmware/google/memconsole.c
40721index 2f569aa..26e4f39 100644
40722--- a/drivers/firmware/google/memconsole.c
40723+++ b/drivers/firmware/google/memconsole.c
40724@@ -136,7 +136,7 @@ static bool __init found_memconsole(void)
40725 return false;
40726 }
40727
40728-static struct dmi_system_id memconsole_dmi_table[] __initdata = {
40729+static const struct dmi_system_id memconsole_dmi_table[] __initconst = {
40730 {
40731 .ident = "Google Board",
40732 .matches = {
40733@@ -155,7 +155,10 @@ static int __init memconsole_init(void)
40734 if (!found_memconsole())
40735 return -ENODEV;
40736
40737- memconsole_bin_attr.size = memconsole_length;
40738+ pax_open_kernel();
40739+ *(size_t *)&memconsole_bin_attr.size = memconsole_length;
40740+ pax_close_kernel();
40741+
40742 return sysfs_create_bin_file(firmware_kobj, &memconsole_bin_attr);
40743 }
40744
40745diff --git a/drivers/firmware/memmap.c b/drivers/firmware/memmap.c
40746index cc016c61..d35279e 100644
40747--- a/drivers/firmware/memmap.c
40748+++ b/drivers/firmware/memmap.c
40749@@ -124,7 +124,7 @@ static void __meminit release_firmware_map_entry(struct kobject *kobj)
40750 kfree(entry);
40751 }
40752
40753-static struct kobj_type __refdata memmap_ktype = {
40754+static const struct kobj_type __refconst memmap_ktype = {
40755 .release = release_firmware_map_entry,
40756 .sysfs_ops = &memmap_attr_ops,
40757 .default_attrs = def_attrs,
40758diff --git a/drivers/gpio/gpio-em.c b/drivers/gpio/gpio-em.c
40759index 3cfcfc6..09d6f117 100644
40760--- a/drivers/gpio/gpio-em.c
40761+++ b/drivers/gpio/gpio-em.c
40762@@ -278,7 +278,7 @@ static int em_gio_probe(struct platform_device *pdev)
40763 struct em_gio_priv *p;
40764 struct resource *io[2], *irq[2];
40765 struct gpio_chip *gpio_chip;
40766- struct irq_chip *irq_chip;
40767+ irq_chip_no_const *irq_chip;
40768 const char *name = dev_name(&pdev->dev);
40769 int ret;
40770
40771diff --git a/drivers/gpio/gpio-ich.c b/drivers/gpio/gpio-ich.c
40772index 7818cd1..1be40e5 100644
40773--- a/drivers/gpio/gpio-ich.c
40774+++ b/drivers/gpio/gpio-ich.c
40775@@ -94,7 +94,7 @@ struct ichx_desc {
40776 * this option allows driver caching written output values
40777 */
40778 bool use_outlvl_cache;
40779-};
40780+} __do_const;
40781
40782 static struct {
40783 spinlock_t lock;
40784diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
40785index f476ae2..05e1bdd 100644
40786--- a/drivers/gpio/gpio-omap.c
40787+++ b/drivers/gpio/gpio-omap.c
40788@@ -1188,7 +1188,7 @@ static int omap_gpio_probe(struct platform_device *pdev)
40789 const struct omap_gpio_platform_data *pdata;
40790 struct resource *res;
40791 struct gpio_bank *bank;
40792- struct irq_chip *irqc;
40793+ irq_chip_no_const *irqc;
40794 int ret;
40795
40796 match = of_match_device(of_match_ptr(omap_gpio_match), dev);
40797diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c
40798index c49522e..9a7ee54 100644
40799--- a/drivers/gpio/gpio-rcar.c
40800+++ b/drivers/gpio/gpio-rcar.c
40801@@ -348,7 +348,7 @@ static int gpio_rcar_probe(struct platform_device *pdev)
40802 struct gpio_rcar_priv *p;
40803 struct resource *io, *irq;
40804 struct gpio_chip *gpio_chip;
40805- struct irq_chip *irq_chip;
40806+ irq_chip_no_const *irq_chip;
40807 struct device *dev = &pdev->dev;
40808 const char *name = dev_name(dev);
40809 int ret;
40810diff --git a/drivers/gpio/gpio-vr41xx.c b/drivers/gpio/gpio-vr41xx.c
40811index c1caa45..f0f97d2 100644
40812--- a/drivers/gpio/gpio-vr41xx.c
40813+++ b/drivers/gpio/gpio-vr41xx.c
40814@@ -224,7 +224,7 @@ static int giu_get_irq(unsigned int irq)
40815 printk(KERN_ERR "spurious GIU interrupt: %04x(%04x),%04x(%04x)\n",
40816 maskl, pendl, maskh, pendh);
40817
40818- atomic_inc(&irq_err_count);
40819+ atomic_inc_unchecked(&irq_err_count);
40820
40821 return -EINVAL;
40822 }
40823diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
40824index 1ca9295..9f3d481 100644
40825--- a/drivers/gpio/gpiolib.c
40826+++ b/drivers/gpio/gpiolib.c
40827@@ -554,8 +554,10 @@ static void gpiochip_irqchip_remove(struct gpio_chip *gpiochip)
40828 }
40829
40830 if (gpiochip->irqchip) {
40831- gpiochip->irqchip->irq_request_resources = NULL;
40832- gpiochip->irqchip->irq_release_resources = NULL;
40833+ pax_open_kernel();
40834+ *(void **)&gpiochip->irqchip->irq_request_resources = NULL;
40835+ *(void **)&gpiochip->irqchip->irq_release_resources = NULL;
40836+ pax_close_kernel();
40837 gpiochip->irqchip = NULL;
40838 }
40839 }
40840@@ -621,8 +623,11 @@ int gpiochip_irqchip_add(struct gpio_chip *gpiochip,
40841 gpiochip->irqchip = NULL;
40842 return -EINVAL;
40843 }
40844- irqchip->irq_request_resources = gpiochip_irq_reqres;
40845- irqchip->irq_release_resources = gpiochip_irq_relres;
40846+
40847+ pax_open_kernel();
40848+ *(void **)&irqchip->irq_request_resources = gpiochip_irq_reqres;
40849+ *(void **)&irqchip->irq_release_resources = gpiochip_irq_relres;
40850+ pax_close_kernel();
40851
40852 /*
40853 * Prepare the mapping since the irqchip shall be orthogonal to
40854diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
40855index 488f51d..301d462 100644
40856--- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
40857+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
40858@@ -118,7 +118,7 @@ struct device_queue_manager_ops {
40859 enum cache_policy alternate_policy,
40860 void __user *alternate_aperture_base,
40861 uint64_t alternate_aperture_size);
40862-};
40863+} __no_const;
40864
40865 /**
40866 * struct device_queue_manager
40867diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h
40868index 5940531..a75b0e5 100644
40869--- a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h
40870+++ b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h
40871@@ -62,7 +62,7 @@ struct kernel_queue_ops {
40872
40873 void (*submit_packet)(struct kernel_queue *kq);
40874 void (*rollback_packet)(struct kernel_queue *kq);
40875-};
40876+} __no_const;
40877
40878 struct kernel_queue {
40879 struct kernel_queue_ops ops;
40880diff --git a/drivers/gpu/drm/drm_context.c b/drivers/gpu/drm/drm_context.c
40881index 9b23525..65f4110 100644
40882--- a/drivers/gpu/drm/drm_context.c
40883+++ b/drivers/gpu/drm/drm_context.c
40884@@ -53,6 +53,9 @@ struct drm_ctx_list {
40885 */
40886 void drm_legacy_ctxbitmap_free(struct drm_device * dev, int ctx_handle)
40887 {
40888+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40889+ return;
40890+
40891 mutex_lock(&dev->struct_mutex);
40892 idr_remove(&dev->ctx_idr, ctx_handle);
40893 mutex_unlock(&dev->struct_mutex);
40894@@ -87,6 +90,9 @@ static int drm_legacy_ctxbitmap_next(struct drm_device * dev)
40895 */
40896 int drm_legacy_ctxbitmap_init(struct drm_device * dev)
40897 {
40898+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40899+ return -EINVAL;
40900+
40901 idr_init(&dev->ctx_idr);
40902 return 0;
40903 }
40904@@ -101,6 +107,9 @@ int drm_legacy_ctxbitmap_init(struct drm_device * dev)
40905 */
40906 void drm_legacy_ctxbitmap_cleanup(struct drm_device * dev)
40907 {
40908+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40909+ return;
40910+
40911 mutex_lock(&dev->struct_mutex);
40912 idr_destroy(&dev->ctx_idr);
40913 mutex_unlock(&dev->struct_mutex);
40914@@ -119,11 +128,14 @@ void drm_legacy_ctxbitmap_flush(struct drm_device *dev, struct drm_file *file)
40915 {
40916 struct drm_ctx_list *pos, *tmp;
40917
40918+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40919+ return;
40920+
40921 mutex_lock(&dev->ctxlist_mutex);
40922
40923 list_for_each_entry_safe(pos, tmp, &dev->ctxlist, head) {
40924 if (pos->tag == file &&
40925- pos->handle != DRM_KERNEL_CONTEXT) {
40926+ _DRM_LOCKING_CONTEXT(pos->handle) != DRM_KERNEL_CONTEXT) {
40927 if (dev->driver->context_dtor)
40928 dev->driver->context_dtor(dev, pos->handle);
40929
40930@@ -161,6 +173,9 @@ int drm_legacy_getsareactx(struct drm_device *dev, void *data,
40931 struct drm_local_map *map;
40932 struct drm_map_list *_entry;
40933
40934+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40935+ return -EINVAL;
40936+
40937 mutex_lock(&dev->struct_mutex);
40938
40939 map = idr_find(&dev->ctx_idr, request->ctx_id);
40940@@ -205,6 +220,9 @@ int drm_legacy_setsareactx(struct drm_device *dev, void *data,
40941 struct drm_local_map *map = NULL;
40942 struct drm_map_list *r_list = NULL;
40943
40944+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40945+ return -EINVAL;
40946+
40947 mutex_lock(&dev->struct_mutex);
40948 list_for_each_entry(r_list, &dev->maplist, head) {
40949 if (r_list->map
40950@@ -277,7 +295,13 @@ static int drm_context_switch_complete(struct drm_device *dev,
40951 {
40952 dev->last_context = new; /* PRE/POST: This is the _only_ writer. */
40953
40954- if (!_DRM_LOCK_IS_HELD(file_priv->master->lock.hw_lock->lock)) {
40955+ if (file_priv->master->lock.hw_lock == NULL) {
40956+ DRM_ERROR(
40957+ "Device has been unregistered. Hard exit. Process %d\n",
40958+ task_pid_nr(current));
40959+ send_sig(SIGTERM, current, 0);
40960+ return -EPERM;
40961+ } else if (!_DRM_LOCK_IS_HELD(file_priv->master->lock.hw_lock->lock)) {
40962 DRM_ERROR("Lock isn't held after context switch\n");
40963 }
40964
40965@@ -305,6 +329,9 @@ int drm_legacy_resctx(struct drm_device *dev, void *data,
40966 struct drm_ctx ctx;
40967 int i;
40968
40969+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40970+ return -EINVAL;
40971+
40972 if (res->count >= DRM_RESERVED_CONTEXTS) {
40973 memset(&ctx, 0, sizeof(ctx));
40974 for (i = 0; i < DRM_RESERVED_CONTEXTS; i++) {
40975@@ -335,8 +362,11 @@ int drm_legacy_addctx(struct drm_device *dev, void *data,
40976 struct drm_ctx_list *ctx_entry;
40977 struct drm_ctx *ctx = data;
40978
40979+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40980+ return -EINVAL;
40981+
40982 ctx->handle = drm_legacy_ctxbitmap_next(dev);
40983- if (ctx->handle == DRM_KERNEL_CONTEXT) {
40984+ if (_DRM_LOCKING_CONTEXT(ctx->handle) == DRM_KERNEL_CONTEXT) {
40985 /* Skip kernel's context and get a new one. */
40986 ctx->handle = drm_legacy_ctxbitmap_next(dev);
40987 }
40988@@ -378,6 +408,9 @@ int drm_legacy_getctx(struct drm_device *dev, void *data,
40989 {
40990 struct drm_ctx *ctx = data;
40991
40992+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40993+ return -EINVAL;
40994+
40995 /* This is 0, because we don't handle any context flags */
40996 ctx->flags = 0;
40997
40998@@ -400,6 +433,9 @@ int drm_legacy_switchctx(struct drm_device *dev, void *data,
40999 {
41000 struct drm_ctx *ctx = data;
41001
41002+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
41003+ return -EINVAL;
41004+
41005 DRM_DEBUG("%d\n", ctx->handle);
41006 return drm_context_switch(dev, dev->last_context, ctx->handle);
41007 }
41008@@ -420,6 +456,9 @@ int drm_legacy_newctx(struct drm_device *dev, void *data,
41009 {
41010 struct drm_ctx *ctx = data;
41011
41012+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
41013+ return -EINVAL;
41014+
41015 DRM_DEBUG("%d\n", ctx->handle);
41016 drm_context_switch_complete(dev, file_priv, ctx->handle);
41017
41018@@ -442,8 +481,11 @@ int drm_legacy_rmctx(struct drm_device *dev, void *data,
41019 {
41020 struct drm_ctx *ctx = data;
41021
41022+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
41023+ return -EINVAL;
41024+
41025 DRM_DEBUG("%d\n", ctx->handle);
41026- if (ctx->handle != DRM_KERNEL_CONTEXT) {
41027+ if (_DRM_LOCKING_CONTEXT(ctx->handle) != DRM_KERNEL_CONTEXT) {
41028 if (dev->driver->context_dtor)
41029 dev->driver->context_dtor(dev, ctx->handle);
41030 drm_legacy_ctxbitmap_free(dev, ctx->handle);
41031diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
41032index b6f076b..2918de2 100644
41033--- a/drivers/gpu/drm/drm_crtc.c
41034+++ b/drivers/gpu/drm/drm_crtc.c
41035@@ -4118,7 +4118,7 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev,
41036 goto done;
41037 }
41038
41039- if (copy_to_user(&enum_ptr[copied].name,
41040+ if (copy_to_user(enum_ptr[copied].name,
41041 &prop_enum->name, DRM_PROP_NAME_LEN)) {
41042 ret = -EFAULT;
41043 goto done;
41044diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
41045index d512134..a80a8e4 100644
41046--- a/drivers/gpu/drm/drm_drv.c
41047+++ b/drivers/gpu/drm/drm_drv.c
41048@@ -448,7 +448,7 @@ void drm_unplug_dev(struct drm_device *dev)
41049
41050 drm_device_set_unplugged(dev);
41051
41052- if (dev->open_count == 0) {
41053+ if (local_read(&dev->open_count) == 0) {
41054 drm_put_dev(dev);
41055 }
41056 mutex_unlock(&drm_global_mutex);
41057@@ -596,10 +596,13 @@ struct drm_device *drm_dev_alloc(struct drm_driver *driver,
41058 if (drm_ht_create(&dev->map_hash, 12))
41059 goto err_minors;
41060
41061- ret = drm_legacy_ctxbitmap_init(dev);
41062- if (ret) {
41063- DRM_ERROR("Cannot allocate memory for context bitmap.\n");
41064- goto err_ht;
41065+ if (drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT)) {
41066+ ret = drm_legacy_ctxbitmap_init(dev);
41067+ if (ret) {
41068+ DRM_ERROR(
41069+ "Cannot allocate memory for context bitmap.\n");
41070+ goto err_ht;
41071+ }
41072 }
41073
41074 if (drm_core_check_feature(dev, DRIVER_GEM)) {
41075diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
41076index 076dd60..e4a4ba7 100644
41077--- a/drivers/gpu/drm/drm_fops.c
41078+++ b/drivers/gpu/drm/drm_fops.c
41079@@ -89,7 +89,7 @@ int drm_open(struct inode *inode, struct file *filp)
41080 return PTR_ERR(minor);
41081
41082 dev = minor->dev;
41083- if (!dev->open_count++)
41084+ if (local_inc_return(&dev->open_count) == 1)
41085 need_setup = 1;
41086
41087 /* share address_space across all char-devs of a single device */
41088@@ -106,7 +106,7 @@ int drm_open(struct inode *inode, struct file *filp)
41089 return 0;
41090
41091 err_undo:
41092- dev->open_count--;
41093+ local_dec(&dev->open_count);
41094 drm_minor_release(minor);
41095 return retcode;
41096 }
41097@@ -376,7 +376,7 @@ int drm_release(struct inode *inode, struct file *filp)
41098
41099 mutex_lock(&drm_global_mutex);
41100
41101- DRM_DEBUG("open_count = %d\n", dev->open_count);
41102+ DRM_DEBUG("open_count = %ld\n", local_read(&dev->open_count));
41103
41104 mutex_lock(&dev->struct_mutex);
41105 list_del(&file_priv->lhead);
41106@@ -389,10 +389,10 @@ int drm_release(struct inode *inode, struct file *filp)
41107 * Begin inline drm_release
41108 */
41109
41110- DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %d\n",
41111+ DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %ld\n",
41112 task_pid_nr(current),
41113 (long)old_encode_dev(file_priv->minor->kdev->devt),
41114- dev->open_count);
41115+ local_read(&dev->open_count));
41116
41117 /* Release any auth tokens that might point to this file_priv,
41118 (do that under the drm_global_mutex) */
41119@@ -465,7 +465,7 @@ int drm_release(struct inode *inode, struct file *filp)
41120 * End inline drm_release
41121 */
41122
41123- if (!--dev->open_count) {
41124+ if (local_dec_and_test(&dev->open_count)) {
41125 retcode = drm_lastclose(dev);
41126 if (drm_device_is_unplugged(dev))
41127 drm_put_dev(dev);
41128diff --git a/drivers/gpu/drm/drm_global.c b/drivers/gpu/drm/drm_global.c
41129index 3d2e91c..d31c4c9 100644
41130--- a/drivers/gpu/drm/drm_global.c
41131+++ b/drivers/gpu/drm/drm_global.c
41132@@ -36,7 +36,7 @@
41133 struct drm_global_item {
41134 struct mutex mutex;
41135 void *object;
41136- int refcount;
41137+ atomic_t refcount;
41138 };
41139
41140 static struct drm_global_item glob[DRM_GLOBAL_NUM];
41141@@ -49,7 +49,7 @@ void drm_global_init(void)
41142 struct drm_global_item *item = &glob[i];
41143 mutex_init(&item->mutex);
41144 item->object = NULL;
41145- item->refcount = 0;
41146+ atomic_set(&item->refcount, 0);
41147 }
41148 }
41149
41150@@ -59,7 +59,7 @@ void drm_global_release(void)
41151 for (i = 0; i < DRM_GLOBAL_NUM; ++i) {
41152 struct drm_global_item *item = &glob[i];
41153 BUG_ON(item->object != NULL);
41154- BUG_ON(item->refcount != 0);
41155+ BUG_ON(atomic_read(&item->refcount) != 0);
41156 }
41157 }
41158
41159@@ -69,7 +69,7 @@ int drm_global_item_ref(struct drm_global_reference *ref)
41160 struct drm_global_item *item = &glob[ref->global_type];
41161
41162 mutex_lock(&item->mutex);
41163- if (item->refcount == 0) {
41164+ if (atomic_read(&item->refcount) == 0) {
41165 item->object = kzalloc(ref->size, GFP_KERNEL);
41166 if (unlikely(item->object == NULL)) {
41167 ret = -ENOMEM;
41168@@ -82,7 +82,7 @@ int drm_global_item_ref(struct drm_global_reference *ref)
41169 goto out_err;
41170
41171 }
41172- ++item->refcount;
41173+ atomic_inc(&item->refcount);
41174 ref->object = item->object;
41175 mutex_unlock(&item->mutex);
41176 return 0;
41177@@ -98,9 +98,9 @@ void drm_global_item_unref(struct drm_global_reference *ref)
41178 struct drm_global_item *item = &glob[ref->global_type];
41179
41180 mutex_lock(&item->mutex);
41181- BUG_ON(item->refcount == 0);
41182+ BUG_ON(atomic_read(&item->refcount) == 0);
41183 BUG_ON(ref->object != item->object);
41184- if (--item->refcount == 0) {
41185+ if (atomic_dec_and_test(&item->refcount)) {
41186 ref->release(ref);
41187 item->object = NULL;
41188 }
41189diff --git a/drivers/gpu/drm/drm_info.c b/drivers/gpu/drm/drm_info.c
41190index f1b32f9..394f791 100644
41191--- a/drivers/gpu/drm/drm_info.c
41192+++ b/drivers/gpu/drm/drm_info.c
41193@@ -76,10 +76,13 @@ int drm_vm_info(struct seq_file *m, void *data)
41194 struct drm_local_map *map;
41195 struct drm_map_list *r_list;
41196
41197- /* Hardcoded from _DRM_FRAME_BUFFER,
41198- _DRM_REGISTERS, _DRM_SHM, _DRM_AGP, and
41199- _DRM_SCATTER_GATHER and _DRM_CONSISTENT */
41200- const char *types[] = { "FB", "REG", "SHM", "AGP", "SG", "PCI" };
41201+ static const char * const types[] = {
41202+ [_DRM_FRAME_BUFFER] = "FB",
41203+ [_DRM_REGISTERS] = "REG",
41204+ [_DRM_SHM] = "SHM",
41205+ [_DRM_AGP] = "AGP",
41206+ [_DRM_SCATTER_GATHER] = "SG",
41207+ [_DRM_CONSISTENT] = "PCI"};
41208 const char *type;
41209 int i;
41210
41211@@ -90,7 +93,7 @@ int drm_vm_info(struct seq_file *m, void *data)
41212 map = r_list->map;
41213 if (!map)
41214 continue;
41215- if (map->type < 0 || map->type > 5)
41216+ if (map->type >= ARRAY_SIZE(types))
41217 type = "??";
41218 else
41219 type = types[map->type];
41220diff --git a/drivers/gpu/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c
41221index 2f4c4343..dd12cd2 100644
41222--- a/drivers/gpu/drm/drm_ioc32.c
41223+++ b/drivers/gpu/drm/drm_ioc32.c
41224@@ -457,7 +457,7 @@ static int compat_drm_infobufs(struct file *file, unsigned int cmd,
41225 request = compat_alloc_user_space(nbytes);
41226 if (!access_ok(VERIFY_WRITE, request, nbytes))
41227 return -EFAULT;
41228- list = (struct drm_buf_desc *) (request + 1);
41229+ list = (struct drm_buf_desc __user *) (request + 1);
41230
41231 if (__put_user(count, &request->count)
41232 || __put_user(list, &request->list))
41233@@ -518,7 +518,7 @@ static int compat_drm_mapbufs(struct file *file, unsigned int cmd,
41234 request = compat_alloc_user_space(nbytes);
41235 if (!access_ok(VERIFY_WRITE, request, nbytes))
41236 return -EFAULT;
41237- list = (struct drm_buf_pub *) (request + 1);
41238+ list = (struct drm_buf_pub __user *) (request + 1);
41239
41240 if (__put_user(count, &request->count)
41241 || __put_user(list, &request->list))
41242@@ -1016,7 +1016,7 @@ static int compat_drm_wait_vblank(struct file *file, unsigned int cmd,
41243 return 0;
41244 }
41245
41246-drm_ioctl_compat_t *drm_compat_ioctls[] = {
41247+drm_ioctl_compat_t drm_compat_ioctls[] = {
41248 [DRM_IOCTL_NR(DRM_IOCTL_VERSION32)] = compat_drm_version,
41249 [DRM_IOCTL_NR(DRM_IOCTL_GET_UNIQUE32)] = compat_drm_getunique,
41250 [DRM_IOCTL_NR(DRM_IOCTL_GET_MAP32)] = compat_drm_getmap,
41251@@ -1062,7 +1062,6 @@ drm_ioctl_compat_t *drm_compat_ioctls[] = {
41252 long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
41253 {
41254 unsigned int nr = DRM_IOCTL_NR(cmd);
41255- drm_ioctl_compat_t *fn;
41256 int ret;
41257
41258 /* Assume that ioctls without an explicit compat routine will just
41259@@ -1072,10 +1071,8 @@ long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
41260 if (nr >= ARRAY_SIZE(drm_compat_ioctls))
41261 return drm_ioctl(filp, cmd, arg);
41262
41263- fn = drm_compat_ioctls[nr];
41264-
41265- if (fn != NULL)
41266- ret = (*fn) (filp, cmd, arg);
41267+ if (drm_compat_ioctls[nr] != NULL)
41268+ ret = (*drm_compat_ioctls[nr]) (filp, cmd, arg);
41269 else
41270 ret = drm_ioctl(filp, cmd, arg);
41271
41272diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c
41273index 3785d66..1c489ef 100644
41274--- a/drivers/gpu/drm/drm_ioctl.c
41275+++ b/drivers/gpu/drm/drm_ioctl.c
41276@@ -655,7 +655,7 @@ long drm_ioctl(struct file *filp,
41277 struct drm_file *file_priv = filp->private_data;
41278 struct drm_device *dev;
41279 const struct drm_ioctl_desc *ioctl = NULL;
41280- drm_ioctl_t *func;
41281+ drm_ioctl_no_const_t func;
41282 unsigned int nr = DRM_IOCTL_NR(cmd);
41283 int retcode = -EINVAL;
41284 char stack_kdata[128];
41285diff --git a/drivers/gpu/drm/drm_lock.c b/drivers/gpu/drm/drm_lock.c
41286index f861361..b61d4c7 100644
41287--- a/drivers/gpu/drm/drm_lock.c
41288+++ b/drivers/gpu/drm/drm_lock.c
41289@@ -61,9 +61,12 @@ int drm_legacy_lock(struct drm_device *dev, void *data,
41290 struct drm_master *master = file_priv->master;
41291 int ret = 0;
41292
41293+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
41294+ return -EINVAL;
41295+
41296 ++file_priv->lock_count;
41297
41298- if (lock->context == DRM_KERNEL_CONTEXT) {
41299+ if (_DRM_LOCKING_CONTEXT(lock->context) == DRM_KERNEL_CONTEXT) {
41300 DRM_ERROR("Process %d using kernel context %d\n",
41301 task_pid_nr(current), lock->context);
41302 return -EINVAL;
41303@@ -153,12 +156,23 @@ int drm_legacy_unlock(struct drm_device *dev, void *data, struct drm_file *file_
41304 struct drm_lock *lock = data;
41305 struct drm_master *master = file_priv->master;
41306
41307- if (lock->context == DRM_KERNEL_CONTEXT) {
41308+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
41309+ return -EINVAL;
41310+
41311+ if (_DRM_LOCKING_CONTEXT(lock->context) == DRM_KERNEL_CONTEXT) {
41312 DRM_ERROR("Process %d using kernel context %d\n",
41313 task_pid_nr(current), lock->context);
41314 return -EINVAL;
41315 }
41316
41317+ if (!master->lock.hw_lock) {
41318+ DRM_ERROR(
41319+ "Device has been unregistered. Hard exit. Process %d\n",
41320+ task_pid_nr(current));
41321+ send_sig(SIGTERM, current, 0);
41322+ return -EPERM;
41323+ }
41324+
41325 if (drm_legacy_lock_free(&master->lock, lock->context)) {
41326 /* FIXME: Should really bail out here. */
41327 }
41328diff --git a/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c b/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c
41329index d4813e0..6c1ab4d 100644
41330--- a/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c
41331+++ b/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c
41332@@ -825,10 +825,16 @@ void mdfld_dsi_dpi_mode_set(struct drm_encoder *encoder,
41333 u32 pipeconf_reg = PIPEACONF;
41334 u32 dspcntr_reg = DSPACNTR;
41335
41336- u32 pipeconf = dev_priv->pipeconf[pipe];
41337- u32 dspcntr = dev_priv->dspcntr[pipe];
41338+ u32 pipeconf;
41339+ u32 dspcntr;
41340 u32 mipi = MIPI_PORT_EN | PASS_FROM_SPHY_TO_AFE | SEL_FLOPPED_HSTX;
41341
41342+ if (pipe == -1)
41343+ return;
41344+
41345+ pipeconf = dev_priv->pipeconf[pipe];
41346+ dspcntr = dev_priv->dspcntr[pipe];
41347+
41348 if (pipe) {
41349 pipeconf_reg = PIPECCONF;
41350 dspcntr_reg = DSPCCNTR;
41351diff --git a/drivers/gpu/drm/i810/i810_drv.h b/drivers/gpu/drm/i810/i810_drv.h
41352index 93ec5dc..82acbaf 100644
41353--- a/drivers/gpu/drm/i810/i810_drv.h
41354+++ b/drivers/gpu/drm/i810/i810_drv.h
41355@@ -110,8 +110,8 @@ typedef struct drm_i810_private {
41356 int page_flipping;
41357
41358 wait_queue_head_t irq_queue;
41359- atomic_t irq_received;
41360- atomic_t irq_emitted;
41361+ atomic_unchecked_t irq_received;
41362+ atomic_unchecked_t irq_emitted;
41363
41364 int front_offset;
41365 } drm_i810_private_t;
41366diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
41367index 1a46787..7fb387c 100644
41368--- a/drivers/gpu/drm/i915/i915_dma.c
41369+++ b/drivers/gpu/drm/i915/i915_dma.c
41370@@ -149,6 +149,9 @@ static int i915_getparam(struct drm_device *dev, void *data,
41371 case I915_PARAM_MMAP_VERSION:
41372 value = 1;
41373 break;
41374+ case I915_PARAM_HAS_LEGACY_CONTEXT:
41375+ value = drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT);
41376+ break;
41377 default:
41378 DRM_DEBUG("Unknown parameter %d\n", param->param);
41379 return -EINVAL;
41380@@ -362,7 +365,7 @@ static bool i915_switcheroo_can_switch(struct pci_dev *pdev)
41381 * locking inversion with the driver load path. And the access here is
41382 * completely racy anyway. So don't bother with locking for now.
41383 */
41384- return dev->open_count == 0;
41385+ return local_read(&dev->open_count) == 0;
41386 }
41387
41388 static const struct vga_switcheroo_client_ops i915_switcheroo_ops = {
41389diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
41390index 38a7425..5322b16 100644
41391--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
41392+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
41393@@ -872,12 +872,12 @@ i915_gem_check_execbuffer(struct drm_i915_gem_execbuffer2 *exec)
41394 static int
41395 validate_exec_list(struct drm_device *dev,
41396 struct drm_i915_gem_exec_object2 *exec,
41397- int count)
41398+ unsigned int count)
41399 {
41400 unsigned relocs_total = 0;
41401 unsigned relocs_max = UINT_MAX / sizeof(struct drm_i915_gem_relocation_entry);
41402 unsigned invalid_flags;
41403- int i;
41404+ unsigned int i;
41405
41406 invalid_flags = __EXEC_OBJECT_UNKNOWN_FLAGS;
41407 if (USES_FULL_PPGTT(dev))
41408diff --git a/drivers/gpu/drm/i915/i915_ioc32.c b/drivers/gpu/drm/i915/i915_ioc32.c
41409index 176de63..b50b66a 100644
41410--- a/drivers/gpu/drm/i915/i915_ioc32.c
41411+++ b/drivers/gpu/drm/i915/i915_ioc32.c
41412@@ -62,7 +62,7 @@ static int compat_i915_batchbuffer(struct file *file, unsigned int cmd,
41413 || __put_user(batchbuffer32.DR4, &batchbuffer->DR4)
41414 || __put_user(batchbuffer32.num_cliprects,
41415 &batchbuffer->num_cliprects)
41416- || __put_user((int __user *)(unsigned long)batchbuffer32.cliprects,
41417+ || __put_user((struct drm_clip_rect __user *)(unsigned long)batchbuffer32.cliprects,
41418 &batchbuffer->cliprects))
41419 return -EFAULT;
41420
41421@@ -91,13 +91,13 @@ static int compat_i915_cmdbuffer(struct file *file, unsigned int cmd,
41422
41423 cmdbuffer = compat_alloc_user_space(sizeof(*cmdbuffer));
41424 if (!access_ok(VERIFY_WRITE, cmdbuffer, sizeof(*cmdbuffer))
41425- || __put_user((int __user *)(unsigned long)cmdbuffer32.buf,
41426+ || __put_user((char __user *)(unsigned long)cmdbuffer32.buf,
41427 &cmdbuffer->buf)
41428 || __put_user(cmdbuffer32.sz, &cmdbuffer->sz)
41429 || __put_user(cmdbuffer32.DR1, &cmdbuffer->DR1)
41430 || __put_user(cmdbuffer32.DR4, &cmdbuffer->DR4)
41431 || __put_user(cmdbuffer32.num_cliprects, &cmdbuffer->num_cliprects)
41432- || __put_user((int __user *)(unsigned long)cmdbuffer32.cliprects,
41433+ || __put_user((struct drm_clip_rect __user *)(unsigned long)cmdbuffer32.cliprects,
41434 &cmdbuffer->cliprects))
41435 return -EFAULT;
41436
41437@@ -181,7 +181,7 @@ static int compat_i915_alloc(struct file *file, unsigned int cmd,
41438 (unsigned long)request);
41439 }
41440
41441-static drm_ioctl_compat_t *i915_compat_ioctls[] = {
41442+static drm_ioctl_compat_t i915_compat_ioctls[] = {
41443 [DRM_I915_BATCHBUFFER] = compat_i915_batchbuffer,
41444 [DRM_I915_CMDBUFFER] = compat_i915_cmdbuffer,
41445 [DRM_I915_GETPARAM] = compat_i915_getparam,
41446@@ -201,17 +201,13 @@ static drm_ioctl_compat_t *i915_compat_ioctls[] = {
41447 long i915_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
41448 {
41449 unsigned int nr = DRM_IOCTL_NR(cmd);
41450- drm_ioctl_compat_t *fn = NULL;
41451 int ret;
41452
41453 if (nr < DRM_COMMAND_BASE)
41454 return drm_compat_ioctl(filp, cmd, arg);
41455
41456- if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(i915_compat_ioctls))
41457- fn = i915_compat_ioctls[nr - DRM_COMMAND_BASE];
41458-
41459- if (fn != NULL)
41460- ret = (*fn) (filp, cmd, arg);
41461+ if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(i915_compat_ioctls) && i915_compat_ioctls[nr - DRM_COMMAND_BASE])
41462+ ret = (*i915_compat_ioctls[nr - DRM_COMMAND_BASE])(filp, cmd, arg);
41463 else
41464 ret = drm_ioctl(filp, cmd, arg);
41465
41466diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
41467index f75173c..f283e45 100644
41468--- a/drivers/gpu/drm/i915/intel_display.c
41469+++ b/drivers/gpu/drm/i915/intel_display.c
41470@@ -13056,13 +13056,13 @@ struct intel_quirk {
41471 int subsystem_vendor;
41472 int subsystem_device;
41473 void (*hook)(struct drm_device *dev);
41474-};
41475+} __do_const;
41476
41477 /* For systems that don't have a meaningful PCI subdevice/subvendor ID */
41478 struct intel_dmi_quirk {
41479 void (*hook)(struct drm_device *dev);
41480 const struct dmi_system_id (*dmi_id_list)[];
41481-};
41482+} __do_const;
41483
41484 static int intel_dmi_reverse_brightness(const struct dmi_system_id *id)
41485 {
41486@@ -13070,18 +13070,20 @@ static int intel_dmi_reverse_brightness(const struct dmi_system_id *id)
41487 return 1;
41488 }
41489
41490-static const struct intel_dmi_quirk intel_dmi_quirks[] = {
41491+static const struct dmi_system_id intel_dmi_quirks_table[] = {
41492 {
41493- .dmi_id_list = &(const struct dmi_system_id[]) {
41494- {
41495- .callback = intel_dmi_reverse_brightness,
41496- .ident = "NCR Corporation",
41497- .matches = {DMI_MATCH(DMI_SYS_VENDOR, "NCR Corporation"),
41498- DMI_MATCH(DMI_PRODUCT_NAME, ""),
41499- },
41500- },
41501- { } /* terminating entry */
41502+ .callback = intel_dmi_reverse_brightness,
41503+ .ident = "NCR Corporation",
41504+ .matches = {DMI_MATCH(DMI_SYS_VENDOR, "NCR Corporation"),
41505+ DMI_MATCH(DMI_PRODUCT_NAME, ""),
41506 },
41507+ },
41508+ { } /* terminating entry */
41509+};
41510+
41511+static const struct intel_dmi_quirk intel_dmi_quirks[] = {
41512+ {
41513+ .dmi_id_list = &intel_dmi_quirks_table,
41514 .hook = quirk_invert_brightness,
41515 },
41516 };
41517diff --git a/drivers/gpu/drm/imx/imx-drm-core.c b/drivers/gpu/drm/imx/imx-drm-core.c
41518index a002f53..0d60514 100644
41519--- a/drivers/gpu/drm/imx/imx-drm-core.c
41520+++ b/drivers/gpu/drm/imx/imx-drm-core.c
41521@@ -355,7 +355,7 @@ int imx_drm_add_crtc(struct drm_device *drm, struct drm_crtc *crtc,
41522 if (imxdrm->pipes >= MAX_CRTC)
41523 return -EINVAL;
41524
41525- if (imxdrm->drm->open_count)
41526+ if (local_read(&imxdrm->drm->open_count))
41527 return -EBUSY;
41528
41529 imx_drm_crtc = kzalloc(sizeof(*imx_drm_crtc), GFP_KERNEL);
41530diff --git a/drivers/gpu/drm/mga/mga_drv.h b/drivers/gpu/drm/mga/mga_drv.h
41531index b4a20149..219ab78 100644
41532--- a/drivers/gpu/drm/mga/mga_drv.h
41533+++ b/drivers/gpu/drm/mga/mga_drv.h
41534@@ -122,9 +122,9 @@ typedef struct drm_mga_private {
41535 u32 clear_cmd;
41536 u32 maccess;
41537
41538- atomic_t vbl_received; /**< Number of vblanks received. */
41539+ atomic_unchecked_t vbl_received; /**< Number of vblanks received. */
41540 wait_queue_head_t fence_queue;
41541- atomic_t last_fence_retired;
41542+ atomic_unchecked_t last_fence_retired;
41543 u32 next_fence_to_post;
41544
41545 unsigned int fb_cpp;
41546diff --git a/drivers/gpu/drm/mga/mga_ioc32.c b/drivers/gpu/drm/mga/mga_ioc32.c
41547index 729bfd5..14bae78 100644
41548--- a/drivers/gpu/drm/mga/mga_ioc32.c
41549+++ b/drivers/gpu/drm/mga/mga_ioc32.c
41550@@ -190,7 +190,7 @@ static int compat_mga_dma_bootstrap(struct file *file, unsigned int cmd,
41551 return 0;
41552 }
41553
41554-drm_ioctl_compat_t *mga_compat_ioctls[] = {
41555+drm_ioctl_compat_t mga_compat_ioctls[] = {
41556 [DRM_MGA_INIT] = compat_mga_init,
41557 [DRM_MGA_GETPARAM] = compat_mga_getparam,
41558 [DRM_MGA_DMA_BOOTSTRAP] = compat_mga_dma_bootstrap,
41559@@ -208,17 +208,13 @@ drm_ioctl_compat_t *mga_compat_ioctls[] = {
41560 long mga_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
41561 {
41562 unsigned int nr = DRM_IOCTL_NR(cmd);
41563- drm_ioctl_compat_t *fn = NULL;
41564 int ret;
41565
41566 if (nr < DRM_COMMAND_BASE)
41567 return drm_compat_ioctl(filp, cmd, arg);
41568
41569- if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(mga_compat_ioctls))
41570- fn = mga_compat_ioctls[nr - DRM_COMMAND_BASE];
41571-
41572- if (fn != NULL)
41573- ret = (*fn) (filp, cmd, arg);
41574+ if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(mga_compat_ioctls) && mga_compat_ioctls[nr - DRM_COMMAND_BASE])
41575+ ret = (*mga_compat_ioctls[nr - DRM_COMMAND_BASE]) (filp, cmd, arg);
41576 else
41577 ret = drm_ioctl(filp, cmd, arg);
41578
41579diff --git a/drivers/gpu/drm/mga/mga_irq.c b/drivers/gpu/drm/mga/mga_irq.c
41580index 1b071b8..de8601a 100644
41581--- a/drivers/gpu/drm/mga/mga_irq.c
41582+++ b/drivers/gpu/drm/mga/mga_irq.c
41583@@ -43,7 +43,7 @@ u32 mga_get_vblank_counter(struct drm_device *dev, int crtc)
41584 if (crtc != 0)
41585 return 0;
41586
41587- return atomic_read(&dev_priv->vbl_received);
41588+ return atomic_read_unchecked(&dev_priv->vbl_received);
41589 }
41590
41591
41592@@ -59,7 +59,7 @@ irqreturn_t mga_driver_irq_handler(int irq, void *arg)
41593 /* VBLANK interrupt */
41594 if (status & MGA_VLINEPEN) {
41595 MGA_WRITE(MGA_ICLEAR, MGA_VLINEICLR);
41596- atomic_inc(&dev_priv->vbl_received);
41597+ atomic_inc_unchecked(&dev_priv->vbl_received);
41598 drm_handle_vblank(dev, 0);
41599 handled = 1;
41600 }
41601@@ -78,7 +78,7 @@ irqreturn_t mga_driver_irq_handler(int irq, void *arg)
41602 if ((prim_start & ~0x03) != (prim_end & ~0x03))
41603 MGA_WRITE(MGA_PRIMEND, prim_end);
41604
41605- atomic_inc(&dev_priv->last_fence_retired);
41606+ atomic_inc_unchecked(&dev_priv->last_fence_retired);
41607 wake_up(&dev_priv->fence_queue);
41608 handled = 1;
41609 }
41610@@ -129,7 +129,7 @@ int mga_driver_fence_wait(struct drm_device *dev, unsigned int *sequence)
41611 * using fences.
41612 */
41613 DRM_WAIT_ON(ret, dev_priv->fence_queue, 3 * HZ,
41614- (((cur_fence = atomic_read(&dev_priv->last_fence_retired))
41615+ (((cur_fence = atomic_read_unchecked(&dev_priv->last_fence_retired))
41616 - *sequence) <= (1 << 23)));
41617
41618 *sequence = cur_fence;
41619diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
41620index 0190b69..60c3eaf 100644
41621--- a/drivers/gpu/drm/nouveau/nouveau_bios.c
41622+++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
41623@@ -963,7 +963,7 @@ static int parse_bit_tmds_tbl_entry(struct drm_device *dev, struct nvbios *bios,
41624 struct bit_table {
41625 const char id;
41626 int (* const parse_fn)(struct drm_device *, struct nvbios *, struct bit_entry *);
41627-};
41628+} __no_const;
41629
41630 #define BIT_TABLE(id, funcid) ((struct bit_table){ id, parse_bit_##funcid##_tbl_entry })
41631
41632diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c
41633index 8763deb..936b423 100644
41634--- a/drivers/gpu/drm/nouveau/nouveau_drm.c
41635+++ b/drivers/gpu/drm/nouveau/nouveau_drm.c
41636@@ -940,7 +940,8 @@ static struct drm_driver
41637 driver_stub = {
41638 .driver_features =
41639 DRIVER_USE_AGP |
41640- DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | DRIVER_RENDER,
41641+ DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | DRIVER_RENDER |
41642+ DRIVER_KMS_LEGACY_CONTEXT,
41643
41644 .load = nouveau_drm_load,
41645 .unload = nouveau_drm_unload,
41646diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.h b/drivers/gpu/drm/nouveau/nouveau_drm.h
41647index fc68f09..0511d71 100644
41648--- a/drivers/gpu/drm/nouveau/nouveau_drm.h
41649+++ b/drivers/gpu/drm/nouveau/nouveau_drm.h
41650@@ -121,7 +121,6 @@ struct nouveau_drm {
41651 struct drm_global_reference mem_global_ref;
41652 struct ttm_bo_global_ref bo_global_ref;
41653 struct ttm_bo_device bdev;
41654- atomic_t validate_sequence;
41655 int (*move)(struct nouveau_channel *,
41656 struct ttm_buffer_object *,
41657 struct ttm_mem_reg *, struct ttm_mem_reg *);
41658diff --git a/drivers/gpu/drm/nouveau/nouveau_ioc32.c b/drivers/gpu/drm/nouveau/nouveau_ioc32.c
41659index 462679a..88e32a7 100644
41660--- a/drivers/gpu/drm/nouveau/nouveau_ioc32.c
41661+++ b/drivers/gpu/drm/nouveau/nouveau_ioc32.c
41662@@ -50,7 +50,7 @@ long nouveau_compat_ioctl(struct file *filp, unsigned int cmd,
41663 unsigned long arg)
41664 {
41665 unsigned int nr = DRM_IOCTL_NR(cmd);
41666- drm_ioctl_compat_t *fn = NULL;
41667+ drm_ioctl_compat_t fn = NULL;
41668 int ret;
41669
41670 if (nr < DRM_COMMAND_BASE)
41671diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c b/drivers/gpu/drm/nouveau/nouveau_ttm.c
41672index 273e501..3b6c0a2 100644
41673--- a/drivers/gpu/drm/nouveau/nouveau_ttm.c
41674+++ b/drivers/gpu/drm/nouveau/nouveau_ttm.c
41675@@ -127,11 +127,11 @@ nouveau_vram_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
41676 }
41677
41678 const struct ttm_mem_type_manager_func nouveau_vram_manager = {
41679- nouveau_vram_manager_init,
41680- nouveau_vram_manager_fini,
41681- nouveau_vram_manager_new,
41682- nouveau_vram_manager_del,
41683- nouveau_vram_manager_debug
41684+ .init = nouveau_vram_manager_init,
41685+ .takedown = nouveau_vram_manager_fini,
41686+ .get_node = nouveau_vram_manager_new,
41687+ .put_node = nouveau_vram_manager_del,
41688+ .debug = nouveau_vram_manager_debug
41689 };
41690
41691 static int
41692@@ -195,11 +195,11 @@ nouveau_gart_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
41693 }
41694
41695 const struct ttm_mem_type_manager_func nouveau_gart_manager = {
41696- nouveau_gart_manager_init,
41697- nouveau_gart_manager_fini,
41698- nouveau_gart_manager_new,
41699- nouveau_gart_manager_del,
41700- nouveau_gart_manager_debug
41701+ .init = nouveau_gart_manager_init,
41702+ .takedown = nouveau_gart_manager_fini,
41703+ .get_node = nouveau_gart_manager_new,
41704+ .put_node = nouveau_gart_manager_del,
41705+ .debug = nouveau_gart_manager_debug
41706 };
41707
41708 /*XXX*/
41709@@ -268,11 +268,11 @@ nv04_gart_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
41710 }
41711
41712 const struct ttm_mem_type_manager_func nv04_gart_manager = {
41713- nv04_gart_manager_init,
41714- nv04_gart_manager_fini,
41715- nv04_gart_manager_new,
41716- nv04_gart_manager_del,
41717- nv04_gart_manager_debug
41718+ .init = nv04_gart_manager_init,
41719+ .takedown = nv04_gart_manager_fini,
41720+ .get_node = nv04_gart_manager_new,
41721+ .put_node = nv04_gart_manager_del,
41722+ .debug = nv04_gart_manager_debug
41723 };
41724
41725 int
41726diff --git a/drivers/gpu/drm/nouveau/nouveau_vga.c b/drivers/gpu/drm/nouveau/nouveau_vga.c
41727index c7592ec..dd45ebc 100644
41728--- a/drivers/gpu/drm/nouveau/nouveau_vga.c
41729+++ b/drivers/gpu/drm/nouveau/nouveau_vga.c
41730@@ -72,7 +72,7 @@ nouveau_switcheroo_can_switch(struct pci_dev *pdev)
41731 * locking inversion with the driver load path. And the access here is
41732 * completely racy anyway. So don't bother with locking for now.
41733 */
41734- return dev->open_count == 0;
41735+ return local_read(&dev->open_count) == 0;
41736 }
41737
41738 static const struct vga_switcheroo_client_ops
41739diff --git a/drivers/gpu/drm/qxl/qxl_cmd.c b/drivers/gpu/drm/qxl/qxl_cmd.c
41740index 9782364..89bd954 100644
41741--- a/drivers/gpu/drm/qxl/qxl_cmd.c
41742+++ b/drivers/gpu/drm/qxl/qxl_cmd.c
41743@@ -285,27 +285,27 @@ static int wait_for_io_cmd_user(struct qxl_device *qdev, uint8_t val, long port,
41744 int ret;
41745
41746 mutex_lock(&qdev->async_io_mutex);
41747- irq_num = atomic_read(&qdev->irq_received_io_cmd);
41748+ irq_num = atomic_read_unchecked(&qdev->irq_received_io_cmd);
41749 if (qdev->last_sent_io_cmd > irq_num) {
41750 if (intr)
41751 ret = wait_event_interruptible_timeout(qdev->io_cmd_event,
41752- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41753+ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41754 else
41755 ret = wait_event_timeout(qdev->io_cmd_event,
41756- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41757+ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41758 /* 0 is timeout, just bail the "hw" has gone away */
41759 if (ret <= 0)
41760 goto out;
41761- irq_num = atomic_read(&qdev->irq_received_io_cmd);
41762+ irq_num = atomic_read_unchecked(&qdev->irq_received_io_cmd);
41763 }
41764 outb(val, addr);
41765 qdev->last_sent_io_cmd = irq_num + 1;
41766 if (intr)
41767 ret = wait_event_interruptible_timeout(qdev->io_cmd_event,
41768- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41769+ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41770 else
41771 ret = wait_event_timeout(qdev->io_cmd_event,
41772- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41773+ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41774 out:
41775 if (ret > 0)
41776 ret = 0;
41777diff --git a/drivers/gpu/drm/qxl/qxl_debugfs.c b/drivers/gpu/drm/qxl/qxl_debugfs.c
41778index 6911b8c..89d6867 100644
41779--- a/drivers/gpu/drm/qxl/qxl_debugfs.c
41780+++ b/drivers/gpu/drm/qxl/qxl_debugfs.c
41781@@ -42,10 +42,10 @@ qxl_debugfs_irq_received(struct seq_file *m, void *data)
41782 struct drm_info_node *node = (struct drm_info_node *) m->private;
41783 struct qxl_device *qdev = node->minor->dev->dev_private;
41784
41785- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received));
41786- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_display));
41787- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_cursor));
41788- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_io_cmd));
41789+ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received));
41790+ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_display));
41791+ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_cursor));
41792+ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_io_cmd));
41793 seq_printf(m, "%d\n", qdev->irq_received_error);
41794 return 0;
41795 }
41796diff --git a/drivers/gpu/drm/qxl/qxl_drv.h b/drivers/gpu/drm/qxl/qxl_drv.h
41797index 7c6cafe..460f542 100644
41798--- a/drivers/gpu/drm/qxl/qxl_drv.h
41799+++ b/drivers/gpu/drm/qxl/qxl_drv.h
41800@@ -290,10 +290,10 @@ struct qxl_device {
41801 unsigned int last_sent_io_cmd;
41802
41803 /* interrupt handling */
41804- atomic_t irq_received;
41805- atomic_t irq_received_display;
41806- atomic_t irq_received_cursor;
41807- atomic_t irq_received_io_cmd;
41808+ atomic_unchecked_t irq_received;
41809+ atomic_unchecked_t irq_received_display;
41810+ atomic_unchecked_t irq_received_cursor;
41811+ atomic_unchecked_t irq_received_io_cmd;
41812 unsigned irq_received_error;
41813 wait_queue_head_t display_event;
41814 wait_queue_head_t cursor_event;
41815diff --git a/drivers/gpu/drm/qxl/qxl_ioctl.c b/drivers/gpu/drm/qxl/qxl_ioctl.c
41816index b110883..dd06418 100644
41817--- a/drivers/gpu/drm/qxl/qxl_ioctl.c
41818+++ b/drivers/gpu/drm/qxl/qxl_ioctl.c
41819@@ -181,7 +181,7 @@ static int qxl_process_single_command(struct qxl_device *qdev,
41820
41821 /* TODO copy slow path code from i915 */
41822 fb_cmd = qxl_bo_kmap_atomic_page(qdev, cmd_bo, (release->release_offset & PAGE_SIZE));
41823- 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);
41824+ 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);
41825
41826 {
41827 struct qxl_drawable *draw = fb_cmd;
41828@@ -201,7 +201,7 @@ static int qxl_process_single_command(struct qxl_device *qdev,
41829 struct drm_qxl_reloc reloc;
41830
41831 if (copy_from_user(&reloc,
41832- &((struct drm_qxl_reloc *)(uintptr_t)cmd->relocs)[i],
41833+ &((struct drm_qxl_reloc __force_user *)(uintptr_t)cmd->relocs)[i],
41834 sizeof(reloc))) {
41835 ret = -EFAULT;
41836 goto out_free_bos;
41837@@ -294,10 +294,10 @@ static int qxl_execbuffer_ioctl(struct drm_device *dev, void *data,
41838
41839 for (cmd_num = 0; cmd_num < execbuffer->commands_num; ++cmd_num) {
41840
41841- struct drm_qxl_command *commands =
41842- (struct drm_qxl_command *)(uintptr_t)execbuffer->commands;
41843+ struct drm_qxl_command __user *commands =
41844+ (struct drm_qxl_command __user *)(uintptr_t)execbuffer->commands;
41845
41846- if (copy_from_user(&user_cmd, &commands[cmd_num],
41847+ if (copy_from_user(&user_cmd, (struct drm_qxl_command __force_user *)&commands[cmd_num],
41848 sizeof(user_cmd)))
41849 return -EFAULT;
41850
41851diff --git a/drivers/gpu/drm/qxl/qxl_irq.c b/drivers/gpu/drm/qxl/qxl_irq.c
41852index 0bf1e20..42a7310 100644
41853--- a/drivers/gpu/drm/qxl/qxl_irq.c
41854+++ b/drivers/gpu/drm/qxl/qxl_irq.c
41855@@ -36,19 +36,19 @@ irqreturn_t qxl_irq_handler(int irq, void *arg)
41856 if (!pending)
41857 return IRQ_NONE;
41858
41859- atomic_inc(&qdev->irq_received);
41860+ atomic_inc_unchecked(&qdev->irq_received);
41861
41862 if (pending & QXL_INTERRUPT_DISPLAY) {
41863- atomic_inc(&qdev->irq_received_display);
41864+ atomic_inc_unchecked(&qdev->irq_received_display);
41865 wake_up_all(&qdev->display_event);
41866 qxl_queue_garbage_collect(qdev, false);
41867 }
41868 if (pending & QXL_INTERRUPT_CURSOR) {
41869- atomic_inc(&qdev->irq_received_cursor);
41870+ atomic_inc_unchecked(&qdev->irq_received_cursor);
41871 wake_up_all(&qdev->cursor_event);
41872 }
41873 if (pending & QXL_INTERRUPT_IO_CMD) {
41874- atomic_inc(&qdev->irq_received_io_cmd);
41875+ atomic_inc_unchecked(&qdev->irq_received_io_cmd);
41876 wake_up_all(&qdev->io_cmd_event);
41877 }
41878 if (pending & QXL_INTERRUPT_ERROR) {
41879@@ -85,10 +85,10 @@ int qxl_irq_init(struct qxl_device *qdev)
41880 init_waitqueue_head(&qdev->io_cmd_event);
41881 INIT_WORK(&qdev->client_monitors_config_work,
41882 qxl_client_monitors_config_work_func);
41883- atomic_set(&qdev->irq_received, 0);
41884- atomic_set(&qdev->irq_received_display, 0);
41885- atomic_set(&qdev->irq_received_cursor, 0);
41886- atomic_set(&qdev->irq_received_io_cmd, 0);
41887+ atomic_set_unchecked(&qdev->irq_received, 0);
41888+ atomic_set_unchecked(&qdev->irq_received_display, 0);
41889+ atomic_set_unchecked(&qdev->irq_received_cursor, 0);
41890+ atomic_set_unchecked(&qdev->irq_received_io_cmd, 0);
41891 qdev->irq_received_error = 0;
41892 ret = drm_irq_install(qdev->ddev, qdev->ddev->pdev->irq);
41893 qdev->ram_header->int_mask = QXL_INTERRUPT_MASK;
41894diff --git a/drivers/gpu/drm/qxl/qxl_ttm.c b/drivers/gpu/drm/qxl/qxl_ttm.c
41895index 0cbc4c9..0e46686 100644
41896--- a/drivers/gpu/drm/qxl/qxl_ttm.c
41897+++ b/drivers/gpu/drm/qxl/qxl_ttm.c
41898@@ -103,7 +103,7 @@ static void qxl_ttm_global_fini(struct qxl_device *qdev)
41899 }
41900 }
41901
41902-static struct vm_operations_struct qxl_ttm_vm_ops;
41903+static vm_operations_struct_no_const qxl_ttm_vm_ops __read_only;
41904 static const struct vm_operations_struct *ttm_vm_ops;
41905
41906 static int qxl_ttm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
41907@@ -145,8 +145,10 @@ int qxl_mmap(struct file *filp, struct vm_area_struct *vma)
41908 return r;
41909 if (unlikely(ttm_vm_ops == NULL)) {
41910 ttm_vm_ops = vma->vm_ops;
41911+ pax_open_kernel();
41912 qxl_ttm_vm_ops = *ttm_vm_ops;
41913 qxl_ttm_vm_ops.fault = &qxl_ttm_fault;
41914+ pax_close_kernel();
41915 }
41916 vma->vm_ops = &qxl_ttm_vm_ops;
41917 return 0;
41918@@ -464,25 +466,23 @@ static int qxl_mm_dump_table(struct seq_file *m, void *data)
41919 static int qxl_ttm_debugfs_init(struct qxl_device *qdev)
41920 {
41921 #if defined(CONFIG_DEBUG_FS)
41922- static struct drm_info_list qxl_mem_types_list[QXL_DEBUGFS_MEM_TYPES];
41923- static char qxl_mem_types_names[QXL_DEBUGFS_MEM_TYPES][32];
41924- unsigned i;
41925+ static struct drm_info_list qxl_mem_types_list[QXL_DEBUGFS_MEM_TYPES] = {
41926+ {
41927+ .name = "qxl_mem_mm",
41928+ .show = &qxl_mm_dump_table,
41929+ },
41930+ {
41931+ .name = "qxl_surf_mm",
41932+ .show = &qxl_mm_dump_table,
41933+ }
41934+ };
41935
41936- for (i = 0; i < QXL_DEBUGFS_MEM_TYPES; i++) {
41937- if (i == 0)
41938- sprintf(qxl_mem_types_names[i], "qxl_mem_mm");
41939- else
41940- sprintf(qxl_mem_types_names[i], "qxl_surf_mm");
41941- qxl_mem_types_list[i].name = qxl_mem_types_names[i];
41942- qxl_mem_types_list[i].show = &qxl_mm_dump_table;
41943- qxl_mem_types_list[i].driver_features = 0;
41944- if (i == 0)
41945- qxl_mem_types_list[i].data = qdev->mman.bdev.man[TTM_PL_VRAM].priv;
41946- else
41947- qxl_mem_types_list[i].data = qdev->mman.bdev.man[TTM_PL_PRIV0].priv;
41948+ pax_open_kernel();
41949+ *(void **)&qxl_mem_types_list[0].data = qdev->mman.bdev.man[TTM_PL_VRAM].priv;
41950+ *(void **)&qxl_mem_types_list[1].data = qdev->mman.bdev.man[TTM_PL_PRIV0].priv;
41951+ pax_close_kernel();
41952
41953- }
41954- return qxl_debugfs_add_files(qdev, qxl_mem_types_list, i);
41955+ return qxl_debugfs_add_files(qdev, qxl_mem_types_list, QXL_DEBUGFS_MEM_TYPES);
41956 #else
41957 return 0;
41958 #endif
41959diff --git a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c
41960index 2c45ac9..5d740f8 100644
41961--- a/drivers/gpu/drm/r128/r128_cce.c
41962+++ b/drivers/gpu/drm/r128/r128_cce.c
41963@@ -377,7 +377,7 @@ static int r128_do_init_cce(struct drm_device *dev, drm_r128_init_t *init)
41964
41965 /* GH: Simple idle check.
41966 */
41967- atomic_set(&dev_priv->idle_count, 0);
41968+ atomic_set_unchecked(&dev_priv->idle_count, 0);
41969
41970 /* We don't support anything other than bus-mastering ring mode,
41971 * but the ring can be in either AGP or PCI space for the ring
41972diff --git a/drivers/gpu/drm/r128/r128_drv.h b/drivers/gpu/drm/r128/r128_drv.h
41973index 723e5d6..102dbaf 100644
41974--- a/drivers/gpu/drm/r128/r128_drv.h
41975+++ b/drivers/gpu/drm/r128/r128_drv.h
41976@@ -93,14 +93,14 @@ typedef struct drm_r128_private {
41977 int is_pci;
41978 unsigned long cce_buffers_offset;
41979
41980- atomic_t idle_count;
41981+ atomic_unchecked_t idle_count;
41982
41983 int page_flipping;
41984 int current_page;
41985 u32 crtc_offset;
41986 u32 crtc_offset_cntl;
41987
41988- atomic_t vbl_received;
41989+ atomic_unchecked_t vbl_received;
41990
41991 u32 color_fmt;
41992 unsigned int front_offset;
41993diff --git a/drivers/gpu/drm/r128/r128_ioc32.c b/drivers/gpu/drm/r128/r128_ioc32.c
41994index 663f38c..ec159a1 100644
41995--- a/drivers/gpu/drm/r128/r128_ioc32.c
41996+++ b/drivers/gpu/drm/r128/r128_ioc32.c
41997@@ -178,7 +178,7 @@ static int compat_r128_getparam(struct file *file, unsigned int cmd,
41998 return drm_ioctl(file, DRM_IOCTL_R128_GETPARAM, (unsigned long)getparam);
41999 }
42000
42001-drm_ioctl_compat_t *r128_compat_ioctls[] = {
42002+drm_ioctl_compat_t r128_compat_ioctls[] = {
42003 [DRM_R128_INIT] = compat_r128_init,
42004 [DRM_R128_DEPTH] = compat_r128_depth,
42005 [DRM_R128_STIPPLE] = compat_r128_stipple,
42006@@ -197,17 +197,13 @@ drm_ioctl_compat_t *r128_compat_ioctls[] = {
42007 long r128_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
42008 {
42009 unsigned int nr = DRM_IOCTL_NR(cmd);
42010- drm_ioctl_compat_t *fn = NULL;
42011 int ret;
42012
42013 if (nr < DRM_COMMAND_BASE)
42014 return drm_compat_ioctl(filp, cmd, arg);
42015
42016- if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(r128_compat_ioctls))
42017- fn = r128_compat_ioctls[nr - DRM_COMMAND_BASE];
42018-
42019- if (fn != NULL)
42020- ret = (*fn) (filp, cmd, arg);
42021+ if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(r128_compat_ioctls) && r128_compat_ioctls[nr - DRM_COMMAND_BASE])
42022+ ret = (*r128_compat_ioctls[nr - DRM_COMMAND_BASE]) (filp, cmd, arg);
42023 else
42024 ret = drm_ioctl(filp, cmd, arg);
42025
42026diff --git a/drivers/gpu/drm/r128/r128_irq.c b/drivers/gpu/drm/r128/r128_irq.c
42027index c2ae496..30b5993 100644
42028--- a/drivers/gpu/drm/r128/r128_irq.c
42029+++ b/drivers/gpu/drm/r128/r128_irq.c
42030@@ -41,7 +41,7 @@ u32 r128_get_vblank_counter(struct drm_device *dev, int crtc)
42031 if (crtc != 0)
42032 return 0;
42033
42034- return atomic_read(&dev_priv->vbl_received);
42035+ return atomic_read_unchecked(&dev_priv->vbl_received);
42036 }
42037
42038 irqreturn_t r128_driver_irq_handler(int irq, void *arg)
42039@@ -55,7 +55,7 @@ irqreturn_t r128_driver_irq_handler(int irq, void *arg)
42040 /* VBLANK interrupt */
42041 if (status & R128_CRTC_VBLANK_INT) {
42042 R128_WRITE(R128_GEN_INT_STATUS, R128_CRTC_VBLANK_INT_AK);
42043- atomic_inc(&dev_priv->vbl_received);
42044+ atomic_inc_unchecked(&dev_priv->vbl_received);
42045 drm_handle_vblank(dev, 0);
42046 return IRQ_HANDLED;
42047 }
42048diff --git a/drivers/gpu/drm/r128/r128_state.c b/drivers/gpu/drm/r128/r128_state.c
42049index 8fd2d9f..18c9660 100644
42050--- a/drivers/gpu/drm/r128/r128_state.c
42051+++ b/drivers/gpu/drm/r128/r128_state.c
42052@@ -320,10 +320,10 @@ static void r128_clear_box(drm_r128_private_t *dev_priv,
42053
42054 static void r128_cce_performance_boxes(drm_r128_private_t *dev_priv)
42055 {
42056- if (atomic_read(&dev_priv->idle_count) == 0)
42057+ if (atomic_read_unchecked(&dev_priv->idle_count) == 0)
42058 r128_clear_box(dev_priv, 64, 4, 8, 8, 0, 255, 0);
42059 else
42060- atomic_set(&dev_priv->idle_count, 0);
42061+ atomic_set_unchecked(&dev_priv->idle_count, 0);
42062 }
42063
42064 #endif
42065diff --git a/drivers/gpu/drm/radeon/mkregtable.c b/drivers/gpu/drm/radeon/mkregtable.c
42066index b928c17..e5d9400 100644
42067--- a/drivers/gpu/drm/radeon/mkregtable.c
42068+++ b/drivers/gpu/drm/radeon/mkregtable.c
42069@@ -624,14 +624,14 @@ static int parser_auth(struct table *t, const char *filename)
42070 regex_t mask_rex;
42071 regmatch_t match[4];
42072 char buf[1024];
42073- size_t end;
42074+ long end;
42075 int len;
42076 int done = 0;
42077 int r;
42078 unsigned o;
42079 struct offset *offset;
42080 char last_reg_s[10];
42081- int last_reg;
42082+ unsigned long last_reg;
42083
42084 if (regcomp
42085 (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
42086diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
42087index aa232fd..7e5f6e1 100644
42088--- a/drivers/gpu/drm/radeon/radeon_device.c
42089+++ b/drivers/gpu/drm/radeon/radeon_device.c
42090@@ -1247,7 +1247,7 @@ static bool radeon_switcheroo_can_switch(struct pci_dev *pdev)
42091 * locking inversion with the driver load path. And the access here is
42092 * completely racy anyway. So don't bother with locking for now.
42093 */
42094- return dev->open_count == 0;
42095+ return local_read(&dev->open_count) == 0;
42096 }
42097
42098 static const struct vga_switcheroo_client_ops radeon_switcheroo_ops = {
42099diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h
42100index 46bd393..6ae4719 100644
42101--- a/drivers/gpu/drm/radeon/radeon_drv.h
42102+++ b/drivers/gpu/drm/radeon/radeon_drv.h
42103@@ -264,7 +264,7 @@ typedef struct drm_radeon_private {
42104
42105 /* SW interrupt */
42106 wait_queue_head_t swi_queue;
42107- atomic_t swi_emitted;
42108+ atomic_unchecked_t swi_emitted;
42109 int vblank_crtc;
42110 uint32_t irq_enable_reg;
42111 uint32_t r500_disp_irq_reg;
42112diff --git a/drivers/gpu/drm/radeon/radeon_ioc32.c b/drivers/gpu/drm/radeon/radeon_ioc32.c
42113index 0b98ea1..a3c770f 100644
42114--- a/drivers/gpu/drm/radeon/radeon_ioc32.c
42115+++ b/drivers/gpu/drm/radeon/radeon_ioc32.c
42116@@ -358,7 +358,7 @@ static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd,
42117 request = compat_alloc_user_space(sizeof(*request));
42118 if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
42119 || __put_user(req32.param, &request->param)
42120- || __put_user((void __user *)(unsigned long)req32.value,
42121+ || __put_user((unsigned long)req32.value,
42122 &request->value))
42123 return -EFAULT;
42124
42125@@ -368,7 +368,7 @@ static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd,
42126 #define compat_radeon_cp_setparam NULL
42127 #endif /* X86_64 || IA64 */
42128
42129-static drm_ioctl_compat_t *radeon_compat_ioctls[] = {
42130+static drm_ioctl_compat_t radeon_compat_ioctls[] = {
42131 [DRM_RADEON_CP_INIT] = compat_radeon_cp_init,
42132 [DRM_RADEON_CLEAR] = compat_radeon_cp_clear,
42133 [DRM_RADEON_STIPPLE] = compat_radeon_cp_stipple,
42134@@ -393,17 +393,13 @@ static drm_ioctl_compat_t *radeon_compat_ioctls[] = {
42135 long radeon_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
42136 {
42137 unsigned int nr = DRM_IOCTL_NR(cmd);
42138- drm_ioctl_compat_t *fn = NULL;
42139 int ret;
42140
42141 if (nr < DRM_COMMAND_BASE)
42142 return drm_compat_ioctl(filp, cmd, arg);
42143
42144- if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(radeon_compat_ioctls))
42145- fn = radeon_compat_ioctls[nr - DRM_COMMAND_BASE];
42146-
42147- if (fn != NULL)
42148- ret = (*fn) (filp, cmd, arg);
42149+ if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(radeon_compat_ioctls) && radeon_compat_ioctls[nr - DRM_COMMAND_BASE])
42150+ ret = (*radeon_compat_ioctls[nr - DRM_COMMAND_BASE]) (filp, cmd, arg);
42151 else
42152 ret = drm_ioctl(filp, cmd, arg);
42153
42154diff --git a/drivers/gpu/drm/radeon/radeon_irq.c b/drivers/gpu/drm/radeon/radeon_irq.c
42155index 244b19b..c19226d 100644
42156--- a/drivers/gpu/drm/radeon/radeon_irq.c
42157+++ b/drivers/gpu/drm/radeon/radeon_irq.c
42158@@ -226,8 +226,8 @@ static int radeon_emit_irq(struct drm_device * dev)
42159 unsigned int ret;
42160 RING_LOCALS;
42161
42162- atomic_inc(&dev_priv->swi_emitted);
42163- ret = atomic_read(&dev_priv->swi_emitted);
42164+ atomic_inc_unchecked(&dev_priv->swi_emitted);
42165+ ret = atomic_read_unchecked(&dev_priv->swi_emitted);
42166
42167 BEGIN_RING(4);
42168 OUT_RING_REG(RADEON_LAST_SWI_REG, ret);
42169@@ -353,7 +353,7 @@ int radeon_driver_irq_postinstall(struct drm_device *dev)
42170 drm_radeon_private_t *dev_priv =
42171 (drm_radeon_private_t *) dev->dev_private;
42172
42173- atomic_set(&dev_priv->swi_emitted, 0);
42174+ atomic_set_unchecked(&dev_priv->swi_emitted, 0);
42175 init_waitqueue_head(&dev_priv->swi_queue);
42176
42177 dev->max_vblank_count = 0x001fffff;
42178diff --git a/drivers/gpu/drm/radeon/radeon_state.c b/drivers/gpu/drm/radeon/radeon_state.c
42179index 15aee72..cda326e 100644
42180--- a/drivers/gpu/drm/radeon/radeon_state.c
42181+++ b/drivers/gpu/drm/radeon/radeon_state.c
42182@@ -2168,7 +2168,7 @@ static int radeon_cp_clear(struct drm_device *dev, void *data, struct drm_file *
42183 if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS)
42184 sarea_priv->nbox = RADEON_NR_SAREA_CLIPRECTS;
42185
42186- if (copy_from_user(&depth_boxes, clear->depth_boxes,
42187+ if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS || copy_from_user(&depth_boxes, clear->depth_boxes,
42188 sarea_priv->nbox * sizeof(depth_boxes[0])))
42189 return -EFAULT;
42190
42191@@ -3031,7 +3031,7 @@ static int radeon_cp_getparam(struct drm_device *dev, void *data, struct drm_fil
42192 {
42193 drm_radeon_private_t *dev_priv = dev->dev_private;
42194 drm_radeon_getparam_t *param = data;
42195- int value;
42196+ int value = 0;
42197
42198 DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
42199
42200diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
42201index edafd3c..3af7c9c 100644
42202--- a/drivers/gpu/drm/radeon/radeon_ttm.c
42203+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
42204@@ -961,7 +961,7 @@ void radeon_ttm_set_active_vram_size(struct radeon_device *rdev, u64 size)
42205 man->size = size >> PAGE_SHIFT;
42206 }
42207
42208-static struct vm_operations_struct radeon_ttm_vm_ops;
42209+static vm_operations_struct_no_const radeon_ttm_vm_ops __read_only;
42210 static const struct vm_operations_struct *ttm_vm_ops = NULL;
42211
42212 static int radeon_ttm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
42213@@ -1002,8 +1002,10 @@ int radeon_mmap(struct file *filp, struct vm_area_struct *vma)
42214 }
42215 if (unlikely(ttm_vm_ops == NULL)) {
42216 ttm_vm_ops = vma->vm_ops;
42217+ pax_open_kernel();
42218 radeon_ttm_vm_ops = *ttm_vm_ops;
42219 radeon_ttm_vm_ops.fault = &radeon_ttm_fault;
42220+ pax_close_kernel();
42221 }
42222 vma->vm_ops = &radeon_ttm_vm_ops;
42223 return 0;
42224diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c
42225index 1a52522..8e78043 100644
42226--- a/drivers/gpu/drm/tegra/dc.c
42227+++ b/drivers/gpu/drm/tegra/dc.c
42228@@ -1585,7 +1585,7 @@ static int tegra_dc_debugfs_init(struct tegra_dc *dc, struct drm_minor *minor)
42229 }
42230
42231 for (i = 0; i < ARRAY_SIZE(debugfs_files); i++)
42232- dc->debugfs_files[i].data = dc;
42233+ *(void **)&dc->debugfs_files[i].data = dc;
42234
42235 err = drm_debugfs_create_files(dc->debugfs_files,
42236 ARRAY_SIZE(debugfs_files),
42237diff --git a/drivers/gpu/drm/tegra/dsi.c b/drivers/gpu/drm/tegra/dsi.c
42238index ed970f6..4eeea42 100644
42239--- a/drivers/gpu/drm/tegra/dsi.c
42240+++ b/drivers/gpu/drm/tegra/dsi.c
42241@@ -62,7 +62,7 @@ struct tegra_dsi {
42242 struct clk *clk_lp;
42243 struct clk *clk;
42244
42245- struct drm_info_list *debugfs_files;
42246+ drm_info_list_no_const *debugfs_files;
42247 struct drm_minor *minor;
42248 struct dentry *debugfs;
42249
42250diff --git a/drivers/gpu/drm/tegra/hdmi.c b/drivers/gpu/drm/tegra/hdmi.c
42251index 7eaaee74..cc2bc04 100644
42252--- a/drivers/gpu/drm/tegra/hdmi.c
42253+++ b/drivers/gpu/drm/tegra/hdmi.c
42254@@ -64,7 +64,7 @@ struct tegra_hdmi {
42255 bool stereo;
42256 bool dvi;
42257
42258- struct drm_info_list *debugfs_files;
42259+ drm_info_list_no_const *debugfs_files;
42260 struct drm_minor *minor;
42261 struct dentry *debugfs;
42262 };
42263diff --git a/drivers/gpu/drm/ttm/ttm_bo_manager.c b/drivers/gpu/drm/ttm/ttm_bo_manager.c
42264index aa0bd054..aea6a01 100644
42265--- a/drivers/gpu/drm/ttm/ttm_bo_manager.c
42266+++ b/drivers/gpu/drm/ttm/ttm_bo_manager.c
42267@@ -148,10 +148,10 @@ static void ttm_bo_man_debug(struct ttm_mem_type_manager *man,
42268 }
42269
42270 const struct ttm_mem_type_manager_func ttm_bo_manager_func = {
42271- ttm_bo_man_init,
42272- ttm_bo_man_takedown,
42273- ttm_bo_man_get_node,
42274- ttm_bo_man_put_node,
42275- ttm_bo_man_debug
42276+ .init = ttm_bo_man_init,
42277+ .takedown = ttm_bo_man_takedown,
42278+ .get_node = ttm_bo_man_get_node,
42279+ .put_node = ttm_bo_man_put_node,
42280+ .debug = ttm_bo_man_debug
42281 };
42282 EXPORT_SYMBOL(ttm_bo_manager_func);
42283diff --git a/drivers/gpu/drm/ttm/ttm_memory.c b/drivers/gpu/drm/ttm/ttm_memory.c
42284index a1803fb..c53f6b0 100644
42285--- a/drivers/gpu/drm/ttm/ttm_memory.c
42286+++ b/drivers/gpu/drm/ttm/ttm_memory.c
42287@@ -264,7 +264,7 @@ static int ttm_mem_init_kernel_zone(struct ttm_mem_global *glob,
42288 zone->glob = glob;
42289 glob->zone_kernel = zone;
42290 ret = kobject_init_and_add(
42291- &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, zone->name);
42292+ &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, "%s", zone->name);
42293 if (unlikely(ret != 0)) {
42294 kobject_put(&zone->kobj);
42295 return ret;
42296@@ -348,7 +348,7 @@ static int ttm_mem_init_dma32_zone(struct ttm_mem_global *glob,
42297 zone->glob = glob;
42298 glob->zone_dma32 = zone;
42299 ret = kobject_init_and_add(
42300- &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, zone->name);
42301+ &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, "%s", zone->name);
42302 if (unlikely(ret != 0)) {
42303 kobject_put(&zone->kobj);
42304 return ret;
42305diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c
42306index 025c429..314062f 100644
42307--- a/drivers/gpu/drm/ttm/ttm_page_alloc.c
42308+++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c
42309@@ -54,7 +54,7 @@
42310
42311 #define NUM_PAGES_TO_ALLOC (PAGE_SIZE/sizeof(struct page *))
42312 #define SMALL_ALLOCATION 16
42313-#define FREE_ALL_PAGES (~0U)
42314+#define FREE_ALL_PAGES (~0UL)
42315 /* times are in msecs */
42316 #define PAGE_FREE_INTERVAL 1000
42317
42318@@ -299,15 +299,14 @@ static void ttm_pool_update_free_locked(struct ttm_page_pool *pool,
42319 * @free_all: If set to true will free all pages in pool
42320 * @use_static: Safe to use static buffer
42321 **/
42322-static int ttm_page_pool_free(struct ttm_page_pool *pool, unsigned nr_free,
42323+static unsigned long ttm_page_pool_free(struct ttm_page_pool *pool, unsigned long nr_free,
42324 bool use_static)
42325 {
42326 static struct page *static_buf[NUM_PAGES_TO_ALLOC];
42327 unsigned long irq_flags;
42328 struct page *p;
42329 struct page **pages_to_free;
42330- unsigned freed_pages = 0,
42331- npages_to_free = nr_free;
42332+ unsigned long freed_pages = 0, npages_to_free = nr_free;
42333
42334 if (NUM_PAGES_TO_ALLOC < nr_free)
42335 npages_to_free = NUM_PAGES_TO_ALLOC;
42336@@ -371,7 +370,8 @@ restart:
42337 __list_del(&p->lru, &pool->list);
42338
42339 ttm_pool_update_free_locked(pool, freed_pages);
42340- nr_free -= freed_pages;
42341+ if (likely(nr_free != FREE_ALL_PAGES))
42342+ nr_free -= freed_pages;
42343 }
42344
42345 spin_unlock_irqrestore(&pool->lock, irq_flags);
42346@@ -399,7 +399,7 @@ ttm_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
42347 unsigned i;
42348 unsigned pool_offset;
42349 struct ttm_page_pool *pool;
42350- int shrink_pages = sc->nr_to_scan;
42351+ unsigned long shrink_pages = sc->nr_to_scan;
42352 unsigned long freed = 0;
42353
42354 if (!mutex_trylock(&lock))
42355@@ -407,7 +407,7 @@ ttm_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
42356 pool_offset = ++start_pool % NUM_POOLS;
42357 /* select start pool in round robin fashion */
42358 for (i = 0; i < NUM_POOLS; ++i) {
42359- unsigned nr_free = shrink_pages;
42360+ unsigned long nr_free = shrink_pages;
42361 if (shrink_pages == 0)
42362 break;
42363 pool = &_manager->pools[(i + pool_offset)%NUM_POOLS];
42364@@ -673,7 +673,7 @@ out:
42365 }
42366
42367 /* Put all pages in pages list to correct pool to wait for reuse */
42368-static void ttm_put_pages(struct page **pages, unsigned npages, int flags,
42369+static void ttm_put_pages(struct page **pages, unsigned long npages, int flags,
42370 enum ttm_caching_state cstate)
42371 {
42372 unsigned long irq_flags;
42373@@ -728,7 +728,7 @@ static int ttm_get_pages(struct page **pages, unsigned npages, int flags,
42374 struct list_head plist;
42375 struct page *p = NULL;
42376 gfp_t gfp_flags = GFP_USER;
42377- unsigned count;
42378+ unsigned long count;
42379 int r;
42380
42381 /* set zero flag for page allocation if required */
42382diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
42383index 01e1d27..aaa018a 100644
42384--- a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
42385+++ b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
42386@@ -56,7 +56,7 @@
42387
42388 #define NUM_PAGES_TO_ALLOC (PAGE_SIZE/sizeof(struct page *))
42389 #define SMALL_ALLOCATION 4
42390-#define FREE_ALL_PAGES (~0U)
42391+#define FREE_ALL_PAGES (~0UL)
42392 /* times are in msecs */
42393 #define IS_UNDEFINED (0)
42394 #define IS_WC (1<<1)
42395@@ -413,7 +413,7 @@ static void ttm_dma_page_put(struct dma_pool *pool, struct dma_page *d_page)
42396 * @nr_free: If set to true will free all pages in pool
42397 * @use_static: Safe to use static buffer
42398 **/
42399-static unsigned ttm_dma_page_pool_free(struct dma_pool *pool, unsigned nr_free,
42400+static unsigned long ttm_dma_page_pool_free(struct dma_pool *pool, unsigned long nr_free,
42401 bool use_static)
42402 {
42403 static struct page *static_buf[NUM_PAGES_TO_ALLOC];
42404@@ -421,8 +421,7 @@ static unsigned ttm_dma_page_pool_free(struct dma_pool *pool, unsigned nr_free,
42405 struct dma_page *dma_p, *tmp;
42406 struct page **pages_to_free;
42407 struct list_head d_pages;
42408- unsigned freed_pages = 0,
42409- npages_to_free = nr_free;
42410+ unsigned long freed_pages = 0, npages_to_free = nr_free;
42411
42412 if (NUM_PAGES_TO_ALLOC < nr_free)
42413 npages_to_free = NUM_PAGES_TO_ALLOC;
42414@@ -499,7 +498,8 @@ restart:
42415 /* remove range of pages from the pool */
42416 if (freed_pages) {
42417 ttm_pool_update_free_locked(pool, freed_pages);
42418- nr_free -= freed_pages;
42419+ if (likely(nr_free != FREE_ALL_PAGES))
42420+ nr_free -= freed_pages;
42421 }
42422
42423 spin_unlock_irqrestore(&pool->lock, irq_flags);
42424@@ -936,7 +936,7 @@ void ttm_dma_unpopulate(struct ttm_dma_tt *ttm_dma, struct device *dev)
42425 struct dma_page *d_page, *next;
42426 enum pool_type type;
42427 bool is_cached = false;
42428- unsigned count = 0, i, npages = 0;
42429+ unsigned long count = 0, i, npages = 0;
42430 unsigned long irq_flags;
42431
42432 type = ttm_to_type(ttm->page_flags, ttm->caching_state);
42433@@ -1012,7 +1012,7 @@ ttm_dma_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
42434 static unsigned start_pool;
42435 unsigned idx = 0;
42436 unsigned pool_offset;
42437- unsigned shrink_pages = sc->nr_to_scan;
42438+ unsigned long shrink_pages = sc->nr_to_scan;
42439 struct device_pools *p;
42440 unsigned long freed = 0;
42441
42442@@ -1025,7 +1025,7 @@ ttm_dma_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
42443 goto out;
42444 pool_offset = ++start_pool % _manager->npools;
42445 list_for_each_entry(p, &_manager->pools, pools) {
42446- unsigned nr_free;
42447+ unsigned long nr_free;
42448
42449 if (!p->dev)
42450 continue;
42451@@ -1039,7 +1039,7 @@ ttm_dma_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
42452 shrink_pages = ttm_dma_page_pool_free(p->pool, nr_free, true);
42453 freed += nr_free - shrink_pages;
42454
42455- pr_debug("%s: (%s:%d) Asked to shrink %d, have %d more to go\n",
42456+ pr_debug("%s: (%s:%d) Asked to shrink %lu, have %lu more to go\n",
42457 p->pool->dev_name, p->pool->name, current->pid,
42458 nr_free, shrink_pages);
42459 }
42460diff --git a/drivers/gpu/drm/udl/udl_fb.c b/drivers/gpu/drm/udl/udl_fb.c
42461index 5fc16ce..1bd84ec 100644
42462--- a/drivers/gpu/drm/udl/udl_fb.c
42463+++ b/drivers/gpu/drm/udl/udl_fb.c
42464@@ -367,7 +367,6 @@ static int udl_fb_release(struct fb_info *info, int user)
42465 fb_deferred_io_cleanup(info);
42466 kfree(info->fbdefio);
42467 info->fbdefio = NULL;
42468- info->fbops->fb_mmap = udl_fb_mmap;
42469 }
42470
42471 pr_warn("released /dev/fb%d user=%d count=%d\n",
42472diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
42473index ef8c500..01030c8 100644
42474--- a/drivers/gpu/drm/via/via_drv.h
42475+++ b/drivers/gpu/drm/via/via_drv.h
42476@@ -53,7 +53,7 @@ typedef struct drm_via_ring_buffer {
42477 typedef uint32_t maskarray_t[5];
42478
42479 typedef struct drm_via_irq {
42480- atomic_t irq_received;
42481+ atomic_unchecked_t irq_received;
42482 uint32_t pending_mask;
42483 uint32_t enable_mask;
42484 wait_queue_head_t irq_queue;
42485@@ -77,7 +77,7 @@ typedef struct drm_via_private {
42486 struct timeval last_vblank;
42487 int last_vblank_valid;
42488 unsigned usec_per_vblank;
42489- atomic_t vbl_received;
42490+ atomic_unchecked_t vbl_received;
42491 drm_via_state_t hc_state;
42492 char pci_buf[VIA_PCI_BUF_SIZE];
42493 const uint32_t *fire_offsets[VIA_FIRE_BUF_SIZE];
42494diff --git a/drivers/gpu/drm/via/via_irq.c b/drivers/gpu/drm/via/via_irq.c
42495index 1319433..a993b0c 100644
42496--- a/drivers/gpu/drm/via/via_irq.c
42497+++ b/drivers/gpu/drm/via/via_irq.c
42498@@ -101,7 +101,7 @@ u32 via_get_vblank_counter(struct drm_device *dev, int crtc)
42499 if (crtc != 0)
42500 return 0;
42501
42502- return atomic_read(&dev_priv->vbl_received);
42503+ return atomic_read_unchecked(&dev_priv->vbl_received);
42504 }
42505
42506 irqreturn_t via_driver_irq_handler(int irq, void *arg)
42507@@ -116,8 +116,8 @@ irqreturn_t via_driver_irq_handler(int irq, void *arg)
42508
42509 status = VIA_READ(VIA_REG_INTERRUPT);
42510 if (status & VIA_IRQ_VBLANK_PENDING) {
42511- atomic_inc(&dev_priv->vbl_received);
42512- if (!(atomic_read(&dev_priv->vbl_received) & 0x0F)) {
42513+ atomic_inc_unchecked(&dev_priv->vbl_received);
42514+ if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0x0F)) {
42515 do_gettimeofday(&cur_vblank);
42516 if (dev_priv->last_vblank_valid) {
42517 dev_priv->usec_per_vblank =
42518@@ -127,7 +127,7 @@ irqreturn_t via_driver_irq_handler(int irq, void *arg)
42519 dev_priv->last_vblank = cur_vblank;
42520 dev_priv->last_vblank_valid = 1;
42521 }
42522- if (!(atomic_read(&dev_priv->vbl_received) & 0xFF)) {
42523+ if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0xFF)) {
42524 DRM_DEBUG("US per vblank is: %u\n",
42525 dev_priv->usec_per_vblank);
42526 }
42527@@ -137,7 +137,7 @@ irqreturn_t via_driver_irq_handler(int irq, void *arg)
42528
42529 for (i = 0; i < dev_priv->num_irqs; ++i) {
42530 if (status & cur_irq->pending_mask) {
42531- atomic_inc(&cur_irq->irq_received);
42532+ atomic_inc_unchecked(&cur_irq->irq_received);
42533 wake_up(&cur_irq->irq_queue);
42534 handled = 1;
42535 if (dev_priv->irq_map[drm_via_irq_dma0_td] == i)
42536@@ -242,11 +242,11 @@ via_driver_irq_wait(struct drm_device *dev, unsigned int irq, int force_sequence
42537 DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * HZ,
42538 ((VIA_READ(masks[irq][2]) & masks[irq][3]) ==
42539 masks[irq][4]));
42540- cur_irq_sequence = atomic_read(&cur_irq->irq_received);
42541+ cur_irq_sequence = atomic_read_unchecked(&cur_irq->irq_received);
42542 } else {
42543 DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * HZ,
42544 (((cur_irq_sequence =
42545- atomic_read(&cur_irq->irq_received)) -
42546+ atomic_read_unchecked(&cur_irq->irq_received)) -
42547 *sequence) <= (1 << 23)));
42548 }
42549 *sequence = cur_irq_sequence;
42550@@ -284,7 +284,7 @@ void via_driver_irq_preinstall(struct drm_device *dev)
42551 }
42552
42553 for (i = 0; i < dev_priv->num_irqs; ++i) {
42554- atomic_set(&cur_irq->irq_received, 0);
42555+ atomic_set_unchecked(&cur_irq->irq_received, 0);
42556 cur_irq->enable_mask = dev_priv->irq_masks[i][0];
42557 cur_irq->pending_mask = dev_priv->irq_masks[i][1];
42558 init_waitqueue_head(&cur_irq->irq_queue);
42559@@ -366,7 +366,7 @@ int via_wait_irq(struct drm_device *dev, void *data, struct drm_file *file_priv)
42560 switch (irqwait->request.type & ~VIA_IRQ_FLAGS_MASK) {
42561 case VIA_IRQ_RELATIVE:
42562 irqwait->request.sequence +=
42563- atomic_read(&cur_irq->irq_received);
42564+ atomic_read_unchecked(&cur_irq->irq_received);
42565 irqwait->request.type &= ~_DRM_VBLANK_RELATIVE;
42566 case VIA_IRQ_ABSOLUTE:
42567 break;
42568diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
42569index d26a6da..5fa41ed 100644
42570--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
42571+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
42572@@ -447,7 +447,7 @@ struct vmw_private {
42573 * Fencing and IRQs.
42574 */
42575
42576- atomic_t marker_seq;
42577+ atomic_unchecked_t marker_seq;
42578 wait_queue_head_t fence_queue;
42579 wait_queue_head_t fifo_queue;
42580 spinlock_t waiter_lock;
42581diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
42582index 39f2b03..d1b0a64 100644
42583--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
42584+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
42585@@ -152,7 +152,7 @@ int vmw_fifo_init(struct vmw_private *dev_priv, struct vmw_fifo_state *fifo)
42586 (unsigned int) min,
42587 (unsigned int) fifo->capabilities);
42588
42589- atomic_set(&dev_priv->marker_seq, dev_priv->last_read_seqno);
42590+ atomic_set_unchecked(&dev_priv->marker_seq, dev_priv->last_read_seqno);
42591 iowrite32(dev_priv->last_read_seqno, fifo_mem + SVGA_FIFO_FENCE);
42592 vmw_marker_queue_init(&fifo->marker_queue);
42593 return vmw_fifo_send_fence(dev_priv, &dummy);
42594@@ -372,7 +372,7 @@ void *vmw_fifo_reserve(struct vmw_private *dev_priv, uint32_t bytes)
42595 if (reserveable)
42596 iowrite32(bytes, fifo_mem +
42597 SVGA_FIFO_RESERVED);
42598- return fifo_mem + (next_cmd >> 2);
42599+ return (__le32 __force_kernel *)fifo_mem + (next_cmd >> 2);
42600 } else {
42601 need_bounce = true;
42602 }
42603@@ -492,7 +492,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
42604
42605 fm = vmw_fifo_reserve(dev_priv, bytes);
42606 if (unlikely(fm == NULL)) {
42607- *seqno = atomic_read(&dev_priv->marker_seq);
42608+ *seqno = atomic_read_unchecked(&dev_priv->marker_seq);
42609 ret = -ENOMEM;
42610 (void)vmw_fallback_wait(dev_priv, false, true, *seqno,
42611 false, 3*HZ);
42612@@ -500,7 +500,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
42613 }
42614
42615 do {
42616- *seqno = atomic_add_return(1, &dev_priv->marker_seq);
42617+ *seqno = atomic_add_return_unchecked(1, &dev_priv->marker_seq);
42618 } while (*seqno == 0);
42619
42620 if (!(fifo_state->capabilities & SVGA_FIFO_CAP_FENCE)) {
42621diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
42622index 170b61b..fec7348 100644
42623--- a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
42624+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
42625@@ -164,9 +164,9 @@ static void vmw_gmrid_man_debug(struct ttm_mem_type_manager *man,
42626 }
42627
42628 const struct ttm_mem_type_manager_func vmw_gmrid_manager_func = {
42629- vmw_gmrid_man_init,
42630- vmw_gmrid_man_takedown,
42631- vmw_gmrid_man_get_node,
42632- vmw_gmrid_man_put_node,
42633- vmw_gmrid_man_debug
42634+ .init = vmw_gmrid_man_init,
42635+ .takedown = vmw_gmrid_man_takedown,
42636+ .get_node = vmw_gmrid_man_get_node,
42637+ .put_node = vmw_gmrid_man_put_node,
42638+ .debug = vmw_gmrid_man_debug
42639 };
42640diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
42641index 69c8ce2..cacb0ab 100644
42642--- a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
42643+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
42644@@ -235,7 +235,7 @@ int vmw_present_ioctl(struct drm_device *dev, void *data,
42645 int ret;
42646
42647 num_clips = arg->num_clips;
42648- clips_ptr = (struct drm_vmw_rect *)(unsigned long)arg->clips_ptr;
42649+ clips_ptr = (struct drm_vmw_rect __user *)(unsigned long)arg->clips_ptr;
42650
42651 if (unlikely(num_clips == 0))
42652 return 0;
42653@@ -318,7 +318,7 @@ int vmw_present_readback_ioctl(struct drm_device *dev, void *data,
42654 int ret;
42655
42656 num_clips = arg->num_clips;
42657- clips_ptr = (struct drm_vmw_rect *)(unsigned long)arg->clips_ptr;
42658+ clips_ptr = (struct drm_vmw_rect __user *)(unsigned long)arg->clips_ptr;
42659
42660 if (unlikely(num_clips == 0))
42661 return 0;
42662diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
42663index 9fe9827..0aa2fc0 100644
42664--- a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
42665+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
42666@@ -102,7 +102,7 @@ bool vmw_seqno_passed(struct vmw_private *dev_priv,
42667 * emitted. Then the fence is stale and signaled.
42668 */
42669
42670- ret = ((atomic_read(&dev_priv->marker_seq) - seqno)
42671+ ret = ((atomic_read_unchecked(&dev_priv->marker_seq) - seqno)
42672 > VMW_FENCE_WRAP);
42673
42674 return ret;
42675@@ -133,7 +133,7 @@ int vmw_fallback_wait(struct vmw_private *dev_priv,
42676
42677 if (fifo_idle)
42678 down_read(&fifo_state->rwsem);
42679- signal_seq = atomic_read(&dev_priv->marker_seq);
42680+ signal_seq = atomic_read_unchecked(&dev_priv->marker_seq);
42681 ret = 0;
42682
42683 for (;;) {
42684diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c b/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
42685index efd1ffd..0ae13ca 100644
42686--- a/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
42687+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
42688@@ -135,7 +135,7 @@ int vmw_wait_lag(struct vmw_private *dev_priv,
42689 while (!vmw_lag_lt(queue, us)) {
42690 spin_lock(&queue->lock);
42691 if (list_empty(&queue->head))
42692- seqno = atomic_read(&dev_priv->marker_seq);
42693+ seqno = atomic_read_unchecked(&dev_priv->marker_seq);
42694 else {
42695 marker = list_first_entry(&queue->head,
42696 struct vmw_marker, head);
42697diff --git a/drivers/gpu/vga/vga_switcheroo.c b/drivers/gpu/vga/vga_switcheroo.c
42698index 37ac7b5..d52a5c9 100644
42699--- a/drivers/gpu/vga/vga_switcheroo.c
42700+++ b/drivers/gpu/vga/vga_switcheroo.c
42701@@ -644,7 +644,7 @@ static int vga_switcheroo_runtime_resume(struct device *dev)
42702
42703 /* this version is for the case where the power switch is separate
42704 to the device being powered down. */
42705-int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain)
42706+int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain)
42707 {
42708 /* copy over all the bus versions */
42709 if (dev->bus && dev->bus->pm) {
42710@@ -695,7 +695,7 @@ static int vga_switcheroo_runtime_resume_hdmi_audio(struct device *dev)
42711 return ret;
42712 }
42713
42714-int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain)
42715+int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain)
42716 {
42717 /* copy over all the bus versions */
42718 if (dev->bus && dev->bus->pm) {
42719diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
42720index 56ce8c2..32ce524 100644
42721--- a/drivers/hid/hid-core.c
42722+++ b/drivers/hid/hid-core.c
42723@@ -2531,7 +2531,7 @@ EXPORT_SYMBOL_GPL(hid_ignore);
42724
42725 int hid_add_device(struct hid_device *hdev)
42726 {
42727- static atomic_t id = ATOMIC_INIT(0);
42728+ static atomic_unchecked_t id = ATOMIC_INIT(0);
42729 int ret;
42730
42731 if (WARN_ON(hdev->status & HID_STAT_ADDED))
42732@@ -2574,7 +2574,7 @@ int hid_add_device(struct hid_device *hdev)
42733 /* XXX hack, any other cleaner solution after the driver core
42734 * is converted to allow more than 20 bytes as the device name? */
42735 dev_set_name(&hdev->dev, "%04X:%04X:%04X.%04X", hdev->bus,
42736- hdev->vendor, hdev->product, atomic_inc_return(&id));
42737+ hdev->vendor, hdev->product, atomic_inc_return_unchecked(&id));
42738
42739 hid_debug_register(hdev, dev_name(&hdev->dev));
42740 ret = device_add(&hdev->dev);
42741diff --git a/drivers/hid/hid-wiimote-debug.c b/drivers/hid/hid-wiimote-debug.c
42742index c13fb5b..55a3802 100644
42743--- a/drivers/hid/hid-wiimote-debug.c
42744+++ b/drivers/hid/hid-wiimote-debug.c
42745@@ -66,7 +66,7 @@ static ssize_t wiidebug_eeprom_read(struct file *f, char __user *u, size_t s,
42746 else if (size == 0)
42747 return -EIO;
42748
42749- if (copy_to_user(u, buf, size))
42750+ if (size > sizeof(buf) || copy_to_user(u, buf, size))
42751 return -EFAULT;
42752
42753 *off += size;
42754diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
42755index 00bc30e..d8e5097 100644
42756--- a/drivers/hv/channel.c
42757+++ b/drivers/hv/channel.c
42758@@ -370,7 +370,7 @@ int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer,
42759 int ret = 0;
42760
42761 next_gpadl_handle =
42762- (atomic_inc_return(&vmbus_connection.next_gpadl_handle) - 1);
42763+ (atomic_inc_return_unchecked(&vmbus_connection.next_gpadl_handle) - 1);
42764
42765 ret = create_gpadl_header(kbuffer, size, &msginfo, &msgcount);
42766 if (ret)
42767diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c
42768index 50e51a5..b0bfd78 100644
42769--- a/drivers/hv/hv.c
42770+++ b/drivers/hv/hv.c
42771@@ -118,7 +118,7 @@ static u64 do_hypercall(u64 control, void *input, void *output)
42772 u64 output_address = (output) ? virt_to_phys(output) : 0;
42773 u32 output_address_hi = output_address >> 32;
42774 u32 output_address_lo = output_address & 0xFFFFFFFF;
42775- void *hypercall_page = hv_context.hypercall_page;
42776+ void *hypercall_page = ktva_ktla(hv_context.hypercall_page);
42777
42778 __asm__ __volatile__ ("call *%8" : "=d"(hv_status_hi),
42779 "=a"(hv_status_lo) : "d" (control_hi),
42780@@ -164,7 +164,7 @@ int hv_init(void)
42781 /* See if the hypercall page is already set */
42782 rdmsrl(HV_X64_MSR_HYPERCALL, hypercall_msr.as_uint64);
42783
42784- virtaddr = __vmalloc(PAGE_SIZE, GFP_KERNEL, PAGE_KERNEL_EXEC);
42785+ virtaddr = __vmalloc(PAGE_SIZE, GFP_KERNEL, PAGE_KERNEL_RX);
42786
42787 if (!virtaddr)
42788 goto cleanup;
42789diff --git a/drivers/hv/hv_balloon.c b/drivers/hv/hv_balloon.c
42790index ff16938..e60879c 100644
42791--- a/drivers/hv/hv_balloon.c
42792+++ b/drivers/hv/hv_balloon.c
42793@@ -470,7 +470,7 @@ MODULE_PARM_DESC(hot_add, "If set attempt memory hot_add");
42794
42795 module_param(pressure_report_delay, uint, (S_IRUGO | S_IWUSR));
42796 MODULE_PARM_DESC(pressure_report_delay, "Delay in secs in reporting pressure");
42797-static atomic_t trans_id = ATOMIC_INIT(0);
42798+static atomic_unchecked_t trans_id = ATOMIC_INIT(0);
42799
42800 static int dm_ring_size = (5 * PAGE_SIZE);
42801
42802@@ -947,7 +947,7 @@ static void hot_add_req(struct work_struct *dummy)
42803 pr_info("Memory hot add failed\n");
42804
42805 dm->state = DM_INITIALIZED;
42806- resp.hdr.trans_id = atomic_inc_return(&trans_id);
42807+ resp.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42808 vmbus_sendpacket(dm->dev->channel, &resp,
42809 sizeof(struct dm_hot_add_response),
42810 (unsigned long)NULL,
42811@@ -1028,7 +1028,7 @@ static void post_status(struct hv_dynmem_device *dm)
42812 memset(&status, 0, sizeof(struct dm_status));
42813 status.hdr.type = DM_STATUS_REPORT;
42814 status.hdr.size = sizeof(struct dm_status);
42815- status.hdr.trans_id = atomic_inc_return(&trans_id);
42816+ status.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42817
42818 /*
42819 * The host expects the guest to report free memory.
42820@@ -1048,7 +1048,7 @@ static void post_status(struct hv_dynmem_device *dm)
42821 * send the status. This can happen if we were interrupted
42822 * after we picked our transaction ID.
42823 */
42824- if (status.hdr.trans_id != atomic_read(&trans_id))
42825+ if (status.hdr.trans_id != atomic_read_unchecked(&trans_id))
42826 return;
42827
42828 /*
42829@@ -1188,7 +1188,7 @@ static void balloon_up(struct work_struct *dummy)
42830 */
42831
42832 do {
42833- bl_resp->hdr.trans_id = atomic_inc_return(&trans_id);
42834+ bl_resp->hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42835 ret = vmbus_sendpacket(dm_device.dev->channel,
42836 bl_resp,
42837 bl_resp->hdr.size,
42838@@ -1234,7 +1234,7 @@ static void balloon_down(struct hv_dynmem_device *dm,
42839
42840 memset(&resp, 0, sizeof(struct dm_unballoon_response));
42841 resp.hdr.type = DM_UNBALLOON_RESPONSE;
42842- resp.hdr.trans_id = atomic_inc_return(&trans_id);
42843+ resp.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42844 resp.hdr.size = sizeof(struct dm_unballoon_response);
42845
42846 vmbus_sendpacket(dm_device.dev->channel, &resp,
42847@@ -1295,7 +1295,7 @@ static void version_resp(struct hv_dynmem_device *dm,
42848 memset(&version_req, 0, sizeof(struct dm_version_request));
42849 version_req.hdr.type = DM_VERSION_REQUEST;
42850 version_req.hdr.size = sizeof(struct dm_version_request);
42851- version_req.hdr.trans_id = atomic_inc_return(&trans_id);
42852+ version_req.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42853 version_req.version.version = DYNMEM_PROTOCOL_VERSION_WIN7;
42854 version_req.is_last_attempt = 1;
42855
42856@@ -1468,7 +1468,7 @@ static int balloon_probe(struct hv_device *dev,
42857 memset(&version_req, 0, sizeof(struct dm_version_request));
42858 version_req.hdr.type = DM_VERSION_REQUEST;
42859 version_req.hdr.size = sizeof(struct dm_version_request);
42860- version_req.hdr.trans_id = atomic_inc_return(&trans_id);
42861+ version_req.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42862 version_req.version.version = DYNMEM_PROTOCOL_VERSION_WIN8;
42863 version_req.is_last_attempt = 0;
42864
42865@@ -1499,7 +1499,7 @@ static int balloon_probe(struct hv_device *dev,
42866 memset(&cap_msg, 0, sizeof(struct dm_capabilities));
42867 cap_msg.hdr.type = DM_CAPABILITIES_REPORT;
42868 cap_msg.hdr.size = sizeof(struct dm_capabilities);
42869- cap_msg.hdr.trans_id = atomic_inc_return(&trans_id);
42870+ cap_msg.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42871
42872 cap_msg.caps.cap_bits.balloon = 1;
42873 cap_msg.caps.cap_bits.hot_add = 1;
42874diff --git a/drivers/hv/hyperv_vmbus.h b/drivers/hv/hyperv_vmbus.h
42875index 44b1c94..6dccc2c 100644
42876--- a/drivers/hv/hyperv_vmbus.h
42877+++ b/drivers/hv/hyperv_vmbus.h
42878@@ -632,7 +632,7 @@ enum vmbus_connect_state {
42879 struct vmbus_connection {
42880 enum vmbus_connect_state conn_state;
42881
42882- atomic_t next_gpadl_handle;
42883+ atomic_unchecked_t next_gpadl_handle;
42884
42885 /*
42886 * Represents channel interrupts. Each bit position represents a
42887diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
42888index f518b8d7..4bc0b64 100644
42889--- a/drivers/hv/vmbus_drv.c
42890+++ b/drivers/hv/vmbus_drv.c
42891@@ -840,10 +840,10 @@ int vmbus_device_register(struct hv_device *child_device_obj)
42892 {
42893 int ret = 0;
42894
42895- static atomic_t device_num = ATOMIC_INIT(0);
42896+ static atomic_unchecked_t device_num = ATOMIC_INIT(0);
42897
42898 dev_set_name(&child_device_obj->device, "vmbus_0_%d",
42899- atomic_inc_return(&device_num));
42900+ atomic_inc_return_unchecked(&device_num));
42901
42902 child_device_obj->device.bus = &hv_bus;
42903 child_device_obj->device.parent = &hv_acpi_dev->dev;
42904diff --git a/drivers/hwmon/acpi_power_meter.c b/drivers/hwmon/acpi_power_meter.c
42905index 579bdf9..0dac21d5 100644
42906--- a/drivers/hwmon/acpi_power_meter.c
42907+++ b/drivers/hwmon/acpi_power_meter.c
42908@@ -116,7 +116,7 @@ struct sensor_template {
42909 struct device_attribute *devattr,
42910 const char *buf, size_t count);
42911 int index;
42912-};
42913+} __do_const;
42914
42915 /* Averaging interval */
42916 static int update_avg_interval(struct acpi_power_meter_resource *resource)
42917@@ -631,7 +631,7 @@ static int register_attrs(struct acpi_power_meter_resource *resource,
42918 struct sensor_template *attrs)
42919 {
42920 struct device *dev = &resource->acpi_dev->dev;
42921- struct sensor_device_attribute *sensors =
42922+ sensor_device_attribute_no_const *sensors =
42923 &resource->sensors[resource->num_sensors];
42924 int res = 0;
42925
42926@@ -973,7 +973,7 @@ static int __init enable_cap_knobs(const struct dmi_system_id *d)
42927 return 0;
42928 }
42929
42930-static struct dmi_system_id __initdata pm_dmi_table[] = {
42931+static const struct dmi_system_id __initconst pm_dmi_table[] = {
42932 {
42933 enable_cap_knobs, "IBM Active Energy Manager",
42934 {
42935diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
42936index 0af63da..05a183a 100644
42937--- a/drivers/hwmon/applesmc.c
42938+++ b/drivers/hwmon/applesmc.c
42939@@ -1105,7 +1105,7 @@ static int applesmc_create_nodes(struct applesmc_node_group *groups, int num)
42940 {
42941 struct applesmc_node_group *grp;
42942 struct applesmc_dev_attr *node;
42943- struct attribute *attr;
42944+ attribute_no_const *attr;
42945 int ret, i;
42946
42947 for (grp = groups; grp->format; grp++) {
42948diff --git a/drivers/hwmon/asus_atk0110.c b/drivers/hwmon/asus_atk0110.c
42949index cccef87..06ce8ec 100644
42950--- a/drivers/hwmon/asus_atk0110.c
42951+++ b/drivers/hwmon/asus_atk0110.c
42952@@ -147,10 +147,10 @@ MODULE_DEVICE_TABLE(acpi, atk_ids);
42953 struct atk_sensor_data {
42954 struct list_head list;
42955 struct atk_data *data;
42956- struct device_attribute label_attr;
42957- struct device_attribute input_attr;
42958- struct device_attribute limit1_attr;
42959- struct device_attribute limit2_attr;
42960+ device_attribute_no_const label_attr;
42961+ device_attribute_no_const input_attr;
42962+ device_attribute_no_const limit1_attr;
42963+ device_attribute_no_const limit2_attr;
42964 char label_attr_name[ATTR_NAME_SIZE];
42965 char input_attr_name[ATTR_NAME_SIZE];
42966 char limit1_attr_name[ATTR_NAME_SIZE];
42967@@ -270,7 +270,7 @@ static ssize_t atk_name_show(struct device *dev,
42968 static struct device_attribute atk_name_attr =
42969 __ATTR(name, 0444, atk_name_show, NULL);
42970
42971-static void atk_init_attribute(struct device_attribute *attr, char *name,
42972+static void atk_init_attribute(device_attribute_no_const *attr, char *name,
42973 sysfs_show_func show)
42974 {
42975 sysfs_attr_init(&attr->attr);
42976diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
42977index 5b7fec8..05c957a 100644
42978--- a/drivers/hwmon/coretemp.c
42979+++ b/drivers/hwmon/coretemp.c
42980@@ -783,7 +783,7 @@ static int coretemp_cpu_callback(struct notifier_block *nfb,
42981 return NOTIFY_OK;
42982 }
42983
42984-static struct notifier_block coretemp_cpu_notifier __refdata = {
42985+static struct notifier_block coretemp_cpu_notifier = {
42986 .notifier_call = coretemp_cpu_callback,
42987 };
42988
42989diff --git a/drivers/hwmon/ibmaem.c b/drivers/hwmon/ibmaem.c
42990index 7a8a6fb..015c1fd 100644
42991--- a/drivers/hwmon/ibmaem.c
42992+++ b/drivers/hwmon/ibmaem.c
42993@@ -924,7 +924,7 @@ static int aem_register_sensors(struct aem_data *data,
42994 struct aem_rw_sensor_template *rw)
42995 {
42996 struct device *dev = &data->pdev->dev;
42997- struct sensor_device_attribute *sensors = data->sensors;
42998+ sensor_device_attribute_no_const *sensors = data->sensors;
42999 int err;
43000
43001 /* Set up read-only sensors */
43002diff --git a/drivers/hwmon/iio_hwmon.c b/drivers/hwmon/iio_hwmon.c
43003index 17ae2eb..21b71dd 100644
43004--- a/drivers/hwmon/iio_hwmon.c
43005+++ b/drivers/hwmon/iio_hwmon.c
43006@@ -61,7 +61,7 @@ static int iio_hwmon_probe(struct platform_device *pdev)
43007 {
43008 struct device *dev = &pdev->dev;
43009 struct iio_hwmon_state *st;
43010- struct sensor_device_attribute *a;
43011+ sensor_device_attribute_no_const *a;
43012 int ret, i;
43013 int in_i = 1, temp_i = 1, curr_i = 1, humidity_i = 1;
43014 enum iio_chan_type type;
43015diff --git a/drivers/hwmon/nct6683.c b/drivers/hwmon/nct6683.c
43016index 37f0170..414ec2c 100644
43017--- a/drivers/hwmon/nct6683.c
43018+++ b/drivers/hwmon/nct6683.c
43019@@ -397,11 +397,11 @@ static struct attribute_group *
43020 nct6683_create_attr_group(struct device *dev, struct sensor_template_group *tg,
43021 int repeat)
43022 {
43023- struct sensor_device_attribute_2 *a2;
43024- struct sensor_device_attribute *a;
43025+ sensor_device_attribute_2_no_const *a2;
43026+ sensor_device_attribute_no_const *a;
43027 struct sensor_device_template **t;
43028 struct sensor_device_attr_u *su;
43029- struct attribute_group *group;
43030+ attribute_group_no_const *group;
43031 struct attribute **attrs;
43032 int i, j, count;
43033
43034diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c
43035index 0773930..6f04305 100644
43036--- a/drivers/hwmon/nct6775.c
43037+++ b/drivers/hwmon/nct6775.c
43038@@ -952,10 +952,10 @@ static struct attribute_group *
43039 nct6775_create_attr_group(struct device *dev, struct sensor_template_group *tg,
43040 int repeat)
43041 {
43042- struct attribute_group *group;
43043+ attribute_group_no_const *group;
43044 struct sensor_device_attr_u *su;
43045- struct sensor_device_attribute *a;
43046- struct sensor_device_attribute_2 *a2;
43047+ sensor_device_attribute_no_const *a;
43048+ sensor_device_attribute_2_no_const *a2;
43049 struct attribute **attrs;
43050 struct sensor_device_template **t;
43051 int i, count;
43052diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c
43053index f2e47c7..45d7941 100644
43054--- a/drivers/hwmon/pmbus/pmbus_core.c
43055+++ b/drivers/hwmon/pmbus/pmbus_core.c
43056@@ -816,7 +816,7 @@ static int pmbus_add_attribute(struct pmbus_data *data, struct attribute *attr)
43057 return 0;
43058 }
43059
43060-static void pmbus_dev_attr_init(struct device_attribute *dev_attr,
43061+static void pmbus_dev_attr_init(device_attribute_no_const *dev_attr,
43062 const char *name,
43063 umode_t mode,
43064 ssize_t (*show)(struct device *dev,
43065@@ -833,7 +833,7 @@ static void pmbus_dev_attr_init(struct device_attribute *dev_attr,
43066 dev_attr->store = store;
43067 }
43068
43069-static void pmbus_attr_init(struct sensor_device_attribute *a,
43070+static void pmbus_attr_init(sensor_device_attribute_no_const *a,
43071 const char *name,
43072 umode_t mode,
43073 ssize_t (*show)(struct device *dev,
43074@@ -855,7 +855,7 @@ static int pmbus_add_boolean(struct pmbus_data *data,
43075 u16 reg, u8 mask)
43076 {
43077 struct pmbus_boolean *boolean;
43078- struct sensor_device_attribute *a;
43079+ sensor_device_attribute_no_const *a;
43080
43081 boolean = devm_kzalloc(data->dev, sizeof(*boolean), GFP_KERNEL);
43082 if (!boolean)
43083@@ -880,7 +880,7 @@ static struct pmbus_sensor *pmbus_add_sensor(struct pmbus_data *data,
43084 bool update, bool readonly)
43085 {
43086 struct pmbus_sensor *sensor;
43087- struct device_attribute *a;
43088+ device_attribute_no_const *a;
43089
43090 sensor = devm_kzalloc(data->dev, sizeof(*sensor), GFP_KERNEL);
43091 if (!sensor)
43092@@ -911,7 +911,7 @@ static int pmbus_add_label(struct pmbus_data *data,
43093 const char *lstring, int index)
43094 {
43095 struct pmbus_label *label;
43096- struct device_attribute *a;
43097+ device_attribute_no_const *a;
43098
43099 label = devm_kzalloc(data->dev, sizeof(*label), GFP_KERNEL);
43100 if (!label)
43101diff --git a/drivers/hwmon/sht15.c b/drivers/hwmon/sht15.c
43102index d4f0935..7420593 100644
43103--- a/drivers/hwmon/sht15.c
43104+++ b/drivers/hwmon/sht15.c
43105@@ -169,7 +169,7 @@ struct sht15_data {
43106 int supply_uv;
43107 bool supply_uv_valid;
43108 struct work_struct update_supply_work;
43109- atomic_t interrupt_handled;
43110+ atomic_unchecked_t interrupt_handled;
43111 };
43112
43113 /**
43114@@ -542,13 +542,13 @@ static int sht15_measurement(struct sht15_data *data,
43115 ret = gpio_direction_input(data->pdata->gpio_data);
43116 if (ret)
43117 return ret;
43118- atomic_set(&data->interrupt_handled, 0);
43119+ atomic_set_unchecked(&data->interrupt_handled, 0);
43120
43121 enable_irq(gpio_to_irq(data->pdata->gpio_data));
43122 if (gpio_get_value(data->pdata->gpio_data) == 0) {
43123 disable_irq_nosync(gpio_to_irq(data->pdata->gpio_data));
43124 /* Only relevant if the interrupt hasn't occurred. */
43125- if (!atomic_read(&data->interrupt_handled))
43126+ if (!atomic_read_unchecked(&data->interrupt_handled))
43127 schedule_work(&data->read_work);
43128 }
43129 ret = wait_event_timeout(data->wait_queue,
43130@@ -820,7 +820,7 @@ static irqreturn_t sht15_interrupt_fired(int irq, void *d)
43131
43132 /* First disable the interrupt */
43133 disable_irq_nosync(irq);
43134- atomic_inc(&data->interrupt_handled);
43135+ atomic_inc_unchecked(&data->interrupt_handled);
43136 /* Then schedule a reading work struct */
43137 if (data->state != SHT15_READING_NOTHING)
43138 schedule_work(&data->read_work);
43139@@ -842,11 +842,11 @@ static void sht15_bh_read_data(struct work_struct *work_s)
43140 * If not, then start the interrupt again - care here as could
43141 * have gone low in meantime so verify it hasn't!
43142 */
43143- atomic_set(&data->interrupt_handled, 0);
43144+ atomic_set_unchecked(&data->interrupt_handled, 0);
43145 enable_irq(gpio_to_irq(data->pdata->gpio_data));
43146 /* If still not occurred or another handler was scheduled */
43147 if (gpio_get_value(data->pdata->gpio_data)
43148- || atomic_read(&data->interrupt_handled))
43149+ || atomic_read_unchecked(&data->interrupt_handled))
43150 return;
43151 }
43152
43153diff --git a/drivers/hwmon/via-cputemp.c b/drivers/hwmon/via-cputemp.c
43154index ac91c07..8e69663 100644
43155--- a/drivers/hwmon/via-cputemp.c
43156+++ b/drivers/hwmon/via-cputemp.c
43157@@ -295,7 +295,7 @@ static int via_cputemp_cpu_callback(struct notifier_block *nfb,
43158 return NOTIFY_OK;
43159 }
43160
43161-static struct notifier_block via_cputemp_cpu_notifier __refdata = {
43162+static struct notifier_block via_cputemp_cpu_notifier = {
43163 .notifier_call = via_cputemp_cpu_callback,
43164 };
43165
43166diff --git a/drivers/i2c/busses/i2c-amd756-s4882.c b/drivers/i2c/busses/i2c-amd756-s4882.c
43167index 65e3240..e6c511d 100644
43168--- a/drivers/i2c/busses/i2c-amd756-s4882.c
43169+++ b/drivers/i2c/busses/i2c-amd756-s4882.c
43170@@ -39,7 +39,7 @@
43171 extern struct i2c_adapter amd756_smbus;
43172
43173 static struct i2c_adapter *s4882_adapter;
43174-static struct i2c_algorithm *s4882_algo;
43175+static i2c_algorithm_no_const *s4882_algo;
43176
43177 /* Wrapper access functions for multiplexed SMBus */
43178 static DEFINE_MUTEX(amd756_lock);
43179diff --git a/drivers/i2c/busses/i2c-diolan-u2c.c b/drivers/i2c/busses/i2c-diolan-u2c.c
43180index b19a310..d6eece0 100644
43181--- a/drivers/i2c/busses/i2c-diolan-u2c.c
43182+++ b/drivers/i2c/busses/i2c-diolan-u2c.c
43183@@ -98,7 +98,7 @@ MODULE_PARM_DESC(frequency, "I2C clock frequency in hertz");
43184 /* usb layer */
43185
43186 /* Send command to device, and get response. */
43187-static int diolan_usb_transfer(struct i2c_diolan_u2c *dev)
43188+static int __intentional_overflow(-1) diolan_usb_transfer(struct i2c_diolan_u2c *dev)
43189 {
43190 int ret = 0;
43191 int actual;
43192diff --git a/drivers/i2c/busses/i2c-nforce2-s4985.c b/drivers/i2c/busses/i2c-nforce2-s4985.c
43193index 88eda09..cf40434 100644
43194--- a/drivers/i2c/busses/i2c-nforce2-s4985.c
43195+++ b/drivers/i2c/busses/i2c-nforce2-s4985.c
43196@@ -37,7 +37,7 @@
43197 extern struct i2c_adapter *nforce2_smbus;
43198
43199 static struct i2c_adapter *s4985_adapter;
43200-static struct i2c_algorithm *s4985_algo;
43201+static i2c_algorithm_no_const *s4985_algo;
43202
43203 /* Wrapper access functions for multiplexed SMBus */
43204 static DEFINE_MUTEX(nforce2_lock);
43205diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c
43206index 71c7a39..71dd3e0 100644
43207--- a/drivers/i2c/i2c-dev.c
43208+++ b/drivers/i2c/i2c-dev.c
43209@@ -272,7 +272,7 @@ static noinline int i2cdev_ioctl_rdrw(struct i2c_client *client,
43210 break;
43211 }
43212
43213- data_ptrs[i] = (u8 __user *)rdwr_pa[i].buf;
43214+ data_ptrs[i] = (u8 __force_user *)rdwr_pa[i].buf;
43215 rdwr_pa[i].buf = memdup_user(data_ptrs[i], rdwr_pa[i].len);
43216 if (IS_ERR(rdwr_pa[i].buf)) {
43217 res = PTR_ERR(rdwr_pa[i].buf);
43218diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
43219index 0b510ba..4fbb5085 100644
43220--- a/drivers/ide/ide-cd.c
43221+++ b/drivers/ide/ide-cd.c
43222@@ -768,7 +768,7 @@ static void cdrom_do_block_pc(ide_drive_t *drive, struct request *rq)
43223 alignment = queue_dma_alignment(q) | q->dma_pad_mask;
43224 if ((unsigned long)buf & alignment
43225 || blk_rq_bytes(rq) & q->dma_pad_mask
43226- || object_is_on_stack(buf))
43227+ || object_starts_on_stack(buf))
43228 drive->dma = 0;
43229 }
43230 }
43231diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
43232index 4df97f6..c751151 100644
43233--- a/drivers/iio/industrialio-core.c
43234+++ b/drivers/iio/industrialio-core.c
43235@@ -570,7 +570,7 @@ static ssize_t iio_write_channel_info(struct device *dev,
43236 }
43237
43238 static
43239-int __iio_device_attr_init(struct device_attribute *dev_attr,
43240+int __iio_device_attr_init(device_attribute_no_const *dev_attr,
43241 const char *postfix,
43242 struct iio_chan_spec const *chan,
43243 ssize_t (*readfunc)(struct device *dev,
43244diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
43245index e28a494..f7c2671 100644
43246--- a/drivers/infiniband/core/cm.c
43247+++ b/drivers/infiniband/core/cm.c
43248@@ -115,7 +115,7 @@ static char const counter_group_names[CM_COUNTER_GROUPS]
43249
43250 struct cm_counter_group {
43251 struct kobject obj;
43252- atomic_long_t counter[CM_ATTR_COUNT];
43253+ atomic_long_unchecked_t counter[CM_ATTR_COUNT];
43254 };
43255
43256 struct cm_counter_attribute {
43257@@ -1398,7 +1398,7 @@ static void cm_dup_req_handler(struct cm_work *work,
43258 struct ib_mad_send_buf *msg = NULL;
43259 int ret;
43260
43261- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
43262+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
43263 counter[CM_REQ_COUNTER]);
43264
43265 /* Quick state check to discard duplicate REQs. */
43266@@ -1785,7 +1785,7 @@ static void cm_dup_rep_handler(struct cm_work *work)
43267 if (!cm_id_priv)
43268 return;
43269
43270- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
43271+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
43272 counter[CM_REP_COUNTER]);
43273 ret = cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg);
43274 if (ret)
43275@@ -1952,7 +1952,7 @@ static int cm_rtu_handler(struct cm_work *work)
43276 if (cm_id_priv->id.state != IB_CM_REP_SENT &&
43277 cm_id_priv->id.state != IB_CM_MRA_REP_RCVD) {
43278 spin_unlock_irq(&cm_id_priv->lock);
43279- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
43280+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
43281 counter[CM_RTU_COUNTER]);
43282 goto out;
43283 }
43284@@ -2135,7 +2135,7 @@ static int cm_dreq_handler(struct cm_work *work)
43285 cm_id_priv = cm_acquire_id(dreq_msg->remote_comm_id,
43286 dreq_msg->local_comm_id);
43287 if (!cm_id_priv) {
43288- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
43289+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
43290 counter[CM_DREQ_COUNTER]);
43291 cm_issue_drep(work->port, work->mad_recv_wc);
43292 return -EINVAL;
43293@@ -2160,7 +2160,7 @@ static int cm_dreq_handler(struct cm_work *work)
43294 case IB_CM_MRA_REP_RCVD:
43295 break;
43296 case IB_CM_TIMEWAIT:
43297- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
43298+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
43299 counter[CM_DREQ_COUNTER]);
43300 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
43301 goto unlock;
43302@@ -2174,7 +2174,7 @@ static int cm_dreq_handler(struct cm_work *work)
43303 cm_free_msg(msg);
43304 goto deref;
43305 case IB_CM_DREQ_RCVD:
43306- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
43307+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
43308 counter[CM_DREQ_COUNTER]);
43309 goto unlock;
43310 default:
43311@@ -2541,7 +2541,7 @@ static int cm_mra_handler(struct cm_work *work)
43312 ib_modify_mad(cm_id_priv->av.port->mad_agent,
43313 cm_id_priv->msg, timeout)) {
43314 if (cm_id_priv->id.lap_state == IB_CM_MRA_LAP_RCVD)
43315- atomic_long_inc(&work->port->
43316+ atomic_long_inc_unchecked(&work->port->
43317 counter_group[CM_RECV_DUPLICATES].
43318 counter[CM_MRA_COUNTER]);
43319 goto out;
43320@@ -2550,7 +2550,7 @@ static int cm_mra_handler(struct cm_work *work)
43321 break;
43322 case IB_CM_MRA_REQ_RCVD:
43323 case IB_CM_MRA_REP_RCVD:
43324- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
43325+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
43326 counter[CM_MRA_COUNTER]);
43327 /* fall through */
43328 default:
43329@@ -2712,7 +2712,7 @@ static int cm_lap_handler(struct cm_work *work)
43330 case IB_CM_LAP_IDLE:
43331 break;
43332 case IB_CM_MRA_LAP_SENT:
43333- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
43334+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
43335 counter[CM_LAP_COUNTER]);
43336 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
43337 goto unlock;
43338@@ -2728,7 +2728,7 @@ static int cm_lap_handler(struct cm_work *work)
43339 cm_free_msg(msg);
43340 goto deref;
43341 case IB_CM_LAP_RCVD:
43342- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
43343+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
43344 counter[CM_LAP_COUNTER]);
43345 goto unlock;
43346 default:
43347@@ -3012,7 +3012,7 @@ static int cm_sidr_req_handler(struct cm_work *work)
43348 cur_cm_id_priv = cm_insert_remote_sidr(cm_id_priv);
43349 if (cur_cm_id_priv) {
43350 spin_unlock_irq(&cm.lock);
43351- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
43352+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
43353 counter[CM_SIDR_REQ_COUNTER]);
43354 goto out; /* Duplicate message. */
43355 }
43356@@ -3224,10 +3224,10 @@ static void cm_send_handler(struct ib_mad_agent *mad_agent,
43357 if (!msg->context[0] && (attr_index != CM_REJ_COUNTER))
43358 msg->retries = 1;
43359
43360- atomic_long_add(1 + msg->retries,
43361+ atomic_long_add_unchecked(1 + msg->retries,
43362 &port->counter_group[CM_XMIT].counter[attr_index]);
43363 if (msg->retries)
43364- atomic_long_add(msg->retries,
43365+ atomic_long_add_unchecked(msg->retries,
43366 &port->counter_group[CM_XMIT_RETRIES].
43367 counter[attr_index]);
43368
43369@@ -3437,7 +3437,7 @@ static void cm_recv_handler(struct ib_mad_agent *mad_agent,
43370 }
43371
43372 attr_id = be16_to_cpu(mad_recv_wc->recv_buf.mad->mad_hdr.attr_id);
43373- atomic_long_inc(&port->counter_group[CM_RECV].
43374+ atomic_long_inc_unchecked(&port->counter_group[CM_RECV].
43375 counter[attr_id - CM_ATTR_ID_OFFSET]);
43376
43377 work = kmalloc(sizeof *work + sizeof(struct ib_sa_path_rec) * paths,
43378@@ -3668,7 +3668,7 @@ static ssize_t cm_show_counter(struct kobject *obj, struct attribute *attr,
43379 cm_attr = container_of(attr, struct cm_counter_attribute, attr);
43380
43381 return sprintf(buf, "%ld\n",
43382- atomic_long_read(&group->counter[cm_attr->index]));
43383+ atomic_long_read_unchecked(&group->counter[cm_attr->index]));
43384 }
43385
43386 static const struct sysfs_ops cm_counter_ops = {
43387diff --git a/drivers/infiniband/core/fmr_pool.c b/drivers/infiniband/core/fmr_pool.c
43388index 9f5ad7c..588cd84 100644
43389--- a/drivers/infiniband/core/fmr_pool.c
43390+++ b/drivers/infiniband/core/fmr_pool.c
43391@@ -98,8 +98,8 @@ struct ib_fmr_pool {
43392
43393 struct task_struct *thread;
43394
43395- atomic_t req_ser;
43396- atomic_t flush_ser;
43397+ atomic_unchecked_t req_ser;
43398+ atomic_unchecked_t flush_ser;
43399
43400 wait_queue_head_t force_wait;
43401 };
43402@@ -179,10 +179,10 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
43403 struct ib_fmr_pool *pool = pool_ptr;
43404
43405 do {
43406- if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) < 0) {
43407+ if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) < 0) {
43408 ib_fmr_batch_release(pool);
43409
43410- atomic_inc(&pool->flush_ser);
43411+ atomic_inc_unchecked(&pool->flush_ser);
43412 wake_up_interruptible(&pool->force_wait);
43413
43414 if (pool->flush_function)
43415@@ -190,7 +190,7 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
43416 }
43417
43418 set_current_state(TASK_INTERRUPTIBLE);
43419- if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) >= 0 &&
43420+ if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) >= 0 &&
43421 !kthread_should_stop())
43422 schedule();
43423 __set_current_state(TASK_RUNNING);
43424@@ -282,8 +282,8 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd *pd,
43425 pool->dirty_watermark = params->dirty_watermark;
43426 pool->dirty_len = 0;
43427 spin_lock_init(&pool->pool_lock);
43428- atomic_set(&pool->req_ser, 0);
43429- atomic_set(&pool->flush_ser, 0);
43430+ atomic_set_unchecked(&pool->req_ser, 0);
43431+ atomic_set_unchecked(&pool->flush_ser, 0);
43432 init_waitqueue_head(&pool->force_wait);
43433
43434 pool->thread = kthread_run(ib_fmr_cleanup_thread,
43435@@ -411,11 +411,11 @@ int ib_flush_fmr_pool(struct ib_fmr_pool *pool)
43436 }
43437 spin_unlock_irq(&pool->pool_lock);
43438
43439- serial = atomic_inc_return(&pool->req_ser);
43440+ serial = atomic_inc_return_unchecked(&pool->req_ser);
43441 wake_up_process(pool->thread);
43442
43443 if (wait_event_interruptible(pool->force_wait,
43444- atomic_read(&pool->flush_ser) - serial >= 0))
43445+ atomic_read_unchecked(&pool->flush_ser) - serial >= 0))
43446 return -EINTR;
43447
43448 return 0;
43449@@ -525,7 +525,7 @@ int ib_fmr_pool_unmap(struct ib_pool_fmr *fmr)
43450 } else {
43451 list_add_tail(&fmr->list, &pool->dirty_list);
43452 if (++pool->dirty_len >= pool->dirty_watermark) {
43453- atomic_inc(&pool->req_ser);
43454+ atomic_inc_unchecked(&pool->req_ser);
43455 wake_up_process(pool->thread);
43456 }
43457 }
43458diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c
43459index a9f0489..27a161b 100644
43460--- a/drivers/infiniband/core/uverbs_cmd.c
43461+++ b/drivers/infiniband/core/uverbs_cmd.c
43462@@ -951,6 +951,9 @@ ssize_t ib_uverbs_reg_mr(struct ib_uverbs_file *file,
43463 if (copy_from_user(&cmd, buf, sizeof cmd))
43464 return -EFAULT;
43465
43466+ if (!access_ok_noprefault(VERIFY_READ, cmd.start, cmd.length))
43467+ return -EFAULT;
43468+
43469 INIT_UDATA(&udata, buf + sizeof cmd,
43470 (unsigned long) cmd.response + sizeof resp,
43471 in_len - sizeof cmd, out_len - sizeof resp);
43472diff --git a/drivers/infiniband/hw/cxgb4/mem.c b/drivers/infiniband/hw/cxgb4/mem.c
43473index 6791fd1..78bdcdf 100644
43474--- a/drivers/infiniband/hw/cxgb4/mem.c
43475+++ b/drivers/infiniband/hw/cxgb4/mem.c
43476@@ -256,7 +256,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
43477 int err;
43478 struct fw_ri_tpte tpt;
43479 u32 stag_idx;
43480- static atomic_t key;
43481+ static atomic_unchecked_t key;
43482
43483 if (c4iw_fatal_error(rdev))
43484 return -EIO;
43485@@ -277,7 +277,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
43486 if (rdev->stats.stag.cur > rdev->stats.stag.max)
43487 rdev->stats.stag.max = rdev->stats.stag.cur;
43488 mutex_unlock(&rdev->stats.lock);
43489- *stag = (stag_idx << 8) | (atomic_inc_return(&key) & 0xff);
43490+ *stag = (stag_idx << 8) | (atomic_inc_return_unchecked(&key) & 0xff);
43491 }
43492 PDBG("%s stag_state 0x%0x type 0x%0x pdid 0x%0x, stag_idx 0x%x\n",
43493 __func__, stag_state, type, pdid, stag_idx);
43494diff --git a/drivers/infiniband/hw/ipath/ipath_rc.c b/drivers/infiniband/hw/ipath/ipath_rc.c
43495index 79b3dbc..96e5fcc 100644
43496--- a/drivers/infiniband/hw/ipath/ipath_rc.c
43497+++ b/drivers/infiniband/hw/ipath/ipath_rc.c
43498@@ -1868,7 +1868,7 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
43499 struct ib_atomic_eth *ateth;
43500 struct ipath_ack_entry *e;
43501 u64 vaddr;
43502- atomic64_t *maddr;
43503+ atomic64_unchecked_t *maddr;
43504 u64 sdata;
43505 u32 rkey;
43506 u8 next;
43507@@ -1903,11 +1903,11 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
43508 IB_ACCESS_REMOTE_ATOMIC)))
43509 goto nack_acc_unlck;
43510 /* Perform atomic OP and save result. */
43511- maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
43512+ maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr;
43513 sdata = be64_to_cpu(ateth->swap_data);
43514 e = &qp->s_ack_queue[qp->r_head_ack_queue];
43515 e->atomic_data = (opcode == OP(FETCH_ADD)) ?
43516- (u64) atomic64_add_return(sdata, maddr) - sdata :
43517+ (u64) atomic64_add_return_unchecked(sdata, maddr) - sdata :
43518 (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
43519 be64_to_cpu(ateth->compare_data),
43520 sdata);
43521diff --git a/drivers/infiniband/hw/ipath/ipath_ruc.c b/drivers/infiniband/hw/ipath/ipath_ruc.c
43522index 1f95bba..9530f87 100644
43523--- a/drivers/infiniband/hw/ipath/ipath_ruc.c
43524+++ b/drivers/infiniband/hw/ipath/ipath_ruc.c
43525@@ -266,7 +266,7 @@ static void ipath_ruc_loopback(struct ipath_qp *sqp)
43526 unsigned long flags;
43527 struct ib_wc wc;
43528 u64 sdata;
43529- atomic64_t *maddr;
43530+ atomic64_unchecked_t *maddr;
43531 enum ib_wc_status send_status;
43532
43533 /*
43534@@ -382,11 +382,11 @@ again:
43535 IB_ACCESS_REMOTE_ATOMIC)))
43536 goto acc_err;
43537 /* Perform atomic OP and save result. */
43538- maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
43539+ maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr;
43540 sdata = wqe->wr.wr.atomic.compare_add;
43541 *(u64 *) sqp->s_sge.sge.vaddr =
43542 (wqe->wr.opcode == IB_WR_ATOMIC_FETCH_AND_ADD) ?
43543- (u64) atomic64_add_return(sdata, maddr) - sdata :
43544+ (u64) atomic64_add_return_unchecked(sdata, maddr) - sdata :
43545 (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
43546 sdata, wqe->wr.wr.atomic.swap);
43547 goto send_comp;
43548diff --git a/drivers/infiniband/hw/mlx4/mad.c b/drivers/infiniband/hw/mlx4/mad.c
43549index 5904026..f1c30e5 100644
43550--- a/drivers/infiniband/hw/mlx4/mad.c
43551+++ b/drivers/infiniband/hw/mlx4/mad.c
43552@@ -106,7 +106,7 @@ __be64 mlx4_ib_gen_node_guid(void)
43553
43554 __be64 mlx4_ib_get_new_demux_tid(struct mlx4_ib_demux_ctx *ctx)
43555 {
43556- return cpu_to_be64(atomic_inc_return(&ctx->tid)) |
43557+ return cpu_to_be64(atomic_inc_return_unchecked(&ctx->tid)) |
43558 cpu_to_be64(0xff00000000000000LL);
43559 }
43560
43561diff --git a/drivers/infiniband/hw/mlx4/mcg.c b/drivers/infiniband/hw/mlx4/mcg.c
43562index ed327e6..ca1739e0 100644
43563--- a/drivers/infiniband/hw/mlx4/mcg.c
43564+++ b/drivers/infiniband/hw/mlx4/mcg.c
43565@@ -1041,7 +1041,7 @@ int mlx4_ib_mcg_port_init(struct mlx4_ib_demux_ctx *ctx)
43566 {
43567 char name[20];
43568
43569- atomic_set(&ctx->tid, 0);
43570+ atomic_set_unchecked(&ctx->tid, 0);
43571 sprintf(name, "mlx4_ib_mcg%d", ctx->port);
43572 ctx->mcg_wq = create_singlethread_workqueue(name);
43573 if (!ctx->mcg_wq)
43574diff --git a/drivers/infiniband/hw/mlx4/mlx4_ib.h b/drivers/infiniband/hw/mlx4/mlx4_ib.h
43575index f829fd9..1a8d436 100644
43576--- a/drivers/infiniband/hw/mlx4/mlx4_ib.h
43577+++ b/drivers/infiniband/hw/mlx4/mlx4_ib.h
43578@@ -439,7 +439,7 @@ struct mlx4_ib_demux_ctx {
43579 struct list_head mcg_mgid0_list;
43580 struct workqueue_struct *mcg_wq;
43581 struct mlx4_ib_demux_pv_ctx **tun;
43582- atomic_t tid;
43583+ atomic_unchecked_t tid;
43584 int flushing; /* flushing the work queue */
43585 };
43586
43587diff --git a/drivers/infiniband/hw/mthca/mthca_cmd.c b/drivers/infiniband/hw/mthca/mthca_cmd.c
43588index 9d3e5c1..6f166df 100644
43589--- a/drivers/infiniband/hw/mthca/mthca_cmd.c
43590+++ b/drivers/infiniband/hw/mthca/mthca_cmd.c
43591@@ -772,7 +772,7 @@ static void mthca_setup_cmd_doorbells(struct mthca_dev *dev, u64 base)
43592 mthca_dbg(dev, "Mapped doorbell page for posting FW commands\n");
43593 }
43594
43595-int mthca_QUERY_FW(struct mthca_dev *dev)
43596+int __intentional_overflow(-1) mthca_QUERY_FW(struct mthca_dev *dev)
43597 {
43598 struct mthca_mailbox *mailbox;
43599 u32 *outbox;
43600@@ -1612,7 +1612,7 @@ int mthca_HW2SW_MPT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
43601 CMD_TIME_CLASS_B);
43602 }
43603
43604-int mthca_WRITE_MTT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
43605+int __intentional_overflow(-1) mthca_WRITE_MTT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
43606 int num_mtt)
43607 {
43608 return mthca_cmd(dev, mailbox->dma, num_mtt, 0, CMD_WRITE_MTT,
43609@@ -1634,7 +1634,7 @@ int mthca_MAP_EQ(struct mthca_dev *dev, u64 event_mask, int unmap,
43610 0, CMD_MAP_EQ, CMD_TIME_CLASS_B);
43611 }
43612
43613-int mthca_SW2HW_EQ(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
43614+int __intentional_overflow(-1) mthca_SW2HW_EQ(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
43615 int eq_num)
43616 {
43617 return mthca_cmd(dev, mailbox->dma, eq_num, 0, CMD_SW2HW_EQ,
43618@@ -1857,7 +1857,7 @@ int mthca_CONF_SPECIAL_QP(struct mthca_dev *dev, int type, u32 qpn)
43619 CMD_TIME_CLASS_B);
43620 }
43621
43622-int mthca_MAD_IFC(struct mthca_dev *dev, int ignore_mkey, int ignore_bkey,
43623+int __intentional_overflow(-1) mthca_MAD_IFC(struct mthca_dev *dev, int ignore_mkey, int ignore_bkey,
43624 int port, struct ib_wc *in_wc, struct ib_grh *in_grh,
43625 void *in_mad, void *response_mad)
43626 {
43627diff --git a/drivers/infiniband/hw/mthca/mthca_main.c b/drivers/infiniband/hw/mthca/mthca_main.c
43628index ded76c1..0cf0a08 100644
43629--- a/drivers/infiniband/hw/mthca/mthca_main.c
43630+++ b/drivers/infiniband/hw/mthca/mthca_main.c
43631@@ -692,7 +692,7 @@ err_close:
43632 return err;
43633 }
43634
43635-static int mthca_setup_hca(struct mthca_dev *dev)
43636+static int __intentional_overflow(-1) mthca_setup_hca(struct mthca_dev *dev)
43637 {
43638 int err;
43639
43640diff --git a/drivers/infiniband/hw/mthca/mthca_mr.c b/drivers/infiniband/hw/mthca/mthca_mr.c
43641index ed9a989..6aa5dc2 100644
43642--- a/drivers/infiniband/hw/mthca/mthca_mr.c
43643+++ b/drivers/infiniband/hw/mthca/mthca_mr.c
43644@@ -81,7 +81,7 @@ struct mthca_mpt_entry {
43645 * through the bitmaps)
43646 */
43647
43648-static u32 mthca_buddy_alloc(struct mthca_buddy *buddy, int order)
43649+static u32 __intentional_overflow(-1) mthca_buddy_alloc(struct mthca_buddy *buddy, int order)
43650 {
43651 int o;
43652 int m;
43653@@ -426,7 +426,7 @@ static inline u32 adjust_key(struct mthca_dev *dev, u32 key)
43654 return key;
43655 }
43656
43657-int mthca_mr_alloc(struct mthca_dev *dev, u32 pd, int buffer_size_shift,
43658+int __intentional_overflow(-1) mthca_mr_alloc(struct mthca_dev *dev, u32 pd, int buffer_size_shift,
43659 u64 iova, u64 total_size, u32 access, struct mthca_mr *mr)
43660 {
43661 struct mthca_mailbox *mailbox;
43662@@ -516,7 +516,7 @@ int mthca_mr_alloc_notrans(struct mthca_dev *dev, u32 pd,
43663 return mthca_mr_alloc(dev, pd, 12, 0, ~0ULL, access, mr);
43664 }
43665
43666-int mthca_mr_alloc_phys(struct mthca_dev *dev, u32 pd,
43667+int __intentional_overflow(-1) mthca_mr_alloc_phys(struct mthca_dev *dev, u32 pd,
43668 u64 *buffer_list, int buffer_size_shift,
43669 int list_len, u64 iova, u64 total_size,
43670 u32 access, struct mthca_mr *mr)
43671diff --git a/drivers/infiniband/hw/mthca/mthca_provider.c b/drivers/infiniband/hw/mthca/mthca_provider.c
43672index 415f8e1..e34214e 100644
43673--- a/drivers/infiniband/hw/mthca/mthca_provider.c
43674+++ b/drivers/infiniband/hw/mthca/mthca_provider.c
43675@@ -764,7 +764,7 @@ unlock:
43676 return 0;
43677 }
43678
43679-static int mthca_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata)
43680+static int __intentional_overflow(-1) mthca_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata)
43681 {
43682 struct mthca_dev *dev = to_mdev(ibcq->device);
43683 struct mthca_cq *cq = to_mcq(ibcq);
43684diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c
43685index 3b2a6dc..bce26ff 100644
43686--- a/drivers/infiniband/hw/nes/nes.c
43687+++ b/drivers/infiniband/hw/nes/nes.c
43688@@ -97,7 +97,7 @@ MODULE_PARM_DESC(limit_maxrdreqsz, "Limit max read request size to 256 Bytes");
43689 LIST_HEAD(nes_adapter_list);
43690 static LIST_HEAD(nes_dev_list);
43691
43692-atomic_t qps_destroyed;
43693+atomic_unchecked_t qps_destroyed;
43694
43695 static unsigned int ee_flsh_adapter;
43696 static unsigned int sysfs_nonidx_addr;
43697@@ -278,7 +278,7 @@ static void nes_cqp_rem_ref_callback(struct nes_device *nesdev, struct nes_cqp_r
43698 struct nes_qp *nesqp = cqp_request->cqp_callback_pointer;
43699 struct nes_adapter *nesadapter = nesdev->nesadapter;
43700
43701- atomic_inc(&qps_destroyed);
43702+ atomic_inc_unchecked(&qps_destroyed);
43703
43704 /* Free the control structures */
43705
43706diff --git a/drivers/infiniband/hw/nes/nes.h b/drivers/infiniband/hw/nes/nes.h
43707index bd9d132..70d84f4 100644
43708--- a/drivers/infiniband/hw/nes/nes.h
43709+++ b/drivers/infiniband/hw/nes/nes.h
43710@@ -180,17 +180,17 @@ extern unsigned int nes_debug_level;
43711 extern unsigned int wqm_quanta;
43712 extern struct list_head nes_adapter_list;
43713
43714-extern atomic_t cm_connects;
43715-extern atomic_t cm_accepts;
43716-extern atomic_t cm_disconnects;
43717-extern atomic_t cm_closes;
43718-extern atomic_t cm_connecteds;
43719-extern atomic_t cm_connect_reqs;
43720-extern atomic_t cm_rejects;
43721-extern atomic_t mod_qp_timouts;
43722-extern atomic_t qps_created;
43723-extern atomic_t qps_destroyed;
43724-extern atomic_t sw_qps_destroyed;
43725+extern atomic_unchecked_t cm_connects;
43726+extern atomic_unchecked_t cm_accepts;
43727+extern atomic_unchecked_t cm_disconnects;
43728+extern atomic_unchecked_t cm_closes;
43729+extern atomic_unchecked_t cm_connecteds;
43730+extern atomic_unchecked_t cm_connect_reqs;
43731+extern atomic_unchecked_t cm_rejects;
43732+extern atomic_unchecked_t mod_qp_timouts;
43733+extern atomic_unchecked_t qps_created;
43734+extern atomic_unchecked_t qps_destroyed;
43735+extern atomic_unchecked_t sw_qps_destroyed;
43736 extern u32 mh_detected;
43737 extern u32 mh_pauses_sent;
43738 extern u32 cm_packets_sent;
43739@@ -199,16 +199,16 @@ extern u32 cm_packets_created;
43740 extern u32 cm_packets_received;
43741 extern u32 cm_packets_dropped;
43742 extern u32 cm_packets_retrans;
43743-extern atomic_t cm_listens_created;
43744-extern atomic_t cm_listens_destroyed;
43745+extern atomic_unchecked_t cm_listens_created;
43746+extern atomic_unchecked_t cm_listens_destroyed;
43747 extern u32 cm_backlog_drops;
43748-extern atomic_t cm_loopbacks;
43749-extern atomic_t cm_nodes_created;
43750-extern atomic_t cm_nodes_destroyed;
43751-extern atomic_t cm_accel_dropped_pkts;
43752-extern atomic_t cm_resets_recvd;
43753-extern atomic_t pau_qps_created;
43754-extern atomic_t pau_qps_destroyed;
43755+extern atomic_unchecked_t cm_loopbacks;
43756+extern atomic_unchecked_t cm_nodes_created;
43757+extern atomic_unchecked_t cm_nodes_destroyed;
43758+extern atomic_unchecked_t cm_accel_dropped_pkts;
43759+extern atomic_unchecked_t cm_resets_recvd;
43760+extern atomic_unchecked_t pau_qps_created;
43761+extern atomic_unchecked_t pau_qps_destroyed;
43762
43763 extern u32 int_mod_timer_init;
43764 extern u32 int_mod_cq_depth_256;
43765diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
43766index 6f09a72..cf4399d 100644
43767--- a/drivers/infiniband/hw/nes/nes_cm.c
43768+++ b/drivers/infiniband/hw/nes/nes_cm.c
43769@@ -69,14 +69,14 @@ u32 cm_packets_dropped;
43770 u32 cm_packets_retrans;
43771 u32 cm_packets_created;
43772 u32 cm_packets_received;
43773-atomic_t cm_listens_created;
43774-atomic_t cm_listens_destroyed;
43775+atomic_unchecked_t cm_listens_created;
43776+atomic_unchecked_t cm_listens_destroyed;
43777 u32 cm_backlog_drops;
43778-atomic_t cm_loopbacks;
43779-atomic_t cm_nodes_created;
43780-atomic_t cm_nodes_destroyed;
43781-atomic_t cm_accel_dropped_pkts;
43782-atomic_t cm_resets_recvd;
43783+atomic_unchecked_t cm_loopbacks;
43784+atomic_unchecked_t cm_nodes_created;
43785+atomic_unchecked_t cm_nodes_destroyed;
43786+atomic_unchecked_t cm_accel_dropped_pkts;
43787+atomic_unchecked_t cm_resets_recvd;
43788
43789 static inline int mini_cm_accelerated(struct nes_cm_core *, struct nes_cm_node *);
43790 static struct nes_cm_listener *mini_cm_listen(struct nes_cm_core *, struct nes_vnic *, struct nes_cm_info *);
43791@@ -135,28 +135,28 @@ static void record_ird_ord(struct nes_cm_node *, u16, u16);
43792 /* instance of function pointers for client API */
43793 /* set address of this instance to cm_core->cm_ops at cm_core alloc */
43794 static struct nes_cm_ops nes_cm_api = {
43795- mini_cm_accelerated,
43796- mini_cm_listen,
43797- mini_cm_del_listen,
43798- mini_cm_connect,
43799- mini_cm_close,
43800- mini_cm_accept,
43801- mini_cm_reject,
43802- mini_cm_recv_pkt,
43803- mini_cm_dealloc_core,
43804- mini_cm_get,
43805- mini_cm_set
43806+ .accelerated = mini_cm_accelerated,
43807+ .listen = mini_cm_listen,
43808+ .stop_listener = mini_cm_del_listen,
43809+ .connect = mini_cm_connect,
43810+ .close = mini_cm_close,
43811+ .accept = mini_cm_accept,
43812+ .reject = mini_cm_reject,
43813+ .recv_pkt = mini_cm_recv_pkt,
43814+ .destroy_cm_core = mini_cm_dealloc_core,
43815+ .get = mini_cm_get,
43816+ .set = mini_cm_set
43817 };
43818
43819 static struct nes_cm_core *g_cm_core;
43820
43821-atomic_t cm_connects;
43822-atomic_t cm_accepts;
43823-atomic_t cm_disconnects;
43824-atomic_t cm_closes;
43825-atomic_t cm_connecteds;
43826-atomic_t cm_connect_reqs;
43827-atomic_t cm_rejects;
43828+atomic_unchecked_t cm_connects;
43829+atomic_unchecked_t cm_accepts;
43830+atomic_unchecked_t cm_disconnects;
43831+atomic_unchecked_t cm_closes;
43832+atomic_unchecked_t cm_connecteds;
43833+atomic_unchecked_t cm_connect_reqs;
43834+atomic_unchecked_t cm_rejects;
43835
43836 int nes_add_ref_cm_node(struct nes_cm_node *cm_node)
43837 {
43838@@ -1436,7 +1436,7 @@ static int mini_cm_dec_refcnt_listen(struct nes_cm_core *cm_core,
43839 kfree(listener);
43840 listener = NULL;
43841 ret = 0;
43842- atomic_inc(&cm_listens_destroyed);
43843+ atomic_inc_unchecked(&cm_listens_destroyed);
43844 } else {
43845 spin_unlock_irqrestore(&cm_core->listen_list_lock, flags);
43846 }
43847@@ -1637,7 +1637,7 @@ static struct nes_cm_node *make_cm_node(struct nes_cm_core *cm_core,
43848 cm_node->rem_mac);
43849
43850 add_hte_node(cm_core, cm_node);
43851- atomic_inc(&cm_nodes_created);
43852+ atomic_inc_unchecked(&cm_nodes_created);
43853
43854 return cm_node;
43855 }
43856@@ -1698,7 +1698,7 @@ static int rem_ref_cm_node(struct nes_cm_core *cm_core,
43857 }
43858
43859 atomic_dec(&cm_core->node_cnt);
43860- atomic_inc(&cm_nodes_destroyed);
43861+ atomic_inc_unchecked(&cm_nodes_destroyed);
43862 nesqp = cm_node->nesqp;
43863 if (nesqp) {
43864 nesqp->cm_node = NULL;
43865@@ -1762,7 +1762,7 @@ static int process_options(struct nes_cm_node *cm_node, u8 *optionsloc,
43866
43867 static void drop_packet(struct sk_buff *skb)
43868 {
43869- atomic_inc(&cm_accel_dropped_pkts);
43870+ atomic_inc_unchecked(&cm_accel_dropped_pkts);
43871 dev_kfree_skb_any(skb);
43872 }
43873
43874@@ -1825,7 +1825,7 @@ static void handle_rst_pkt(struct nes_cm_node *cm_node, struct sk_buff *skb,
43875 {
43876
43877 int reset = 0; /* whether to send reset in case of err.. */
43878- atomic_inc(&cm_resets_recvd);
43879+ atomic_inc_unchecked(&cm_resets_recvd);
43880 nes_debug(NES_DBG_CM, "Received Reset, cm_node = %p, state = %u."
43881 " refcnt=%d\n", cm_node, cm_node->state,
43882 atomic_read(&cm_node->ref_count));
43883@@ -2492,7 +2492,7 @@ static struct nes_cm_node *mini_cm_connect(struct nes_cm_core *cm_core,
43884 rem_ref_cm_node(cm_node->cm_core, cm_node);
43885 return NULL;
43886 }
43887- atomic_inc(&cm_loopbacks);
43888+ atomic_inc_unchecked(&cm_loopbacks);
43889 loopbackremotenode->loopbackpartner = cm_node;
43890 loopbackremotenode->tcp_cntxt.rcv_wscale =
43891 NES_CM_DEFAULT_RCV_WND_SCALE;
43892@@ -2773,7 +2773,7 @@ static int mini_cm_recv_pkt(struct nes_cm_core *cm_core,
43893 nes_queue_mgt_skbs(skb, nesvnic, cm_node->nesqp);
43894 else {
43895 rem_ref_cm_node(cm_core, cm_node);
43896- atomic_inc(&cm_accel_dropped_pkts);
43897+ atomic_inc_unchecked(&cm_accel_dropped_pkts);
43898 dev_kfree_skb_any(skb);
43899 }
43900 break;
43901@@ -3081,7 +3081,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
43902
43903 if ((cm_id) && (cm_id->event_handler)) {
43904 if (issue_disconn) {
43905- atomic_inc(&cm_disconnects);
43906+ atomic_inc_unchecked(&cm_disconnects);
43907 cm_event.event = IW_CM_EVENT_DISCONNECT;
43908 cm_event.status = disconn_status;
43909 cm_event.local_addr = cm_id->local_addr;
43910@@ -3103,7 +3103,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
43911 }
43912
43913 if (issue_close) {
43914- atomic_inc(&cm_closes);
43915+ atomic_inc_unchecked(&cm_closes);
43916 nes_disconnect(nesqp, 1);
43917
43918 cm_id->provider_data = nesqp;
43919@@ -3241,7 +3241,7 @@ int nes_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
43920
43921 nes_debug(NES_DBG_CM, "QP%u, cm_node=%p, jiffies = %lu listener = %p\n",
43922 nesqp->hwqp.qp_id, cm_node, jiffies, cm_node->listener);
43923- atomic_inc(&cm_accepts);
43924+ atomic_inc_unchecked(&cm_accepts);
43925
43926 nes_debug(NES_DBG_CM, "netdev refcnt = %u.\n",
43927 netdev_refcnt_read(nesvnic->netdev));
43928@@ -3439,7 +3439,7 @@ int nes_reject(struct iw_cm_id *cm_id, const void *pdata, u8 pdata_len)
43929 struct nes_cm_core *cm_core;
43930 u8 *start_buff;
43931
43932- atomic_inc(&cm_rejects);
43933+ atomic_inc_unchecked(&cm_rejects);
43934 cm_node = (struct nes_cm_node *)cm_id->provider_data;
43935 loopback = cm_node->loopbackpartner;
43936 cm_core = cm_node->cm_core;
43937@@ -3504,7 +3504,7 @@ int nes_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
43938 ntohs(raddr->sin_port), ntohl(laddr->sin_addr.s_addr),
43939 ntohs(laddr->sin_port));
43940
43941- atomic_inc(&cm_connects);
43942+ atomic_inc_unchecked(&cm_connects);
43943 nesqp->active_conn = 1;
43944
43945 /* cache the cm_id in the qp */
43946@@ -3649,7 +3649,7 @@ int nes_create_listen(struct iw_cm_id *cm_id, int backlog)
43947 g_cm_core->api->stop_listener(g_cm_core, (void *)cm_node);
43948 return err;
43949 }
43950- atomic_inc(&cm_listens_created);
43951+ atomic_inc_unchecked(&cm_listens_created);
43952 }
43953
43954 cm_id->add_ref(cm_id);
43955@@ -3756,7 +3756,7 @@ static void cm_event_connected(struct nes_cm_event *event)
43956
43957 if (nesqp->destroyed)
43958 return;
43959- atomic_inc(&cm_connecteds);
43960+ atomic_inc_unchecked(&cm_connecteds);
43961 nes_debug(NES_DBG_CM, "QP%u attempting to connect to 0x%08X:0x%04X on"
43962 " local port 0x%04X. jiffies = %lu.\n",
43963 nesqp->hwqp.qp_id, ntohl(raddr->sin_addr.s_addr),
43964@@ -3941,7 +3941,7 @@ static void cm_event_reset(struct nes_cm_event *event)
43965
43966 cm_id->add_ref(cm_id);
43967 ret = cm_id->event_handler(cm_id, &cm_event);
43968- atomic_inc(&cm_closes);
43969+ atomic_inc_unchecked(&cm_closes);
43970 cm_event.event = IW_CM_EVENT_CLOSE;
43971 cm_event.status = 0;
43972 cm_event.provider_data = cm_id->provider_data;
43973@@ -3981,7 +3981,7 @@ static void cm_event_mpa_req(struct nes_cm_event *event)
43974 return;
43975 cm_id = cm_node->cm_id;
43976
43977- atomic_inc(&cm_connect_reqs);
43978+ atomic_inc_unchecked(&cm_connect_reqs);
43979 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
43980 cm_node, cm_id, jiffies);
43981
43982@@ -4030,7 +4030,7 @@ static void cm_event_mpa_reject(struct nes_cm_event *event)
43983 return;
43984 cm_id = cm_node->cm_id;
43985
43986- atomic_inc(&cm_connect_reqs);
43987+ atomic_inc_unchecked(&cm_connect_reqs);
43988 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
43989 cm_node, cm_id, jiffies);
43990
43991diff --git a/drivers/infiniband/hw/nes/nes_mgt.c b/drivers/infiniband/hw/nes/nes_mgt.c
43992index 4166452..fc952c3 100644
43993--- a/drivers/infiniband/hw/nes/nes_mgt.c
43994+++ b/drivers/infiniband/hw/nes/nes_mgt.c
43995@@ -40,8 +40,8 @@
43996 #include "nes.h"
43997 #include "nes_mgt.h"
43998
43999-atomic_t pau_qps_created;
44000-atomic_t pau_qps_destroyed;
44001+atomic_unchecked_t pau_qps_created;
44002+atomic_unchecked_t pau_qps_destroyed;
44003
44004 static void nes_replenish_mgt_rq(struct nes_vnic_mgt *mgtvnic)
44005 {
44006@@ -621,7 +621,7 @@ void nes_destroy_pau_qp(struct nes_device *nesdev, struct nes_qp *nesqp)
44007 {
44008 struct sk_buff *skb;
44009 unsigned long flags;
44010- atomic_inc(&pau_qps_destroyed);
44011+ atomic_inc_unchecked(&pau_qps_destroyed);
44012
44013 /* Free packets that have not yet been forwarded */
44014 /* Lock is acquired by skb_dequeue when removing the skb */
44015@@ -810,7 +810,7 @@ static void nes_mgt_ce_handler(struct nes_device *nesdev, struct nes_hw_nic_cq *
44016 cq->cq_vbase[head].cqe_words[NES_NIC_CQE_HASH_RCVNXT]);
44017 skb_queue_head_init(&nesqp->pau_list);
44018 spin_lock_init(&nesqp->pau_lock);
44019- atomic_inc(&pau_qps_created);
44020+ atomic_inc_unchecked(&pau_qps_created);
44021 nes_change_quad_hash(nesdev, mgtvnic->nesvnic, nesqp);
44022 }
44023
44024diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
44025index 70acda9..a96de9d 100644
44026--- a/drivers/infiniband/hw/nes/nes_nic.c
44027+++ b/drivers/infiniband/hw/nes/nes_nic.c
44028@@ -1274,39 +1274,39 @@ static void nes_netdev_get_ethtool_stats(struct net_device *netdev,
44029 target_stat_values[++index] = mh_detected;
44030 target_stat_values[++index] = mh_pauses_sent;
44031 target_stat_values[++index] = nesvnic->endnode_ipv4_tcp_retransmits;
44032- target_stat_values[++index] = atomic_read(&cm_connects);
44033- target_stat_values[++index] = atomic_read(&cm_accepts);
44034- target_stat_values[++index] = atomic_read(&cm_disconnects);
44035- target_stat_values[++index] = atomic_read(&cm_connecteds);
44036- target_stat_values[++index] = atomic_read(&cm_connect_reqs);
44037- target_stat_values[++index] = atomic_read(&cm_rejects);
44038- target_stat_values[++index] = atomic_read(&mod_qp_timouts);
44039- target_stat_values[++index] = atomic_read(&qps_created);
44040- target_stat_values[++index] = atomic_read(&sw_qps_destroyed);
44041- target_stat_values[++index] = atomic_read(&qps_destroyed);
44042- target_stat_values[++index] = atomic_read(&cm_closes);
44043+ target_stat_values[++index] = atomic_read_unchecked(&cm_connects);
44044+ target_stat_values[++index] = atomic_read_unchecked(&cm_accepts);
44045+ target_stat_values[++index] = atomic_read_unchecked(&cm_disconnects);
44046+ target_stat_values[++index] = atomic_read_unchecked(&cm_connecteds);
44047+ target_stat_values[++index] = atomic_read_unchecked(&cm_connect_reqs);
44048+ target_stat_values[++index] = atomic_read_unchecked(&cm_rejects);
44049+ target_stat_values[++index] = atomic_read_unchecked(&mod_qp_timouts);
44050+ target_stat_values[++index] = atomic_read_unchecked(&qps_created);
44051+ target_stat_values[++index] = atomic_read_unchecked(&sw_qps_destroyed);
44052+ target_stat_values[++index] = atomic_read_unchecked(&qps_destroyed);
44053+ target_stat_values[++index] = atomic_read_unchecked(&cm_closes);
44054 target_stat_values[++index] = cm_packets_sent;
44055 target_stat_values[++index] = cm_packets_bounced;
44056 target_stat_values[++index] = cm_packets_created;
44057 target_stat_values[++index] = cm_packets_received;
44058 target_stat_values[++index] = cm_packets_dropped;
44059 target_stat_values[++index] = cm_packets_retrans;
44060- target_stat_values[++index] = atomic_read(&cm_listens_created);
44061- target_stat_values[++index] = atomic_read(&cm_listens_destroyed);
44062+ target_stat_values[++index] = atomic_read_unchecked(&cm_listens_created);
44063+ target_stat_values[++index] = atomic_read_unchecked(&cm_listens_destroyed);
44064 target_stat_values[++index] = cm_backlog_drops;
44065- target_stat_values[++index] = atomic_read(&cm_loopbacks);
44066- target_stat_values[++index] = atomic_read(&cm_nodes_created);
44067- target_stat_values[++index] = atomic_read(&cm_nodes_destroyed);
44068- target_stat_values[++index] = atomic_read(&cm_accel_dropped_pkts);
44069- target_stat_values[++index] = atomic_read(&cm_resets_recvd);
44070+ target_stat_values[++index] = atomic_read_unchecked(&cm_loopbacks);
44071+ target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_created);
44072+ target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_destroyed);
44073+ target_stat_values[++index] = atomic_read_unchecked(&cm_accel_dropped_pkts);
44074+ target_stat_values[++index] = atomic_read_unchecked(&cm_resets_recvd);
44075 target_stat_values[++index] = nesadapter->free_4kpbl;
44076 target_stat_values[++index] = nesadapter->free_256pbl;
44077 target_stat_values[++index] = int_mod_timer_init;
44078 target_stat_values[++index] = nesvnic->lro_mgr.stats.aggregated;
44079 target_stat_values[++index] = nesvnic->lro_mgr.stats.flushed;
44080 target_stat_values[++index] = nesvnic->lro_mgr.stats.no_desc;
44081- target_stat_values[++index] = atomic_read(&pau_qps_created);
44082- target_stat_values[++index] = atomic_read(&pau_qps_destroyed);
44083+ target_stat_values[++index] = atomic_read_unchecked(&pau_qps_created);
44084+ target_stat_values[++index] = atomic_read_unchecked(&pau_qps_destroyed);
44085 }
44086
44087 /**
44088diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c
44089index c0d0296..3185f57 100644
44090--- a/drivers/infiniband/hw/nes/nes_verbs.c
44091+++ b/drivers/infiniband/hw/nes/nes_verbs.c
44092@@ -46,9 +46,9 @@
44093
44094 #include <rdma/ib_umem.h>
44095
44096-atomic_t mod_qp_timouts;
44097-atomic_t qps_created;
44098-atomic_t sw_qps_destroyed;
44099+atomic_unchecked_t mod_qp_timouts;
44100+atomic_unchecked_t qps_created;
44101+atomic_unchecked_t sw_qps_destroyed;
44102
44103 static void nes_unregister_ofa_device(struct nes_ib_device *nesibdev);
44104
44105@@ -1134,7 +1134,7 @@ static struct ib_qp *nes_create_qp(struct ib_pd *ibpd,
44106 if (init_attr->create_flags)
44107 return ERR_PTR(-EINVAL);
44108
44109- atomic_inc(&qps_created);
44110+ atomic_inc_unchecked(&qps_created);
44111 switch (init_attr->qp_type) {
44112 case IB_QPT_RC:
44113 if (nes_drv_opt & NES_DRV_OPT_NO_INLINE_DATA) {
44114@@ -1468,7 +1468,7 @@ static int nes_destroy_qp(struct ib_qp *ibqp)
44115 struct iw_cm_event cm_event;
44116 int ret = 0;
44117
44118- atomic_inc(&sw_qps_destroyed);
44119+ atomic_inc_unchecked(&sw_qps_destroyed);
44120 nesqp->destroyed = 1;
44121
44122 /* Blow away the connection if it exists. */
44123diff --git a/drivers/infiniband/hw/qib/qib.h b/drivers/infiniband/hw/qib/qib.h
44124index ffd48bf..83cdb56 100644
44125--- a/drivers/infiniband/hw/qib/qib.h
44126+++ b/drivers/infiniband/hw/qib/qib.h
44127@@ -52,6 +52,7 @@
44128 #include <linux/kref.h>
44129 #include <linux/sched.h>
44130 #include <linux/kthread.h>
44131+#include <linux/slab.h>
44132
44133 #include "qib_common.h"
44134 #include "qib_verbs.h"
44135diff --git a/drivers/infiniband/ulp/ipoib/ipoib_netlink.c b/drivers/infiniband/ulp/ipoib/ipoib_netlink.c
44136index cdc7df4..a2fdfdb 100644
44137--- a/drivers/infiniband/ulp/ipoib/ipoib_netlink.c
44138+++ b/drivers/infiniband/ulp/ipoib/ipoib_netlink.c
44139@@ -156,7 +156,7 @@ static size_t ipoib_get_size(const struct net_device *dev)
44140 nla_total_size(2); /* IFLA_IPOIB_UMCAST */
44141 }
44142
44143-static struct rtnl_link_ops ipoib_link_ops __read_mostly = {
44144+static struct rtnl_link_ops ipoib_link_ops = {
44145 .kind = "ipoib",
44146 .maxtype = IFLA_IPOIB_MAX,
44147 .policy = ipoib_policy,
44148diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c
44149index e853a21..56fc5a8 100644
44150--- a/drivers/input/gameport/gameport.c
44151+++ b/drivers/input/gameport/gameport.c
44152@@ -527,14 +527,14 @@ EXPORT_SYMBOL(gameport_set_phys);
44153 */
44154 static void gameport_init_port(struct gameport *gameport)
44155 {
44156- static atomic_t gameport_no = ATOMIC_INIT(-1);
44157+ static atomic_unchecked_t gameport_no = ATOMIC_INIT(-1);
44158
44159 __module_get(THIS_MODULE);
44160
44161 mutex_init(&gameport->drv_mutex);
44162 device_initialize(&gameport->dev);
44163 dev_set_name(&gameport->dev, "gameport%lu",
44164- (unsigned long)atomic_inc_return(&gameport_no));
44165+ (unsigned long)atomic_inc_return_unchecked(&gameport_no));
44166 gameport->dev.bus = &gameport_bus;
44167 gameport->dev.release = gameport_release_port;
44168 if (gameport->parent)
44169diff --git a/drivers/input/input.c b/drivers/input/input.c
44170index cc357f1..ee42fbc 100644
44171--- a/drivers/input/input.c
44172+++ b/drivers/input/input.c
44173@@ -1781,7 +1781,7 @@ EXPORT_SYMBOL_GPL(input_class);
44174 */
44175 struct input_dev *input_allocate_device(void)
44176 {
44177- static atomic_t input_no = ATOMIC_INIT(-1);
44178+ static atomic_unchecked_t input_no = ATOMIC_INIT(-1);
44179 struct input_dev *dev;
44180
44181 dev = kzalloc(sizeof(struct input_dev), GFP_KERNEL);
44182@@ -1796,7 +1796,7 @@ struct input_dev *input_allocate_device(void)
44183 INIT_LIST_HEAD(&dev->node);
44184
44185 dev_set_name(&dev->dev, "input%lu",
44186- (unsigned long)atomic_inc_return(&input_no));
44187+ (unsigned long)atomic_inc_return_unchecked(&input_no));
44188
44189 __module_get(THIS_MODULE);
44190 }
44191diff --git a/drivers/input/joystick/sidewinder.c b/drivers/input/joystick/sidewinder.c
44192index 4a95b22..874c182 100644
44193--- a/drivers/input/joystick/sidewinder.c
44194+++ b/drivers/input/joystick/sidewinder.c
44195@@ -30,6 +30,7 @@
44196 #include <linux/kernel.h>
44197 #include <linux/module.h>
44198 #include <linux/slab.h>
44199+#include <linux/sched.h>
44200 #include <linux/input.h>
44201 #include <linux/gameport.h>
44202 #include <linux/jiffies.h>
44203diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
44204index 3aa2f3f..53c00ea 100644
44205--- a/drivers/input/joystick/xpad.c
44206+++ b/drivers/input/joystick/xpad.c
44207@@ -886,7 +886,7 @@ static void xpad_led_set(struct led_classdev *led_cdev,
44208
44209 static int xpad_led_probe(struct usb_xpad *xpad)
44210 {
44211- static atomic_t led_seq = ATOMIC_INIT(-1);
44212+ static atomic_unchecked_t led_seq = ATOMIC_INIT(-1);
44213 unsigned long led_no;
44214 struct xpad_led *led;
44215 struct led_classdev *led_cdev;
44216@@ -899,7 +899,7 @@ static int xpad_led_probe(struct usb_xpad *xpad)
44217 if (!led)
44218 return -ENOMEM;
44219
44220- led_no = atomic_inc_return(&led_seq);
44221+ led_no = atomic_inc_return_unchecked(&led_seq);
44222
44223 snprintf(led->name, sizeof(led->name), "xpad%lu", led_no);
44224 led->xpad = xpad;
44225diff --git a/drivers/input/misc/ims-pcu.c b/drivers/input/misc/ims-pcu.c
44226index ac1fa5f..5f7502c 100644
44227--- a/drivers/input/misc/ims-pcu.c
44228+++ b/drivers/input/misc/ims-pcu.c
44229@@ -1851,7 +1851,7 @@ static int ims_pcu_identify_type(struct ims_pcu *pcu, u8 *device_id)
44230
44231 static int ims_pcu_init_application_mode(struct ims_pcu *pcu)
44232 {
44233- static atomic_t device_no = ATOMIC_INIT(-1);
44234+ static atomic_unchecked_t device_no = ATOMIC_INIT(-1);
44235
44236 const struct ims_pcu_device_info *info;
44237 int error;
44238@@ -1882,7 +1882,7 @@ static int ims_pcu_init_application_mode(struct ims_pcu *pcu)
44239 }
44240
44241 /* Device appears to be operable, complete initialization */
44242- pcu->device_no = atomic_inc_return(&device_no);
44243+ pcu->device_no = atomic_inc_return_unchecked(&device_no);
44244
44245 /*
44246 * PCU-B devices, both GEN_1 and GEN_2 do not have OFN sensor
44247diff --git a/drivers/input/mouse/psmouse.h b/drivers/input/mouse/psmouse.h
44248index d02e1bd..d719719 100644
44249--- a/drivers/input/mouse/psmouse.h
44250+++ b/drivers/input/mouse/psmouse.h
44251@@ -124,7 +124,7 @@ struct psmouse_attribute {
44252 ssize_t (*set)(struct psmouse *psmouse, void *data,
44253 const char *buf, size_t count);
44254 bool protect;
44255-};
44256+} __do_const;
44257 #define to_psmouse_attr(a) container_of((a), struct psmouse_attribute, dattr)
44258
44259 ssize_t psmouse_attr_show_helper(struct device *dev, struct device_attribute *attr,
44260diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c
44261index b604564..3f14ae4 100644
44262--- a/drivers/input/mousedev.c
44263+++ b/drivers/input/mousedev.c
44264@@ -744,7 +744,7 @@ static ssize_t mousedev_read(struct file *file, char __user *buffer,
44265
44266 spin_unlock_irq(&client->packet_lock);
44267
44268- if (copy_to_user(buffer, data, count))
44269+ if (count > sizeof(data) || copy_to_user(buffer, data, count))
44270 return -EFAULT;
44271
44272 return count;
44273diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
44274index a05a517..323a2fd 100644
44275--- a/drivers/input/serio/serio.c
44276+++ b/drivers/input/serio/serio.c
44277@@ -514,7 +514,7 @@ static void serio_release_port(struct device *dev)
44278 */
44279 static void serio_init_port(struct serio *serio)
44280 {
44281- static atomic_t serio_no = ATOMIC_INIT(-1);
44282+ static atomic_unchecked_t serio_no = ATOMIC_INIT(-1);
44283
44284 __module_get(THIS_MODULE);
44285
44286@@ -525,7 +525,7 @@ static void serio_init_port(struct serio *serio)
44287 mutex_init(&serio->drv_mutex);
44288 device_initialize(&serio->dev);
44289 dev_set_name(&serio->dev, "serio%lu",
44290- (unsigned long)atomic_inc_return(&serio_no));
44291+ (unsigned long)atomic_inc_return_unchecked(&serio_no));
44292 serio->dev.bus = &serio_bus;
44293 serio->dev.release = serio_release_port;
44294 serio->dev.groups = serio_device_attr_groups;
44295diff --git a/drivers/input/serio/serio_raw.c b/drivers/input/serio/serio_raw.c
44296index 71ef5d6..93380a9 100644
44297--- a/drivers/input/serio/serio_raw.c
44298+++ b/drivers/input/serio/serio_raw.c
44299@@ -292,7 +292,7 @@ static irqreturn_t serio_raw_interrupt(struct serio *serio, unsigned char data,
44300
44301 static int serio_raw_connect(struct serio *serio, struct serio_driver *drv)
44302 {
44303- static atomic_t serio_raw_no = ATOMIC_INIT(-1);
44304+ static atomic_unchecked_t serio_raw_no = ATOMIC_INIT(-1);
44305 struct serio_raw *serio_raw;
44306 int err;
44307
44308@@ -303,7 +303,7 @@ static int serio_raw_connect(struct serio *serio, struct serio_driver *drv)
44309 }
44310
44311 snprintf(serio_raw->name, sizeof(serio_raw->name),
44312- "serio_raw%ld", (long)atomic_inc_return(&serio_raw_no));
44313+ "serio_raw%ld", (long)atomic_inc_return_unchecked(&serio_raw_no));
44314 kref_init(&serio_raw->kref);
44315 INIT_LIST_HEAD(&serio_raw->client_list);
44316 init_waitqueue_head(&serio_raw->wait);
44317diff --git a/drivers/input/touchscreen/htcpen.c b/drivers/input/touchscreen/htcpen.c
44318index 92e2243..8fd9092 100644
44319--- a/drivers/input/touchscreen/htcpen.c
44320+++ b/drivers/input/touchscreen/htcpen.c
44321@@ -219,7 +219,7 @@ static struct isa_driver htcpen_isa_driver = {
44322 }
44323 };
44324
44325-static struct dmi_system_id htcshift_dmi_table[] __initdata = {
44326+static const struct dmi_system_id htcshift_dmi_table[] __initconst = {
44327 {
44328 .ident = "Shift",
44329 .matches = {
44330diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
44331index 48882c1..93e0987 100644
44332--- a/drivers/iommu/amd_iommu.c
44333+++ b/drivers/iommu/amd_iommu.c
44334@@ -823,11 +823,21 @@ static void copy_cmd_to_buffer(struct amd_iommu *iommu,
44335
44336 static void build_completion_wait(struct iommu_cmd *cmd, u64 address)
44337 {
44338+ phys_addr_t physaddr;
44339 WARN_ON(address & 0x7ULL);
44340
44341 memset(cmd, 0, sizeof(*cmd));
44342- cmd->data[0] = lower_32_bits(__pa(address)) | CMD_COMPL_WAIT_STORE_MASK;
44343- cmd->data[1] = upper_32_bits(__pa(address));
44344+
44345+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
44346+ if (object_starts_on_stack((void *)address)) {
44347+ void *adjbuf = (void *)address - current->stack + current->lowmem_stack;
44348+ physaddr = __pa((u64)adjbuf);
44349+ } else
44350+#endif
44351+ physaddr = __pa(address);
44352+
44353+ cmd->data[0] = lower_32_bits(physaddr) | CMD_COMPL_WAIT_STORE_MASK;
44354+ cmd->data[1] = upper_32_bits(physaddr);
44355 cmd->data[2] = 1;
44356 CMD_SET_TYPE(cmd, CMD_COMPL_WAIT);
44357 }
44358diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
44359index bd6252b..0716605 100644
44360--- a/drivers/iommu/arm-smmu.c
44361+++ b/drivers/iommu/arm-smmu.c
44362@@ -331,7 +331,7 @@ enum arm_smmu_domain_stage {
44363
44364 struct arm_smmu_domain {
44365 struct arm_smmu_device *smmu;
44366- struct io_pgtable_ops *pgtbl_ops;
44367+ struct io_pgtable *pgtbl;
44368 spinlock_t pgtbl_lock;
44369 struct arm_smmu_cfg cfg;
44370 enum arm_smmu_domain_stage stage;
44371@@ -807,7 +807,7 @@ static int arm_smmu_init_domain_context(struct iommu_domain *domain,
44372 {
44373 int irq, start, ret = 0;
44374 unsigned long ias, oas;
44375- struct io_pgtable_ops *pgtbl_ops;
44376+ struct io_pgtable *pgtbl;
44377 struct io_pgtable_cfg pgtbl_cfg;
44378 enum io_pgtable_fmt fmt;
44379 struct arm_smmu_domain *smmu_domain = domain->priv;
44380@@ -892,14 +892,16 @@ static int arm_smmu_init_domain_context(struct iommu_domain *domain,
44381 };
44382
44383 smmu_domain->smmu = smmu;
44384- pgtbl_ops = alloc_io_pgtable_ops(fmt, &pgtbl_cfg, smmu_domain);
44385- if (!pgtbl_ops) {
44386+ pgtbl = alloc_io_pgtable(fmt, &pgtbl_cfg, smmu_domain);
44387+ if (!pgtbl) {
44388 ret = -ENOMEM;
44389 goto out_clear_smmu;
44390 }
44391
44392 /* Update our support page sizes to reflect the page table format */
44393- arm_smmu_ops.pgsize_bitmap = pgtbl_cfg.pgsize_bitmap;
44394+ pax_open_kernel();
44395+ *(unsigned long *)&arm_smmu_ops.pgsize_bitmap = pgtbl_cfg.pgsize_bitmap;
44396+ pax_close_kernel();
44397
44398 /* Initialise the context bank with our page table cfg */
44399 arm_smmu_init_context_bank(smmu_domain, &pgtbl_cfg);
44400@@ -920,7 +922,7 @@ static int arm_smmu_init_domain_context(struct iommu_domain *domain,
44401 mutex_unlock(&smmu_domain->init_mutex);
44402
44403 /* Publish page table ops for map/unmap */
44404- smmu_domain->pgtbl_ops = pgtbl_ops;
44405+ smmu_domain->pgtbl = pgtbl;
44406 return 0;
44407
44408 out_clear_smmu:
44409@@ -953,8 +955,7 @@ static void arm_smmu_destroy_domain_context(struct iommu_domain *domain)
44410 free_irq(irq, domain);
44411 }
44412
44413- if (smmu_domain->pgtbl_ops)
44414- free_io_pgtable_ops(smmu_domain->pgtbl_ops);
44415+ free_io_pgtable(smmu_domain->pgtbl);
44416
44417 __arm_smmu_free_bitmap(smmu->context_map, cfg->cbndx);
44418 }
44419@@ -1178,13 +1179,13 @@ static int arm_smmu_map(struct iommu_domain *domain, unsigned long iova,
44420 int ret;
44421 unsigned long flags;
44422 struct arm_smmu_domain *smmu_domain = domain->priv;
44423- struct io_pgtable_ops *ops= smmu_domain->pgtbl_ops;
44424+ struct io_pgtable *iop = smmu_domain->pgtbl;
44425
44426- if (!ops)
44427+ if (!iop)
44428 return -ENODEV;
44429
44430 spin_lock_irqsave(&smmu_domain->pgtbl_lock, flags);
44431- ret = ops->map(ops, iova, paddr, size, prot);
44432+ ret = iop->ops->map(iop, iova, paddr, size, prot);
44433 spin_unlock_irqrestore(&smmu_domain->pgtbl_lock, flags);
44434 return ret;
44435 }
44436@@ -1195,13 +1196,13 @@ static size_t arm_smmu_unmap(struct iommu_domain *domain, unsigned long iova,
44437 size_t ret;
44438 unsigned long flags;
44439 struct arm_smmu_domain *smmu_domain = domain->priv;
44440- struct io_pgtable_ops *ops= smmu_domain->pgtbl_ops;
44441+ struct io_pgtable *iop = smmu_domain->pgtbl;
44442
44443- if (!ops)
44444+ if (!iop)
44445 return 0;
44446
44447 spin_lock_irqsave(&smmu_domain->pgtbl_lock, flags);
44448- ret = ops->unmap(ops, iova, size);
44449+ ret = iop->ops->unmap(iop, iova, size);
44450 spin_unlock_irqrestore(&smmu_domain->pgtbl_lock, flags);
44451 return ret;
44452 }
44453@@ -1212,7 +1213,7 @@ static phys_addr_t arm_smmu_iova_to_phys_hard(struct iommu_domain *domain,
44454 struct arm_smmu_domain *smmu_domain = domain->priv;
44455 struct arm_smmu_device *smmu = smmu_domain->smmu;
44456 struct arm_smmu_cfg *cfg = &smmu_domain->cfg;
44457- struct io_pgtable_ops *ops= smmu_domain->pgtbl_ops;
44458+ struct io_pgtable *iop = smmu_domain->pgtbl;
44459 struct device *dev = smmu->dev;
44460 void __iomem *cb_base;
44461 u32 tmp;
44462@@ -1235,7 +1236,7 @@ static phys_addr_t arm_smmu_iova_to_phys_hard(struct iommu_domain *domain,
44463 dev_err(dev,
44464 "iova to phys timed out on 0x%pad. Falling back to software table walk.\n",
44465 &iova);
44466- return ops->iova_to_phys(ops, iova);
44467+ return iop->ops->iova_to_phys(iop, iova);
44468 }
44469
44470 phys = readl_relaxed(cb_base + ARM_SMMU_CB_PAR_LO);
44471@@ -1256,9 +1257,9 @@ static phys_addr_t arm_smmu_iova_to_phys(struct iommu_domain *domain,
44472 phys_addr_t ret;
44473 unsigned long flags;
44474 struct arm_smmu_domain *smmu_domain = domain->priv;
44475- struct io_pgtable_ops *ops= smmu_domain->pgtbl_ops;
44476+ struct io_pgtable *iop = smmu_domain->pgtbl;
44477
44478- if (!ops)
44479+ if (!iop)
44480 return 0;
44481
44482 spin_lock_irqsave(&smmu_domain->pgtbl_lock, flags);
44483@@ -1266,7 +1267,7 @@ static phys_addr_t arm_smmu_iova_to_phys(struct iommu_domain *domain,
44484 smmu_domain->stage == ARM_SMMU_DOMAIN_S1) {
44485 ret = arm_smmu_iova_to_phys_hard(domain, iova);
44486 } else {
44487- ret = ops->iova_to_phys(ops, iova);
44488+ ret = iop->ops->iova_to_phys(iop, iova);
44489 }
44490
44491 spin_unlock_irqrestore(&smmu_domain->pgtbl_lock, flags);
44492@@ -1625,7 +1626,9 @@ static int arm_smmu_device_cfg_probe(struct arm_smmu_device *smmu)
44493 size |= SZ_64K | SZ_512M;
44494 }
44495
44496- arm_smmu_ops.pgsize_bitmap &= size;
44497+ pax_open_kernel();
44498+ *(unsigned long *)&arm_smmu_ops.pgsize_bitmap &= size;
44499+ pax_close_kernel();
44500 dev_notice(smmu->dev, "\tSupported page sizes: 0x%08lx\n", size);
44501
44502 if (smmu->features & ARM_SMMU_FEAT_TRANS_S1)
44503diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c
44504index b610a8d..08eb879 100644
44505--- a/drivers/iommu/io-pgtable-arm.c
44506+++ b/drivers/iommu/io-pgtable-arm.c
44507@@ -36,12 +36,6 @@
44508 #define io_pgtable_to_data(x) \
44509 container_of((x), struct arm_lpae_io_pgtable, iop)
44510
44511-#define io_pgtable_ops_to_pgtable(x) \
44512- container_of((x), struct io_pgtable, ops)
44513-
44514-#define io_pgtable_ops_to_data(x) \
44515- io_pgtable_to_data(io_pgtable_ops_to_pgtable(x))
44516-
44517 /*
44518 * For consistency with the architecture, we always consider
44519 * ARM_LPAE_MAX_LEVELS levels, with the walk starting at level n >=0
44520@@ -302,10 +296,10 @@ static arm_lpae_iopte arm_lpae_prot_to_pte(struct arm_lpae_io_pgtable *data,
44521 return pte;
44522 }
44523
44524-static int arm_lpae_map(struct io_pgtable_ops *ops, unsigned long iova,
44525+static int arm_lpae_map(struct io_pgtable *iop, unsigned long iova,
44526 phys_addr_t paddr, size_t size, int iommu_prot)
44527 {
44528- struct arm_lpae_io_pgtable *data = io_pgtable_ops_to_data(ops);
44529+ struct arm_lpae_io_pgtable *data = io_pgtable_to_data(iop);
44530 arm_lpae_iopte *ptep = data->pgd;
44531 int lvl = ARM_LPAE_START_LVL(data);
44532 arm_lpae_iopte prot;
44533@@ -445,12 +439,11 @@ static int __arm_lpae_unmap(struct arm_lpae_io_pgtable *data,
44534 return __arm_lpae_unmap(data, iova, size, lvl + 1, ptep);
44535 }
44536
44537-static int arm_lpae_unmap(struct io_pgtable_ops *ops, unsigned long iova,
44538+static int arm_lpae_unmap(struct io_pgtable *iop, unsigned long iova,
44539 size_t size)
44540 {
44541 size_t unmapped;
44542- struct arm_lpae_io_pgtable *data = io_pgtable_ops_to_data(ops);
44543- struct io_pgtable *iop = &data->iop;
44544+ struct arm_lpae_io_pgtable *data = io_pgtable_to_data(iop);
44545 arm_lpae_iopte *ptep = data->pgd;
44546 int lvl = ARM_LPAE_START_LVL(data);
44547
44548@@ -461,10 +454,10 @@ static int arm_lpae_unmap(struct io_pgtable_ops *ops, unsigned long iova,
44549 return unmapped;
44550 }
44551
44552-static phys_addr_t arm_lpae_iova_to_phys(struct io_pgtable_ops *ops,
44553+static phys_addr_t arm_lpae_iova_to_phys(struct io_pgtable *iop,
44554 unsigned long iova)
44555 {
44556- struct arm_lpae_io_pgtable *data = io_pgtable_ops_to_data(ops);
44557+ struct arm_lpae_io_pgtable *data = io_pgtable_to_data(iop);
44558 arm_lpae_iopte pte, *ptep = data->pgd;
44559 int lvl = ARM_LPAE_START_LVL(data);
44560
44561@@ -531,6 +524,12 @@ static void arm_lpae_restrict_pgsizes(struct io_pgtable_cfg *cfg)
44562 }
44563 }
44564
44565+static struct io_pgtable_ops arm_lpae_io_pgtable_ops = {
44566+ .map = arm_lpae_map,
44567+ .unmap = arm_lpae_unmap,
44568+ .iova_to_phys = arm_lpae_iova_to_phys,
44569+};
44570+
44571 static struct arm_lpae_io_pgtable *
44572 arm_lpae_alloc_pgtable(struct io_pgtable_cfg *cfg)
44573 {
44574@@ -562,11 +561,7 @@ arm_lpae_alloc_pgtable(struct io_pgtable_cfg *cfg)
44575 pgd_bits = va_bits - (data->bits_per_level * (data->levels - 1));
44576 data->pgd_size = 1UL << (pgd_bits + ilog2(sizeof(arm_lpae_iopte)));
44577
44578- data->iop.ops = (struct io_pgtable_ops) {
44579- .map = arm_lpae_map,
44580- .unmap = arm_lpae_unmap,
44581- .iova_to_phys = arm_lpae_iova_to_phys,
44582- };
44583+ data->iop.ops = &arm_lpae_io_pgtable_ops;
44584
44585 return data;
44586 }
44587@@ -825,9 +820,9 @@ static struct iommu_gather_ops dummy_tlb_ops __initdata = {
44588 .flush_pgtable = dummy_flush_pgtable,
44589 };
44590
44591-static void __init arm_lpae_dump_ops(struct io_pgtable_ops *ops)
44592+static void __init arm_lpae_dump_ops(struct io_pgtable *iop)
44593 {
44594- struct arm_lpae_io_pgtable *data = io_pgtable_ops_to_data(ops);
44595+ struct arm_lpae_io_pgtable *data = io_pgtable_to_data(iop);
44596 struct io_pgtable_cfg *cfg = &data->iop.cfg;
44597
44598 pr_err("cfg: pgsize_bitmap 0x%lx, ias %u-bit\n",
44599@@ -837,9 +832,9 @@ static void __init arm_lpae_dump_ops(struct io_pgtable_ops *ops)
44600 data->bits_per_level, data->pgd);
44601 }
44602
44603-#define __FAIL(ops, i) ({ \
44604+#define __FAIL(iop, i) ({ \
44605 WARN(1, "selftest: test failed for fmt idx %d\n", (i)); \
44606- arm_lpae_dump_ops(ops); \
44607+ arm_lpae_dump_ops(iop); \
44608 selftest_running = false; \
44609 -EFAULT; \
44610 })
44611@@ -854,30 +849,32 @@ static int __init arm_lpae_run_tests(struct io_pgtable_cfg *cfg)
44612 int i, j;
44613 unsigned long iova;
44614 size_t size;
44615- struct io_pgtable_ops *ops;
44616+ struct io_pgtable *iop;
44617+ const struct io_pgtable_ops *ops;
44618
44619 selftest_running = true;
44620
44621 for (i = 0; i < ARRAY_SIZE(fmts); ++i) {
44622 cfg_cookie = cfg;
44623- ops = alloc_io_pgtable_ops(fmts[i], cfg, cfg);
44624- if (!ops) {
44625+ iop = alloc_io_pgtable(fmts[i], cfg, cfg);
44626+ if (!iop) {
44627 pr_err("selftest: failed to allocate io pgtable ops\n");
44628 return -ENOMEM;
44629 }
44630+ ops = iop->ops;
44631
44632 /*
44633 * Initial sanity checks.
44634 * Empty page tables shouldn't provide any translations.
44635 */
44636- if (ops->iova_to_phys(ops, 42))
44637- return __FAIL(ops, i);
44638+ if (ops->iova_to_phys(iop, 42))
44639+ return __FAIL(iop, i);
44640
44641- if (ops->iova_to_phys(ops, SZ_1G + 42))
44642- return __FAIL(ops, i);
44643+ if (ops->iova_to_phys(iop, SZ_1G + 42))
44644+ return __FAIL(iop, i);
44645
44646- if (ops->iova_to_phys(ops, SZ_2G + 42))
44647- return __FAIL(ops, i);
44648+ if (ops->iova_to_phys(iop, SZ_2G + 42))
44649+ return __FAIL(iop, i);
44650
44651 /*
44652 * Distinct mappings of different granule sizes.
44653@@ -887,19 +884,19 @@ static int __init arm_lpae_run_tests(struct io_pgtable_cfg *cfg)
44654 while (j != BITS_PER_LONG) {
44655 size = 1UL << j;
44656
44657- if (ops->map(ops, iova, iova, size, IOMMU_READ |
44658+ if (ops->map(iop, iova, iova, size, IOMMU_READ |
44659 IOMMU_WRITE |
44660 IOMMU_NOEXEC |
44661 IOMMU_CACHE))
44662- return __FAIL(ops, i);
44663+ return __FAIL(iop, i);
44664
44665 /* Overlapping mappings */
44666- if (!ops->map(ops, iova, iova + size, size,
44667+ if (!ops->map(iop, iova, iova + size, size,
44668 IOMMU_READ | IOMMU_NOEXEC))
44669- return __FAIL(ops, i);
44670+ return __FAIL(iop, i);
44671
44672- if (ops->iova_to_phys(ops, iova + 42) != (iova + 42))
44673- return __FAIL(ops, i);
44674+ if (ops->iova_to_phys(iop, iova + 42) != (iova + 42))
44675+ return __FAIL(iop, i);
44676
44677 iova += SZ_1G;
44678 j++;
44679@@ -908,15 +905,15 @@ static int __init arm_lpae_run_tests(struct io_pgtable_cfg *cfg)
44680
44681 /* Partial unmap */
44682 size = 1UL << __ffs(cfg->pgsize_bitmap);
44683- if (ops->unmap(ops, SZ_1G + size, size) != size)
44684- return __FAIL(ops, i);
44685+ if (ops->unmap(iop, SZ_1G + size, size) != size)
44686+ return __FAIL(iop, i);
44687
44688 /* Remap of partial unmap */
44689- if (ops->map(ops, SZ_1G + size, size, size, IOMMU_READ))
44690- return __FAIL(ops, i);
44691+ if (ops->map(iop, SZ_1G + size, size, size, IOMMU_READ))
44692+ return __FAIL(iop, i);
44693
44694- if (ops->iova_to_phys(ops, SZ_1G + size + 42) != (size + 42))
44695- return __FAIL(ops, i);
44696+ if (ops->iova_to_phys(iop, SZ_1G + size + 42) != (size + 42))
44697+ return __FAIL(iop, i);
44698
44699 /* Full unmap */
44700 iova = 0;
44701@@ -924,25 +921,25 @@ static int __init arm_lpae_run_tests(struct io_pgtable_cfg *cfg)
44702 while (j != BITS_PER_LONG) {
44703 size = 1UL << j;
44704
44705- if (ops->unmap(ops, iova, size) != size)
44706- return __FAIL(ops, i);
44707+ if (ops->unmap(iop, iova, size) != size)
44708+ return __FAIL(iop, i);
44709
44710- if (ops->iova_to_phys(ops, iova + 42))
44711- return __FAIL(ops, i);
44712+ if (ops->iova_to_phys(iop, iova + 42))
44713+ return __FAIL(iop, i);
44714
44715 /* Remap full block */
44716- if (ops->map(ops, iova, iova, size, IOMMU_WRITE))
44717- return __FAIL(ops, i);
44718+ if (ops->map(iop, iova, iova, size, IOMMU_WRITE))
44719+ return __FAIL(iop, i);
44720
44721- if (ops->iova_to_phys(ops, iova + 42) != (iova + 42))
44722- return __FAIL(ops, i);
44723+ if (ops->iova_to_phys(iop, iova + 42) != (iova + 42))
44724+ return __FAIL(iop, i);
44725
44726 iova += SZ_1G;
44727 j++;
44728 j = find_next_bit(&cfg->pgsize_bitmap, BITS_PER_LONG, j);
44729 }
44730
44731- free_io_pgtable_ops(ops);
44732+ free_io_pgtable(iop);
44733 }
44734
44735 selftest_running = false;
44736diff --git a/drivers/iommu/io-pgtable.c b/drivers/iommu/io-pgtable.c
44737index 6436fe2..088c965 100644
44738--- a/drivers/iommu/io-pgtable.c
44739+++ b/drivers/iommu/io-pgtable.c
44740@@ -40,7 +40,7 @@ io_pgtable_init_table[IO_PGTABLE_NUM_FMTS] =
44741 #endif
44742 };
44743
44744-struct io_pgtable_ops *alloc_io_pgtable_ops(enum io_pgtable_fmt fmt,
44745+struct io_pgtable *alloc_io_pgtable(enum io_pgtable_fmt fmt,
44746 struct io_pgtable_cfg *cfg,
44747 void *cookie)
44748 {
44749@@ -62,21 +62,18 @@ struct io_pgtable_ops *alloc_io_pgtable_ops(enum io_pgtable_fmt fmt,
44750 iop->cookie = cookie;
44751 iop->cfg = *cfg;
44752
44753- return &iop->ops;
44754+ return iop;
44755 }
44756
44757 /*
44758 * It is the IOMMU driver's responsibility to ensure that the page table
44759 * is no longer accessible to the walker by this point.
44760 */
44761-void free_io_pgtable_ops(struct io_pgtable_ops *ops)
44762+void free_io_pgtable(struct io_pgtable *iop)
44763 {
44764- struct io_pgtable *iop;
44765-
44766- if (!ops)
44767+ if (!iop)
44768 return;
44769
44770- iop = container_of(ops, struct io_pgtable, ops);
44771 iop->cfg.tlb->tlb_flush_all(iop->cookie);
44772 io_pgtable_init_table[iop->fmt]->free(iop);
44773 }
44774diff --git a/drivers/iommu/io-pgtable.h b/drivers/iommu/io-pgtable.h
44775index 10e32f6..0b276c8 100644
44776--- a/drivers/iommu/io-pgtable.h
44777+++ b/drivers/iommu/io-pgtable.h
44778@@ -75,17 +75,18 @@ struct io_pgtable_cfg {
44779 * These functions map directly onto the iommu_ops member functions with
44780 * the same names.
44781 */
44782+struct io_pgtable;
44783 struct io_pgtable_ops {
44784- int (*map)(struct io_pgtable_ops *ops, unsigned long iova,
44785+ int (*map)(struct io_pgtable *iop, unsigned long iova,
44786 phys_addr_t paddr, size_t size, int prot);
44787- int (*unmap)(struct io_pgtable_ops *ops, unsigned long iova,
44788+ int (*unmap)(struct io_pgtable *iop, unsigned long iova,
44789 size_t size);
44790- phys_addr_t (*iova_to_phys)(struct io_pgtable_ops *ops,
44791+ phys_addr_t (*iova_to_phys)(struct io_pgtable *iop,
44792 unsigned long iova);
44793 };
44794
44795 /**
44796- * alloc_io_pgtable_ops() - Allocate a page table allocator for use by an IOMMU.
44797+ * alloc_io_pgtable() - Allocate a page table allocator for use by an IOMMU.
44798 *
44799 * @fmt: The page table format.
44800 * @cfg: The page table configuration. This will be modified to represent
44801@@ -94,9 +95,9 @@ struct io_pgtable_ops {
44802 * @cookie: An opaque token provided by the IOMMU driver and passed back to
44803 * the callback routines in cfg->tlb.
44804 */
44805-struct io_pgtable_ops *alloc_io_pgtable_ops(enum io_pgtable_fmt fmt,
44806- struct io_pgtable_cfg *cfg,
44807- void *cookie);
44808+struct io_pgtable *alloc_io_pgtable(enum io_pgtable_fmt fmt,
44809+ struct io_pgtable_cfg *cfg,
44810+ void *cookie);
44811
44812 /**
44813 * free_io_pgtable_ops() - Free an io_pgtable_ops structure. The caller
44814@@ -105,7 +106,7 @@ struct io_pgtable_ops *alloc_io_pgtable_ops(enum io_pgtable_fmt fmt,
44815 *
44816 * @ops: The ops returned from alloc_io_pgtable_ops.
44817 */
44818-void free_io_pgtable_ops(struct io_pgtable_ops *ops);
44819+void free_io_pgtable(struct io_pgtable *iop);
44820
44821
44822 /*
44823@@ -125,7 +126,7 @@ struct io_pgtable {
44824 enum io_pgtable_fmt fmt;
44825 void *cookie;
44826 struct io_pgtable_cfg cfg;
44827- struct io_pgtable_ops ops;
44828+ const struct io_pgtable_ops *ops;
44829 };
44830
44831 /**
44832diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
44833index 72e683d..c9db262 100644
44834--- a/drivers/iommu/iommu.c
44835+++ b/drivers/iommu/iommu.c
44836@@ -802,7 +802,7 @@ static int iommu_bus_notifier(struct notifier_block *nb,
44837 static int iommu_bus_init(struct bus_type *bus, const struct iommu_ops *ops)
44838 {
44839 int err;
44840- struct notifier_block *nb;
44841+ notifier_block_no_const *nb;
44842 struct iommu_callback_data cb = {
44843 .ops = ops,
44844 };
44845diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c
44846index bc39bdf..e2de272 100644
44847--- a/drivers/iommu/ipmmu-vmsa.c
44848+++ b/drivers/iommu/ipmmu-vmsa.c
44849@@ -41,7 +41,7 @@ struct ipmmu_vmsa_domain {
44850 struct iommu_domain *io_domain;
44851
44852 struct io_pgtable_cfg cfg;
44853- struct io_pgtable_ops *iop;
44854+ struct io_pgtable *iop;
44855
44856 unsigned int context_id;
44857 spinlock_t lock; /* Protects mappings */
44858@@ -323,8 +323,7 @@ static int ipmmu_domain_init_context(struct ipmmu_vmsa_domain *domain)
44859 domain->cfg.oas = 40;
44860 domain->cfg.tlb = &ipmmu_gather_ops;
44861
44862- domain->iop = alloc_io_pgtable_ops(ARM_32_LPAE_S1, &domain->cfg,
44863- domain);
44864+ domain->iop = alloc_io_pgtable(ARM_32_LPAE_S1, &domain->cfg, domain);
44865 if (!domain->iop)
44866 return -EINVAL;
44867
44868@@ -482,7 +481,7 @@ static void ipmmu_domain_destroy(struct iommu_domain *io_domain)
44869 * been detached.
44870 */
44871 ipmmu_domain_destroy_context(domain);
44872- free_io_pgtable_ops(domain->iop);
44873+ free_io_pgtable(domain->iop);
44874 kfree(domain);
44875 }
44876
44877@@ -551,7 +550,7 @@ static int ipmmu_map(struct iommu_domain *io_domain, unsigned long iova,
44878 if (!domain)
44879 return -ENODEV;
44880
44881- return domain->iop->map(domain->iop, iova, paddr, size, prot);
44882+ return domain->iop->ops->map(domain->iop, iova, paddr, size, prot);
44883 }
44884
44885 static size_t ipmmu_unmap(struct iommu_domain *io_domain, unsigned long iova,
44886@@ -559,7 +558,7 @@ static size_t ipmmu_unmap(struct iommu_domain *io_domain, unsigned long iova,
44887 {
44888 struct ipmmu_vmsa_domain *domain = io_domain->priv;
44889
44890- return domain->iop->unmap(domain->iop, iova, size);
44891+ return domain->iop->ops->unmap(domain->iop, iova, size);
44892 }
44893
44894 static phys_addr_t ipmmu_iova_to_phys(struct iommu_domain *io_domain,
44895@@ -569,7 +568,7 @@ static phys_addr_t ipmmu_iova_to_phys(struct iommu_domain *io_domain,
44896
44897 /* TODO: Is locking needed ? */
44898
44899- return domain->iop->iova_to_phys(domain->iop, iova);
44900+ return domain->iop->ops->iova_to_phys(domain->iop, iova);
44901 }
44902
44903 static int ipmmu_find_utlbs(struct ipmmu_vmsa_device *mmu, struct device *dev,
44904diff --git a/drivers/iommu/irq_remapping.c b/drivers/iommu/irq_remapping.c
44905index 390079e..1da9d6c 100644
44906--- a/drivers/iommu/irq_remapping.c
44907+++ b/drivers/iommu/irq_remapping.c
44908@@ -329,7 +329,7 @@ int setup_hpet_msi_remapped(unsigned int irq, unsigned int id)
44909 void panic_if_irq_remap(const char *msg)
44910 {
44911 if (irq_remapping_enabled)
44912- panic(msg);
44913+ panic("%s", msg);
44914 }
44915
44916 static void ir_ack_apic_edge(struct irq_data *data)
44917@@ -350,10 +350,12 @@ static void ir_print_prefix(struct irq_data *data, struct seq_file *p)
44918
44919 void irq_remap_modify_chip_defaults(struct irq_chip *chip)
44920 {
44921- chip->irq_print_chip = ir_print_prefix;
44922- chip->irq_ack = ir_ack_apic_edge;
44923- chip->irq_eoi = ir_ack_apic_level;
44924- chip->irq_set_affinity = x86_io_apic_ops.set_affinity;
44925+ pax_open_kernel();
44926+ *(void **)&chip->irq_print_chip = ir_print_prefix;
44927+ *(void **)&chip->irq_ack = ir_ack_apic_edge;
44928+ *(void **)&chip->irq_eoi = ir_ack_apic_level;
44929+ *(void **)&chip->irq_set_affinity = x86_io_apic_ops.set_affinity;
44930+ pax_close_kernel();
44931 }
44932
44933 bool setup_remapped_irq(int irq, struct irq_cfg *cfg, struct irq_chip *chip)
44934diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c
44935index 471e1cd..b53b870 100644
44936--- a/drivers/irqchip/irq-gic.c
44937+++ b/drivers/irqchip/irq-gic.c
44938@@ -84,7 +84,7 @@ static u8 gic_cpu_map[NR_GIC_CPU_IF] __read_mostly;
44939 * Supported arch specific GIC irq extension.
44940 * Default make them NULL.
44941 */
44942-struct irq_chip gic_arch_extn = {
44943+irq_chip_no_const gic_arch_extn = {
44944 .irq_eoi = NULL,
44945 .irq_mask = NULL,
44946 .irq_unmask = NULL,
44947@@ -318,7 +318,7 @@ static void gic_handle_cascade_irq(unsigned int irq, struct irq_desc *desc)
44948 chained_irq_exit(chip, desc);
44949 }
44950
44951-static struct irq_chip gic_chip = {
44952+static irq_chip_no_const gic_chip __read_only = {
44953 .name = "GIC",
44954 .irq_mask = gic_mask_irq,
44955 .irq_unmask = gic_unmask_irq,
44956diff --git a/drivers/irqchip/irq-renesas-intc-irqpin.c b/drivers/irqchip/irq-renesas-intc-irqpin.c
44957index 9a0767b..5e5f86f 100644
44958--- a/drivers/irqchip/irq-renesas-intc-irqpin.c
44959+++ b/drivers/irqchip/irq-renesas-intc-irqpin.c
44960@@ -373,7 +373,7 @@ static int intc_irqpin_probe(struct platform_device *pdev)
44961 struct intc_irqpin_iomem *i;
44962 struct resource *io[INTC_IRQPIN_REG_NR];
44963 struct resource *irq;
44964- struct irq_chip *irq_chip;
44965+ irq_chip_no_const *irq_chip;
44966 void (*enable_fn)(struct irq_data *d);
44967 void (*disable_fn)(struct irq_data *d);
44968 const char *name = dev_name(dev);
44969diff --git a/drivers/irqchip/irq-renesas-irqc.c b/drivers/irqchip/irq-renesas-irqc.c
44970index 384e6ed..7a771b2 100644
44971--- a/drivers/irqchip/irq-renesas-irqc.c
44972+++ b/drivers/irqchip/irq-renesas-irqc.c
44973@@ -151,7 +151,7 @@ static int irqc_probe(struct platform_device *pdev)
44974 struct irqc_priv *p;
44975 struct resource *io;
44976 struct resource *irq;
44977- struct irq_chip *irq_chip;
44978+ irq_chip_no_const *irq_chip;
44979 const char *name = dev_name(&pdev->dev);
44980 int ret;
44981 int k;
44982diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
44983index 6a2df32..dc962f1 100644
44984--- a/drivers/isdn/capi/capi.c
44985+++ b/drivers/isdn/capi/capi.c
44986@@ -81,8 +81,8 @@ struct capiminor {
44987
44988 struct capi20_appl *ap;
44989 u32 ncci;
44990- atomic_t datahandle;
44991- atomic_t msgid;
44992+ atomic_unchecked_t datahandle;
44993+ atomic_unchecked_t msgid;
44994
44995 struct tty_port port;
44996 int ttyinstop;
44997@@ -391,7 +391,7 @@ gen_data_b3_resp_for(struct capiminor *mp, struct sk_buff *skb)
44998 capimsg_setu16(s, 2, mp->ap->applid);
44999 capimsg_setu8 (s, 4, CAPI_DATA_B3);
45000 capimsg_setu8 (s, 5, CAPI_RESP);
45001- capimsg_setu16(s, 6, atomic_inc_return(&mp->msgid));
45002+ capimsg_setu16(s, 6, atomic_inc_return_unchecked(&mp->msgid));
45003 capimsg_setu32(s, 8, mp->ncci);
45004 capimsg_setu16(s, 12, datahandle);
45005 }
45006@@ -512,14 +512,14 @@ static void handle_minor_send(struct capiminor *mp)
45007 mp->outbytes -= len;
45008 spin_unlock_bh(&mp->outlock);
45009
45010- datahandle = atomic_inc_return(&mp->datahandle);
45011+ datahandle = atomic_inc_return_unchecked(&mp->datahandle);
45012 skb_push(skb, CAPI_DATA_B3_REQ_LEN);
45013 memset(skb->data, 0, CAPI_DATA_B3_REQ_LEN);
45014 capimsg_setu16(skb->data, 0, CAPI_DATA_B3_REQ_LEN);
45015 capimsg_setu16(skb->data, 2, mp->ap->applid);
45016 capimsg_setu8 (skb->data, 4, CAPI_DATA_B3);
45017 capimsg_setu8 (skb->data, 5, CAPI_REQ);
45018- capimsg_setu16(skb->data, 6, atomic_inc_return(&mp->msgid));
45019+ capimsg_setu16(skb->data, 6, atomic_inc_return_unchecked(&mp->msgid));
45020 capimsg_setu32(skb->data, 8, mp->ncci); /* NCCI */
45021 capimsg_setu32(skb->data, 12, (u32)(long)skb->data);/* Data32 */
45022 capimsg_setu16(skb->data, 16, len); /* Data length */
45023diff --git a/drivers/isdn/gigaset/bas-gigaset.c b/drivers/isdn/gigaset/bas-gigaset.c
45024index aecec6d..11e13c5 100644
45025--- a/drivers/isdn/gigaset/bas-gigaset.c
45026+++ b/drivers/isdn/gigaset/bas-gigaset.c
45027@@ -2565,22 +2565,22 @@ static int gigaset_post_reset(struct usb_interface *intf)
45028
45029
45030 static const struct gigaset_ops gigops = {
45031- gigaset_write_cmd,
45032- gigaset_write_room,
45033- gigaset_chars_in_buffer,
45034- gigaset_brkchars,
45035- gigaset_init_bchannel,
45036- gigaset_close_bchannel,
45037- gigaset_initbcshw,
45038- gigaset_freebcshw,
45039- gigaset_reinitbcshw,
45040- gigaset_initcshw,
45041- gigaset_freecshw,
45042- gigaset_set_modem_ctrl,
45043- gigaset_baud_rate,
45044- gigaset_set_line_ctrl,
45045- gigaset_isoc_send_skb,
45046- gigaset_isoc_input,
45047+ .write_cmd = gigaset_write_cmd,
45048+ .write_room = gigaset_write_room,
45049+ .chars_in_buffer = gigaset_chars_in_buffer,
45050+ .brkchars = gigaset_brkchars,
45051+ .init_bchannel = gigaset_init_bchannel,
45052+ .close_bchannel = gigaset_close_bchannel,
45053+ .initbcshw = gigaset_initbcshw,
45054+ .freebcshw = gigaset_freebcshw,
45055+ .reinitbcshw = gigaset_reinitbcshw,
45056+ .initcshw = gigaset_initcshw,
45057+ .freecshw = gigaset_freecshw,
45058+ .set_modem_ctrl = gigaset_set_modem_ctrl,
45059+ .baud_rate = gigaset_baud_rate,
45060+ .set_line_ctrl = gigaset_set_line_ctrl,
45061+ .send_skb = gigaset_isoc_send_skb,
45062+ .handle_input = gigaset_isoc_input,
45063 };
45064
45065 /* bas_gigaset_init
45066diff --git a/drivers/isdn/gigaset/interface.c b/drivers/isdn/gigaset/interface.c
45067index 600c79b..3752bab 100644
45068--- a/drivers/isdn/gigaset/interface.c
45069+++ b/drivers/isdn/gigaset/interface.c
45070@@ -130,9 +130,9 @@ static int if_open(struct tty_struct *tty, struct file *filp)
45071 }
45072 tty->driver_data = cs;
45073
45074- ++cs->port.count;
45075+ atomic_inc(&cs->port.count);
45076
45077- if (cs->port.count == 1) {
45078+ if (atomic_read(&cs->port.count) == 1) {
45079 tty_port_tty_set(&cs->port, tty);
45080 cs->port.low_latency = 1;
45081 }
45082@@ -156,9 +156,9 @@ static void if_close(struct tty_struct *tty, struct file *filp)
45083
45084 if (!cs->connected)
45085 gig_dbg(DEBUG_IF, "not connected"); /* nothing to do */
45086- else if (!cs->port.count)
45087+ else if (!atomic_read(&cs->port.count))
45088 dev_warn(cs->dev, "%s: device not opened\n", __func__);
45089- else if (!--cs->port.count)
45090+ else if (!atomic_dec_return(&cs->port.count))
45091 tty_port_tty_set(&cs->port, NULL);
45092
45093 mutex_unlock(&cs->mutex);
45094diff --git a/drivers/isdn/gigaset/ser-gigaset.c b/drivers/isdn/gigaset/ser-gigaset.c
45095index 8c91fd5..14f13ce 100644
45096--- a/drivers/isdn/gigaset/ser-gigaset.c
45097+++ b/drivers/isdn/gigaset/ser-gigaset.c
45098@@ -453,22 +453,22 @@ static int gigaset_set_line_ctrl(struct cardstate *cs, unsigned cflag)
45099 }
45100
45101 static const struct gigaset_ops ops = {
45102- gigaset_write_cmd,
45103- gigaset_write_room,
45104- gigaset_chars_in_buffer,
45105- gigaset_brkchars,
45106- gigaset_init_bchannel,
45107- gigaset_close_bchannel,
45108- gigaset_initbcshw,
45109- gigaset_freebcshw,
45110- gigaset_reinitbcshw,
45111- gigaset_initcshw,
45112- gigaset_freecshw,
45113- gigaset_set_modem_ctrl,
45114- gigaset_baud_rate,
45115- gigaset_set_line_ctrl,
45116- gigaset_m10x_send_skb, /* asyncdata.c */
45117- gigaset_m10x_input, /* asyncdata.c */
45118+ .write_cmd = gigaset_write_cmd,
45119+ .write_room = gigaset_write_room,
45120+ .chars_in_buffer = gigaset_chars_in_buffer,
45121+ .brkchars = gigaset_brkchars,
45122+ .init_bchannel = gigaset_init_bchannel,
45123+ .close_bchannel = gigaset_close_bchannel,
45124+ .initbcshw = gigaset_initbcshw,
45125+ .freebcshw = gigaset_freebcshw,
45126+ .reinitbcshw = gigaset_reinitbcshw,
45127+ .initcshw = gigaset_initcshw,
45128+ .freecshw = gigaset_freecshw,
45129+ .set_modem_ctrl = gigaset_set_modem_ctrl,
45130+ .baud_rate = gigaset_baud_rate,
45131+ .set_line_ctrl = gigaset_set_line_ctrl,
45132+ .send_skb = gigaset_m10x_send_skb, /* asyncdata.c */
45133+ .handle_input = gigaset_m10x_input, /* asyncdata.c */
45134 };
45135
45136
45137diff --git a/drivers/isdn/gigaset/usb-gigaset.c b/drivers/isdn/gigaset/usb-gigaset.c
45138index 5f306e2..5342f88 100644
45139--- a/drivers/isdn/gigaset/usb-gigaset.c
45140+++ b/drivers/isdn/gigaset/usb-gigaset.c
45141@@ -543,7 +543,7 @@ static int gigaset_brkchars(struct cardstate *cs, const unsigned char buf[6])
45142 gigaset_dbg_buffer(DEBUG_USBREQ, "brkchars", 6, buf);
45143 memcpy(cs->hw.usb->bchars, buf, 6);
45144 return usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x19, 0x41,
45145- 0, 0, &buf, 6, 2000);
45146+ 0, 0, buf, 6, 2000);
45147 }
45148
45149 static void gigaset_freebcshw(struct bc_state *bcs)
45150@@ -862,22 +862,22 @@ static int gigaset_pre_reset(struct usb_interface *intf)
45151 }
45152
45153 static const struct gigaset_ops ops = {
45154- gigaset_write_cmd,
45155- gigaset_write_room,
45156- gigaset_chars_in_buffer,
45157- gigaset_brkchars,
45158- gigaset_init_bchannel,
45159- gigaset_close_bchannel,
45160- gigaset_initbcshw,
45161- gigaset_freebcshw,
45162- gigaset_reinitbcshw,
45163- gigaset_initcshw,
45164- gigaset_freecshw,
45165- gigaset_set_modem_ctrl,
45166- gigaset_baud_rate,
45167- gigaset_set_line_ctrl,
45168- gigaset_m10x_send_skb,
45169- gigaset_m10x_input,
45170+ .write_cmd = gigaset_write_cmd,
45171+ .write_room = gigaset_write_room,
45172+ .chars_in_buffer = gigaset_chars_in_buffer,
45173+ .brkchars = gigaset_brkchars,
45174+ .init_bchannel = gigaset_init_bchannel,
45175+ .close_bchannel = gigaset_close_bchannel,
45176+ .initbcshw = gigaset_initbcshw,
45177+ .freebcshw = gigaset_freebcshw,
45178+ .reinitbcshw = gigaset_reinitbcshw,
45179+ .initcshw = gigaset_initcshw,
45180+ .freecshw = gigaset_freecshw,
45181+ .set_modem_ctrl = gigaset_set_modem_ctrl,
45182+ .baud_rate = gigaset_baud_rate,
45183+ .set_line_ctrl = gigaset_set_line_ctrl,
45184+ .send_skb = gigaset_m10x_send_skb,
45185+ .handle_input = gigaset_m10x_input,
45186 };
45187
45188 /*
45189diff --git a/drivers/isdn/hardware/avm/b1.c b/drivers/isdn/hardware/avm/b1.c
45190index 4d9b195..455075c 100644
45191--- a/drivers/isdn/hardware/avm/b1.c
45192+++ b/drivers/isdn/hardware/avm/b1.c
45193@@ -176,7 +176,7 @@ int b1_load_t4file(avmcard *card, capiloaddatapart *t4file)
45194 }
45195 if (left) {
45196 if (t4file->user) {
45197- if (copy_from_user(buf, dp, left))
45198+ if (left > sizeof buf || copy_from_user(buf, dp, left))
45199 return -EFAULT;
45200 } else {
45201 memcpy(buf, dp, left);
45202@@ -224,7 +224,7 @@ int b1_load_config(avmcard *card, capiloaddatapart *config)
45203 }
45204 if (left) {
45205 if (config->user) {
45206- if (copy_from_user(buf, dp, left))
45207+ if (left > sizeof buf || copy_from_user(buf, dp, left))
45208 return -EFAULT;
45209 } else {
45210 memcpy(buf, dp, left);
45211diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c
45212index 9b856e1..fa03c92 100644
45213--- a/drivers/isdn/i4l/isdn_common.c
45214+++ b/drivers/isdn/i4l/isdn_common.c
45215@@ -1654,6 +1654,8 @@ isdn_ioctl(struct file *file, uint cmd, ulong arg)
45216 } else
45217 return -EINVAL;
45218 case IIOCDBGVAR:
45219+ if (!capable(CAP_SYS_RAWIO))
45220+ return -EPERM;
45221 if (arg) {
45222 if (copy_to_user(argp, &dev, sizeof(ulong)))
45223 return -EFAULT;
45224diff --git a/drivers/isdn/i4l/isdn_concap.c b/drivers/isdn/i4l/isdn_concap.c
45225index 91d5730..336523e 100644
45226--- a/drivers/isdn/i4l/isdn_concap.c
45227+++ b/drivers/isdn/i4l/isdn_concap.c
45228@@ -80,9 +80,9 @@ static int isdn_concap_dl_disconn_req(struct concap_proto *concap)
45229 }
45230
45231 struct concap_device_ops isdn_concap_reliable_dl_dops = {
45232- &isdn_concap_dl_data_req,
45233- &isdn_concap_dl_connect_req,
45234- &isdn_concap_dl_disconn_req
45235+ .data_req = &isdn_concap_dl_data_req,
45236+ .connect_req = &isdn_concap_dl_connect_req,
45237+ .disconn_req = &isdn_concap_dl_disconn_req
45238 };
45239
45240 /* The following should better go into a dedicated source file such that
45241diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c
45242index bc91261..2ef7e36 100644
45243--- a/drivers/isdn/i4l/isdn_tty.c
45244+++ b/drivers/isdn/i4l/isdn_tty.c
45245@@ -1503,9 +1503,9 @@ isdn_tty_open(struct tty_struct *tty, struct file *filp)
45246
45247 #ifdef ISDN_DEBUG_MODEM_OPEN
45248 printk(KERN_DEBUG "isdn_tty_open %s, count = %d\n", tty->name,
45249- port->count);
45250+ atomic_read(&port->count));
45251 #endif
45252- port->count++;
45253+ atomic_inc(&port->count);
45254 port->tty = tty;
45255 /*
45256 * Start up serial port
45257@@ -1549,7 +1549,7 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
45258 #endif
45259 return;
45260 }
45261- if ((tty->count == 1) && (port->count != 1)) {
45262+ if ((tty->count == 1) && (atomic_read(&port->count) != 1)) {
45263 /*
45264 * Uh, oh. tty->count is 1, which means that the tty
45265 * structure will be freed. Info->count should always
45266@@ -1558,15 +1558,15 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
45267 * serial port won't be shutdown.
45268 */
45269 printk(KERN_ERR "isdn_tty_close: bad port count; tty->count is 1, "
45270- "info->count is %d\n", port->count);
45271- port->count = 1;
45272+ "info->count is %d\n", atomic_read(&port->count));
45273+ atomic_set(&port->count, 1);
45274 }
45275- if (--port->count < 0) {
45276+ if (atomic_dec_return(&port->count) < 0) {
45277 printk(KERN_ERR "isdn_tty_close: bad port count for ttyi%d: %d\n",
45278- info->line, port->count);
45279- port->count = 0;
45280+ info->line, atomic_read(&port->count));
45281+ atomic_set(&port->count, 0);
45282 }
45283- if (port->count) {
45284+ if (atomic_read(&port->count)) {
45285 #ifdef ISDN_DEBUG_MODEM_OPEN
45286 printk(KERN_DEBUG "isdn_tty_close after info->count != 0\n");
45287 #endif
45288@@ -1620,7 +1620,7 @@ isdn_tty_hangup(struct tty_struct *tty)
45289 if (isdn_tty_paranoia_check(info, tty->name, "isdn_tty_hangup"))
45290 return;
45291 isdn_tty_shutdown(info);
45292- port->count = 0;
45293+ atomic_set(&port->count, 0);
45294 port->flags &= ~ASYNC_NORMAL_ACTIVE;
45295 port->tty = NULL;
45296 wake_up_interruptible(&port->open_wait);
45297@@ -1965,7 +1965,7 @@ isdn_tty_find_icall(int di, int ch, setup_parm *setup)
45298 for (i = 0; i < ISDN_MAX_CHANNELS; i++) {
45299 modem_info *info = &dev->mdm.info[i];
45300
45301- if (info->port.count == 0)
45302+ if (atomic_read(&info->port.count) == 0)
45303 continue;
45304 if ((info->emu.mdmreg[REG_SI1] & si2bit[si1]) && /* SI1 is matching */
45305 (info->emu.mdmreg[REG_SI2] == si2)) { /* SI2 is matching */
45306diff --git a/drivers/isdn/i4l/isdn_x25iface.c b/drivers/isdn/i4l/isdn_x25iface.c
45307index e2d4e58..40cd045 100644
45308--- a/drivers/isdn/i4l/isdn_x25iface.c
45309+++ b/drivers/isdn/i4l/isdn_x25iface.c
45310@@ -53,14 +53,14 @@ static int isdn_x25iface_disconn_ind(struct concap_proto *);
45311
45312
45313 static struct concap_proto_ops ix25_pops = {
45314- &isdn_x25iface_proto_new,
45315- &isdn_x25iface_proto_del,
45316- &isdn_x25iface_proto_restart,
45317- &isdn_x25iface_proto_close,
45318- &isdn_x25iface_xmit,
45319- &isdn_x25iface_receive,
45320- &isdn_x25iface_connect_ind,
45321- &isdn_x25iface_disconn_ind
45322+ .proto_new = &isdn_x25iface_proto_new,
45323+ .proto_del = &isdn_x25iface_proto_del,
45324+ .restart = &isdn_x25iface_proto_restart,
45325+ .close = &isdn_x25iface_proto_close,
45326+ .encap_and_xmit = &isdn_x25iface_xmit,
45327+ .data_ind = &isdn_x25iface_receive,
45328+ .connect_ind = &isdn_x25iface_connect_ind,
45329+ .disconn_ind = &isdn_x25iface_disconn_ind
45330 };
45331
45332 /* error message helper function */
45333diff --git a/drivers/isdn/icn/icn.c b/drivers/isdn/icn/icn.c
45334index 358a574..b4987ea 100644
45335--- a/drivers/isdn/icn/icn.c
45336+++ b/drivers/isdn/icn/icn.c
45337@@ -1045,7 +1045,7 @@ icn_writecmd(const u_char *buf, int len, int user, icn_card *card)
45338 if (count > len)
45339 count = len;
45340 if (user) {
45341- if (copy_from_user(msg, buf, count))
45342+ if (count > sizeof msg || copy_from_user(msg, buf, count))
45343 return -EFAULT;
45344 } else
45345 memcpy(msg, buf, count);
45346diff --git a/drivers/isdn/mISDN/dsp_cmx.c b/drivers/isdn/mISDN/dsp_cmx.c
45347index 87f7dff..7300125 100644
45348--- a/drivers/isdn/mISDN/dsp_cmx.c
45349+++ b/drivers/isdn/mISDN/dsp_cmx.c
45350@@ -1625,7 +1625,7 @@ unsigned long dsp_spl_jiffies; /* calculate the next time to fire */
45351 static u16 dsp_count; /* last sample count */
45352 static int dsp_count_valid; /* if we have last sample count */
45353
45354-void
45355+void __intentional_overflow(-1)
45356 dsp_cmx_send(void *arg)
45357 {
45358 struct dsp_conf *conf;
45359diff --git a/drivers/lguest/core.c b/drivers/lguest/core.c
45360index 312ffd3..9263d05 100644
45361--- a/drivers/lguest/core.c
45362+++ b/drivers/lguest/core.c
45363@@ -96,9 +96,17 @@ static __init int map_switcher(void)
45364 * The end address needs +1 because __get_vm_area allocates an
45365 * extra guard page, so we need space for that.
45366 */
45367+
45368+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
45369+ switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
45370+ VM_ALLOC | VM_KERNEXEC, switcher_addr, switcher_addr
45371+ + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
45372+#else
45373 switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
45374 VM_ALLOC, switcher_addr, switcher_addr
45375 + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
45376+#endif
45377+
45378 if (!switcher_vma) {
45379 err = -ENOMEM;
45380 printk("lguest: could not map switcher pages high\n");
45381@@ -121,7 +129,7 @@ static __init int map_switcher(void)
45382 * Now the Switcher is mapped at the right address, we can't fail!
45383 * Copy in the compiled-in Switcher code (from x86/switcher_32.S).
45384 */
45385- memcpy(switcher_vma->addr, start_switcher_text,
45386+ memcpy(switcher_vma->addr, ktla_ktva(start_switcher_text),
45387 end_switcher_text - start_switcher_text);
45388
45389 printk(KERN_INFO "lguest: mapped switcher at %p\n",
45390diff --git a/drivers/lguest/page_tables.c b/drivers/lguest/page_tables.c
45391index e3abebc9..6a35328 100644
45392--- a/drivers/lguest/page_tables.c
45393+++ b/drivers/lguest/page_tables.c
45394@@ -585,7 +585,7 @@ void pin_page(struct lg_cpu *cpu, unsigned long vaddr)
45395 /*:*/
45396
45397 #ifdef CONFIG_X86_PAE
45398-static void release_pmd(pmd_t *spmd)
45399+static void __intentional_overflow(-1) release_pmd(pmd_t *spmd)
45400 {
45401 /* If the entry's not present, there's nothing to release. */
45402 if (pmd_flags(*spmd) & _PAGE_PRESENT) {
45403diff --git a/drivers/lguest/x86/core.c b/drivers/lguest/x86/core.c
45404index 30f2aef..391c748 100644
45405--- a/drivers/lguest/x86/core.c
45406+++ b/drivers/lguest/x86/core.c
45407@@ -60,7 +60,7 @@ static struct {
45408 /* Offset from where switcher.S was compiled to where we've copied it */
45409 static unsigned long switcher_offset(void)
45410 {
45411- return switcher_addr - (unsigned long)start_switcher_text;
45412+ return switcher_addr - (unsigned long)ktla_ktva(start_switcher_text);
45413 }
45414
45415 /* This cpu's struct lguest_pages (after the Switcher text page) */
45416@@ -100,7 +100,13 @@ static void copy_in_guest_info(struct lg_cpu *cpu, struct lguest_pages *pages)
45417 * These copies are pretty cheap, so we do them unconditionally: */
45418 /* Save the current Host top-level page directory.
45419 */
45420+
45421+#ifdef CONFIG_PAX_PER_CPU_PGD
45422+ pages->state.host_cr3 = read_cr3();
45423+#else
45424 pages->state.host_cr3 = __pa(current->mm->pgd);
45425+#endif
45426+
45427 /*
45428 * Set up the Guest's page tables to see this CPU's pages (and no
45429 * other CPU's pages).
45430@@ -494,7 +500,7 @@ void __init lguest_arch_host_init(void)
45431 * compiled-in switcher code and the high-mapped copy we just made.
45432 */
45433 for (i = 0; i < IDT_ENTRIES; i++)
45434- default_idt_entries[i] += switcher_offset();
45435+ default_idt_entries[i] = ktla_ktva(default_idt_entries[i]) + switcher_offset();
45436
45437 /*
45438 * Set up the Switcher's per-cpu areas.
45439@@ -577,7 +583,7 @@ void __init lguest_arch_host_init(void)
45440 * it will be undisturbed when we switch. To change %cs and jump we
45441 * need this structure to feed to Intel's "lcall" instruction.
45442 */
45443- lguest_entry.offset = (long)switch_to_guest + switcher_offset();
45444+ lguest_entry.offset = (long)ktla_ktva(switch_to_guest) + switcher_offset();
45445 lguest_entry.segment = LGUEST_CS;
45446
45447 /*
45448diff --git a/drivers/lguest/x86/switcher_32.S b/drivers/lguest/x86/switcher_32.S
45449index 40634b0..4f5855e 100644
45450--- a/drivers/lguest/x86/switcher_32.S
45451+++ b/drivers/lguest/x86/switcher_32.S
45452@@ -87,6 +87,7 @@
45453 #include <asm/page.h>
45454 #include <asm/segment.h>
45455 #include <asm/lguest.h>
45456+#include <asm/processor-flags.h>
45457
45458 // We mark the start of the code to copy
45459 // It's placed in .text tho it's never run here
45460@@ -149,6 +150,13 @@ ENTRY(switch_to_guest)
45461 // Changes type when we load it: damn Intel!
45462 // For after we switch over our page tables
45463 // That entry will be read-only: we'd crash.
45464+
45465+#ifdef CONFIG_PAX_KERNEXEC
45466+ mov %cr0, %edx
45467+ xor $X86_CR0_WP, %edx
45468+ mov %edx, %cr0
45469+#endif
45470+
45471 movl $(GDT_ENTRY_TSS*8), %edx
45472 ltr %dx
45473
45474@@ -157,9 +165,15 @@ ENTRY(switch_to_guest)
45475 // Let's clear it again for our return.
45476 // The GDT descriptor of the Host
45477 // Points to the table after two "size" bytes
45478- movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %edx
45479+ movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %eax
45480 // Clear "used" from type field (byte 5, bit 2)
45481- andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%edx)
45482+ andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%eax)
45483+
45484+#ifdef CONFIG_PAX_KERNEXEC
45485+ mov %cr0, %eax
45486+ xor $X86_CR0_WP, %eax
45487+ mov %eax, %cr0
45488+#endif
45489
45490 // Once our page table's switched, the Guest is live!
45491 // The Host fades as we run this final step.
45492@@ -295,13 +309,12 @@ deliver_to_host:
45493 // I consulted gcc, and it gave
45494 // These instructions, which I gladly credit:
45495 leal (%edx,%ebx,8), %eax
45496- movzwl (%eax),%edx
45497- movl 4(%eax), %eax
45498- xorw %ax, %ax
45499- orl %eax, %edx
45500+ movl 4(%eax), %edx
45501+ movw (%eax), %dx
45502 // Now the address of the handler's in %edx
45503 // We call it now: its "iret" drops us home.
45504- jmp *%edx
45505+ ljmp $__KERNEL_CS, $1f
45506+1: jmp *%edx
45507
45508 // Every interrupt can come to us here
45509 // But we must truly tell each apart.
45510diff --git a/drivers/md/bcache/closure.h b/drivers/md/bcache/closure.h
45511index a08e3ee..df8ade2 100644
45512--- a/drivers/md/bcache/closure.h
45513+++ b/drivers/md/bcache/closure.h
45514@@ -238,7 +238,7 @@ static inline void closure_set_stopped(struct closure *cl)
45515 static inline void set_closure_fn(struct closure *cl, closure_fn *fn,
45516 struct workqueue_struct *wq)
45517 {
45518- BUG_ON(object_is_on_stack(cl));
45519+ BUG_ON(object_starts_on_stack(cl));
45520 closure_set_ip(cl);
45521 cl->fn = fn;
45522 cl->wq = wq;
45523diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
45524index 3a57679..c58cdaf 100644
45525--- a/drivers/md/bitmap.c
45526+++ b/drivers/md/bitmap.c
45527@@ -1786,7 +1786,7 @@ void bitmap_status(struct seq_file *seq, struct bitmap *bitmap)
45528 chunk_kb ? "KB" : "B");
45529 if (bitmap->storage.file) {
45530 seq_printf(seq, ", file: ");
45531- seq_path(seq, &bitmap->storage.file->f_path, " \t\n");
45532+ seq_path(seq, &bitmap->storage.file->f_path, " \t\n\\");
45533 }
45534
45535 seq_printf(seq, "\n");
45536diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
45537index c8a18e4..0ab43e5 100644
45538--- a/drivers/md/dm-ioctl.c
45539+++ b/drivers/md/dm-ioctl.c
45540@@ -1772,7 +1772,7 @@ static int validate_params(uint cmd, struct dm_ioctl *param)
45541 cmd == DM_LIST_VERSIONS_CMD)
45542 return 0;
45543
45544- if ((cmd == DM_DEV_CREATE_CMD)) {
45545+ if (cmd == DM_DEV_CREATE_CMD) {
45546 if (!*param->name) {
45547 DMWARN("name not supplied when creating device");
45548 return -EINVAL;
45549diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c
45550index 089d627..ef7352e 100644
45551--- a/drivers/md/dm-raid1.c
45552+++ b/drivers/md/dm-raid1.c
45553@@ -40,7 +40,7 @@ enum dm_raid1_error {
45554
45555 struct mirror {
45556 struct mirror_set *ms;
45557- atomic_t error_count;
45558+ atomic_unchecked_t error_count;
45559 unsigned long error_type;
45560 struct dm_dev *dev;
45561 sector_t offset;
45562@@ -186,7 +186,7 @@ static struct mirror *get_valid_mirror(struct mirror_set *ms)
45563 struct mirror *m;
45564
45565 for (m = ms->mirror; m < ms->mirror + ms->nr_mirrors; m++)
45566- if (!atomic_read(&m->error_count))
45567+ if (!atomic_read_unchecked(&m->error_count))
45568 return m;
45569
45570 return NULL;
45571@@ -218,7 +218,7 @@ static void fail_mirror(struct mirror *m, enum dm_raid1_error error_type)
45572 * simple way to tell if a device has encountered
45573 * errors.
45574 */
45575- atomic_inc(&m->error_count);
45576+ atomic_inc_unchecked(&m->error_count);
45577
45578 if (test_and_set_bit(error_type, &m->error_type))
45579 return;
45580@@ -409,7 +409,7 @@ static struct mirror *choose_mirror(struct mirror_set *ms, sector_t sector)
45581 struct mirror *m = get_default_mirror(ms);
45582
45583 do {
45584- if (likely(!atomic_read(&m->error_count)))
45585+ if (likely(!atomic_read_unchecked(&m->error_count)))
45586 return m;
45587
45588 if (m-- == ms->mirror)
45589@@ -423,7 +423,7 @@ static int default_ok(struct mirror *m)
45590 {
45591 struct mirror *default_mirror = get_default_mirror(m->ms);
45592
45593- return !atomic_read(&default_mirror->error_count);
45594+ return !atomic_read_unchecked(&default_mirror->error_count);
45595 }
45596
45597 static int mirror_available(struct mirror_set *ms, struct bio *bio)
45598@@ -560,7 +560,7 @@ static void do_reads(struct mirror_set *ms, struct bio_list *reads)
45599 */
45600 if (likely(region_in_sync(ms, region, 1)))
45601 m = choose_mirror(ms, bio->bi_iter.bi_sector);
45602- else if (m && atomic_read(&m->error_count))
45603+ else if (m && atomic_read_unchecked(&m->error_count))
45604 m = NULL;
45605
45606 if (likely(m))
45607@@ -936,7 +936,7 @@ static int get_mirror(struct mirror_set *ms, struct dm_target *ti,
45608 }
45609
45610 ms->mirror[mirror].ms = ms;
45611- atomic_set(&(ms->mirror[mirror].error_count), 0);
45612+ atomic_set_unchecked(&(ms->mirror[mirror].error_count), 0);
45613 ms->mirror[mirror].error_type = 0;
45614 ms->mirror[mirror].offset = offset;
45615
45616@@ -1351,7 +1351,7 @@ static void mirror_resume(struct dm_target *ti)
45617 */
45618 static char device_status_char(struct mirror *m)
45619 {
45620- if (!atomic_read(&(m->error_count)))
45621+ if (!atomic_read_unchecked(&(m->error_count)))
45622 return 'A';
45623
45624 return (test_bit(DM_RAID1_FLUSH_ERROR, &(m->error_type))) ? 'F' :
45625diff --git a/drivers/md/dm-stats.c b/drivers/md/dm-stats.c
45626index f478a4c..4b8e5ef 100644
45627--- a/drivers/md/dm-stats.c
45628+++ b/drivers/md/dm-stats.c
45629@@ -382,7 +382,7 @@ do_sync_free:
45630 synchronize_rcu_expedited();
45631 dm_stat_free(&s->rcu_head);
45632 } else {
45633- ACCESS_ONCE(dm_stat_need_rcu_barrier) = 1;
45634+ ACCESS_ONCE_RW(dm_stat_need_rcu_barrier) = 1;
45635 call_rcu(&s->rcu_head, dm_stat_free);
45636 }
45637 return 0;
45638@@ -554,8 +554,8 @@ void dm_stats_account_io(struct dm_stats *stats, unsigned long bi_rw,
45639 ((bi_rw & (REQ_WRITE | REQ_DISCARD)) ==
45640 (ACCESS_ONCE(last->last_rw) & (REQ_WRITE | REQ_DISCARD)))
45641 ));
45642- ACCESS_ONCE(last->last_sector) = end_sector;
45643- ACCESS_ONCE(last->last_rw) = bi_rw;
45644+ ACCESS_ONCE_RW(last->last_sector) = end_sector;
45645+ ACCESS_ONCE_RW(last->last_rw) = bi_rw;
45646 }
45647
45648 rcu_read_lock();
45649diff --git a/drivers/md/dm-stripe.c b/drivers/md/dm-stripe.c
45650index f8b37d4..5c5cafd 100644
45651--- a/drivers/md/dm-stripe.c
45652+++ b/drivers/md/dm-stripe.c
45653@@ -21,7 +21,7 @@ struct stripe {
45654 struct dm_dev *dev;
45655 sector_t physical_start;
45656
45657- atomic_t error_count;
45658+ atomic_unchecked_t error_count;
45659 };
45660
45661 struct stripe_c {
45662@@ -188,7 +188,7 @@ static int stripe_ctr(struct dm_target *ti, unsigned int argc, char **argv)
45663 kfree(sc);
45664 return r;
45665 }
45666- atomic_set(&(sc->stripe[i].error_count), 0);
45667+ atomic_set_unchecked(&(sc->stripe[i].error_count), 0);
45668 }
45669
45670 ti->private = sc;
45671@@ -332,7 +332,7 @@ static void stripe_status(struct dm_target *ti, status_type_t type,
45672 DMEMIT("%d ", sc->stripes);
45673 for (i = 0; i < sc->stripes; i++) {
45674 DMEMIT("%s ", sc->stripe[i].dev->name);
45675- buffer[i] = atomic_read(&(sc->stripe[i].error_count)) ?
45676+ buffer[i] = atomic_read_unchecked(&(sc->stripe[i].error_count)) ?
45677 'D' : 'A';
45678 }
45679 buffer[i] = '\0';
45680@@ -377,8 +377,8 @@ static int stripe_end_io(struct dm_target *ti, struct bio *bio, int error)
45681 */
45682 for (i = 0; i < sc->stripes; i++)
45683 if (!strcmp(sc->stripe[i].dev->name, major_minor)) {
45684- atomic_inc(&(sc->stripe[i].error_count));
45685- if (atomic_read(&(sc->stripe[i].error_count)) <
45686+ atomic_inc_unchecked(&(sc->stripe[i].error_count));
45687+ if (atomic_read_unchecked(&(sc->stripe[i].error_count)) <
45688 DM_IO_ERROR_THRESHOLD)
45689 schedule_work(&sc->trigger_event);
45690 }
45691diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
45692index 757f1ba..bf9ec8f 100644
45693--- a/drivers/md/dm-table.c
45694+++ b/drivers/md/dm-table.c
45695@@ -303,7 +303,7 @@ static int device_area_is_invalid(struct dm_target *ti, struct dm_dev *dev,
45696 if (!dev_size)
45697 return 0;
45698
45699- if ((start >= dev_size) || (start + len > dev_size)) {
45700+ if ((start >= dev_size) || (len > dev_size - start)) {
45701 DMWARN("%s: %s too small for target: "
45702 "start=%llu, len=%llu, dev_size=%llu",
45703 dm_device_name(ti->table->md), bdevname(bdev, b),
45704diff --git a/drivers/md/dm-thin-metadata.c b/drivers/md/dm-thin-metadata.c
45705index 79f6941..b33b4e0 100644
45706--- a/drivers/md/dm-thin-metadata.c
45707+++ b/drivers/md/dm-thin-metadata.c
45708@@ -404,7 +404,7 @@ static void __setup_btree_details(struct dm_pool_metadata *pmd)
45709 {
45710 pmd->info.tm = pmd->tm;
45711 pmd->info.levels = 2;
45712- pmd->info.value_type.context = pmd->data_sm;
45713+ pmd->info.value_type.context = (dm_space_map_no_const *)pmd->data_sm;
45714 pmd->info.value_type.size = sizeof(__le64);
45715 pmd->info.value_type.inc = data_block_inc;
45716 pmd->info.value_type.dec = data_block_dec;
45717@@ -423,7 +423,7 @@ static void __setup_btree_details(struct dm_pool_metadata *pmd)
45718
45719 pmd->bl_info.tm = pmd->tm;
45720 pmd->bl_info.levels = 1;
45721- pmd->bl_info.value_type.context = pmd->data_sm;
45722+ pmd->bl_info.value_type.context = (dm_space_map_no_const *)pmd->data_sm;
45723 pmd->bl_info.value_type.size = sizeof(__le64);
45724 pmd->bl_info.value_type.inc = data_block_inc;
45725 pmd->bl_info.value_type.dec = data_block_dec;
45726diff --git a/drivers/md/dm.c b/drivers/md/dm.c
45727index 9b4e30a..83c927d 100644
45728--- a/drivers/md/dm.c
45729+++ b/drivers/md/dm.c
45730@@ -188,9 +188,9 @@ struct mapped_device {
45731 /*
45732 * Event handling.
45733 */
45734- atomic_t event_nr;
45735+ atomic_unchecked_t event_nr;
45736 wait_queue_head_t eventq;
45737- atomic_t uevent_seq;
45738+ atomic_unchecked_t uevent_seq;
45739 struct list_head uevent_list;
45740 spinlock_t uevent_lock; /* Protect access to uevent_list */
45741
45742@@ -2170,8 +2170,8 @@ static struct mapped_device *alloc_dev(int minor)
45743 spin_lock_init(&md->deferred_lock);
45744 atomic_set(&md->holders, 1);
45745 atomic_set(&md->open_count, 0);
45746- atomic_set(&md->event_nr, 0);
45747- atomic_set(&md->uevent_seq, 0);
45748+ atomic_set_unchecked(&md->event_nr, 0);
45749+ atomic_set_unchecked(&md->uevent_seq, 0);
45750 INIT_LIST_HEAD(&md->uevent_list);
45751 INIT_LIST_HEAD(&md->table_devices);
45752 spin_lock_init(&md->uevent_lock);
45753@@ -2336,7 +2336,7 @@ static void event_callback(void *context)
45754
45755 dm_send_uevents(&uevents, &disk_to_dev(md->disk)->kobj);
45756
45757- atomic_inc(&md->event_nr);
45758+ atomic_inc_unchecked(&md->event_nr);
45759 wake_up(&md->eventq);
45760 }
45761
45762@@ -3182,18 +3182,18 @@ int dm_kobject_uevent(struct mapped_device *md, enum kobject_action action,
45763
45764 uint32_t dm_next_uevent_seq(struct mapped_device *md)
45765 {
45766- return atomic_add_return(1, &md->uevent_seq);
45767+ return atomic_add_return_unchecked(1, &md->uevent_seq);
45768 }
45769
45770 uint32_t dm_get_event_nr(struct mapped_device *md)
45771 {
45772- return atomic_read(&md->event_nr);
45773+ return atomic_read_unchecked(&md->event_nr);
45774 }
45775
45776 int dm_wait_event(struct mapped_device *md, int event_nr)
45777 {
45778 return wait_event_interruptible(md->eventq,
45779- (event_nr != atomic_read(&md->event_nr)));
45780+ (event_nr != atomic_read_unchecked(&md->event_nr)));
45781 }
45782
45783 void dm_uevent_add(struct mapped_device *md, struct list_head *elist)
45784diff --git a/drivers/md/md.c b/drivers/md/md.c
45785index b7bf8ee..ee17152 100644
45786--- a/drivers/md/md.c
45787+++ b/drivers/md/md.c
45788@@ -191,10 +191,10 @@ EXPORT_SYMBOL_GPL(bio_clone_mddev);
45789 * start build, activate spare
45790 */
45791 static DECLARE_WAIT_QUEUE_HEAD(md_event_waiters);
45792-static atomic_t md_event_count;
45793+static atomic_unchecked_t md_event_count;
45794 void md_new_event(struct mddev *mddev)
45795 {
45796- atomic_inc(&md_event_count);
45797+ atomic_inc_unchecked(&md_event_count);
45798 wake_up(&md_event_waiters);
45799 }
45800 EXPORT_SYMBOL_GPL(md_new_event);
45801@@ -204,7 +204,7 @@ EXPORT_SYMBOL_GPL(md_new_event);
45802 */
45803 static void md_new_event_inintr(struct mddev *mddev)
45804 {
45805- atomic_inc(&md_event_count);
45806+ atomic_inc_unchecked(&md_event_count);
45807 wake_up(&md_event_waiters);
45808 }
45809
45810@@ -1442,7 +1442,7 @@ static int super_1_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor_
45811 if ((le32_to_cpu(sb->feature_map) & MD_FEATURE_RESHAPE_ACTIVE) &&
45812 (le32_to_cpu(sb->feature_map) & MD_FEATURE_NEW_OFFSET))
45813 rdev->new_data_offset += (s32)le32_to_cpu(sb->new_offset);
45814- atomic_set(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
45815+ atomic_set_unchecked(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
45816
45817 rdev->sb_size = le32_to_cpu(sb->max_dev) * 2 + 256;
45818 bmask = queue_logical_block_size(rdev->bdev->bd_disk->queue)-1;
45819@@ -1693,7 +1693,7 @@ static void super_1_sync(struct mddev *mddev, struct md_rdev *rdev)
45820 else
45821 sb->resync_offset = cpu_to_le64(0);
45822
45823- sb->cnt_corrected_read = cpu_to_le32(atomic_read(&rdev->corrected_errors));
45824+ sb->cnt_corrected_read = cpu_to_le32(atomic_read_unchecked(&rdev->corrected_errors));
45825
45826 sb->raid_disks = cpu_to_le32(mddev->raid_disks);
45827 sb->size = cpu_to_le64(mddev->dev_sectors);
45828@@ -2564,7 +2564,7 @@ __ATTR_PREALLOC(state, S_IRUGO|S_IWUSR, state_show, state_store);
45829 static ssize_t
45830 errors_show(struct md_rdev *rdev, char *page)
45831 {
45832- return sprintf(page, "%d\n", atomic_read(&rdev->corrected_errors));
45833+ return sprintf(page, "%d\n", atomic_read_unchecked(&rdev->corrected_errors));
45834 }
45835
45836 static ssize_t
45837@@ -2573,7 +2573,7 @@ errors_store(struct md_rdev *rdev, const char *buf, size_t len)
45838 char *e;
45839 unsigned long n = simple_strtoul(buf, &e, 10);
45840 if (*buf && (*e == 0 || *e == '\n')) {
45841- atomic_set(&rdev->corrected_errors, n);
45842+ atomic_set_unchecked(&rdev->corrected_errors, n);
45843 return len;
45844 }
45845 return -EINVAL;
45846@@ -3009,8 +3009,8 @@ int md_rdev_init(struct md_rdev *rdev)
45847 rdev->sb_loaded = 0;
45848 rdev->bb_page = NULL;
45849 atomic_set(&rdev->nr_pending, 0);
45850- atomic_set(&rdev->read_errors, 0);
45851- atomic_set(&rdev->corrected_errors, 0);
45852+ atomic_set_unchecked(&rdev->read_errors, 0);
45853+ atomic_set_unchecked(&rdev->corrected_errors, 0);
45854
45855 INIT_LIST_HEAD(&rdev->same_set);
45856 init_waitqueue_head(&rdev->blocked_wait);
45857@@ -7086,7 +7086,7 @@ static int md_seq_show(struct seq_file *seq, void *v)
45858
45859 spin_unlock(&pers_lock);
45860 seq_printf(seq, "\n");
45861- seq->poll_event = atomic_read(&md_event_count);
45862+ seq->poll_event = atomic_read_unchecked(&md_event_count);
45863 return 0;
45864 }
45865 if (v == (void*)2) {
45866@@ -7189,7 +7189,7 @@ static int md_seq_open(struct inode *inode, struct file *file)
45867 return error;
45868
45869 seq = file->private_data;
45870- seq->poll_event = atomic_read(&md_event_count);
45871+ seq->poll_event = atomic_read_unchecked(&md_event_count);
45872 return error;
45873 }
45874
45875@@ -7206,7 +7206,7 @@ static unsigned int mdstat_poll(struct file *filp, poll_table *wait)
45876 /* always allow read */
45877 mask = POLLIN | POLLRDNORM;
45878
45879- if (seq->poll_event != atomic_read(&md_event_count))
45880+ if (seq->poll_event != atomic_read_unchecked(&md_event_count))
45881 mask |= POLLERR | POLLPRI;
45882 return mask;
45883 }
45884@@ -7253,7 +7253,7 @@ static int is_mddev_idle(struct mddev *mddev, int init)
45885 struct gendisk *disk = rdev->bdev->bd_contains->bd_disk;
45886 curr_events = (int)part_stat_read(&disk->part0, sectors[0]) +
45887 (int)part_stat_read(&disk->part0, sectors[1]) -
45888- atomic_read(&disk->sync_io);
45889+ atomic_read_unchecked(&disk->sync_io);
45890 /* sync IO will cause sync_io to increase before the disk_stats
45891 * as sync_io is counted when a request starts, and
45892 * disk_stats is counted when it completes.
45893diff --git a/drivers/md/md.h b/drivers/md/md.h
45894index 318ca8f..31e4478 100644
45895--- a/drivers/md/md.h
45896+++ b/drivers/md/md.h
45897@@ -94,13 +94,13 @@ struct md_rdev {
45898 * only maintained for arrays that
45899 * support hot removal
45900 */
45901- atomic_t read_errors; /* number of consecutive read errors that
45902+ atomic_unchecked_t read_errors; /* number of consecutive read errors that
45903 * we have tried to ignore.
45904 */
45905 struct timespec last_read_error; /* monotonic time since our
45906 * last read error
45907 */
45908- atomic_t corrected_errors; /* number of corrected read errors,
45909+ atomic_unchecked_t corrected_errors; /* number of corrected read errors,
45910 * for reporting to userspace and storing
45911 * in superblock.
45912 */
45913@@ -476,7 +476,7 @@ extern void mddev_unlock(struct mddev *mddev);
45914
45915 static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors)
45916 {
45917- atomic_add(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
45918+ atomic_add_unchecked(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
45919 }
45920
45921 struct md_personality
45922diff --git a/drivers/md/persistent-data/dm-space-map-metadata.c b/drivers/md/persistent-data/dm-space-map-metadata.c
45923index e8a9042..35bd145 100644
45924--- a/drivers/md/persistent-data/dm-space-map-metadata.c
45925+++ b/drivers/md/persistent-data/dm-space-map-metadata.c
45926@@ -683,7 +683,7 @@ static int sm_metadata_extend(struct dm_space_map *sm, dm_block_t extra_blocks)
45927 * Flick into a mode where all blocks get allocated in the new area.
45928 */
45929 smm->begin = old_len;
45930- memcpy(sm, &bootstrap_ops, sizeof(*sm));
45931+ memcpy((void *)sm, &bootstrap_ops, sizeof(*sm));
45932
45933 /*
45934 * Extend.
45935@@ -714,7 +714,7 @@ out:
45936 /*
45937 * Switch back to normal behaviour.
45938 */
45939- memcpy(sm, &ops, sizeof(*sm));
45940+ memcpy((void *)sm, &ops, sizeof(*sm));
45941 return r;
45942 }
45943
45944diff --git a/drivers/md/persistent-data/dm-space-map.h b/drivers/md/persistent-data/dm-space-map.h
45945index 3e6d115..ffecdeb 100644
45946--- a/drivers/md/persistent-data/dm-space-map.h
45947+++ b/drivers/md/persistent-data/dm-space-map.h
45948@@ -71,6 +71,7 @@ struct dm_space_map {
45949 dm_sm_threshold_fn fn,
45950 void *context);
45951 };
45952+typedef struct dm_space_map __no_const dm_space_map_no_const;
45953
45954 /*----------------------------------------------------------------*/
45955
45956diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
45957index d34e238..34f8d98 100644
45958--- a/drivers/md/raid1.c
45959+++ b/drivers/md/raid1.c
45960@@ -1922,7 +1922,7 @@ static int fix_sync_read_error(struct r1bio *r1_bio)
45961 if (r1_sync_page_io(rdev, sect, s,
45962 bio->bi_io_vec[idx].bv_page,
45963 READ) != 0)
45964- atomic_add(s, &rdev->corrected_errors);
45965+ atomic_add_unchecked(s, &rdev->corrected_errors);
45966 }
45967 sectors -= s;
45968 sect += s;
45969@@ -2155,7 +2155,7 @@ static void fix_read_error(struct r1conf *conf, int read_disk,
45970 !test_bit(Faulty, &rdev->flags)) {
45971 if (r1_sync_page_io(rdev, sect, s,
45972 conf->tmppage, READ)) {
45973- atomic_add(s, &rdev->corrected_errors);
45974+ atomic_add_unchecked(s, &rdev->corrected_errors);
45975 printk(KERN_INFO
45976 "md/raid1:%s: read error corrected "
45977 "(%d sectors at %llu on %s)\n",
45978diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
45979index a7196c4..439f012 100644
45980--- a/drivers/md/raid10.c
45981+++ b/drivers/md/raid10.c
45982@@ -1934,7 +1934,7 @@ static void end_sync_read(struct bio *bio, int error)
45983 /* The write handler will notice the lack of
45984 * R10BIO_Uptodate and record any errors etc
45985 */
45986- atomic_add(r10_bio->sectors,
45987+ atomic_add_unchecked(r10_bio->sectors,
45988 &conf->mirrors[d].rdev->corrected_errors);
45989
45990 /* for reconstruct, we always reschedule after a read.
45991@@ -2291,7 +2291,7 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
45992 {
45993 struct timespec cur_time_mon;
45994 unsigned long hours_since_last;
45995- unsigned int read_errors = atomic_read(&rdev->read_errors);
45996+ unsigned int read_errors = atomic_read_unchecked(&rdev->read_errors);
45997
45998 ktime_get_ts(&cur_time_mon);
45999
46000@@ -2313,9 +2313,9 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
46001 * overflowing the shift of read_errors by hours_since_last.
46002 */
46003 if (hours_since_last >= 8 * sizeof(read_errors))
46004- atomic_set(&rdev->read_errors, 0);
46005+ atomic_set_unchecked(&rdev->read_errors, 0);
46006 else
46007- atomic_set(&rdev->read_errors, read_errors >> hours_since_last);
46008+ atomic_set_unchecked(&rdev->read_errors, read_errors >> hours_since_last);
46009 }
46010
46011 static int r10_sync_page_io(struct md_rdev *rdev, sector_t sector,
46012@@ -2369,8 +2369,8 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
46013 return;
46014
46015 check_decay_read_errors(mddev, rdev);
46016- atomic_inc(&rdev->read_errors);
46017- if (atomic_read(&rdev->read_errors) > max_read_errors) {
46018+ atomic_inc_unchecked(&rdev->read_errors);
46019+ if (atomic_read_unchecked(&rdev->read_errors) > max_read_errors) {
46020 char b[BDEVNAME_SIZE];
46021 bdevname(rdev->bdev, b);
46022
46023@@ -2378,7 +2378,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
46024 "md/raid10:%s: %s: Raid device exceeded "
46025 "read_error threshold [cur %d:max %d]\n",
46026 mdname(mddev), b,
46027- atomic_read(&rdev->read_errors), max_read_errors);
46028+ atomic_read_unchecked(&rdev->read_errors), max_read_errors);
46029 printk(KERN_NOTICE
46030 "md/raid10:%s: %s: Failing raid device\n",
46031 mdname(mddev), b);
46032@@ -2533,7 +2533,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
46033 sect +
46034 choose_data_offset(r10_bio, rdev)),
46035 bdevname(rdev->bdev, b));
46036- atomic_add(s, &rdev->corrected_errors);
46037+ atomic_add_unchecked(s, &rdev->corrected_errors);
46038 }
46039
46040 rdev_dec_pending(rdev, mddev);
46041diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
46042index 007ab86..d11593d 100644
46043--- a/drivers/md/raid5.c
46044+++ b/drivers/md/raid5.c
46045@@ -947,23 +947,23 @@ async_copy_data(int frombio, struct bio *bio, struct page **page,
46046 struct bio_vec bvl;
46047 struct bvec_iter iter;
46048 struct page *bio_page;
46049- int page_offset;
46050+ s64 page_offset;
46051 struct async_submit_ctl submit;
46052 enum async_tx_flags flags = 0;
46053
46054 if (bio->bi_iter.bi_sector >= sector)
46055- page_offset = (signed)(bio->bi_iter.bi_sector - sector) * 512;
46056+ page_offset = (s64)(bio->bi_iter.bi_sector - sector) * 512;
46057 else
46058- page_offset = (signed)(sector - bio->bi_iter.bi_sector) * -512;
46059+ page_offset = (s64)(sector - bio->bi_iter.bi_sector) * -512;
46060
46061 if (frombio)
46062 flags |= ASYNC_TX_FENCE;
46063 init_async_submit(&submit, flags, tx, NULL, NULL, NULL);
46064
46065 bio_for_each_segment(bvl, bio, iter) {
46066- int len = bvl.bv_len;
46067- int clen;
46068- int b_offset = 0;
46069+ s64 len = bvl.bv_len;
46070+ s64 clen;
46071+ s64 b_offset = 0;
46072
46073 if (page_offset < 0) {
46074 b_offset = -page_offset;
46075@@ -1727,6 +1727,10 @@ static int grow_one_stripe(struct r5conf *conf, int hash)
46076 return 1;
46077 }
46078
46079+#ifdef CONFIG_GRKERNSEC_HIDESYM
46080+static atomic_unchecked_t raid5_cache_id = ATOMIC_INIT(0);
46081+#endif
46082+
46083 static int grow_stripes(struct r5conf *conf, int num)
46084 {
46085 struct kmem_cache *sc;
46086@@ -1738,7 +1742,11 @@ static int grow_stripes(struct r5conf *conf, int num)
46087 "raid%d-%s", conf->level, mdname(conf->mddev));
46088 else
46089 sprintf(conf->cache_name[0],
46090+#ifdef CONFIG_GRKERNSEC_HIDESYM
46091+ "raid%d-%08lx", conf->level, atomic_inc_return_unchecked(&raid5_cache_id));
46092+#else
46093 "raid%d-%p", conf->level, conf->mddev);
46094+#endif
46095 sprintf(conf->cache_name[1], "%s-alt", conf->cache_name[0]);
46096
46097 conf->active_name = 0;
46098@@ -2015,21 +2023,21 @@ static void raid5_end_read_request(struct bio * bi, int error)
46099 mdname(conf->mddev), STRIPE_SECTORS,
46100 (unsigned long long)s,
46101 bdevname(rdev->bdev, b));
46102- atomic_add(STRIPE_SECTORS, &rdev->corrected_errors);
46103+ atomic_add_unchecked(STRIPE_SECTORS, &rdev->corrected_errors);
46104 clear_bit(R5_ReadError, &sh->dev[i].flags);
46105 clear_bit(R5_ReWrite, &sh->dev[i].flags);
46106 } else if (test_bit(R5_ReadNoMerge, &sh->dev[i].flags))
46107 clear_bit(R5_ReadNoMerge, &sh->dev[i].flags);
46108
46109- if (atomic_read(&rdev->read_errors))
46110- atomic_set(&rdev->read_errors, 0);
46111+ if (atomic_read_unchecked(&rdev->read_errors))
46112+ atomic_set_unchecked(&rdev->read_errors, 0);
46113 } else {
46114 const char *bdn = bdevname(rdev->bdev, b);
46115 int retry = 0;
46116 int set_bad = 0;
46117
46118 clear_bit(R5_UPTODATE, &sh->dev[i].flags);
46119- atomic_inc(&rdev->read_errors);
46120+ atomic_inc_unchecked(&rdev->read_errors);
46121 if (test_bit(R5_ReadRepl, &sh->dev[i].flags))
46122 printk_ratelimited(
46123 KERN_WARNING
46124@@ -2057,7 +2065,7 @@ static void raid5_end_read_request(struct bio * bi, int error)
46125 mdname(conf->mddev),
46126 (unsigned long long)s,
46127 bdn);
46128- } else if (atomic_read(&rdev->read_errors)
46129+ } else if (atomic_read_unchecked(&rdev->read_errors)
46130 > conf->max_nr_stripes)
46131 printk(KERN_WARNING
46132 "md/raid:%s: Too many read errors, failing device %s.\n",
46133diff --git a/drivers/media/dvb-core/dvbdev.c b/drivers/media/dvb-core/dvbdev.c
46134index 983db75..ef9248c 100644
46135--- a/drivers/media/dvb-core/dvbdev.c
46136+++ b/drivers/media/dvb-core/dvbdev.c
46137@@ -185,7 +185,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
46138 const struct dvb_device *template, void *priv, int type)
46139 {
46140 struct dvb_device *dvbdev;
46141- struct file_operations *dvbdevfops;
46142+ file_operations_no_const *dvbdevfops;
46143 struct device *clsdev;
46144 int minor;
46145 int id;
46146diff --git a/drivers/media/dvb-frontends/af9033.h b/drivers/media/dvb-frontends/af9033.h
46147index 6ad22b6..6e90e2a 100644
46148--- a/drivers/media/dvb-frontends/af9033.h
46149+++ b/drivers/media/dvb-frontends/af9033.h
46150@@ -96,6 +96,6 @@ struct af9033_ops {
46151 int (*pid_filter_ctrl)(struct dvb_frontend *fe, int onoff);
46152 int (*pid_filter)(struct dvb_frontend *fe, int index, u16 pid,
46153 int onoff);
46154-};
46155+} __no_const;
46156
46157 #endif /* AF9033_H */
46158diff --git a/drivers/media/dvb-frontends/dib3000.h b/drivers/media/dvb-frontends/dib3000.h
46159index 9b6c3bb..baeb5c7 100644
46160--- a/drivers/media/dvb-frontends/dib3000.h
46161+++ b/drivers/media/dvb-frontends/dib3000.h
46162@@ -39,7 +39,7 @@ struct dib_fe_xfer_ops
46163 int (*fifo_ctrl)(struct dvb_frontend *fe, int onoff);
46164 int (*pid_ctrl)(struct dvb_frontend *fe, int index, int pid, int onoff);
46165 int (*tuner_pass_ctrl)(struct dvb_frontend *fe, int onoff, u8 pll_ctrl);
46166-};
46167+} __no_const;
46168
46169 #if IS_ENABLED(CONFIG_DVB_DIB3000MB)
46170 extern struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config,
46171diff --git a/drivers/media/dvb-frontends/dib7000p.h b/drivers/media/dvb-frontends/dib7000p.h
46172index 1fea0e9..321ce8f 100644
46173--- a/drivers/media/dvb-frontends/dib7000p.h
46174+++ b/drivers/media/dvb-frontends/dib7000p.h
46175@@ -64,7 +64,7 @@ struct dib7000p_ops {
46176 int (*get_adc_power)(struct dvb_frontend *fe);
46177 int (*slave_reset)(struct dvb_frontend *fe);
46178 struct dvb_frontend *(*init)(struct i2c_adapter *i2c_adap, u8 i2c_addr, struct dib7000p_config *cfg);
46179-};
46180+} __no_const;
46181
46182 #if IS_ENABLED(CONFIG_DVB_DIB7000P)
46183 void *dib7000p_attach(struct dib7000p_ops *ops);
46184diff --git a/drivers/media/dvb-frontends/dib8000.h b/drivers/media/dvb-frontends/dib8000.h
46185index 84cc103..5780c54 100644
46186--- a/drivers/media/dvb-frontends/dib8000.h
46187+++ b/drivers/media/dvb-frontends/dib8000.h
46188@@ -61,7 +61,7 @@ struct dib8000_ops {
46189 int (*pid_filter_ctrl)(struct dvb_frontend *fe, u8 onoff);
46190 int (*pid_filter)(struct dvb_frontend *fe, u8 id, u16 pid, u8 onoff);
46191 struct dvb_frontend *(*init)(struct i2c_adapter *i2c_adap, u8 i2c_addr, struct dib8000_config *cfg);
46192-};
46193+} __no_const;
46194
46195 #if IS_ENABLED(CONFIG_DVB_DIB8000)
46196 void *dib8000_attach(struct dib8000_ops *ops);
46197diff --git a/drivers/media/pci/cx88/cx88-video.c b/drivers/media/pci/cx88/cx88-video.c
46198index 860c98fc..497fa25 100644
46199--- a/drivers/media/pci/cx88/cx88-video.c
46200+++ b/drivers/media/pci/cx88/cx88-video.c
46201@@ -50,9 +50,9 @@ MODULE_VERSION(CX88_VERSION);
46202
46203 /* ------------------------------------------------------------------ */
46204
46205-static unsigned int video_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
46206-static unsigned int vbi_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
46207-static unsigned int radio_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
46208+static int video_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
46209+static int vbi_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
46210+static int radio_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
46211
46212 module_param_array(video_nr, int, NULL, 0444);
46213 module_param_array(vbi_nr, int, NULL, 0444);
46214diff --git a/drivers/media/pci/ivtv/ivtv-driver.c b/drivers/media/pci/ivtv/ivtv-driver.c
46215index 802642d..5534900 100644
46216--- a/drivers/media/pci/ivtv/ivtv-driver.c
46217+++ b/drivers/media/pci/ivtv/ivtv-driver.c
46218@@ -83,7 +83,7 @@ static struct pci_device_id ivtv_pci_tbl[] = {
46219 MODULE_DEVICE_TABLE(pci,ivtv_pci_tbl);
46220
46221 /* ivtv instance counter */
46222-static atomic_t ivtv_instance = ATOMIC_INIT(0);
46223+static atomic_unchecked_t ivtv_instance = ATOMIC_INIT(0);
46224
46225 /* Parameter declarations */
46226 static int cardtype[IVTV_MAX_CARDS];
46227diff --git a/drivers/media/pci/solo6x10/solo6x10-core.c b/drivers/media/pci/solo6x10/solo6x10-core.c
46228index 570d119..ed25830 100644
46229--- a/drivers/media/pci/solo6x10/solo6x10-core.c
46230+++ b/drivers/media/pci/solo6x10/solo6x10-core.c
46231@@ -424,7 +424,7 @@ static void solo_device_release(struct device *dev)
46232
46233 static int solo_sysfs_init(struct solo_dev *solo_dev)
46234 {
46235- struct bin_attribute *sdram_attr = &solo_dev->sdram_attr;
46236+ bin_attribute_no_const *sdram_attr = &solo_dev->sdram_attr;
46237 struct device *dev = &solo_dev->dev;
46238 const char *driver;
46239 int i;
46240diff --git a/drivers/media/pci/solo6x10/solo6x10-g723.c b/drivers/media/pci/solo6x10/solo6x10-g723.c
46241index 7ddc767..1c24361 100644
46242--- a/drivers/media/pci/solo6x10/solo6x10-g723.c
46243+++ b/drivers/media/pci/solo6x10/solo6x10-g723.c
46244@@ -351,7 +351,7 @@ static int solo_snd_pcm_init(struct solo_dev *solo_dev)
46245
46246 int solo_g723_init(struct solo_dev *solo_dev)
46247 {
46248- static struct snd_device_ops ops = { NULL };
46249+ static struct snd_device_ops ops = { };
46250 struct snd_card *card;
46251 struct snd_kcontrol_new kctl;
46252 char name[32];
46253diff --git a/drivers/media/pci/solo6x10/solo6x10-p2m.c b/drivers/media/pci/solo6x10/solo6x10-p2m.c
46254index 8c84846..27b4f83 100644
46255--- a/drivers/media/pci/solo6x10/solo6x10-p2m.c
46256+++ b/drivers/media/pci/solo6x10/solo6x10-p2m.c
46257@@ -73,7 +73,7 @@ int solo_p2m_dma_desc(struct solo_dev *solo_dev,
46258
46259 /* Get next ID. According to Softlogic, 6110 has problems on !=0 P2M */
46260 if (solo_dev->type != SOLO_DEV_6110 && multi_p2m) {
46261- p2m_id = atomic_inc_return(&solo_dev->p2m_count) % SOLO_NR_P2M;
46262+ p2m_id = atomic_inc_return_unchecked(&solo_dev->p2m_count) % SOLO_NR_P2M;
46263 if (p2m_id < 0)
46264 p2m_id = -p2m_id;
46265 }
46266diff --git a/drivers/media/pci/solo6x10/solo6x10.h b/drivers/media/pci/solo6x10/solo6x10.h
46267index 1ca54b0..7d7cb9a 100644
46268--- a/drivers/media/pci/solo6x10/solo6x10.h
46269+++ b/drivers/media/pci/solo6x10/solo6x10.h
46270@@ -218,7 +218,7 @@ struct solo_dev {
46271
46272 /* P2M DMA Engine */
46273 struct solo_p2m_dev p2m_dev[SOLO_NR_P2M];
46274- atomic_t p2m_count;
46275+ atomic_unchecked_t p2m_count;
46276 int p2m_jiffies;
46277 unsigned int p2m_timeouts;
46278
46279diff --git a/drivers/media/pci/tw68/tw68-core.c b/drivers/media/pci/tw68/tw68-core.c
46280index c135165..dc69499 100644
46281--- a/drivers/media/pci/tw68/tw68-core.c
46282+++ b/drivers/media/pci/tw68/tw68-core.c
46283@@ -60,7 +60,7 @@ static unsigned int card[] = {[0 ... (TW68_MAXBOARDS - 1)] = UNSET };
46284 module_param_array(card, int, NULL, 0444);
46285 MODULE_PARM_DESC(card, "card type");
46286
46287-static atomic_t tw68_instance = ATOMIC_INIT(0);
46288+static atomic_unchecked_t tw68_instance = ATOMIC_INIT(0);
46289
46290 /* ------------------------------------------------------------------ */
46291
46292diff --git a/drivers/media/platform/omap/omap_vout.c b/drivers/media/platform/omap/omap_vout.c
46293index ba2d8f9..1566684 100644
46294--- a/drivers/media/platform/omap/omap_vout.c
46295+++ b/drivers/media/platform/omap/omap_vout.c
46296@@ -63,7 +63,6 @@ enum omap_vout_channels {
46297 OMAP_VIDEO2,
46298 };
46299
46300-static struct videobuf_queue_ops video_vbq_ops;
46301 /* Variables configurable through module params*/
46302 static u32 video1_numbuffers = 3;
46303 static u32 video2_numbuffers = 3;
46304@@ -1012,6 +1011,12 @@ static int omap_vout_open(struct file *file)
46305 {
46306 struct videobuf_queue *q;
46307 struct omap_vout_device *vout = NULL;
46308+ static struct videobuf_queue_ops video_vbq_ops = {
46309+ .buf_setup = omap_vout_buffer_setup,
46310+ .buf_prepare = omap_vout_buffer_prepare,
46311+ .buf_release = omap_vout_buffer_release,
46312+ .buf_queue = omap_vout_buffer_queue,
46313+ };
46314
46315 vout = video_drvdata(file);
46316 v4l2_dbg(1, debug, &vout->vid_dev->v4l2_dev, "Entering %s\n", __func__);
46317@@ -1029,10 +1034,6 @@ static int omap_vout_open(struct file *file)
46318 vout->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
46319
46320 q = &vout->vbq;
46321- video_vbq_ops.buf_setup = omap_vout_buffer_setup;
46322- video_vbq_ops.buf_prepare = omap_vout_buffer_prepare;
46323- video_vbq_ops.buf_release = omap_vout_buffer_release;
46324- video_vbq_ops.buf_queue = omap_vout_buffer_queue;
46325 spin_lock_init(&vout->vbq_lock);
46326
46327 videobuf_queue_dma_contig_init(q, &video_vbq_ops, q->dev,
46328diff --git a/drivers/media/platform/s5p-tv/mixer.h b/drivers/media/platform/s5p-tv/mixer.h
46329index fb2acc5..a2fcbdc4 100644
46330--- a/drivers/media/platform/s5p-tv/mixer.h
46331+++ b/drivers/media/platform/s5p-tv/mixer.h
46332@@ -156,7 +156,7 @@ struct mxr_layer {
46333 /** layer index (unique identifier) */
46334 int idx;
46335 /** callbacks for layer methods */
46336- struct mxr_layer_ops ops;
46337+ struct mxr_layer_ops *ops;
46338 /** format array */
46339 const struct mxr_format **fmt_array;
46340 /** size of format array */
46341diff --git a/drivers/media/platform/s5p-tv/mixer_grp_layer.c b/drivers/media/platform/s5p-tv/mixer_grp_layer.c
46342index 74344c7..a39e70e 100644
46343--- a/drivers/media/platform/s5p-tv/mixer_grp_layer.c
46344+++ b/drivers/media/platform/s5p-tv/mixer_grp_layer.c
46345@@ -235,7 +235,7 @@ struct mxr_layer *mxr_graph_layer_create(struct mxr_device *mdev, int idx)
46346 {
46347 struct mxr_layer *layer;
46348 int ret;
46349- struct mxr_layer_ops ops = {
46350+ static struct mxr_layer_ops ops = {
46351 .release = mxr_graph_layer_release,
46352 .buffer_set = mxr_graph_buffer_set,
46353 .stream_set = mxr_graph_stream_set,
46354diff --git a/drivers/media/platform/s5p-tv/mixer_reg.c b/drivers/media/platform/s5p-tv/mixer_reg.c
46355index b713403..53cb5ad 100644
46356--- a/drivers/media/platform/s5p-tv/mixer_reg.c
46357+++ b/drivers/media/platform/s5p-tv/mixer_reg.c
46358@@ -276,7 +276,7 @@ static void mxr_irq_layer_handle(struct mxr_layer *layer)
46359 layer->update_buf = next;
46360 }
46361
46362- layer->ops.buffer_set(layer, layer->update_buf);
46363+ layer->ops->buffer_set(layer, layer->update_buf);
46364
46365 if (done && done != layer->shadow_buf)
46366 vb2_buffer_done(&done->vb, VB2_BUF_STATE_DONE);
46367diff --git a/drivers/media/platform/s5p-tv/mixer_video.c b/drivers/media/platform/s5p-tv/mixer_video.c
46368index 72d4f2e..4b2ea0d 100644
46369--- a/drivers/media/platform/s5p-tv/mixer_video.c
46370+++ b/drivers/media/platform/s5p-tv/mixer_video.c
46371@@ -210,7 +210,7 @@ static void mxr_layer_default_geo(struct mxr_layer *layer)
46372 layer->geo.src.height = layer->geo.src.full_height;
46373
46374 mxr_geometry_dump(mdev, &layer->geo);
46375- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
46376+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
46377 mxr_geometry_dump(mdev, &layer->geo);
46378 }
46379
46380@@ -228,7 +228,7 @@ static void mxr_layer_update_output(struct mxr_layer *layer)
46381 layer->geo.dst.full_width = mbus_fmt.width;
46382 layer->geo.dst.full_height = mbus_fmt.height;
46383 layer->geo.dst.field = mbus_fmt.field;
46384- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
46385+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
46386
46387 mxr_geometry_dump(mdev, &layer->geo);
46388 }
46389@@ -334,7 +334,7 @@ static int mxr_s_fmt(struct file *file, void *priv,
46390 /* set source size to highest accepted value */
46391 geo->src.full_width = max(geo->dst.full_width, pix->width);
46392 geo->src.full_height = max(geo->dst.full_height, pix->height);
46393- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
46394+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
46395 mxr_geometry_dump(mdev, &layer->geo);
46396 /* set cropping to total visible screen */
46397 geo->src.width = pix->width;
46398@@ -342,12 +342,12 @@ static int mxr_s_fmt(struct file *file, void *priv,
46399 geo->src.x_offset = 0;
46400 geo->src.y_offset = 0;
46401 /* assure consistency of geometry */
46402- layer->ops.fix_geometry(layer, MXR_GEOMETRY_CROP, MXR_NO_OFFSET);
46403+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_CROP, MXR_NO_OFFSET);
46404 mxr_geometry_dump(mdev, &layer->geo);
46405 /* set full size to lowest possible value */
46406 geo->src.full_width = 0;
46407 geo->src.full_height = 0;
46408- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
46409+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
46410 mxr_geometry_dump(mdev, &layer->geo);
46411
46412 /* returning results */
46413@@ -474,7 +474,7 @@ static int mxr_s_selection(struct file *file, void *fh,
46414 target->width = s->r.width;
46415 target->height = s->r.height;
46416
46417- layer->ops.fix_geometry(layer, stage, s->flags);
46418+ layer->ops->fix_geometry(layer, stage, s->flags);
46419
46420 /* retrieve update selection rectangle */
46421 res.left = target->x_offset;
46422@@ -938,13 +938,13 @@ static int start_streaming(struct vb2_queue *vq, unsigned int count)
46423 mxr_output_get(mdev);
46424
46425 mxr_layer_update_output(layer);
46426- layer->ops.format_set(layer);
46427+ layer->ops->format_set(layer);
46428 /* enabling layer in hardware */
46429 spin_lock_irqsave(&layer->enq_slock, flags);
46430 layer->state = MXR_LAYER_STREAMING;
46431 spin_unlock_irqrestore(&layer->enq_slock, flags);
46432
46433- layer->ops.stream_set(layer, MXR_ENABLE);
46434+ layer->ops->stream_set(layer, MXR_ENABLE);
46435 mxr_streamer_get(mdev);
46436
46437 return 0;
46438@@ -1014,7 +1014,7 @@ static void stop_streaming(struct vb2_queue *vq)
46439 spin_unlock_irqrestore(&layer->enq_slock, flags);
46440
46441 /* disabling layer in hardware */
46442- layer->ops.stream_set(layer, MXR_DISABLE);
46443+ layer->ops->stream_set(layer, MXR_DISABLE);
46444 /* remove one streamer */
46445 mxr_streamer_put(mdev);
46446 /* allow changes in output configuration */
46447@@ -1052,8 +1052,8 @@ void mxr_base_layer_unregister(struct mxr_layer *layer)
46448
46449 void mxr_layer_release(struct mxr_layer *layer)
46450 {
46451- if (layer->ops.release)
46452- layer->ops.release(layer);
46453+ if (layer->ops->release)
46454+ layer->ops->release(layer);
46455 }
46456
46457 void mxr_base_layer_release(struct mxr_layer *layer)
46458@@ -1079,7 +1079,7 @@ struct mxr_layer *mxr_base_layer_create(struct mxr_device *mdev,
46459
46460 layer->mdev = mdev;
46461 layer->idx = idx;
46462- layer->ops = *ops;
46463+ layer->ops = ops;
46464
46465 spin_lock_init(&layer->enq_slock);
46466 INIT_LIST_HEAD(&layer->enq_list);
46467diff --git a/drivers/media/platform/s5p-tv/mixer_vp_layer.c b/drivers/media/platform/s5p-tv/mixer_vp_layer.c
46468index c9388c4..ce71ece 100644
46469--- a/drivers/media/platform/s5p-tv/mixer_vp_layer.c
46470+++ b/drivers/media/platform/s5p-tv/mixer_vp_layer.c
46471@@ -206,7 +206,7 @@ struct mxr_layer *mxr_vp_layer_create(struct mxr_device *mdev, int idx)
46472 {
46473 struct mxr_layer *layer;
46474 int ret;
46475- struct mxr_layer_ops ops = {
46476+ static struct mxr_layer_ops ops = {
46477 .release = mxr_vp_layer_release,
46478 .buffer_set = mxr_vp_buffer_set,
46479 .stream_set = mxr_vp_stream_set,
46480diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c
46481index 82affae..42833ec 100644
46482--- a/drivers/media/radio/radio-cadet.c
46483+++ b/drivers/media/radio/radio-cadet.c
46484@@ -333,6 +333,8 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
46485 unsigned char readbuf[RDS_BUFFER];
46486 int i = 0;
46487
46488+ if (count > RDS_BUFFER)
46489+ return -EFAULT;
46490 mutex_lock(&dev->lock);
46491 if (dev->rdsstat == 0)
46492 cadet_start_rds(dev);
46493@@ -349,8 +351,9 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
46494 readbuf[i++] = dev->rdsbuf[dev->rdsout++];
46495 mutex_unlock(&dev->lock);
46496
46497- if (i && copy_to_user(data, readbuf, i))
46498- return -EFAULT;
46499+ if (i > sizeof(readbuf) || (i && copy_to_user(data, readbuf, i)))
46500+ i = -EFAULT;
46501+
46502 return i;
46503 }
46504
46505diff --git a/drivers/media/radio/radio-maxiradio.c b/drivers/media/radio/radio-maxiradio.c
46506index 5236035..c622c74 100644
46507--- a/drivers/media/radio/radio-maxiradio.c
46508+++ b/drivers/media/radio/radio-maxiradio.c
46509@@ -61,7 +61,7 @@ MODULE_PARM_DESC(radio_nr, "Radio device number");
46510 /* TEA5757 pin mappings */
46511 static const int clk = 1, data = 2, wren = 4, mo_st = 8, power = 16;
46512
46513-static atomic_t maxiradio_instance = ATOMIC_INIT(0);
46514+static atomic_unchecked_t maxiradio_instance = ATOMIC_INIT(0);
46515
46516 #define PCI_VENDOR_ID_GUILLEMOT 0x5046
46517 #define PCI_DEVICE_ID_GUILLEMOT_MAXIRADIO 0x1001
46518diff --git a/drivers/media/radio/radio-shark.c b/drivers/media/radio/radio-shark.c
46519index 050b3bb..79f62b9 100644
46520--- a/drivers/media/radio/radio-shark.c
46521+++ b/drivers/media/radio/radio-shark.c
46522@@ -79,7 +79,7 @@ struct shark_device {
46523 u32 last_val;
46524 };
46525
46526-static atomic_t shark_instance = ATOMIC_INIT(0);
46527+static atomic_unchecked_t shark_instance = ATOMIC_INIT(0);
46528
46529 static void shark_write_val(struct snd_tea575x *tea, u32 val)
46530 {
46531diff --git a/drivers/media/radio/radio-shark2.c b/drivers/media/radio/radio-shark2.c
46532index 8654e0d..0608a64 100644
46533--- a/drivers/media/radio/radio-shark2.c
46534+++ b/drivers/media/radio/radio-shark2.c
46535@@ -74,7 +74,7 @@ struct shark_device {
46536 u8 *transfer_buffer;
46537 };
46538
46539-static atomic_t shark_instance = ATOMIC_INIT(0);
46540+static atomic_unchecked_t shark_instance = ATOMIC_INIT(0);
46541
46542 static int shark_write_reg(struct radio_tea5777 *tea, u64 reg)
46543 {
46544diff --git a/drivers/media/radio/radio-si476x.c b/drivers/media/radio/radio-si476x.c
46545index dccf586..d5db411 100644
46546--- a/drivers/media/radio/radio-si476x.c
46547+++ b/drivers/media/radio/radio-si476x.c
46548@@ -1445,7 +1445,7 @@ static int si476x_radio_probe(struct platform_device *pdev)
46549 struct si476x_radio *radio;
46550 struct v4l2_ctrl *ctrl;
46551
46552- static atomic_t instance = ATOMIC_INIT(0);
46553+ static atomic_unchecked_t instance = ATOMIC_INIT(0);
46554
46555 radio = devm_kzalloc(&pdev->dev, sizeof(*radio), GFP_KERNEL);
46556 if (!radio)
46557diff --git a/drivers/media/radio/wl128x/fmdrv_common.c b/drivers/media/radio/wl128x/fmdrv_common.c
46558index 704397f..4d05977 100644
46559--- a/drivers/media/radio/wl128x/fmdrv_common.c
46560+++ b/drivers/media/radio/wl128x/fmdrv_common.c
46561@@ -71,7 +71,7 @@ module_param(default_rds_buf, uint, 0444);
46562 MODULE_PARM_DESC(rds_buf, "RDS buffer entries");
46563
46564 /* Radio Nr */
46565-static u32 radio_nr = -1;
46566+static int radio_nr = -1;
46567 module_param(radio_nr, int, 0444);
46568 MODULE_PARM_DESC(radio_nr, "Radio Nr");
46569
46570diff --git a/drivers/media/usb/dvb-usb/cinergyT2-core.c b/drivers/media/usb/dvb-usb/cinergyT2-core.c
46571index 9fd1527..8927230 100644
46572--- a/drivers/media/usb/dvb-usb/cinergyT2-core.c
46573+++ b/drivers/media/usb/dvb-usb/cinergyT2-core.c
46574@@ -50,29 +50,73 @@ static struct dvb_usb_device_properties cinergyt2_properties;
46575
46576 static int cinergyt2_streaming_ctrl(struct dvb_usb_adapter *adap, int enable)
46577 {
46578- char buf[] = { CINERGYT2_EP1_CONTROL_STREAM_TRANSFER, enable ? 1 : 0 };
46579- char result[64];
46580- return dvb_usb_generic_rw(adap->dev, buf, sizeof(buf), result,
46581- sizeof(result), 0);
46582+ char *buf;
46583+ char *result;
46584+ int retval;
46585+
46586+ buf = kmalloc(2, GFP_KERNEL);
46587+ if (buf == NULL)
46588+ return -ENOMEM;
46589+ result = kmalloc(64, GFP_KERNEL);
46590+ if (result == NULL) {
46591+ kfree(buf);
46592+ return -ENOMEM;
46593+ }
46594+
46595+ buf[0] = CINERGYT2_EP1_CONTROL_STREAM_TRANSFER;
46596+ buf[1] = enable ? 1 : 0;
46597+
46598+ retval = dvb_usb_generic_rw(adap->dev, buf, 2, result, 64, 0);
46599+
46600+ kfree(buf);
46601+ kfree(result);
46602+ return retval;
46603 }
46604
46605 static int cinergyt2_power_ctrl(struct dvb_usb_device *d, int enable)
46606 {
46607- char buf[] = { CINERGYT2_EP1_SLEEP_MODE, enable ? 0 : 1 };
46608- char state[3];
46609- return dvb_usb_generic_rw(d, buf, sizeof(buf), state, sizeof(state), 0);
46610+ char *buf;
46611+ char *state;
46612+ int retval;
46613+
46614+ buf = kmalloc(2, GFP_KERNEL);
46615+ if (buf == NULL)
46616+ return -ENOMEM;
46617+ state = kmalloc(3, GFP_KERNEL);
46618+ if (state == NULL) {
46619+ kfree(buf);
46620+ return -ENOMEM;
46621+ }
46622+
46623+ buf[0] = CINERGYT2_EP1_SLEEP_MODE;
46624+ buf[1] = enable ? 1 : 0;
46625+
46626+ retval = dvb_usb_generic_rw(d, buf, 2, state, 3, 0);
46627+
46628+ kfree(buf);
46629+ kfree(state);
46630+ return retval;
46631 }
46632
46633 static int cinergyt2_frontend_attach(struct dvb_usb_adapter *adap)
46634 {
46635- char query[] = { CINERGYT2_EP1_GET_FIRMWARE_VERSION };
46636- char state[3];
46637+ char *query;
46638+ char *state;
46639 int ret;
46640+ query = kmalloc(1, GFP_KERNEL);
46641+ if (query == NULL)
46642+ return -ENOMEM;
46643+ state = kmalloc(3, GFP_KERNEL);
46644+ if (state == NULL) {
46645+ kfree(query);
46646+ return -ENOMEM;
46647+ }
46648+
46649+ query[0] = CINERGYT2_EP1_GET_FIRMWARE_VERSION;
46650
46651 adap->fe_adap[0].fe = cinergyt2_fe_attach(adap->dev);
46652
46653- ret = dvb_usb_generic_rw(adap->dev, query, sizeof(query), state,
46654- sizeof(state), 0);
46655+ ret = dvb_usb_generic_rw(adap->dev, query, 1, state, 3, 0);
46656 if (ret < 0) {
46657 deb_rc("cinergyt2_power_ctrl() Failed to retrieve sleep "
46658 "state info\n");
46659@@ -80,7 +124,8 @@ static int cinergyt2_frontend_attach(struct dvb_usb_adapter *adap)
46660
46661 /* Copy this pointer as we are gonna need it in the release phase */
46662 cinergyt2_usb_device = adap->dev;
46663-
46664+ kfree(query);
46665+ kfree(state);
46666 return 0;
46667 }
46668
46669@@ -141,12 +186,23 @@ static int repeatable_keys[] = {
46670 static int cinergyt2_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
46671 {
46672 struct cinergyt2_state *st = d->priv;
46673- u8 key[5] = {0, 0, 0, 0, 0}, cmd = CINERGYT2_EP1_GET_RC_EVENTS;
46674+ u8 *key, *cmd;
46675 int i;
46676
46677+ cmd = kmalloc(1, GFP_KERNEL);
46678+ if (cmd == NULL)
46679+ return -EINVAL;
46680+ key = kzalloc(5, GFP_KERNEL);
46681+ if (key == NULL) {
46682+ kfree(cmd);
46683+ return -EINVAL;
46684+ }
46685+
46686+ cmd[0] = CINERGYT2_EP1_GET_RC_EVENTS;
46687+
46688 *state = REMOTE_NO_KEY_PRESSED;
46689
46690- dvb_usb_generic_rw(d, &cmd, 1, key, sizeof(key), 0);
46691+ dvb_usb_generic_rw(d, cmd, 1, key, 5, 0);
46692 if (key[4] == 0xff) {
46693 /* key repeat */
46694 st->rc_counter++;
46695@@ -157,12 +213,12 @@ static int cinergyt2_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
46696 *event = d->last_event;
46697 deb_rc("repeat key, event %x\n",
46698 *event);
46699- return 0;
46700+ goto out;
46701 }
46702 }
46703 deb_rc("repeated key (non repeatable)\n");
46704 }
46705- return 0;
46706+ goto out;
46707 }
46708
46709 /* hack to pass checksum on the custom field */
46710@@ -174,6 +230,9 @@ static int cinergyt2_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
46711
46712 deb_rc("key: %*ph\n", 5, key);
46713 }
46714+out:
46715+ kfree(cmd);
46716+ kfree(key);
46717 return 0;
46718 }
46719
46720diff --git a/drivers/media/usb/dvb-usb/cinergyT2-fe.c b/drivers/media/usb/dvb-usb/cinergyT2-fe.c
46721index c890fe4..f9b2ae6 100644
46722--- a/drivers/media/usb/dvb-usb/cinergyT2-fe.c
46723+++ b/drivers/media/usb/dvb-usb/cinergyT2-fe.c
46724@@ -145,103 +145,176 @@ static int cinergyt2_fe_read_status(struct dvb_frontend *fe,
46725 fe_status_t *status)
46726 {
46727 struct cinergyt2_fe_state *state = fe->demodulator_priv;
46728- struct dvbt_get_status_msg result;
46729- u8 cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
46730+ struct dvbt_get_status_msg *result;
46731+ u8 *cmd;
46732 int ret;
46733
46734- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (u8 *)&result,
46735- sizeof(result), 0);
46736+ cmd = kmalloc(1, GFP_KERNEL);
46737+ if (cmd == NULL)
46738+ return -ENOMEM;
46739+ result = kmalloc(sizeof(*result), GFP_KERNEL);
46740+ if (result == NULL) {
46741+ kfree(cmd);
46742+ return -ENOMEM;
46743+ }
46744+
46745+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
46746+
46747+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (u8 *)result,
46748+ sizeof(*result), 0);
46749 if (ret < 0)
46750- return ret;
46751+ goto out;
46752
46753 *status = 0;
46754
46755- if (0xffff - le16_to_cpu(result.gain) > 30)
46756+ if (0xffff - le16_to_cpu(result->gain) > 30)
46757 *status |= FE_HAS_SIGNAL;
46758- if (result.lock_bits & (1 << 6))
46759+ if (result->lock_bits & (1 << 6))
46760 *status |= FE_HAS_LOCK;
46761- if (result.lock_bits & (1 << 5))
46762+ if (result->lock_bits & (1 << 5))
46763 *status |= FE_HAS_SYNC;
46764- if (result.lock_bits & (1 << 4))
46765+ if (result->lock_bits & (1 << 4))
46766 *status |= FE_HAS_CARRIER;
46767- if (result.lock_bits & (1 << 1))
46768+ if (result->lock_bits & (1 << 1))
46769 *status |= FE_HAS_VITERBI;
46770
46771 if ((*status & (FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC)) !=
46772 (FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC))
46773 *status &= ~FE_HAS_LOCK;
46774
46775- return 0;
46776+out:
46777+ kfree(cmd);
46778+ kfree(result);
46779+ return ret;
46780 }
46781
46782 static int cinergyt2_fe_read_ber(struct dvb_frontend *fe, u32 *ber)
46783 {
46784 struct cinergyt2_fe_state *state = fe->demodulator_priv;
46785- struct dvbt_get_status_msg status;
46786- char cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
46787+ struct dvbt_get_status_msg *status;
46788+ char *cmd;
46789 int ret;
46790
46791- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (char *)&status,
46792- sizeof(status), 0);
46793+ cmd = kmalloc(1, GFP_KERNEL);
46794+ if (cmd == NULL)
46795+ return -ENOMEM;
46796+ status = kmalloc(sizeof(*status), GFP_KERNEL);
46797+ if (status == NULL) {
46798+ kfree(cmd);
46799+ return -ENOMEM;
46800+ }
46801+
46802+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
46803+
46804+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (char *)status,
46805+ sizeof(*status), 0);
46806 if (ret < 0)
46807- return ret;
46808+ goto out;
46809
46810- *ber = le32_to_cpu(status.viterbi_error_rate);
46811+ *ber = le32_to_cpu(status->viterbi_error_rate);
46812+out:
46813+ kfree(cmd);
46814+ kfree(status);
46815 return 0;
46816 }
46817
46818 static int cinergyt2_fe_read_unc_blocks(struct dvb_frontend *fe, u32 *unc)
46819 {
46820 struct cinergyt2_fe_state *state = fe->demodulator_priv;
46821- struct dvbt_get_status_msg status;
46822- u8 cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
46823+ struct dvbt_get_status_msg *status;
46824+ u8 *cmd;
46825 int ret;
46826
46827- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (u8 *)&status,
46828- sizeof(status), 0);
46829+ cmd = kmalloc(1, GFP_KERNEL);
46830+ if (cmd == NULL)
46831+ return -ENOMEM;
46832+ status = kmalloc(sizeof(*status), GFP_KERNEL);
46833+ if (status == NULL) {
46834+ kfree(cmd);
46835+ return -ENOMEM;
46836+ }
46837+
46838+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
46839+
46840+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (u8 *)status,
46841+ sizeof(*status), 0);
46842 if (ret < 0) {
46843 err("cinergyt2_fe_read_unc_blocks() Failed! (Error=%d)\n",
46844 ret);
46845- return ret;
46846+ goto out;
46847 }
46848- *unc = le32_to_cpu(status.uncorrected_block_count);
46849- return 0;
46850+ *unc = le32_to_cpu(status->uncorrected_block_count);
46851+
46852+out:
46853+ kfree(cmd);
46854+ kfree(status);
46855+ return ret;
46856 }
46857
46858 static int cinergyt2_fe_read_signal_strength(struct dvb_frontend *fe,
46859 u16 *strength)
46860 {
46861 struct cinergyt2_fe_state *state = fe->demodulator_priv;
46862- struct dvbt_get_status_msg status;
46863- char cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
46864+ struct dvbt_get_status_msg *status;
46865+ char *cmd;
46866 int ret;
46867
46868- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (char *)&status,
46869- sizeof(status), 0);
46870+ cmd = kmalloc(1, GFP_KERNEL);
46871+ if (cmd == NULL)
46872+ return -ENOMEM;
46873+ status = kmalloc(sizeof(*status), GFP_KERNEL);
46874+ if (status == NULL) {
46875+ kfree(cmd);
46876+ return -ENOMEM;
46877+ }
46878+
46879+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
46880+
46881+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (char *)status,
46882+ sizeof(*status), 0);
46883 if (ret < 0) {
46884 err("cinergyt2_fe_read_signal_strength() Failed!"
46885 " (Error=%d)\n", ret);
46886- return ret;
46887+ goto out;
46888 }
46889- *strength = (0xffff - le16_to_cpu(status.gain));
46890+ *strength = (0xffff - le16_to_cpu(status->gain));
46891+
46892+out:
46893+ kfree(cmd);
46894+ kfree(status);
46895 return 0;
46896 }
46897
46898 static int cinergyt2_fe_read_snr(struct dvb_frontend *fe, u16 *snr)
46899 {
46900 struct cinergyt2_fe_state *state = fe->demodulator_priv;
46901- struct dvbt_get_status_msg status;
46902- char cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
46903+ struct dvbt_get_status_msg *status;
46904+ char *cmd;
46905 int ret;
46906
46907- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (char *)&status,
46908- sizeof(status), 0);
46909+ cmd = kmalloc(1, GFP_KERNEL);
46910+ if (cmd == NULL)
46911+ return -ENOMEM;
46912+ status = kmalloc(sizeof(*status), GFP_KERNEL);
46913+ if (status == NULL) {
46914+ kfree(cmd);
46915+ return -ENOMEM;
46916+ }
46917+
46918+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
46919+
46920+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (char *)status,
46921+ sizeof(*status), 0);
46922 if (ret < 0) {
46923 err("cinergyt2_fe_read_snr() Failed! (Error=%d)\n", ret);
46924- return ret;
46925+ goto out;
46926 }
46927- *snr = (status.snr << 8) | status.snr;
46928- return 0;
46929+ *snr = (status->snr << 8) | status->snr;
46930+
46931+out:
46932+ kfree(cmd);
46933+ kfree(status);
46934+ return ret;
46935 }
46936
46937 static int cinergyt2_fe_init(struct dvb_frontend *fe)
46938@@ -266,35 +339,46 @@ static int cinergyt2_fe_set_frontend(struct dvb_frontend *fe)
46939 {
46940 struct dtv_frontend_properties *fep = &fe->dtv_property_cache;
46941 struct cinergyt2_fe_state *state = fe->demodulator_priv;
46942- struct dvbt_set_parameters_msg param;
46943- char result[2];
46944+ struct dvbt_set_parameters_msg *param;
46945+ char *result;
46946 int err;
46947
46948- param.cmd = CINERGYT2_EP1_SET_TUNER_PARAMETERS;
46949- param.tps = cpu_to_le16(compute_tps(fep));
46950- param.freq = cpu_to_le32(fep->frequency / 1000);
46951- param.flags = 0;
46952+ result = kmalloc(2, GFP_KERNEL);
46953+ if (result == NULL)
46954+ return -ENOMEM;
46955+ param = kmalloc(sizeof(*param), GFP_KERNEL);
46956+ if (param == NULL) {
46957+ kfree(result);
46958+ return -ENOMEM;
46959+ }
46960+
46961+ param->cmd = CINERGYT2_EP1_SET_TUNER_PARAMETERS;
46962+ param->tps = cpu_to_le16(compute_tps(fep));
46963+ param->freq = cpu_to_le32(fep->frequency / 1000);
46964+ param->flags = 0;
46965
46966 switch (fep->bandwidth_hz) {
46967 default:
46968 case 8000000:
46969- param.bandwidth = 8;
46970+ param->bandwidth = 8;
46971 break;
46972 case 7000000:
46973- param.bandwidth = 7;
46974+ param->bandwidth = 7;
46975 break;
46976 case 6000000:
46977- param.bandwidth = 6;
46978+ param->bandwidth = 6;
46979 break;
46980 }
46981
46982 err = dvb_usb_generic_rw(state->d,
46983- (char *)&param, sizeof(param),
46984- result, sizeof(result), 0);
46985+ (char *)param, sizeof(*param),
46986+ result, 2, 0);
46987 if (err < 0)
46988 err("cinergyt2_fe_set_frontend() Failed! err=%d\n", err);
46989
46990- return (err < 0) ? err : 0;
46991+ kfree(result);
46992+ kfree(param);
46993+ return err;
46994 }
46995
46996 static void cinergyt2_fe_release(struct dvb_frontend *fe)
46997diff --git a/drivers/media/usb/dvb-usb/dvb-usb-firmware.c b/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
46998index 733a7ff..f8b52e3 100644
46999--- a/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
47000+++ b/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
47001@@ -35,42 +35,57 @@ static int usb_cypress_writemem(struct usb_device *udev,u16 addr,u8 *data, u8 le
47002
47003 int usb_cypress_load_firmware(struct usb_device *udev, const struct firmware *fw, int type)
47004 {
47005- struct hexline hx;
47006- u8 reset;
47007+ struct hexline *hx;
47008+ u8 *reset;
47009 int ret,pos=0;
47010
47011+ reset = kmalloc(1, GFP_KERNEL);
47012+ if (reset == NULL)
47013+ return -ENOMEM;
47014+
47015+ hx = kmalloc(sizeof(struct hexline), GFP_KERNEL);
47016+ if (hx == NULL) {
47017+ kfree(reset);
47018+ return -ENOMEM;
47019+ }
47020+
47021 /* stop the CPU */
47022- reset = 1;
47023- if ((ret = usb_cypress_writemem(udev,cypress[type].cpu_cs_register,&reset,1)) != 1)
47024+ reset[0] = 1;
47025+ if ((ret = usb_cypress_writemem(udev,cypress[type].cpu_cs_register,reset,1)) != 1)
47026 err("could not stop the USB controller CPU.");
47027
47028- while ((ret = dvb_usb_get_hexline(fw,&hx,&pos)) > 0) {
47029- deb_fw("writing to address 0x%04x (buffer: 0x%02x %02x)\n",hx.addr,hx.len,hx.chk);
47030- ret = usb_cypress_writemem(udev,hx.addr,hx.data,hx.len);
47031+ while ((ret = dvb_usb_get_hexline(fw,hx,&pos)) > 0) {
47032+ deb_fw("writing to address 0x%04x (buffer: 0x%02x %02x)\n",hx->addr,hx->len,hx->chk);
47033+ ret = usb_cypress_writemem(udev,hx->addr,hx->data,hx->len);
47034
47035- if (ret != hx.len) {
47036+ if (ret != hx->len) {
47037 err("error while transferring firmware "
47038 "(transferred size: %d, block size: %d)",
47039- ret,hx.len);
47040+ ret,hx->len);
47041 ret = -EINVAL;
47042 break;
47043 }
47044 }
47045 if (ret < 0) {
47046 err("firmware download failed at %d with %d",pos,ret);
47047+ kfree(reset);
47048+ kfree(hx);
47049 return ret;
47050 }
47051
47052 if (ret == 0) {
47053 /* restart the CPU */
47054- reset = 0;
47055- if (ret || usb_cypress_writemem(udev,cypress[type].cpu_cs_register,&reset,1) != 1) {
47056+ reset[0] = 0;
47057+ if (ret || usb_cypress_writemem(udev,cypress[type].cpu_cs_register,reset,1) != 1) {
47058 err("could not restart the USB controller CPU.");
47059 ret = -EINVAL;
47060 }
47061 } else
47062 ret = -EIO;
47063
47064+ kfree(reset);
47065+ kfree(hx);
47066+
47067 return ret;
47068 }
47069 EXPORT_SYMBOL(usb_cypress_load_firmware);
47070diff --git a/drivers/media/usb/dvb-usb/dw2102.c b/drivers/media/usb/dvb-usb/dw2102.c
47071index 1a3df10..57997a5 100644
47072--- a/drivers/media/usb/dvb-usb/dw2102.c
47073+++ b/drivers/media/usb/dvb-usb/dw2102.c
47074@@ -118,7 +118,7 @@ struct su3000_state {
47075
47076 struct s6x0_state {
47077 int (*old_set_voltage)(struct dvb_frontend *f, fe_sec_voltage_t v);
47078-};
47079+} __no_const;
47080
47081 /* debug */
47082 static int dvb_usb_dw2102_debug;
47083diff --git a/drivers/media/usb/dvb-usb/technisat-usb2.c b/drivers/media/usb/dvb-usb/technisat-usb2.c
47084index 5801ae7..83f71fa 100644
47085--- a/drivers/media/usb/dvb-usb/technisat-usb2.c
47086+++ b/drivers/media/usb/dvb-usb/technisat-usb2.c
47087@@ -87,8 +87,11 @@ struct technisat_usb2_state {
47088 static int technisat_usb2_i2c_access(struct usb_device *udev,
47089 u8 device_addr, u8 *tx, u8 txlen, u8 *rx, u8 rxlen)
47090 {
47091- u8 b[64];
47092- int ret, actual_length;
47093+ u8 *b = kmalloc(64, GFP_KERNEL);
47094+ int ret, actual_length, error = 0;
47095+
47096+ if (b == NULL)
47097+ return -ENOMEM;
47098
47099 deb_i2c("i2c-access: %02x, tx: ", device_addr);
47100 debug_dump(tx, txlen, deb_i2c);
47101@@ -121,7 +124,8 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
47102
47103 if (ret < 0) {
47104 err("i2c-error: out failed %02x = %d", device_addr, ret);
47105- return -ENODEV;
47106+ error = -ENODEV;
47107+ goto out;
47108 }
47109
47110 ret = usb_bulk_msg(udev,
47111@@ -129,7 +133,8 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
47112 b, 64, &actual_length, 1000);
47113 if (ret < 0) {
47114 err("i2c-error: in failed %02x = %d", device_addr, ret);
47115- return -ENODEV;
47116+ error = -ENODEV;
47117+ goto out;
47118 }
47119
47120 if (b[0] != I2C_STATUS_OK) {
47121@@ -137,8 +142,10 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
47122 /* handle tuner-i2c-nak */
47123 if (!(b[0] == I2C_STATUS_NAK &&
47124 device_addr == 0x60
47125- /* && device_is_technisat_usb2 */))
47126- return -ENODEV;
47127+ /* && device_is_technisat_usb2 */)) {
47128+ error = -ENODEV;
47129+ goto out;
47130+ }
47131 }
47132
47133 deb_i2c("status: %d, ", b[0]);
47134@@ -152,7 +159,9 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
47135
47136 deb_i2c("\n");
47137
47138- return 0;
47139+out:
47140+ kfree(b);
47141+ return error;
47142 }
47143
47144 static int technisat_usb2_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msg,
47145@@ -224,14 +233,16 @@ static int technisat_usb2_set_led(struct dvb_usb_device *d, int red, enum techni
47146 {
47147 int ret;
47148
47149- u8 led[8] = {
47150- red ? SET_RED_LED_VENDOR_REQUEST : SET_GREEN_LED_VENDOR_REQUEST,
47151- 0
47152- };
47153+ u8 *led = kzalloc(8, GFP_KERNEL);
47154+
47155+ if (led == NULL)
47156+ return -ENOMEM;
47157
47158 if (disable_led_control && state != TECH_LED_OFF)
47159 return 0;
47160
47161+ led[0] = red ? SET_RED_LED_VENDOR_REQUEST : SET_GREEN_LED_VENDOR_REQUEST;
47162+
47163 switch (state) {
47164 case TECH_LED_ON:
47165 led[1] = 0x82;
47166@@ -263,16 +274,22 @@ static int technisat_usb2_set_led(struct dvb_usb_device *d, int red, enum techni
47167 red ? SET_RED_LED_VENDOR_REQUEST : SET_GREEN_LED_VENDOR_REQUEST,
47168 USB_TYPE_VENDOR | USB_DIR_OUT,
47169 0, 0,
47170- led, sizeof(led), 500);
47171+ led, 8, 500);
47172
47173 mutex_unlock(&d->i2c_mutex);
47174+
47175+ kfree(led);
47176+
47177 return ret;
47178 }
47179
47180 static int technisat_usb2_set_led_timer(struct dvb_usb_device *d, u8 red, u8 green)
47181 {
47182 int ret;
47183- u8 b = 0;
47184+ u8 *b = kzalloc(1, GFP_KERNEL);
47185+
47186+ if (b == NULL)
47187+ return -ENOMEM;
47188
47189 if (mutex_lock_interruptible(&d->i2c_mutex) < 0)
47190 return -EAGAIN;
47191@@ -281,10 +298,12 @@ static int technisat_usb2_set_led_timer(struct dvb_usb_device *d, u8 red, u8 gre
47192 SET_LED_TIMER_DIVIDER_VENDOR_REQUEST,
47193 USB_TYPE_VENDOR | USB_DIR_OUT,
47194 (red << 8) | green, 0,
47195- &b, 1, 500);
47196+ b, 1, 500);
47197
47198 mutex_unlock(&d->i2c_mutex);
47199
47200+ kfree(b);
47201+
47202 return ret;
47203 }
47204
47205@@ -328,7 +347,7 @@ static int technisat_usb2_identify_state(struct usb_device *udev,
47206 struct dvb_usb_device_description **desc, int *cold)
47207 {
47208 int ret;
47209- u8 version[3];
47210+ u8 *version = kmalloc(3, GFP_KERNEL);
47211
47212 /* first select the interface */
47213 if (usb_set_interface(udev, 0, 1) != 0)
47214@@ -338,11 +357,14 @@ static int technisat_usb2_identify_state(struct usb_device *udev,
47215
47216 *cold = 0; /* by default do not download a firmware - just in case something is wrong */
47217
47218+ if (version == NULL)
47219+ return 0;
47220+
47221 ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
47222 GET_VERSION_INFO_VENDOR_REQUEST,
47223 USB_TYPE_VENDOR | USB_DIR_IN,
47224 0, 0,
47225- version, sizeof(version), 500);
47226+ version, 3, 500);
47227
47228 if (ret < 0)
47229 *cold = 1;
47230@@ -351,6 +373,8 @@ static int technisat_usb2_identify_state(struct usb_device *udev,
47231 *cold = 0;
47232 }
47233
47234+ kfree(version);
47235+
47236 return 0;
47237 }
47238
47239@@ -594,10 +618,15 @@ static int technisat_usb2_frontend_attach(struct dvb_usb_adapter *a)
47240
47241 static int technisat_usb2_get_ir(struct dvb_usb_device *d)
47242 {
47243- u8 buf[62], *b;
47244+ u8 *buf, *b;
47245 int ret;
47246 struct ir_raw_event ev;
47247
47248+ buf = kmalloc(62, GFP_KERNEL);
47249+
47250+ if (buf == NULL)
47251+ return -ENOMEM;
47252+
47253 buf[0] = GET_IR_DATA_VENDOR_REQUEST;
47254 buf[1] = 0x08;
47255 buf[2] = 0x8f;
47256@@ -620,16 +649,20 @@ static int technisat_usb2_get_ir(struct dvb_usb_device *d)
47257 GET_IR_DATA_VENDOR_REQUEST,
47258 USB_TYPE_VENDOR | USB_DIR_IN,
47259 0x8080, 0,
47260- buf, sizeof(buf), 500);
47261+ buf, 62, 500);
47262
47263 unlock:
47264 mutex_unlock(&d->i2c_mutex);
47265
47266- if (ret < 0)
47267+ if (ret < 0) {
47268+ kfree(buf);
47269 return ret;
47270+ }
47271
47272- if (ret == 1)
47273+ if (ret == 1) {
47274+ kfree(buf);
47275 return 0; /* no key pressed */
47276+ }
47277
47278 /* decoding */
47279 b = buf+1;
47280@@ -656,6 +689,8 @@ unlock:
47281
47282 ir_raw_event_handle(d->rc_dev);
47283
47284+ kfree(buf);
47285+
47286 return 1;
47287 }
47288
47289diff --git a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
47290index af63543..0436f20 100644
47291--- a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
47292+++ b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
47293@@ -429,7 +429,7 @@ static int get_v4l2_buffer32(struct v4l2_buffer *kp, struct v4l2_buffer32 __user
47294 * by passing a very big num_planes value */
47295 uplane = compat_alloc_user_space(num_planes *
47296 sizeof(struct v4l2_plane));
47297- kp->m.planes = (__force struct v4l2_plane *)uplane;
47298+ kp->m.planes = (__force_kernel struct v4l2_plane *)uplane;
47299
47300 while (--num_planes >= 0) {
47301 ret = get_v4l2_plane32(uplane, uplane32, kp->memory);
47302@@ -500,7 +500,7 @@ static int put_v4l2_buffer32(struct v4l2_buffer *kp, struct v4l2_buffer32 __user
47303 if (num_planes == 0)
47304 return 0;
47305
47306- uplane = (__force struct v4l2_plane __user *)kp->m.planes;
47307+ uplane = (struct v4l2_plane __force_user *)kp->m.planes;
47308 if (get_user(p, &up->m.planes))
47309 return -EFAULT;
47310 uplane32 = compat_ptr(p);
47311@@ -564,7 +564,7 @@ static int get_v4l2_framebuffer32(struct v4l2_framebuffer *kp, struct v4l2_frame
47312 get_user(kp->flags, &up->flags) ||
47313 copy_from_user(&kp->fmt, &up->fmt, sizeof(up->fmt)))
47314 return -EFAULT;
47315- kp->base = (__force void *)compat_ptr(tmp);
47316+ kp->base = (__force_kernel void *)compat_ptr(tmp);
47317 return 0;
47318 }
47319
47320@@ -669,7 +669,7 @@ static int get_v4l2_ext_controls32(struct v4l2_ext_controls *kp, struct v4l2_ext
47321 n * sizeof(struct v4l2_ext_control32)))
47322 return -EFAULT;
47323 kcontrols = compat_alloc_user_space(n * sizeof(struct v4l2_ext_control));
47324- kp->controls = (__force struct v4l2_ext_control *)kcontrols;
47325+ kp->controls = (__force_kernel struct v4l2_ext_control *)kcontrols;
47326 while (--n >= 0) {
47327 u32 id;
47328
47329@@ -696,7 +696,7 @@ static int put_v4l2_ext_controls32(struct v4l2_ext_controls *kp, struct v4l2_ext
47330 {
47331 struct v4l2_ext_control32 __user *ucontrols;
47332 struct v4l2_ext_control __user *kcontrols =
47333- (__force struct v4l2_ext_control __user *)kp->controls;
47334+ (struct v4l2_ext_control __force_user *)kp->controls;
47335 int n = kp->count;
47336 compat_caddr_t p;
47337
47338@@ -780,7 +780,7 @@ static int get_v4l2_edid32(struct v4l2_edid *kp, struct v4l2_edid32 __user *up)
47339 get_user(tmp, &up->edid) ||
47340 copy_from_user(kp->reserved, up->reserved, sizeof(kp->reserved)))
47341 return -EFAULT;
47342- kp->edid = (__force u8 *)compat_ptr(tmp);
47343+ kp->edid = (__force_kernel u8 *)compat_ptr(tmp);
47344 return 0;
47345 }
47346
47347diff --git a/drivers/media/v4l2-core/v4l2-device.c b/drivers/media/v4l2-core/v4l2-device.c
47348index 015f92a..59e311e 100644
47349--- a/drivers/media/v4l2-core/v4l2-device.c
47350+++ b/drivers/media/v4l2-core/v4l2-device.c
47351@@ -75,9 +75,9 @@ int v4l2_device_put(struct v4l2_device *v4l2_dev)
47352 EXPORT_SYMBOL_GPL(v4l2_device_put);
47353
47354 int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename,
47355- atomic_t *instance)
47356+ atomic_unchecked_t *instance)
47357 {
47358- int num = atomic_inc_return(instance) - 1;
47359+ int num = atomic_inc_return_unchecked(instance) - 1;
47360 int len = strlen(basename);
47361
47362 if (basename[len - 1] >= '0' && basename[len - 1] <= '9')
47363diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
47364index b084072..36706d7 100644
47365--- a/drivers/media/v4l2-core/v4l2-ioctl.c
47366+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
47367@@ -2151,7 +2151,8 @@ struct v4l2_ioctl_info {
47368 struct file *file, void *fh, void *p);
47369 } u;
47370 void (*debug)(const void *arg, bool write_only);
47371-};
47372+} __do_const;
47373+typedef struct v4l2_ioctl_info __no_const v4l2_ioctl_info_no_const;
47374
47375 /* This control needs a priority check */
47376 #define INFO_FL_PRIO (1 << 0)
47377@@ -2335,7 +2336,7 @@ static long __video_do_ioctl(struct file *file,
47378 struct video_device *vfd = video_devdata(file);
47379 const struct v4l2_ioctl_ops *ops = vfd->ioctl_ops;
47380 bool write_only = false;
47381- struct v4l2_ioctl_info default_info;
47382+ v4l2_ioctl_info_no_const default_info;
47383 const struct v4l2_ioctl_info *info;
47384 void *fh = file->private_data;
47385 struct v4l2_fh *vfh = NULL;
47386@@ -2426,7 +2427,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
47387 ret = -EINVAL;
47388 break;
47389 }
47390- *user_ptr = (void __user *)buf->m.planes;
47391+ *user_ptr = (void __force_user *)buf->m.planes;
47392 *kernel_ptr = (void **)&buf->m.planes;
47393 *array_size = sizeof(struct v4l2_plane) * buf->length;
47394 ret = 1;
47395@@ -2443,7 +2444,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
47396 ret = -EINVAL;
47397 break;
47398 }
47399- *user_ptr = (void __user *)edid->edid;
47400+ *user_ptr = (void __force_user *)edid->edid;
47401 *kernel_ptr = (void **)&edid->edid;
47402 *array_size = edid->blocks * 128;
47403 ret = 1;
47404@@ -2461,7 +2462,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
47405 ret = -EINVAL;
47406 break;
47407 }
47408- *user_ptr = (void __user *)ctrls->controls;
47409+ *user_ptr = (void __force_user *)ctrls->controls;
47410 *kernel_ptr = (void **)&ctrls->controls;
47411 *array_size = sizeof(struct v4l2_ext_control)
47412 * ctrls->count;
47413@@ -2562,7 +2563,7 @@ video_usercopy(struct file *file, unsigned int cmd, unsigned long arg,
47414 }
47415
47416 if (has_array_args) {
47417- *kernel_ptr = (void __force *)user_ptr;
47418+ *kernel_ptr = (void __force_kernel *)user_ptr;
47419 if (copy_to_user(user_ptr, mbuf, array_size))
47420 err = -EFAULT;
47421 goto out_array_args;
47422diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c
47423index 24696f5..3637780 100644
47424--- a/drivers/memory/omap-gpmc.c
47425+++ b/drivers/memory/omap-gpmc.c
47426@@ -211,7 +211,6 @@ struct omap3_gpmc_regs {
47427 };
47428
47429 static struct gpmc_client_irq gpmc_client_irq[GPMC_NR_IRQ];
47430-static struct irq_chip gpmc_irq_chip;
47431 static int gpmc_irq_start;
47432
47433 static struct resource gpmc_mem_root;
47434@@ -939,6 +938,17 @@ static void gpmc_irq_noop(struct irq_data *data) { }
47435
47436 static unsigned int gpmc_irq_noop_ret(struct irq_data *data) { return 0; }
47437
47438+static struct irq_chip gpmc_irq_chip = {
47439+ .name = "gpmc",
47440+ .irq_startup = gpmc_irq_noop_ret,
47441+ .irq_enable = gpmc_irq_enable,
47442+ .irq_disable = gpmc_irq_disable,
47443+ .irq_shutdown = gpmc_irq_noop,
47444+ .irq_ack = gpmc_irq_noop,
47445+ .irq_mask = gpmc_irq_noop,
47446+ .irq_unmask = gpmc_irq_noop,
47447+};
47448+
47449 static int gpmc_setup_irq(void)
47450 {
47451 int i;
47452@@ -953,15 +963,6 @@ static int gpmc_setup_irq(void)
47453 return gpmc_irq_start;
47454 }
47455
47456- gpmc_irq_chip.name = "gpmc";
47457- gpmc_irq_chip.irq_startup = gpmc_irq_noop_ret;
47458- gpmc_irq_chip.irq_enable = gpmc_irq_enable;
47459- gpmc_irq_chip.irq_disable = gpmc_irq_disable;
47460- gpmc_irq_chip.irq_shutdown = gpmc_irq_noop;
47461- gpmc_irq_chip.irq_ack = gpmc_irq_noop;
47462- gpmc_irq_chip.irq_mask = gpmc_irq_noop;
47463- gpmc_irq_chip.irq_unmask = gpmc_irq_noop;
47464-
47465 gpmc_client_irq[0].bitmask = GPMC_IRQ_FIFOEVENTENABLE;
47466 gpmc_client_irq[1].bitmask = GPMC_IRQ_COUNT_EVENT;
47467
47468diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
47469index 187f836..679544b 100644
47470--- a/drivers/message/fusion/mptbase.c
47471+++ b/drivers/message/fusion/mptbase.c
47472@@ -6746,8 +6746,13 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
47473 seq_printf(m, " MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth);
47474 seq_printf(m, " MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize);
47475
47476+#ifdef CONFIG_GRKERNSEC_HIDESYM
47477+ seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n", NULL, NULL);
47478+#else
47479 seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n",
47480 (void *)ioc->req_frames, (void *)(ulong)ioc->req_frames_dma);
47481+#endif
47482+
47483 /*
47484 * Rounding UP to nearest 4-kB boundary here...
47485 */
47486@@ -6760,7 +6765,11 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
47487 ioc->facts.GlobalCredits);
47488
47489 seq_printf(m, " Frames @ 0x%p (Dma @ 0x%p)\n",
47490+#ifdef CONFIG_GRKERNSEC_HIDESYM
47491+ NULL, NULL);
47492+#else
47493 (void *)ioc->alloc, (void *)(ulong)ioc->alloc_dma);
47494+#endif
47495 sz = (ioc->reply_sz * ioc->reply_depth) + 128;
47496 seq_printf(m, " {CurRepSz=%d} x {CurRepDepth=%d} = %d bytes ^= 0x%x\n",
47497 ioc->reply_sz, ioc->reply_depth, ioc->reply_sz*ioc->reply_depth, sz);
47498diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
47499index 5bdaae1..eced16f 100644
47500--- a/drivers/message/fusion/mptsas.c
47501+++ b/drivers/message/fusion/mptsas.c
47502@@ -446,6 +446,23 @@ mptsas_is_end_device(struct mptsas_devinfo * attached)
47503 return 0;
47504 }
47505
47506+static inline void
47507+mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
47508+{
47509+ if (phy_info->port_details) {
47510+ phy_info->port_details->rphy = rphy;
47511+ dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
47512+ ioc->name, rphy));
47513+ }
47514+
47515+ if (rphy) {
47516+ dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
47517+ &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
47518+ dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
47519+ ioc->name, rphy, rphy->dev.release));
47520+ }
47521+}
47522+
47523 /* no mutex */
47524 static void
47525 mptsas_port_delete(MPT_ADAPTER *ioc, struct mptsas_portinfo_details * port_details)
47526@@ -484,23 +501,6 @@ mptsas_get_rphy(struct mptsas_phyinfo *phy_info)
47527 return NULL;
47528 }
47529
47530-static inline void
47531-mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
47532-{
47533- if (phy_info->port_details) {
47534- phy_info->port_details->rphy = rphy;
47535- dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
47536- ioc->name, rphy));
47537- }
47538-
47539- if (rphy) {
47540- dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
47541- &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
47542- dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
47543- ioc->name, rphy, rphy->dev.release));
47544- }
47545-}
47546-
47547 static inline struct sas_port *
47548 mptsas_get_port(struct mptsas_phyinfo *phy_info)
47549 {
47550diff --git a/drivers/mfd/ab8500-debugfs.c b/drivers/mfd/ab8500-debugfs.c
47551index 9a8e185..27ff17d 100644
47552--- a/drivers/mfd/ab8500-debugfs.c
47553+++ b/drivers/mfd/ab8500-debugfs.c
47554@@ -100,7 +100,7 @@ static int irq_last;
47555 static u32 *irq_count;
47556 static int num_irqs;
47557
47558-static struct device_attribute **dev_attr;
47559+static device_attribute_no_const **dev_attr;
47560 static char **event_name;
47561
47562 static u8 avg_sample = SAMPLE_16;
47563diff --git a/drivers/mfd/kempld-core.c b/drivers/mfd/kempld-core.c
47564index 5615522..1eb6f3dc 100644
47565--- a/drivers/mfd/kempld-core.c
47566+++ b/drivers/mfd/kempld-core.c
47567@@ -499,7 +499,7 @@ static struct platform_driver kempld_driver = {
47568 .remove = kempld_remove,
47569 };
47570
47571-static struct dmi_system_id kempld_dmi_table[] __initdata = {
47572+static const struct dmi_system_id kempld_dmi_table[] __initconst = {
47573 {
47574 .ident = "BHL6",
47575 .matches = {
47576diff --git a/drivers/mfd/max8925-i2c.c b/drivers/mfd/max8925-i2c.c
47577index c880c89..45a7c68 100644
47578--- a/drivers/mfd/max8925-i2c.c
47579+++ b/drivers/mfd/max8925-i2c.c
47580@@ -152,7 +152,7 @@ static int max8925_probe(struct i2c_client *client,
47581 const struct i2c_device_id *id)
47582 {
47583 struct max8925_platform_data *pdata = dev_get_platdata(&client->dev);
47584- static struct max8925_chip *chip;
47585+ struct max8925_chip *chip;
47586 struct device_node *node = client->dev.of_node;
47587
47588 if (node && !pdata) {
47589diff --git a/drivers/mfd/tps65910.c b/drivers/mfd/tps65910.c
47590index 7612d89..70549c2 100644
47591--- a/drivers/mfd/tps65910.c
47592+++ b/drivers/mfd/tps65910.c
47593@@ -230,7 +230,7 @@ static int tps65910_irq_init(struct tps65910 *tps65910, int irq,
47594 struct tps65910_platform_data *pdata)
47595 {
47596 int ret = 0;
47597- static struct regmap_irq_chip *tps6591x_irqs_chip;
47598+ struct regmap_irq_chip *tps6591x_irqs_chip;
47599
47600 if (!irq) {
47601 dev_warn(tps65910->dev, "No interrupt support, no core IRQ\n");
47602diff --git a/drivers/mfd/twl4030-irq.c b/drivers/mfd/twl4030-irq.c
47603index 1b772ef..01e77d33 100644
47604--- a/drivers/mfd/twl4030-irq.c
47605+++ b/drivers/mfd/twl4030-irq.c
47606@@ -34,6 +34,7 @@
47607 #include <linux/of.h>
47608 #include <linux/irqdomain.h>
47609 #include <linux/i2c/twl.h>
47610+#include <asm/pgtable.h>
47611
47612 #include "twl-core.h"
47613
47614@@ -729,10 +730,12 @@ int twl4030_init_irq(struct device *dev, int irq_num)
47615 * Install an irq handler for each of the SIH modules;
47616 * clone dummy irq_chip since PIH can't *do* anything
47617 */
47618- twl4030_irq_chip = dummy_irq_chip;
47619- twl4030_irq_chip.name = "twl4030";
47620+ pax_open_kernel();
47621+ memcpy((void *)&twl4030_irq_chip, &dummy_irq_chip, sizeof twl4030_irq_chip);
47622+ *(const char **)&twl4030_irq_chip.name = "twl4030";
47623
47624- twl4030_sih_irq_chip.irq_ack = dummy_irq_chip.irq_ack;
47625+ *(void **)&twl4030_sih_irq_chip.irq_ack = dummy_irq_chip.irq_ack;
47626+ pax_close_kernel();
47627
47628 for (i = irq_base; i < irq_end; i++) {
47629 irq_set_chip_and_handler(i, &twl4030_irq_chip,
47630diff --git a/drivers/misc/c2port/core.c b/drivers/misc/c2port/core.c
47631index 464419b..64bae8d 100644
47632--- a/drivers/misc/c2port/core.c
47633+++ b/drivers/misc/c2port/core.c
47634@@ -922,7 +922,9 @@ struct c2port_device *c2port_device_register(char *name,
47635 goto error_idr_alloc;
47636 c2dev->id = ret;
47637
47638- bin_attr_flash_data.size = ops->blocks_num * ops->block_size;
47639+ pax_open_kernel();
47640+ *(size_t *)&bin_attr_flash_data.size = ops->blocks_num * ops->block_size;
47641+ pax_close_kernel();
47642
47643 c2dev->dev = device_create(c2port_class, NULL, 0, c2dev,
47644 "c2port%d", c2dev->id);
47645diff --git a/drivers/misc/eeprom/sunxi_sid.c b/drivers/misc/eeprom/sunxi_sid.c
47646index 8385177..2f54635 100644
47647--- a/drivers/misc/eeprom/sunxi_sid.c
47648+++ b/drivers/misc/eeprom/sunxi_sid.c
47649@@ -126,7 +126,9 @@ static int sunxi_sid_probe(struct platform_device *pdev)
47650
47651 platform_set_drvdata(pdev, sid_data);
47652
47653- sid_bin_attr.size = sid_data->keysize;
47654+ pax_open_kernel();
47655+ *(size_t *)&sid_bin_attr.size = sid_data->keysize;
47656+ pax_close_kernel();
47657 if (device_create_bin_file(&pdev->dev, &sid_bin_attr))
47658 return -ENODEV;
47659
47660diff --git a/drivers/misc/kgdbts.c b/drivers/misc/kgdbts.c
47661index 36f5d52..32311c3 100644
47662--- a/drivers/misc/kgdbts.c
47663+++ b/drivers/misc/kgdbts.c
47664@@ -834,7 +834,7 @@ static void run_plant_and_detach_test(int is_early)
47665 char before[BREAK_INSTR_SIZE];
47666 char after[BREAK_INSTR_SIZE];
47667
47668- probe_kernel_read(before, (char *)kgdbts_break_test,
47669+ probe_kernel_read(before, ktla_ktva((char *)kgdbts_break_test),
47670 BREAK_INSTR_SIZE);
47671 init_simple_test();
47672 ts.tst = plant_and_detach_test;
47673@@ -842,7 +842,7 @@ static void run_plant_and_detach_test(int is_early)
47674 /* Activate test with initial breakpoint */
47675 if (!is_early)
47676 kgdb_breakpoint();
47677- probe_kernel_read(after, (char *)kgdbts_break_test,
47678+ probe_kernel_read(after, ktla_ktva((char *)kgdbts_break_test),
47679 BREAK_INSTR_SIZE);
47680 if (memcmp(before, after, BREAK_INSTR_SIZE)) {
47681 printk(KERN_CRIT "kgdbts: ERROR kgdb corrupted memory\n");
47682diff --git a/drivers/misc/lis3lv02d/lis3lv02d.c b/drivers/misc/lis3lv02d/lis3lv02d.c
47683index 3ef4627..8d00486 100644
47684--- a/drivers/misc/lis3lv02d/lis3lv02d.c
47685+++ b/drivers/misc/lis3lv02d/lis3lv02d.c
47686@@ -497,7 +497,7 @@ static irqreturn_t lis302dl_interrupt(int irq, void *data)
47687 * the lid is closed. This leads to interrupts as soon as a little move
47688 * is done.
47689 */
47690- atomic_inc(&lis3->count);
47691+ atomic_inc_unchecked(&lis3->count);
47692
47693 wake_up_interruptible(&lis3->misc_wait);
47694 kill_fasync(&lis3->async_queue, SIGIO, POLL_IN);
47695@@ -583,7 +583,7 @@ static int lis3lv02d_misc_open(struct inode *inode, struct file *file)
47696 if (lis3->pm_dev)
47697 pm_runtime_get_sync(lis3->pm_dev);
47698
47699- atomic_set(&lis3->count, 0);
47700+ atomic_set_unchecked(&lis3->count, 0);
47701 return 0;
47702 }
47703
47704@@ -615,7 +615,7 @@ static ssize_t lis3lv02d_misc_read(struct file *file, char __user *buf,
47705 add_wait_queue(&lis3->misc_wait, &wait);
47706 while (true) {
47707 set_current_state(TASK_INTERRUPTIBLE);
47708- data = atomic_xchg(&lis3->count, 0);
47709+ data = atomic_xchg_unchecked(&lis3->count, 0);
47710 if (data)
47711 break;
47712
47713@@ -656,7 +656,7 @@ static unsigned int lis3lv02d_misc_poll(struct file *file, poll_table *wait)
47714 struct lis3lv02d, miscdev);
47715
47716 poll_wait(file, &lis3->misc_wait, wait);
47717- if (atomic_read(&lis3->count))
47718+ if (atomic_read_unchecked(&lis3->count))
47719 return POLLIN | POLLRDNORM;
47720 return 0;
47721 }
47722diff --git a/drivers/misc/lis3lv02d/lis3lv02d.h b/drivers/misc/lis3lv02d/lis3lv02d.h
47723index c439c82..1f20f57 100644
47724--- a/drivers/misc/lis3lv02d/lis3lv02d.h
47725+++ b/drivers/misc/lis3lv02d/lis3lv02d.h
47726@@ -297,7 +297,7 @@ struct lis3lv02d {
47727 struct input_polled_dev *idev; /* input device */
47728 struct platform_device *pdev; /* platform device */
47729 struct regulator_bulk_data regulators[2];
47730- atomic_t count; /* interrupt count after last read */
47731+ atomic_unchecked_t count; /* interrupt count after last read */
47732 union axis_conversion ac; /* hw -> logical axis */
47733 int mapped_btns[3];
47734
47735diff --git a/drivers/misc/sgi-gru/gruhandles.c b/drivers/misc/sgi-gru/gruhandles.c
47736index 2f30bad..c4c13d0 100644
47737--- a/drivers/misc/sgi-gru/gruhandles.c
47738+++ b/drivers/misc/sgi-gru/gruhandles.c
47739@@ -44,8 +44,8 @@ static void update_mcs_stats(enum mcs_op op, unsigned long clks)
47740 unsigned long nsec;
47741
47742 nsec = CLKS2NSEC(clks);
47743- atomic_long_inc(&mcs_op_statistics[op].count);
47744- atomic_long_add(nsec, &mcs_op_statistics[op].total);
47745+ atomic_long_inc_unchecked(&mcs_op_statistics[op].count);
47746+ atomic_long_add_unchecked(nsec, &mcs_op_statistics[op].total);
47747 if (mcs_op_statistics[op].max < nsec)
47748 mcs_op_statistics[op].max = nsec;
47749 }
47750diff --git a/drivers/misc/sgi-gru/gruprocfs.c b/drivers/misc/sgi-gru/gruprocfs.c
47751index 4f76359..cdfcb2e 100644
47752--- a/drivers/misc/sgi-gru/gruprocfs.c
47753+++ b/drivers/misc/sgi-gru/gruprocfs.c
47754@@ -32,9 +32,9 @@
47755
47756 #define printstat(s, f) printstat_val(s, &gru_stats.f, #f)
47757
47758-static void printstat_val(struct seq_file *s, atomic_long_t *v, char *id)
47759+static void printstat_val(struct seq_file *s, atomic_long_unchecked_t *v, char *id)
47760 {
47761- unsigned long val = atomic_long_read(v);
47762+ unsigned long val = atomic_long_read_unchecked(v);
47763
47764 seq_printf(s, "%16lu %s\n", val, id);
47765 }
47766@@ -134,8 +134,8 @@ static int mcs_statistics_show(struct seq_file *s, void *p)
47767
47768 seq_printf(s, "%-20s%12s%12s%12s\n", "#id", "count", "aver-clks", "max-clks");
47769 for (op = 0; op < mcsop_last; op++) {
47770- count = atomic_long_read(&mcs_op_statistics[op].count);
47771- total = atomic_long_read(&mcs_op_statistics[op].total);
47772+ count = atomic_long_read_unchecked(&mcs_op_statistics[op].count);
47773+ total = atomic_long_read_unchecked(&mcs_op_statistics[op].total);
47774 max = mcs_op_statistics[op].max;
47775 seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count,
47776 count ? total / count : 0, max);
47777diff --git a/drivers/misc/sgi-gru/grutables.h b/drivers/misc/sgi-gru/grutables.h
47778index 5c3ce24..4915ccb 100644
47779--- a/drivers/misc/sgi-gru/grutables.h
47780+++ b/drivers/misc/sgi-gru/grutables.h
47781@@ -167,82 +167,82 @@ extern unsigned int gru_max_gids;
47782 * GRU statistics.
47783 */
47784 struct gru_stats_s {
47785- atomic_long_t vdata_alloc;
47786- atomic_long_t vdata_free;
47787- atomic_long_t gts_alloc;
47788- atomic_long_t gts_free;
47789- atomic_long_t gms_alloc;
47790- atomic_long_t gms_free;
47791- atomic_long_t gts_double_allocate;
47792- atomic_long_t assign_context;
47793- atomic_long_t assign_context_failed;
47794- atomic_long_t free_context;
47795- atomic_long_t load_user_context;
47796- atomic_long_t load_kernel_context;
47797- atomic_long_t lock_kernel_context;
47798- atomic_long_t unlock_kernel_context;
47799- atomic_long_t steal_user_context;
47800- atomic_long_t steal_kernel_context;
47801- atomic_long_t steal_context_failed;
47802- atomic_long_t nopfn;
47803- atomic_long_t asid_new;
47804- atomic_long_t asid_next;
47805- atomic_long_t asid_wrap;
47806- atomic_long_t asid_reuse;
47807- atomic_long_t intr;
47808- atomic_long_t intr_cbr;
47809- atomic_long_t intr_tfh;
47810- atomic_long_t intr_spurious;
47811- atomic_long_t intr_mm_lock_failed;
47812- atomic_long_t call_os;
47813- atomic_long_t call_os_wait_queue;
47814- atomic_long_t user_flush_tlb;
47815- atomic_long_t user_unload_context;
47816- atomic_long_t user_exception;
47817- atomic_long_t set_context_option;
47818- atomic_long_t check_context_retarget_intr;
47819- atomic_long_t check_context_unload;
47820- atomic_long_t tlb_dropin;
47821- atomic_long_t tlb_preload_page;
47822- atomic_long_t tlb_dropin_fail_no_asid;
47823- atomic_long_t tlb_dropin_fail_upm;
47824- atomic_long_t tlb_dropin_fail_invalid;
47825- atomic_long_t tlb_dropin_fail_range_active;
47826- atomic_long_t tlb_dropin_fail_idle;
47827- atomic_long_t tlb_dropin_fail_fmm;
47828- atomic_long_t tlb_dropin_fail_no_exception;
47829- atomic_long_t tfh_stale_on_fault;
47830- atomic_long_t mmu_invalidate_range;
47831- atomic_long_t mmu_invalidate_page;
47832- atomic_long_t flush_tlb;
47833- atomic_long_t flush_tlb_gru;
47834- atomic_long_t flush_tlb_gru_tgh;
47835- atomic_long_t flush_tlb_gru_zero_asid;
47836+ atomic_long_unchecked_t vdata_alloc;
47837+ atomic_long_unchecked_t vdata_free;
47838+ atomic_long_unchecked_t gts_alloc;
47839+ atomic_long_unchecked_t gts_free;
47840+ atomic_long_unchecked_t gms_alloc;
47841+ atomic_long_unchecked_t gms_free;
47842+ atomic_long_unchecked_t gts_double_allocate;
47843+ atomic_long_unchecked_t assign_context;
47844+ atomic_long_unchecked_t assign_context_failed;
47845+ atomic_long_unchecked_t free_context;
47846+ atomic_long_unchecked_t load_user_context;
47847+ atomic_long_unchecked_t load_kernel_context;
47848+ atomic_long_unchecked_t lock_kernel_context;
47849+ atomic_long_unchecked_t unlock_kernel_context;
47850+ atomic_long_unchecked_t steal_user_context;
47851+ atomic_long_unchecked_t steal_kernel_context;
47852+ atomic_long_unchecked_t steal_context_failed;
47853+ atomic_long_unchecked_t nopfn;
47854+ atomic_long_unchecked_t asid_new;
47855+ atomic_long_unchecked_t asid_next;
47856+ atomic_long_unchecked_t asid_wrap;
47857+ atomic_long_unchecked_t asid_reuse;
47858+ atomic_long_unchecked_t intr;
47859+ atomic_long_unchecked_t intr_cbr;
47860+ atomic_long_unchecked_t intr_tfh;
47861+ atomic_long_unchecked_t intr_spurious;
47862+ atomic_long_unchecked_t intr_mm_lock_failed;
47863+ atomic_long_unchecked_t call_os;
47864+ atomic_long_unchecked_t call_os_wait_queue;
47865+ atomic_long_unchecked_t user_flush_tlb;
47866+ atomic_long_unchecked_t user_unload_context;
47867+ atomic_long_unchecked_t user_exception;
47868+ atomic_long_unchecked_t set_context_option;
47869+ atomic_long_unchecked_t check_context_retarget_intr;
47870+ atomic_long_unchecked_t check_context_unload;
47871+ atomic_long_unchecked_t tlb_dropin;
47872+ atomic_long_unchecked_t tlb_preload_page;
47873+ atomic_long_unchecked_t tlb_dropin_fail_no_asid;
47874+ atomic_long_unchecked_t tlb_dropin_fail_upm;
47875+ atomic_long_unchecked_t tlb_dropin_fail_invalid;
47876+ atomic_long_unchecked_t tlb_dropin_fail_range_active;
47877+ atomic_long_unchecked_t tlb_dropin_fail_idle;
47878+ atomic_long_unchecked_t tlb_dropin_fail_fmm;
47879+ atomic_long_unchecked_t tlb_dropin_fail_no_exception;
47880+ atomic_long_unchecked_t tfh_stale_on_fault;
47881+ atomic_long_unchecked_t mmu_invalidate_range;
47882+ atomic_long_unchecked_t mmu_invalidate_page;
47883+ atomic_long_unchecked_t flush_tlb;
47884+ atomic_long_unchecked_t flush_tlb_gru;
47885+ atomic_long_unchecked_t flush_tlb_gru_tgh;
47886+ atomic_long_unchecked_t flush_tlb_gru_zero_asid;
47887
47888- atomic_long_t copy_gpa;
47889- atomic_long_t read_gpa;
47890+ atomic_long_unchecked_t copy_gpa;
47891+ atomic_long_unchecked_t read_gpa;
47892
47893- atomic_long_t mesq_receive;
47894- atomic_long_t mesq_receive_none;
47895- atomic_long_t mesq_send;
47896- atomic_long_t mesq_send_failed;
47897- atomic_long_t mesq_noop;
47898- atomic_long_t mesq_send_unexpected_error;
47899- atomic_long_t mesq_send_lb_overflow;
47900- atomic_long_t mesq_send_qlimit_reached;
47901- atomic_long_t mesq_send_amo_nacked;
47902- atomic_long_t mesq_send_put_nacked;
47903- atomic_long_t mesq_page_overflow;
47904- atomic_long_t mesq_qf_locked;
47905- atomic_long_t mesq_qf_noop_not_full;
47906- atomic_long_t mesq_qf_switch_head_failed;
47907- atomic_long_t mesq_qf_unexpected_error;
47908- atomic_long_t mesq_noop_unexpected_error;
47909- atomic_long_t mesq_noop_lb_overflow;
47910- atomic_long_t mesq_noop_qlimit_reached;
47911- atomic_long_t mesq_noop_amo_nacked;
47912- atomic_long_t mesq_noop_put_nacked;
47913- atomic_long_t mesq_noop_page_overflow;
47914+ atomic_long_unchecked_t mesq_receive;
47915+ atomic_long_unchecked_t mesq_receive_none;
47916+ atomic_long_unchecked_t mesq_send;
47917+ atomic_long_unchecked_t mesq_send_failed;
47918+ atomic_long_unchecked_t mesq_noop;
47919+ atomic_long_unchecked_t mesq_send_unexpected_error;
47920+ atomic_long_unchecked_t mesq_send_lb_overflow;
47921+ atomic_long_unchecked_t mesq_send_qlimit_reached;
47922+ atomic_long_unchecked_t mesq_send_amo_nacked;
47923+ atomic_long_unchecked_t mesq_send_put_nacked;
47924+ atomic_long_unchecked_t mesq_page_overflow;
47925+ atomic_long_unchecked_t mesq_qf_locked;
47926+ atomic_long_unchecked_t mesq_qf_noop_not_full;
47927+ atomic_long_unchecked_t mesq_qf_switch_head_failed;
47928+ atomic_long_unchecked_t mesq_qf_unexpected_error;
47929+ atomic_long_unchecked_t mesq_noop_unexpected_error;
47930+ atomic_long_unchecked_t mesq_noop_lb_overflow;
47931+ atomic_long_unchecked_t mesq_noop_qlimit_reached;
47932+ atomic_long_unchecked_t mesq_noop_amo_nacked;
47933+ atomic_long_unchecked_t mesq_noop_put_nacked;
47934+ atomic_long_unchecked_t mesq_noop_page_overflow;
47935
47936 };
47937
47938@@ -251,8 +251,8 @@ enum mcs_op {cchop_allocate, cchop_start, cchop_interrupt, cchop_interrupt_sync,
47939 tghop_invalidate, mcsop_last};
47940
47941 struct mcs_op_statistic {
47942- atomic_long_t count;
47943- atomic_long_t total;
47944+ atomic_long_unchecked_t count;
47945+ atomic_long_unchecked_t total;
47946 unsigned long max;
47947 };
47948
47949@@ -275,7 +275,7 @@ extern struct mcs_op_statistic mcs_op_statistics[mcsop_last];
47950
47951 #define STAT(id) do { \
47952 if (gru_options & OPT_STATS) \
47953- atomic_long_inc(&gru_stats.id); \
47954+ atomic_long_inc_unchecked(&gru_stats.id); \
47955 } while (0)
47956
47957 #ifdef CONFIG_SGI_GRU_DEBUG
47958diff --git a/drivers/misc/sgi-xp/xp.h b/drivers/misc/sgi-xp/xp.h
47959index c862cd4..0d176fe 100644
47960--- a/drivers/misc/sgi-xp/xp.h
47961+++ b/drivers/misc/sgi-xp/xp.h
47962@@ -288,7 +288,7 @@ struct xpc_interface {
47963 xpc_notify_func, void *);
47964 void (*received) (short, int, void *);
47965 enum xp_retval (*partid_to_nasids) (short, void *);
47966-};
47967+} __no_const;
47968
47969 extern struct xpc_interface xpc_interface;
47970
47971diff --git a/drivers/misc/sgi-xp/xp_main.c b/drivers/misc/sgi-xp/xp_main.c
47972index 01be66d..e3a0c7e 100644
47973--- a/drivers/misc/sgi-xp/xp_main.c
47974+++ b/drivers/misc/sgi-xp/xp_main.c
47975@@ -78,13 +78,13 @@ xpc_notloaded(void)
47976 }
47977
47978 struct xpc_interface xpc_interface = {
47979- (void (*)(int))xpc_notloaded,
47980- (void (*)(int))xpc_notloaded,
47981- (enum xp_retval(*)(short, int, u32, void *, u16))xpc_notloaded,
47982- (enum xp_retval(*)(short, int, u32, void *, u16, xpc_notify_func,
47983+ .connect = (void (*)(int))xpc_notloaded,
47984+ .disconnect = (void (*)(int))xpc_notloaded,
47985+ .send = (enum xp_retval(*)(short, int, u32, void *, u16))xpc_notloaded,
47986+ .send_notify = (enum xp_retval(*)(short, int, u32, void *, u16, xpc_notify_func,
47987 void *))xpc_notloaded,
47988- (void (*)(short, int, void *))xpc_notloaded,
47989- (enum xp_retval(*)(short, void *))xpc_notloaded
47990+ .received = (void (*)(short, int, void *))xpc_notloaded,
47991+ .partid_to_nasids = (enum xp_retval(*)(short, void *))xpc_notloaded
47992 };
47993 EXPORT_SYMBOL_GPL(xpc_interface);
47994
47995diff --git a/drivers/misc/sgi-xp/xpc.h b/drivers/misc/sgi-xp/xpc.h
47996index b94d5f7..7f494c5 100644
47997--- a/drivers/misc/sgi-xp/xpc.h
47998+++ b/drivers/misc/sgi-xp/xpc.h
47999@@ -835,6 +835,7 @@ struct xpc_arch_operations {
48000 void (*received_payload) (struct xpc_channel *, void *);
48001 void (*notify_senders_of_disconnect) (struct xpc_channel *);
48002 };
48003+typedef struct xpc_arch_operations __no_const xpc_arch_operations_no_const;
48004
48005 /* struct xpc_partition act_state values (for XPC HB) */
48006
48007@@ -876,7 +877,7 @@ extern struct xpc_registration xpc_registrations[];
48008 /* found in xpc_main.c */
48009 extern struct device *xpc_part;
48010 extern struct device *xpc_chan;
48011-extern struct xpc_arch_operations xpc_arch_ops;
48012+extern xpc_arch_operations_no_const xpc_arch_ops;
48013 extern int xpc_disengage_timelimit;
48014 extern int xpc_disengage_timedout;
48015 extern int xpc_activate_IRQ_rcvd;
48016diff --git a/drivers/misc/sgi-xp/xpc_main.c b/drivers/misc/sgi-xp/xpc_main.c
48017index 82dc574..8539ab2 100644
48018--- a/drivers/misc/sgi-xp/xpc_main.c
48019+++ b/drivers/misc/sgi-xp/xpc_main.c
48020@@ -166,7 +166,7 @@ static struct notifier_block xpc_die_notifier = {
48021 .notifier_call = xpc_system_die,
48022 };
48023
48024-struct xpc_arch_operations xpc_arch_ops;
48025+xpc_arch_operations_no_const xpc_arch_ops;
48026
48027 /*
48028 * Timer function to enforce the timelimit on the partition disengage.
48029@@ -1210,7 +1210,7 @@ xpc_system_die(struct notifier_block *nb, unsigned long event, void *_die_args)
48030
48031 if (((die_args->trapnr == X86_TRAP_MF) ||
48032 (die_args->trapnr == X86_TRAP_XF)) &&
48033- !user_mode_vm(die_args->regs))
48034+ !user_mode(die_args->regs))
48035 xpc_die_deactivate();
48036
48037 break;
48038diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
48039index ed2e71a..54c498e 100644
48040--- a/drivers/mmc/card/block.c
48041+++ b/drivers/mmc/card/block.c
48042@@ -577,7 +577,7 @@ static int mmc_blk_ioctl_cmd(struct block_device *bdev,
48043 if (idata->ic.postsleep_min_us)
48044 usleep_range(idata->ic.postsleep_min_us, idata->ic.postsleep_max_us);
48045
48046- if (copy_to_user(&(ic_ptr->response), cmd.resp, sizeof(cmd.resp))) {
48047+ if (copy_to_user(ic_ptr->response, cmd.resp, sizeof(cmd.resp))) {
48048 err = -EFAULT;
48049 goto cmd_rel_host;
48050 }
48051diff --git a/drivers/mmc/host/dw_mmc.h b/drivers/mmc/host/dw_mmc.h
48052index 18c4afe..43be71e 100644
48053--- a/drivers/mmc/host/dw_mmc.h
48054+++ b/drivers/mmc/host/dw_mmc.h
48055@@ -271,5 +271,5 @@ struct dw_mci_drv_data {
48056 void (*set_ios)(struct dw_mci *host, struct mmc_ios *ios);
48057 int (*parse_dt)(struct dw_mci *host);
48058 int (*execute_tuning)(struct dw_mci_slot *slot);
48059-};
48060+} __do_const;
48061 #endif /* _DW_MMC_H_ */
48062diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
48063index 7fe1619..ae0781b 100644
48064--- a/drivers/mmc/host/mmci.c
48065+++ b/drivers/mmc/host/mmci.c
48066@@ -1630,7 +1630,9 @@ static int mmci_probe(struct amba_device *dev,
48067 mmc->caps |= MMC_CAP_CMD23;
48068
48069 if (variant->busy_detect) {
48070- mmci_ops.card_busy = mmci_card_busy;
48071+ pax_open_kernel();
48072+ *(void **)&mmci_ops.card_busy = mmci_card_busy;
48073+ pax_close_kernel();
48074 mmci_write_datactrlreg(host, MCI_ST_DPSM_BUSYMODE);
48075 mmc->caps |= MMC_CAP_WAIT_WHILE_BUSY;
48076 mmc->max_busy_timeout = 0;
48077diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
48078index f84cfb0..aebe5d6 100644
48079--- a/drivers/mmc/host/omap_hsmmc.c
48080+++ b/drivers/mmc/host/omap_hsmmc.c
48081@@ -2054,7 +2054,9 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
48082
48083 if (host->pdata->controller_flags & OMAP_HSMMC_BROKEN_MULTIBLOCK_READ) {
48084 dev_info(&pdev->dev, "multiblock reads disabled due to 35xx erratum 2.1.1.128; MMC read performance may suffer\n");
48085- omap_hsmmc_ops.multi_io_quirk = omap_hsmmc_multi_io_quirk;
48086+ pax_open_kernel();
48087+ *(void **)&omap_hsmmc_ops.multi_io_quirk = omap_hsmmc_multi_io_quirk;
48088+ pax_close_kernel();
48089 }
48090
48091 pm_runtime_enable(host->dev);
48092diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
48093index 10ef824..88461a2 100644
48094--- a/drivers/mmc/host/sdhci-esdhc-imx.c
48095+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
48096@@ -989,9 +989,12 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev)
48097 host->mmc->caps |= MMC_CAP_1_8V_DDR;
48098 }
48099
48100- if (imx_data->socdata->flags & ESDHC_FLAG_MAN_TUNING)
48101- sdhci_esdhc_ops.platform_execute_tuning =
48102+ if (imx_data->socdata->flags & ESDHC_FLAG_MAN_TUNING) {
48103+ pax_open_kernel();
48104+ *(void **)&sdhci_esdhc_ops.platform_execute_tuning =
48105 esdhc_executing_tuning;
48106+ pax_close_kernel();
48107+ }
48108
48109 if (imx_data->socdata->flags & ESDHC_FLAG_STD_TUNING)
48110 writel(readl(host->ioaddr + ESDHC_TUNING_CTRL) |
48111diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c
48112index c6d2dd7..81b1ca3 100644
48113--- a/drivers/mmc/host/sdhci-s3c.c
48114+++ b/drivers/mmc/host/sdhci-s3c.c
48115@@ -598,9 +598,11 @@ static int sdhci_s3c_probe(struct platform_device *pdev)
48116 * we can use overriding functions instead of default.
48117 */
48118 if (sc->no_divider) {
48119- sdhci_s3c_ops.set_clock = sdhci_cmu_set_clock;
48120- sdhci_s3c_ops.get_min_clock = sdhci_cmu_get_min_clock;
48121- sdhci_s3c_ops.get_max_clock = sdhci_cmu_get_max_clock;
48122+ pax_open_kernel();
48123+ *(void **)&sdhci_s3c_ops.set_clock = sdhci_cmu_set_clock;
48124+ *(void **)&sdhci_s3c_ops.get_min_clock = sdhci_cmu_get_min_clock;
48125+ *(void **)&sdhci_s3c_ops.get_max_clock = sdhci_cmu_get_max_clock;
48126+ pax_close_kernel();
48127 }
48128
48129 /* It supports additional host capabilities if needed */
48130diff --git a/drivers/mtd/chips/cfi_cmdset_0020.c b/drivers/mtd/chips/cfi_cmdset_0020.c
48131index 423666b..81ff5eb 100644
48132--- a/drivers/mtd/chips/cfi_cmdset_0020.c
48133+++ b/drivers/mtd/chips/cfi_cmdset_0020.c
48134@@ -666,7 +666,7 @@ cfi_staa_writev(struct mtd_info *mtd, const struct kvec *vecs,
48135 size_t totlen = 0, thislen;
48136 int ret = 0;
48137 size_t buflen = 0;
48138- static char *buffer;
48139+ char *buffer;
48140
48141 if (!ECCBUF_SIZE) {
48142 /* We should fall back to a general writev implementation.
48143diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c
48144index f44c606..aa4e804 100644
48145--- a/drivers/mtd/nand/denali.c
48146+++ b/drivers/mtd/nand/denali.c
48147@@ -24,6 +24,7 @@
48148 #include <linux/slab.h>
48149 #include <linux/mtd/mtd.h>
48150 #include <linux/module.h>
48151+#include <linux/slab.h>
48152
48153 #include "denali.h"
48154
48155diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
48156index 33f3c3c..d6bbe6a 100644
48157--- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
48158+++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
48159@@ -386,7 +386,7 @@ void prepare_data_dma(struct gpmi_nand_data *this, enum dma_data_direction dr)
48160
48161 /* first try to map the upper buffer directly */
48162 if (virt_addr_valid(this->upper_buf) &&
48163- !object_is_on_stack(this->upper_buf)) {
48164+ !object_starts_on_stack(this->upper_buf)) {
48165 sg_init_one(sgl, this->upper_buf, this->upper_len);
48166 ret = dma_map_sg(this->dev, sgl, 1, dr);
48167 if (ret == 0)
48168diff --git a/drivers/mtd/nftlmount.c b/drivers/mtd/nftlmount.c
48169index a5dfbfb..8042ab4 100644
48170--- a/drivers/mtd/nftlmount.c
48171+++ b/drivers/mtd/nftlmount.c
48172@@ -24,6 +24,7 @@
48173 #include <asm/errno.h>
48174 #include <linux/delay.h>
48175 #include <linux/slab.h>
48176+#include <linux/sched.h>
48177 #include <linux/mtd/mtd.h>
48178 #include <linux/mtd/nand.h>
48179 #include <linux/mtd/nftl.h>
48180diff --git a/drivers/mtd/sm_ftl.c b/drivers/mtd/sm_ftl.c
48181index c23184a..4115c41 100644
48182--- a/drivers/mtd/sm_ftl.c
48183+++ b/drivers/mtd/sm_ftl.c
48184@@ -56,7 +56,7 @@ static ssize_t sm_attr_show(struct device *dev, struct device_attribute *attr,
48185 #define SM_CIS_VENDOR_OFFSET 0x59
48186 static struct attribute_group *sm_create_sysfs_attributes(struct sm_ftl *ftl)
48187 {
48188- struct attribute_group *attr_group;
48189+ attribute_group_no_const *attr_group;
48190 struct attribute **attributes;
48191 struct sm_sysfs_attribute *vendor_attribute;
48192 char *vendor;
48193diff --git a/drivers/net/bonding/bond_netlink.c b/drivers/net/bonding/bond_netlink.c
48194index 7b11243..b3278a3 100644
48195--- a/drivers/net/bonding/bond_netlink.c
48196+++ b/drivers/net/bonding/bond_netlink.c
48197@@ -585,7 +585,7 @@ nla_put_failure:
48198 return -EMSGSIZE;
48199 }
48200
48201-struct rtnl_link_ops bond_link_ops __read_mostly = {
48202+struct rtnl_link_ops bond_link_ops = {
48203 .kind = "bond",
48204 .priv_size = sizeof(struct bonding),
48205 .setup = bond_setup,
48206diff --git a/drivers/net/caif/caif_hsi.c b/drivers/net/caif/caif_hsi.c
48207index b3b922a..80bba38 100644
48208--- a/drivers/net/caif/caif_hsi.c
48209+++ b/drivers/net/caif/caif_hsi.c
48210@@ -1444,7 +1444,7 @@ err:
48211 return -ENODEV;
48212 }
48213
48214-static struct rtnl_link_ops caif_hsi_link_ops __read_mostly = {
48215+static struct rtnl_link_ops caif_hsi_link_ops = {
48216 .kind = "cfhsi",
48217 .priv_size = sizeof(struct cfhsi),
48218 .setup = cfhsi_setup,
48219diff --git a/drivers/net/can/Kconfig b/drivers/net/can/Kconfig
48220index 58808f65..0bdc7b3 100644
48221--- a/drivers/net/can/Kconfig
48222+++ b/drivers/net/can/Kconfig
48223@@ -98,7 +98,7 @@ config CAN_JANZ_ICAN3
48224
48225 config CAN_FLEXCAN
48226 tristate "Support for Freescale FLEXCAN based chips"
48227- depends on ARM || PPC
48228+ depends on (ARM && CPU_LITTLE_ENDIAN) || PPC
48229 ---help---
48230 Say Y here if you want to support for Freescale FlexCAN.
48231
48232diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c
48233index b0f6924..59e9640 100644
48234--- a/drivers/net/can/dev.c
48235+++ b/drivers/net/can/dev.c
48236@@ -959,7 +959,7 @@ static int can_newlink(struct net *src_net, struct net_device *dev,
48237 return -EOPNOTSUPP;
48238 }
48239
48240-static struct rtnl_link_ops can_link_ops __read_mostly = {
48241+static struct rtnl_link_ops can_link_ops = {
48242 .kind = "can",
48243 .maxtype = IFLA_CAN_MAX,
48244 .policy = can_policy,
48245diff --git a/drivers/net/can/vcan.c b/drivers/net/can/vcan.c
48246index 674f367..ec3a31f 100644
48247--- a/drivers/net/can/vcan.c
48248+++ b/drivers/net/can/vcan.c
48249@@ -163,7 +163,7 @@ static void vcan_setup(struct net_device *dev)
48250 dev->destructor = free_netdev;
48251 }
48252
48253-static struct rtnl_link_ops vcan_link_ops __read_mostly = {
48254+static struct rtnl_link_ops vcan_link_ops = {
48255 .kind = "vcan",
48256 .setup = vcan_setup,
48257 };
48258diff --git a/drivers/net/dummy.c b/drivers/net/dummy.c
48259index 49adbf1..fff7ff8 100644
48260--- a/drivers/net/dummy.c
48261+++ b/drivers/net/dummy.c
48262@@ -164,7 +164,7 @@ static int dummy_validate(struct nlattr *tb[], struct nlattr *data[])
48263 return 0;
48264 }
48265
48266-static struct rtnl_link_ops dummy_link_ops __read_mostly = {
48267+static struct rtnl_link_ops dummy_link_ops = {
48268 .kind = DRV_NAME,
48269 .setup = dummy_setup,
48270 .validate = dummy_validate,
48271diff --git a/drivers/net/ethernet/8390/ax88796.c b/drivers/net/ethernet/8390/ax88796.c
48272index 0443654..4f0aa18 100644
48273--- a/drivers/net/ethernet/8390/ax88796.c
48274+++ b/drivers/net/ethernet/8390/ax88796.c
48275@@ -889,9 +889,11 @@ static int ax_probe(struct platform_device *pdev)
48276 if (ax->plat->reg_offsets)
48277 ei_local->reg_offset = ax->plat->reg_offsets;
48278 else {
48279+ resource_size_t _mem_size = mem_size;
48280+ do_div(_mem_size, 0x18);
48281 ei_local->reg_offset = ax->reg_offsets;
48282 for (ret = 0; ret < 0x18; ret++)
48283- ax->reg_offsets[ret] = (mem_size / 0x18) * ret;
48284+ ax->reg_offsets[ret] = _mem_size * ret;
48285 }
48286
48287 if (!request_mem_region(mem->start, mem_size, pdev->name)) {
48288diff --git a/drivers/net/ethernet/altera/altera_tse_main.c b/drivers/net/ethernet/altera/altera_tse_main.c
48289index 6725dc0..163549c 100644
48290--- a/drivers/net/ethernet/altera/altera_tse_main.c
48291+++ b/drivers/net/ethernet/altera/altera_tse_main.c
48292@@ -1216,7 +1216,7 @@ static int tse_shutdown(struct net_device *dev)
48293 return 0;
48294 }
48295
48296-static struct net_device_ops altera_tse_netdev_ops = {
48297+static net_device_ops_no_const altera_tse_netdev_ops __read_only = {
48298 .ndo_open = tse_open,
48299 .ndo_stop = tse_shutdown,
48300 .ndo_start_xmit = tse_start_xmit,
48301@@ -1453,11 +1453,13 @@ static int altera_tse_probe(struct platform_device *pdev)
48302 ndev->netdev_ops = &altera_tse_netdev_ops;
48303 altera_tse_set_ethtool_ops(ndev);
48304
48305+ pax_open_kernel();
48306 altera_tse_netdev_ops.ndo_set_rx_mode = tse_set_rx_mode;
48307
48308 if (priv->hash_filter)
48309 altera_tse_netdev_ops.ndo_set_rx_mode =
48310 tse_set_rx_mode_hashfilter;
48311+ pax_close_kernel();
48312
48313 /* Scatter/gather IO is not supported,
48314 * so it is turned off
48315diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-common.h b/drivers/net/ethernet/amd/xgbe/xgbe-common.h
48316index 29a0927..5a348e24 100644
48317--- a/drivers/net/ethernet/amd/xgbe/xgbe-common.h
48318+++ b/drivers/net/ethernet/amd/xgbe/xgbe-common.h
48319@@ -1122,14 +1122,14 @@ do { \
48320 * operations, everything works on mask values.
48321 */
48322 #define XMDIO_READ(_pdata, _mmd, _reg) \
48323- ((_pdata)->hw_if.read_mmd_regs((_pdata), 0, \
48324+ ((_pdata)->hw_if->read_mmd_regs((_pdata), 0, \
48325 MII_ADDR_C45 | (_mmd << 16) | ((_reg) & 0xffff)))
48326
48327 #define XMDIO_READ_BITS(_pdata, _mmd, _reg, _mask) \
48328 (XMDIO_READ((_pdata), _mmd, _reg) & _mask)
48329
48330 #define XMDIO_WRITE(_pdata, _mmd, _reg, _val) \
48331- ((_pdata)->hw_if.write_mmd_regs((_pdata), 0, \
48332+ ((_pdata)->hw_if->write_mmd_regs((_pdata), 0, \
48333 MII_ADDR_C45 | (_mmd << 16) | ((_reg) & 0xffff), (_val)))
48334
48335 #define XMDIO_WRITE_BITS(_pdata, _mmd, _reg, _mask, _val) \
48336diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c b/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c
48337index 8a50b01..39c1ad0 100644
48338--- a/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c
48339+++ b/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c
48340@@ -187,7 +187,7 @@ static int xgbe_dcb_ieee_setets(struct net_device *netdev,
48341
48342 memcpy(pdata->ets, ets, sizeof(*pdata->ets));
48343
48344- pdata->hw_if.config_dcb_tc(pdata);
48345+ pdata->hw_if->config_dcb_tc(pdata);
48346
48347 return 0;
48348 }
48349@@ -226,7 +226,7 @@ static int xgbe_dcb_ieee_setpfc(struct net_device *netdev,
48350
48351 memcpy(pdata->pfc, pfc, sizeof(*pdata->pfc));
48352
48353- pdata->hw_if.config_dcb_pfc(pdata);
48354+ pdata->hw_if->config_dcb_pfc(pdata);
48355
48356 return 0;
48357 }
48358diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-desc.c b/drivers/net/ethernet/amd/xgbe/xgbe-desc.c
48359index d81fc6b..6f8ab25 100644
48360--- a/drivers/net/ethernet/amd/xgbe/xgbe-desc.c
48361+++ b/drivers/net/ethernet/amd/xgbe/xgbe-desc.c
48362@@ -347,7 +347,7 @@ static int xgbe_map_rx_buffer(struct xgbe_prv_data *pdata,
48363
48364 static void xgbe_wrapper_tx_descriptor_init(struct xgbe_prv_data *pdata)
48365 {
48366- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48367+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48368 struct xgbe_channel *channel;
48369 struct xgbe_ring *ring;
48370 struct xgbe_ring_data *rdata;
48371@@ -388,7 +388,7 @@ static void xgbe_wrapper_tx_descriptor_init(struct xgbe_prv_data *pdata)
48372
48373 static void xgbe_wrapper_rx_descriptor_init(struct xgbe_prv_data *pdata)
48374 {
48375- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48376+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48377 struct xgbe_channel *channel;
48378 struct xgbe_ring *ring;
48379 struct xgbe_ring_desc *rdesc;
48380@@ -620,17 +620,12 @@ err_out:
48381 return 0;
48382 }
48383
48384-void xgbe_init_function_ptrs_desc(struct xgbe_desc_if *desc_if)
48385-{
48386- DBGPR("-->xgbe_init_function_ptrs_desc\n");
48387-
48388- desc_if->alloc_ring_resources = xgbe_alloc_ring_resources;
48389- desc_if->free_ring_resources = xgbe_free_ring_resources;
48390- desc_if->map_tx_skb = xgbe_map_tx_skb;
48391- desc_if->map_rx_buffer = xgbe_map_rx_buffer;
48392- desc_if->unmap_rdata = xgbe_unmap_rdata;
48393- desc_if->wrapper_tx_desc_init = xgbe_wrapper_tx_descriptor_init;
48394- desc_if->wrapper_rx_desc_init = xgbe_wrapper_rx_descriptor_init;
48395-
48396- DBGPR("<--xgbe_init_function_ptrs_desc\n");
48397-}
48398+const struct xgbe_desc_if default_xgbe_desc_if = {
48399+ .alloc_ring_resources = xgbe_alloc_ring_resources,
48400+ .free_ring_resources = xgbe_free_ring_resources,
48401+ .map_tx_skb = xgbe_map_tx_skb,
48402+ .map_rx_buffer = xgbe_map_rx_buffer,
48403+ .unmap_rdata = xgbe_unmap_rdata,
48404+ .wrapper_tx_desc_init = xgbe_wrapper_tx_descriptor_init,
48405+ .wrapper_rx_desc_init = xgbe_wrapper_rx_descriptor_init,
48406+};
48407diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
48408index 400757b..d8c53f6 100644
48409--- a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
48410+++ b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
48411@@ -2748,7 +2748,7 @@ static void xgbe_powerdown_rx(struct xgbe_prv_data *pdata)
48412
48413 static int xgbe_init(struct xgbe_prv_data *pdata)
48414 {
48415- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48416+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48417 int ret;
48418
48419 DBGPR("-->xgbe_init\n");
48420@@ -2813,108 +2813,103 @@ static int xgbe_init(struct xgbe_prv_data *pdata)
48421 return 0;
48422 }
48423
48424-void xgbe_init_function_ptrs_dev(struct xgbe_hw_if *hw_if)
48425-{
48426- DBGPR("-->xgbe_init_function_ptrs\n");
48427-
48428- hw_if->tx_complete = xgbe_tx_complete;
48429-
48430- hw_if->set_promiscuous_mode = xgbe_set_promiscuous_mode;
48431- hw_if->set_all_multicast_mode = xgbe_set_all_multicast_mode;
48432- hw_if->add_mac_addresses = xgbe_add_mac_addresses;
48433- hw_if->set_mac_address = xgbe_set_mac_address;
48434-
48435- hw_if->enable_rx_csum = xgbe_enable_rx_csum;
48436- hw_if->disable_rx_csum = xgbe_disable_rx_csum;
48437-
48438- hw_if->enable_rx_vlan_stripping = xgbe_enable_rx_vlan_stripping;
48439- hw_if->disable_rx_vlan_stripping = xgbe_disable_rx_vlan_stripping;
48440- hw_if->enable_rx_vlan_filtering = xgbe_enable_rx_vlan_filtering;
48441- hw_if->disable_rx_vlan_filtering = xgbe_disable_rx_vlan_filtering;
48442- hw_if->update_vlan_hash_table = xgbe_update_vlan_hash_table;
48443-
48444- hw_if->read_mmd_regs = xgbe_read_mmd_regs;
48445- hw_if->write_mmd_regs = xgbe_write_mmd_regs;
48446-
48447- hw_if->set_gmii_speed = xgbe_set_gmii_speed;
48448- hw_if->set_gmii_2500_speed = xgbe_set_gmii_2500_speed;
48449- hw_if->set_xgmii_speed = xgbe_set_xgmii_speed;
48450-
48451- hw_if->enable_tx = xgbe_enable_tx;
48452- hw_if->disable_tx = xgbe_disable_tx;
48453- hw_if->enable_rx = xgbe_enable_rx;
48454- hw_if->disable_rx = xgbe_disable_rx;
48455-
48456- hw_if->powerup_tx = xgbe_powerup_tx;
48457- hw_if->powerdown_tx = xgbe_powerdown_tx;
48458- hw_if->powerup_rx = xgbe_powerup_rx;
48459- hw_if->powerdown_rx = xgbe_powerdown_rx;
48460-
48461- hw_if->dev_xmit = xgbe_dev_xmit;
48462- hw_if->dev_read = xgbe_dev_read;
48463- hw_if->enable_int = xgbe_enable_int;
48464- hw_if->disable_int = xgbe_disable_int;
48465- hw_if->init = xgbe_init;
48466- hw_if->exit = xgbe_exit;
48467+const struct xgbe_hw_if default_xgbe_hw_if = {
48468+ .tx_complete = xgbe_tx_complete,
48469+
48470+ .set_promiscuous_mode = xgbe_set_promiscuous_mode,
48471+ .set_all_multicast_mode = xgbe_set_all_multicast_mode,
48472+ .add_mac_addresses = xgbe_add_mac_addresses,
48473+ .set_mac_address = xgbe_set_mac_address,
48474+
48475+ .enable_rx_csum = xgbe_enable_rx_csum,
48476+ .disable_rx_csum = xgbe_disable_rx_csum,
48477+
48478+ .enable_rx_vlan_stripping = xgbe_enable_rx_vlan_stripping,
48479+ .disable_rx_vlan_stripping = xgbe_disable_rx_vlan_stripping,
48480+ .enable_rx_vlan_filtering = xgbe_enable_rx_vlan_filtering,
48481+ .disable_rx_vlan_filtering = xgbe_disable_rx_vlan_filtering,
48482+ .update_vlan_hash_table = xgbe_update_vlan_hash_table,
48483+
48484+ .read_mmd_regs = xgbe_read_mmd_regs,
48485+ .write_mmd_regs = xgbe_write_mmd_regs,
48486+
48487+ .set_gmii_speed = xgbe_set_gmii_speed,
48488+ .set_gmii_2500_speed = xgbe_set_gmii_2500_speed,
48489+ .set_xgmii_speed = xgbe_set_xgmii_speed,
48490+
48491+ .enable_tx = xgbe_enable_tx,
48492+ .disable_tx = xgbe_disable_tx,
48493+ .enable_rx = xgbe_enable_rx,
48494+ .disable_rx = xgbe_disable_rx,
48495+
48496+ .powerup_tx = xgbe_powerup_tx,
48497+ .powerdown_tx = xgbe_powerdown_tx,
48498+ .powerup_rx = xgbe_powerup_rx,
48499+ .powerdown_rx = xgbe_powerdown_rx,
48500+
48501+ .dev_xmit = xgbe_dev_xmit,
48502+ .dev_read = xgbe_dev_read,
48503+ .enable_int = xgbe_enable_int,
48504+ .disable_int = xgbe_disable_int,
48505+ .init = xgbe_init,
48506+ .exit = xgbe_exit,
48507
48508 /* Descriptor related Sequences have to be initialized here */
48509- hw_if->tx_desc_init = xgbe_tx_desc_init;
48510- hw_if->rx_desc_init = xgbe_rx_desc_init;
48511- hw_if->tx_desc_reset = xgbe_tx_desc_reset;
48512- hw_if->rx_desc_reset = xgbe_rx_desc_reset;
48513- hw_if->is_last_desc = xgbe_is_last_desc;
48514- hw_if->is_context_desc = xgbe_is_context_desc;
48515- hw_if->tx_start_xmit = xgbe_tx_start_xmit;
48516+ .tx_desc_init = xgbe_tx_desc_init,
48517+ .rx_desc_init = xgbe_rx_desc_init,
48518+ .tx_desc_reset = xgbe_tx_desc_reset,
48519+ .rx_desc_reset = xgbe_rx_desc_reset,
48520+ .is_last_desc = xgbe_is_last_desc,
48521+ .is_context_desc = xgbe_is_context_desc,
48522+ .tx_start_xmit = xgbe_tx_start_xmit,
48523
48524 /* For FLOW ctrl */
48525- hw_if->config_tx_flow_control = xgbe_config_tx_flow_control;
48526- hw_if->config_rx_flow_control = xgbe_config_rx_flow_control;
48527+ .config_tx_flow_control = xgbe_config_tx_flow_control,
48528+ .config_rx_flow_control = xgbe_config_rx_flow_control,
48529
48530 /* For RX coalescing */
48531- hw_if->config_rx_coalesce = xgbe_config_rx_coalesce;
48532- hw_if->config_tx_coalesce = xgbe_config_tx_coalesce;
48533- hw_if->usec_to_riwt = xgbe_usec_to_riwt;
48534- hw_if->riwt_to_usec = xgbe_riwt_to_usec;
48535+ .config_rx_coalesce = xgbe_config_rx_coalesce,
48536+ .config_tx_coalesce = xgbe_config_tx_coalesce,
48537+ .usec_to_riwt = xgbe_usec_to_riwt,
48538+ .riwt_to_usec = xgbe_riwt_to_usec,
48539
48540 /* For RX and TX threshold config */
48541- hw_if->config_rx_threshold = xgbe_config_rx_threshold;
48542- hw_if->config_tx_threshold = xgbe_config_tx_threshold;
48543+ .config_rx_threshold = xgbe_config_rx_threshold,
48544+ .config_tx_threshold = xgbe_config_tx_threshold,
48545
48546 /* For RX and TX Store and Forward Mode config */
48547- hw_if->config_rsf_mode = xgbe_config_rsf_mode;
48548- hw_if->config_tsf_mode = xgbe_config_tsf_mode;
48549+ .config_rsf_mode = xgbe_config_rsf_mode,
48550+ .config_tsf_mode = xgbe_config_tsf_mode,
48551
48552 /* For TX DMA Operating on Second Frame config */
48553- hw_if->config_osp_mode = xgbe_config_osp_mode;
48554+ .config_osp_mode = xgbe_config_osp_mode,
48555
48556 /* For RX and TX PBL config */
48557- hw_if->config_rx_pbl_val = xgbe_config_rx_pbl_val;
48558- hw_if->get_rx_pbl_val = xgbe_get_rx_pbl_val;
48559- hw_if->config_tx_pbl_val = xgbe_config_tx_pbl_val;
48560- hw_if->get_tx_pbl_val = xgbe_get_tx_pbl_val;
48561- hw_if->config_pblx8 = xgbe_config_pblx8;
48562+ .config_rx_pbl_val = xgbe_config_rx_pbl_val,
48563+ .get_rx_pbl_val = xgbe_get_rx_pbl_val,
48564+ .config_tx_pbl_val = xgbe_config_tx_pbl_val,
48565+ .get_tx_pbl_val = xgbe_get_tx_pbl_val,
48566+ .config_pblx8 = xgbe_config_pblx8,
48567
48568 /* For MMC statistics support */
48569- hw_if->tx_mmc_int = xgbe_tx_mmc_int;
48570- hw_if->rx_mmc_int = xgbe_rx_mmc_int;
48571- hw_if->read_mmc_stats = xgbe_read_mmc_stats;
48572+ .tx_mmc_int = xgbe_tx_mmc_int,
48573+ .rx_mmc_int = xgbe_rx_mmc_int,
48574+ .read_mmc_stats = xgbe_read_mmc_stats,
48575
48576 /* For PTP config */
48577- hw_if->config_tstamp = xgbe_config_tstamp;
48578- hw_if->update_tstamp_addend = xgbe_update_tstamp_addend;
48579- hw_if->set_tstamp_time = xgbe_set_tstamp_time;
48580- hw_if->get_tstamp_time = xgbe_get_tstamp_time;
48581- hw_if->get_tx_tstamp = xgbe_get_tx_tstamp;
48582+ .config_tstamp = xgbe_config_tstamp,
48583+ .update_tstamp_addend = xgbe_update_tstamp_addend,
48584+ .set_tstamp_time = xgbe_set_tstamp_time,
48585+ .get_tstamp_time = xgbe_get_tstamp_time,
48586+ .get_tx_tstamp = xgbe_get_tx_tstamp,
48587
48588 /* For Data Center Bridging config */
48589- hw_if->config_dcb_tc = xgbe_config_dcb_tc;
48590- hw_if->config_dcb_pfc = xgbe_config_dcb_pfc;
48591+ .config_dcb_tc = xgbe_config_dcb_tc,
48592+ .config_dcb_pfc = xgbe_config_dcb_pfc,
48593
48594 /* For Receive Side Scaling */
48595- hw_if->enable_rss = xgbe_enable_rss;
48596- hw_if->disable_rss = xgbe_disable_rss;
48597- hw_if->set_rss_hash_key = xgbe_set_rss_hash_key;
48598- hw_if->set_rss_lookup_table = xgbe_set_rss_lookup_table;
48599-
48600- DBGPR("<--xgbe_init_function_ptrs\n");
48601-}
48602+ .enable_rss = xgbe_enable_rss,
48603+ .disable_rss = xgbe_disable_rss,
48604+ .set_rss_hash_key = xgbe_set_rss_hash_key,
48605+ .set_rss_lookup_table = xgbe_set_rss_lookup_table,
48606+};
48607diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
48608index 885b02b..4b31a4c 100644
48609--- a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
48610+++ b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
48611@@ -244,7 +244,7 @@ static int xgbe_maybe_stop_tx_queue(struct xgbe_channel *channel,
48612 * support, tell it now
48613 */
48614 if (ring->tx.xmit_more)
48615- pdata->hw_if.tx_start_xmit(channel, ring);
48616+ pdata->hw_if->tx_start_xmit(channel, ring);
48617
48618 return NETDEV_TX_BUSY;
48619 }
48620@@ -272,7 +272,7 @@ static int xgbe_calc_rx_buf_size(struct net_device *netdev, unsigned int mtu)
48621
48622 static void xgbe_enable_rx_tx_ints(struct xgbe_prv_data *pdata)
48623 {
48624- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48625+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48626 struct xgbe_channel *channel;
48627 enum xgbe_int int_id;
48628 unsigned int i;
48629@@ -294,7 +294,7 @@ static void xgbe_enable_rx_tx_ints(struct xgbe_prv_data *pdata)
48630
48631 static void xgbe_disable_rx_tx_ints(struct xgbe_prv_data *pdata)
48632 {
48633- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48634+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48635 struct xgbe_channel *channel;
48636 enum xgbe_int int_id;
48637 unsigned int i;
48638@@ -317,7 +317,7 @@ static void xgbe_disable_rx_tx_ints(struct xgbe_prv_data *pdata)
48639 static irqreturn_t xgbe_isr(int irq, void *data)
48640 {
48641 struct xgbe_prv_data *pdata = data;
48642- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48643+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48644 struct xgbe_channel *channel;
48645 unsigned int dma_isr, dma_ch_isr;
48646 unsigned int mac_isr, mac_tssr;
48647@@ -673,7 +673,7 @@ static void xgbe_free_irqs(struct xgbe_prv_data *pdata)
48648
48649 void xgbe_init_tx_coalesce(struct xgbe_prv_data *pdata)
48650 {
48651- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48652+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48653
48654 DBGPR("-->xgbe_init_tx_coalesce\n");
48655
48656@@ -687,7 +687,7 @@ void xgbe_init_tx_coalesce(struct xgbe_prv_data *pdata)
48657
48658 void xgbe_init_rx_coalesce(struct xgbe_prv_data *pdata)
48659 {
48660- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48661+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48662
48663 DBGPR("-->xgbe_init_rx_coalesce\n");
48664
48665@@ -701,7 +701,7 @@ void xgbe_init_rx_coalesce(struct xgbe_prv_data *pdata)
48666
48667 static void xgbe_free_tx_data(struct xgbe_prv_data *pdata)
48668 {
48669- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48670+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48671 struct xgbe_channel *channel;
48672 struct xgbe_ring *ring;
48673 struct xgbe_ring_data *rdata;
48674@@ -726,7 +726,7 @@ static void xgbe_free_tx_data(struct xgbe_prv_data *pdata)
48675
48676 static void xgbe_free_rx_data(struct xgbe_prv_data *pdata)
48677 {
48678- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48679+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48680 struct xgbe_channel *channel;
48681 struct xgbe_ring *ring;
48682 struct xgbe_ring_data *rdata;
48683@@ -752,7 +752,7 @@ static void xgbe_free_rx_data(struct xgbe_prv_data *pdata)
48684 static void xgbe_adjust_link(struct net_device *netdev)
48685 {
48686 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48687- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48688+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48689 struct phy_device *phydev = pdata->phydev;
48690 int new_state = 0;
48691
48692@@ -860,7 +860,7 @@ static void xgbe_phy_exit(struct xgbe_prv_data *pdata)
48693 int xgbe_powerdown(struct net_device *netdev, unsigned int caller)
48694 {
48695 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48696- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48697+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48698 unsigned long flags;
48699
48700 DBGPR("-->xgbe_powerdown\n");
48701@@ -898,7 +898,7 @@ int xgbe_powerdown(struct net_device *netdev, unsigned int caller)
48702 int xgbe_powerup(struct net_device *netdev, unsigned int caller)
48703 {
48704 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48705- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48706+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48707 unsigned long flags;
48708
48709 DBGPR("-->xgbe_powerup\n");
48710@@ -935,7 +935,7 @@ int xgbe_powerup(struct net_device *netdev, unsigned int caller)
48711
48712 static int xgbe_start(struct xgbe_prv_data *pdata)
48713 {
48714- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48715+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48716 struct net_device *netdev = pdata->netdev;
48717 int ret;
48718
48719@@ -976,7 +976,7 @@ err_napi:
48720
48721 static void xgbe_stop(struct xgbe_prv_data *pdata)
48722 {
48723- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48724+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48725 struct xgbe_channel *channel;
48726 struct net_device *netdev = pdata->netdev;
48727 struct netdev_queue *txq;
48728@@ -1203,7 +1203,7 @@ static int xgbe_set_hwtstamp_settings(struct xgbe_prv_data *pdata,
48729 return -ERANGE;
48730 }
48731
48732- pdata->hw_if.config_tstamp(pdata, mac_tscr);
48733+ pdata->hw_if->config_tstamp(pdata, mac_tscr);
48734
48735 memcpy(&pdata->tstamp_config, &config, sizeof(config));
48736
48737@@ -1352,7 +1352,7 @@ static void xgbe_packet_info(struct xgbe_prv_data *pdata,
48738 static int xgbe_open(struct net_device *netdev)
48739 {
48740 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48741- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48742+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48743 int ret;
48744
48745 DBGPR("-->xgbe_open\n");
48746@@ -1424,7 +1424,7 @@ err_phy_init:
48747 static int xgbe_close(struct net_device *netdev)
48748 {
48749 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48750- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48751+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48752
48753 DBGPR("-->xgbe_close\n");
48754
48755@@ -1452,8 +1452,8 @@ static int xgbe_close(struct net_device *netdev)
48756 static int xgbe_xmit(struct sk_buff *skb, struct net_device *netdev)
48757 {
48758 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48759- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48760- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48761+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48762+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48763 struct xgbe_channel *channel;
48764 struct xgbe_ring *ring;
48765 struct xgbe_packet_data *packet;
48766@@ -1521,7 +1521,7 @@ tx_netdev_return:
48767 static void xgbe_set_rx_mode(struct net_device *netdev)
48768 {
48769 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48770- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48771+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48772 unsigned int pr_mode, am_mode;
48773
48774 DBGPR("-->xgbe_set_rx_mode\n");
48775@@ -1540,7 +1540,7 @@ static void xgbe_set_rx_mode(struct net_device *netdev)
48776 static int xgbe_set_mac_address(struct net_device *netdev, void *addr)
48777 {
48778 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48779- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48780+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48781 struct sockaddr *saddr = addr;
48782
48783 DBGPR("-->xgbe_set_mac_address\n");
48784@@ -1607,7 +1607,7 @@ static struct rtnl_link_stats64 *xgbe_get_stats64(struct net_device *netdev,
48785
48786 DBGPR("-->%s\n", __func__);
48787
48788- pdata->hw_if.read_mmc_stats(pdata);
48789+ pdata->hw_if->read_mmc_stats(pdata);
48790
48791 s->rx_packets = pstats->rxframecount_gb;
48792 s->rx_bytes = pstats->rxoctetcount_gb;
48793@@ -1634,7 +1634,7 @@ static int xgbe_vlan_rx_add_vid(struct net_device *netdev, __be16 proto,
48794 u16 vid)
48795 {
48796 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48797- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48798+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48799
48800 DBGPR("-->%s\n", __func__);
48801
48802@@ -1650,7 +1650,7 @@ static int xgbe_vlan_rx_kill_vid(struct net_device *netdev, __be16 proto,
48803 u16 vid)
48804 {
48805 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48806- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48807+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48808
48809 DBGPR("-->%s\n", __func__);
48810
48811@@ -1716,7 +1716,7 @@ static int xgbe_set_features(struct net_device *netdev,
48812 netdev_features_t features)
48813 {
48814 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48815- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48816+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48817 netdev_features_t rxhash, rxcsum, rxvlan, rxvlan_filter;
48818 int ret = 0;
48819
48820@@ -1781,8 +1781,8 @@ struct net_device_ops *xgbe_get_netdev_ops(void)
48821 static void xgbe_rx_refresh(struct xgbe_channel *channel)
48822 {
48823 struct xgbe_prv_data *pdata = channel->pdata;
48824- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48825- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48826+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48827+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48828 struct xgbe_ring *ring = channel->rx_ring;
48829 struct xgbe_ring_data *rdata;
48830
48831@@ -1835,8 +1835,8 @@ static struct sk_buff *xgbe_create_skb(struct xgbe_prv_data *pdata,
48832 static int xgbe_tx_poll(struct xgbe_channel *channel)
48833 {
48834 struct xgbe_prv_data *pdata = channel->pdata;
48835- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48836- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48837+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48838+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48839 struct xgbe_ring *ring = channel->tx_ring;
48840 struct xgbe_ring_data *rdata;
48841 struct xgbe_ring_desc *rdesc;
48842@@ -1901,7 +1901,7 @@ static int xgbe_tx_poll(struct xgbe_channel *channel)
48843 static int xgbe_rx_poll(struct xgbe_channel *channel, int budget)
48844 {
48845 struct xgbe_prv_data *pdata = channel->pdata;
48846- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48847+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48848 struct xgbe_ring *ring = channel->rx_ring;
48849 struct xgbe_ring_data *rdata;
48850 struct xgbe_packet_data *packet;
48851diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c b/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
48852index ebf4893..a8f51c6 100644
48853--- a/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
48854+++ b/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
48855@@ -203,7 +203,7 @@ static void xgbe_get_ethtool_stats(struct net_device *netdev,
48856
48857 DBGPR("-->%s\n", __func__);
48858
48859- pdata->hw_if.read_mmc_stats(pdata);
48860+ pdata->hw_if->read_mmc_stats(pdata);
48861 for (i = 0; i < XGBE_STATS_COUNT; i++) {
48862 stat = (u8 *)pdata + xgbe_gstring_stats[i].stat_offset;
48863 *data++ = *(u64 *)stat;
48864@@ -378,7 +378,7 @@ static int xgbe_get_coalesce(struct net_device *netdev,
48865 struct ethtool_coalesce *ec)
48866 {
48867 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48868- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48869+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48870 unsigned int riwt;
48871
48872 DBGPR("-->xgbe_get_coalesce\n");
48873@@ -401,7 +401,7 @@ static int xgbe_set_coalesce(struct net_device *netdev,
48874 struct ethtool_coalesce *ec)
48875 {
48876 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48877- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48878+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48879 unsigned int rx_frames, rx_riwt, rx_usecs;
48880 unsigned int tx_frames, tx_usecs;
48881
48882@@ -536,7 +536,7 @@ static int xgbe_set_rxfh(struct net_device *netdev, const u32 *indir,
48883 const u8 *key, const u8 hfunc)
48884 {
48885 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48886- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48887+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48888 unsigned int ret;
48889
48890 if (hfunc != ETH_RSS_HASH_NO_CHANGE && hfunc != ETH_RSS_HASH_TOP)
48891diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-main.c b/drivers/net/ethernet/amd/xgbe/xgbe-main.c
48892index 32dd651..225cca3 100644
48893--- a/drivers/net/ethernet/amd/xgbe/xgbe-main.c
48894+++ b/drivers/net/ethernet/amd/xgbe/xgbe-main.c
48895@@ -159,12 +159,6 @@ static void xgbe_default_config(struct xgbe_prv_data *pdata)
48896 DBGPR("<--xgbe_default_config\n");
48897 }
48898
48899-static void xgbe_init_all_fptrs(struct xgbe_prv_data *pdata)
48900-{
48901- xgbe_init_function_ptrs_dev(&pdata->hw_if);
48902- xgbe_init_function_ptrs_desc(&pdata->desc_if);
48903-}
48904-
48905 #ifdef CONFIG_ACPI
48906 static int xgbe_acpi_support(struct xgbe_prv_data *pdata)
48907 {
48908@@ -396,9 +390,8 @@ static int xgbe_probe(struct platform_device *pdev)
48909 memcpy(netdev->dev_addr, pdata->mac_addr, netdev->addr_len);
48910
48911 /* Set all the function pointers */
48912- xgbe_init_all_fptrs(pdata);
48913- hw_if = &pdata->hw_if;
48914- desc_if = &pdata->desc_if;
48915+ hw_if = pdata->hw_if = &default_xgbe_hw_if;
48916+ desc_if = pdata->desc_if = &default_xgbe_desc_if;
48917
48918 /* Issue software reset to device */
48919 hw_if->exit(pdata);
48920diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c b/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
48921index 59e267f..0842a88 100644
48922--- a/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
48923+++ b/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
48924@@ -126,7 +126,7 @@
48925 static int xgbe_mdio_read(struct mii_bus *mii, int prtad, int mmd_reg)
48926 {
48927 struct xgbe_prv_data *pdata = mii->priv;
48928- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48929+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48930 int mmd_data;
48931
48932 DBGPR_MDIO("-->xgbe_mdio_read: prtad=%#x mmd_reg=%#x\n",
48933@@ -143,7 +143,7 @@ static int xgbe_mdio_write(struct mii_bus *mii, int prtad, int mmd_reg,
48934 u16 mmd_val)
48935 {
48936 struct xgbe_prv_data *pdata = mii->priv;
48937- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48938+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48939 int mmd_data = mmd_val;
48940
48941 DBGPR_MDIO("-->xgbe_mdio_write: prtad=%#x mmd_reg=%#x mmd_data=%#x\n",
48942diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c b/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c
48943index f326178..8bd7daf 100644
48944--- a/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c
48945+++ b/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c
48946@@ -129,7 +129,7 @@ static cycle_t xgbe_cc_read(const struct cyclecounter *cc)
48947 tstamp_cc);
48948 u64 nsec;
48949
48950- nsec = pdata->hw_if.get_tstamp_time(pdata);
48951+ nsec = pdata->hw_if->get_tstamp_time(pdata);
48952
48953 return nsec;
48954 }
48955@@ -158,7 +158,7 @@ static int xgbe_adjfreq(struct ptp_clock_info *info, s32 delta)
48956
48957 spin_lock_irqsave(&pdata->tstamp_lock, flags);
48958
48959- pdata->hw_if.update_tstamp_addend(pdata, addend);
48960+ pdata->hw_if->update_tstamp_addend(pdata, addend);
48961
48962 spin_unlock_irqrestore(&pdata->tstamp_lock, flags);
48963
48964diff --git a/drivers/net/ethernet/amd/xgbe/xgbe.h b/drivers/net/ethernet/amd/xgbe/xgbe.h
48965index 13e8f95..1d8beef 100644
48966--- a/drivers/net/ethernet/amd/xgbe/xgbe.h
48967+++ b/drivers/net/ethernet/amd/xgbe/xgbe.h
48968@@ -675,8 +675,8 @@ struct xgbe_prv_data {
48969 int dev_irq;
48970 unsigned int per_channel_irq;
48971
48972- struct xgbe_hw_if hw_if;
48973- struct xgbe_desc_if desc_if;
48974+ struct xgbe_hw_if *hw_if;
48975+ struct xgbe_desc_if *desc_if;
48976
48977 /* AXI DMA settings */
48978 unsigned int coherent;
48979@@ -798,6 +798,9 @@ struct xgbe_prv_data {
48980 #endif
48981 };
48982
48983+extern const struct xgbe_hw_if default_xgbe_hw_if;
48984+extern const struct xgbe_desc_if default_xgbe_desc_if;
48985+
48986 /* Function prototypes*/
48987
48988 void xgbe_init_function_ptrs_dev(struct xgbe_hw_if *);
48989diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
48990index adcacda..fa6e0ae 100644
48991--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
48992+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
48993@@ -1065,7 +1065,7 @@ static inline u8 bnx2x_get_path_func_num(struct bnx2x *bp)
48994 static inline void bnx2x_init_bp_objs(struct bnx2x *bp)
48995 {
48996 /* RX_MODE controlling object */
48997- bnx2x_init_rx_mode_obj(bp, &bp->rx_mode_obj);
48998+ bnx2x_init_rx_mode_obj(bp);
48999
49000 /* multicast configuration controlling object */
49001 bnx2x_init_mcast_obj(bp, &bp->mcast_obj, bp->fp->cl_id, bp->fp->cid,
49002diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
49003index 07cdf9b..b08ecc7 100644
49004--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
49005+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
49006@@ -2329,15 +2329,14 @@ int bnx2x_config_rx_mode(struct bnx2x *bp,
49007 return rc;
49008 }
49009
49010-void bnx2x_init_rx_mode_obj(struct bnx2x *bp,
49011- struct bnx2x_rx_mode_obj *o)
49012+void bnx2x_init_rx_mode_obj(struct bnx2x *bp)
49013 {
49014 if (CHIP_IS_E1x(bp)) {
49015- o->wait_comp = bnx2x_empty_rx_mode_wait;
49016- o->config_rx_mode = bnx2x_set_rx_mode_e1x;
49017+ bp->rx_mode_obj.wait_comp = bnx2x_empty_rx_mode_wait;
49018+ bp->rx_mode_obj.config_rx_mode = bnx2x_set_rx_mode_e1x;
49019 } else {
49020- o->wait_comp = bnx2x_wait_rx_mode_comp_e2;
49021- o->config_rx_mode = bnx2x_set_rx_mode_e2;
49022+ bp->rx_mode_obj.wait_comp = bnx2x_wait_rx_mode_comp_e2;
49023+ bp->rx_mode_obj.config_rx_mode = bnx2x_set_rx_mode_e2;
49024 }
49025 }
49026
49027diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
49028index 86baecb..ff3bb46 100644
49029--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
49030+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
49031@@ -1411,8 +1411,7 @@ int bnx2x_vlan_mac_move(struct bnx2x *bp,
49032
49033 /********************* RX MODE ****************/
49034
49035-void bnx2x_init_rx_mode_obj(struct bnx2x *bp,
49036- struct bnx2x_rx_mode_obj *o);
49037+void bnx2x_init_rx_mode_obj(struct bnx2x *bp);
49038
49039 /**
49040 * bnx2x_config_rx_mode - Send and RX_MODE ramrod according to the provided parameters.
49041diff --git a/drivers/net/ethernet/broadcom/tg3.h b/drivers/net/ethernet/broadcom/tg3.h
49042index 31c9f82..e65e986 100644
49043--- a/drivers/net/ethernet/broadcom/tg3.h
49044+++ b/drivers/net/ethernet/broadcom/tg3.h
49045@@ -150,6 +150,7 @@
49046 #define CHIPREV_ID_5750_A0 0x4000
49047 #define CHIPREV_ID_5750_A1 0x4001
49048 #define CHIPREV_ID_5750_A3 0x4003
49049+#define CHIPREV_ID_5750_C1 0x4201
49050 #define CHIPREV_ID_5750_C2 0x4202
49051 #define CHIPREV_ID_5752_A0_HW 0x5000
49052 #define CHIPREV_ID_5752_A0 0x6000
49053diff --git a/drivers/net/ethernet/brocade/bna/bna_enet.c b/drivers/net/ethernet/brocade/bna/bna_enet.c
49054index 903466e..b285864 100644
49055--- a/drivers/net/ethernet/brocade/bna/bna_enet.c
49056+++ b/drivers/net/ethernet/brocade/bna/bna_enet.c
49057@@ -1693,10 +1693,10 @@ bna_cb_ioceth_reset(void *arg)
49058 }
49059
49060 static struct bfa_ioc_cbfn bna_ioceth_cbfn = {
49061- bna_cb_ioceth_enable,
49062- bna_cb_ioceth_disable,
49063- bna_cb_ioceth_hbfail,
49064- bna_cb_ioceth_reset
49065+ .enable_cbfn = bna_cb_ioceth_enable,
49066+ .disable_cbfn = bna_cb_ioceth_disable,
49067+ .hbfail_cbfn = bna_cb_ioceth_hbfail,
49068+ .reset_cbfn = bna_cb_ioceth_reset
49069 };
49070
49071 static void bna_attr_init(struct bna_ioceth *ioceth)
49072diff --git a/drivers/net/ethernet/chelsio/cxgb3/l2t.h b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
49073index 8cffcdf..aadf043 100644
49074--- a/drivers/net/ethernet/chelsio/cxgb3/l2t.h
49075+++ b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
49076@@ -87,7 +87,7 @@ typedef void (*arp_failure_handler_func)(struct t3cdev * dev,
49077 */
49078 struct l2t_skb_cb {
49079 arp_failure_handler_func arp_failure_handler;
49080-};
49081+} __no_const;
49082
49083 #define L2T_SKB_CB(skb) ((struct l2t_skb_cb *)(skb)->cb)
49084
49085diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
49086index d929951..a2c23f5 100644
49087--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
49088+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
49089@@ -2215,7 +2215,7 @@ static void get_regs(struct net_device *dev, struct ethtool_regs *regs,
49090
49091 int i;
49092 struct adapter *ap = netdev2adap(dev);
49093- static const unsigned int *reg_ranges;
49094+ const unsigned int *reg_ranges;
49095 int arr_size = 0, buf_size = 0;
49096
49097 if (is_t4(ap->params.chip)) {
49098diff --git a/drivers/net/ethernet/dec/tulip/de4x5.c b/drivers/net/ethernet/dec/tulip/de4x5.c
49099index badff18..e15c4ec 100644
49100--- a/drivers/net/ethernet/dec/tulip/de4x5.c
49101+++ b/drivers/net/ethernet/dec/tulip/de4x5.c
49102@@ -5373,7 +5373,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
49103 for (i=0; i<ETH_ALEN; i++) {
49104 tmp.addr[i] = dev->dev_addr[i];
49105 }
49106- if (copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
49107+ if (ioc->len > sizeof tmp.addr || copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
49108 break;
49109
49110 case DE4X5_SET_HWADDR: /* Set the hardware address */
49111@@ -5413,7 +5413,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
49112 spin_lock_irqsave(&lp->lock, flags);
49113 memcpy(&statbuf, &lp->pktStats, ioc->len);
49114 spin_unlock_irqrestore(&lp->lock, flags);
49115- if (copy_to_user(ioc->data, &statbuf, ioc->len))
49116+ if (ioc->len > sizeof statbuf || copy_to_user(ioc->data, &statbuf, ioc->len))
49117 return -EFAULT;
49118 break;
49119 }
49120diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
49121index 893753f..3b5d790 100644
49122--- a/drivers/net/ethernet/emulex/benet/be_main.c
49123+++ b/drivers/net/ethernet/emulex/benet/be_main.c
49124@@ -536,7 +536,7 @@ static void accumulate_16bit_val(u32 *acc, u16 val)
49125
49126 if (wrapped)
49127 newacc += 65536;
49128- ACCESS_ONCE(*acc) = newacc;
49129+ ACCESS_ONCE_RW(*acc) = newacc;
49130 }
49131
49132 static void populate_erx_stats(struct be_adapter *adapter,
49133diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
49134index 6d0c5d5..55be363 100644
49135--- a/drivers/net/ethernet/faraday/ftgmac100.c
49136+++ b/drivers/net/ethernet/faraday/ftgmac100.c
49137@@ -30,6 +30,8 @@
49138 #include <linux/netdevice.h>
49139 #include <linux/phy.h>
49140 #include <linux/platform_device.h>
49141+#include <linux/interrupt.h>
49142+#include <linux/irqreturn.h>
49143 #include <net/ip.h>
49144
49145 #include "ftgmac100.h"
49146diff --git a/drivers/net/ethernet/faraday/ftmac100.c b/drivers/net/ethernet/faraday/ftmac100.c
49147index dce5f7b..2433466 100644
49148--- a/drivers/net/ethernet/faraday/ftmac100.c
49149+++ b/drivers/net/ethernet/faraday/ftmac100.c
49150@@ -31,6 +31,8 @@
49151 #include <linux/module.h>
49152 #include <linux/netdevice.h>
49153 #include <linux/platform_device.h>
49154+#include <linux/interrupt.h>
49155+#include <linux/irqreturn.h>
49156
49157 #include "ftmac100.h"
49158
49159diff --git a/drivers/net/ethernet/intel/i40e/i40e_ptp.c b/drivers/net/ethernet/intel/i40e/i40e_ptp.c
49160index fabcfa1..188fd22 100644
49161--- a/drivers/net/ethernet/intel/i40e/i40e_ptp.c
49162+++ b/drivers/net/ethernet/intel/i40e/i40e_ptp.c
49163@@ -419,7 +419,7 @@ void i40e_ptp_set_increment(struct i40e_pf *pf)
49164 wr32(hw, I40E_PRTTSYN_INC_H, incval >> 32);
49165
49166 /* Update the base adjustement value. */
49167- ACCESS_ONCE(pf->ptp_base_adj) = incval;
49168+ ACCESS_ONCE_RW(pf->ptp_base_adj) = incval;
49169 smp_mb(); /* Force the above update. */
49170 }
49171
49172diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
49173index 79c00f5..8da39f6 100644
49174--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
49175+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
49176@@ -785,7 +785,7 @@ void ixgbe_ptp_start_cyclecounter(struct ixgbe_adapter *adapter)
49177 }
49178
49179 /* update the base incval used to calculate frequency adjustment */
49180- ACCESS_ONCE(adapter->base_incval) = incval;
49181+ ACCESS_ONCE_RW(adapter->base_incval) = incval;
49182 smp_mb();
49183
49184 /* need lock to prevent incorrect read while modifying cyclecounter */
49185diff --git a/drivers/net/ethernet/mellanox/mlx4/en_tx.c b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
49186index 8c234ec..757331f 100644
49187--- a/drivers/net/ethernet/mellanox/mlx4/en_tx.c
49188+++ b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
49189@@ -468,8 +468,8 @@ static bool mlx4_en_process_tx_cq(struct net_device *dev,
49190 wmb();
49191
49192 /* we want to dirty this cache line once */
49193- ACCESS_ONCE(ring->last_nr_txbb) = last_nr_txbb;
49194- ACCESS_ONCE(ring->cons) = ring_cons + txbbs_skipped;
49195+ ACCESS_ONCE_RW(ring->last_nr_txbb) = last_nr_txbb;
49196+ ACCESS_ONCE_RW(ring->cons) = ring_cons + txbbs_skipped;
49197
49198 netdev_tx_completed_queue(ring->tx_queue, packets, bytes);
49199
49200diff --git a/drivers/net/ethernet/neterion/vxge/vxge-config.c b/drivers/net/ethernet/neterion/vxge/vxge-config.c
49201index 6223930..975033d 100644
49202--- a/drivers/net/ethernet/neterion/vxge/vxge-config.c
49203+++ b/drivers/net/ethernet/neterion/vxge/vxge-config.c
49204@@ -3457,7 +3457,10 @@ __vxge_hw_fifo_create(struct __vxge_hw_vpath_handle *vp,
49205 struct __vxge_hw_fifo *fifo;
49206 struct vxge_hw_fifo_config *config;
49207 u32 txdl_size, txdl_per_memblock;
49208- struct vxge_hw_mempool_cbs fifo_mp_callback;
49209+ static struct vxge_hw_mempool_cbs fifo_mp_callback = {
49210+ .item_func_alloc = __vxge_hw_fifo_mempool_item_alloc,
49211+ };
49212+
49213 struct __vxge_hw_virtualpath *vpath;
49214
49215 if ((vp == NULL) || (attr == NULL)) {
49216@@ -3540,8 +3543,6 @@ __vxge_hw_fifo_create(struct __vxge_hw_vpath_handle *vp,
49217 goto exit;
49218 }
49219
49220- fifo_mp_callback.item_func_alloc = __vxge_hw_fifo_mempool_item_alloc;
49221-
49222 fifo->mempool =
49223 __vxge_hw_mempool_create(vpath->hldev,
49224 fifo->config->memblock_size,
49225diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
49226index 2bb48d5..d1a865d 100644
49227--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
49228+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
49229@@ -2324,7 +2324,9 @@ int qlcnic_83xx_configure_opmode(struct qlcnic_adapter *adapter)
49230 max_tx_rings = QLCNIC_MAX_VNIC_TX_RINGS;
49231 } else if (ret == QLC_83XX_DEFAULT_OPMODE) {
49232 ahw->nic_mode = QLCNIC_DEFAULT_MODE;
49233- adapter->nic_ops->init_driver = qlcnic_83xx_init_default_driver;
49234+ pax_open_kernel();
49235+ *(void **)&adapter->nic_ops->init_driver = qlcnic_83xx_init_default_driver;
49236+ pax_close_kernel();
49237 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
49238 max_sds_rings = QLCNIC_MAX_SDS_RINGS;
49239 max_tx_rings = QLCNIC_MAX_TX_RINGS;
49240diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
49241index be7d7a6..a8983f8 100644
49242--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
49243+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
49244@@ -207,17 +207,23 @@ int qlcnic_83xx_config_vnic_opmode(struct qlcnic_adapter *adapter)
49245 case QLCNIC_NON_PRIV_FUNC:
49246 ahw->op_mode = QLCNIC_NON_PRIV_FUNC;
49247 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
49248- nic_ops->init_driver = qlcnic_83xx_init_non_privileged_vnic;
49249+ pax_open_kernel();
49250+ *(void **)&nic_ops->init_driver = qlcnic_83xx_init_non_privileged_vnic;
49251+ pax_close_kernel();
49252 break;
49253 case QLCNIC_PRIV_FUNC:
49254 ahw->op_mode = QLCNIC_PRIV_FUNC;
49255 ahw->idc.state_entry = qlcnic_83xx_idc_vnic_pf_entry;
49256- nic_ops->init_driver = qlcnic_83xx_init_privileged_vnic;
49257+ pax_open_kernel();
49258+ *(void **)&nic_ops->init_driver = qlcnic_83xx_init_privileged_vnic;
49259+ pax_close_kernel();
49260 break;
49261 case QLCNIC_MGMT_FUNC:
49262 ahw->op_mode = QLCNIC_MGMT_FUNC;
49263 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
49264- nic_ops->init_driver = qlcnic_83xx_init_mgmt_vnic;
49265+ pax_open_kernel();
49266+ *(void **)&nic_ops->init_driver = qlcnic_83xx_init_mgmt_vnic;
49267+ pax_close_kernel();
49268 break;
49269 default:
49270 dev_err(&adapter->pdev->dev, "Invalid Virtual NIC opmode\n");
49271diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
49272index 332bb8a..e6adcd1 100644
49273--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
49274+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
49275@@ -1285,7 +1285,7 @@ flash_temp:
49276 int qlcnic_dump_fw(struct qlcnic_adapter *adapter)
49277 {
49278 struct qlcnic_fw_dump *fw_dump = &adapter->ahw->fw_dump;
49279- static const struct qlcnic_dump_operations *fw_dump_ops;
49280+ const struct qlcnic_dump_operations *fw_dump_ops;
49281 struct qlcnic_83xx_dump_template_hdr *hdr_83xx;
49282 u32 entry_offset, dump, no_entries, buf_offset = 0;
49283 int i, k, ops_cnt, ops_index, dump_size = 0;
49284diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
49285index c70ab40..00b28e0 100644
49286--- a/drivers/net/ethernet/realtek/r8169.c
49287+++ b/drivers/net/ethernet/realtek/r8169.c
49288@@ -788,22 +788,22 @@ struct rtl8169_private {
49289 struct mdio_ops {
49290 void (*write)(struct rtl8169_private *, int, int);
49291 int (*read)(struct rtl8169_private *, int);
49292- } mdio_ops;
49293+ } __no_const mdio_ops;
49294
49295 struct pll_power_ops {
49296 void (*down)(struct rtl8169_private *);
49297 void (*up)(struct rtl8169_private *);
49298- } pll_power_ops;
49299+ } __no_const pll_power_ops;
49300
49301 struct jumbo_ops {
49302 void (*enable)(struct rtl8169_private *);
49303 void (*disable)(struct rtl8169_private *);
49304- } jumbo_ops;
49305+ } __no_const jumbo_ops;
49306
49307 struct csi_ops {
49308 void (*write)(struct rtl8169_private *, int, int);
49309 u32 (*read)(struct rtl8169_private *, int);
49310- } csi_ops;
49311+ } __no_const csi_ops;
49312
49313 int (*set_speed)(struct net_device *, u8 aneg, u16 sp, u8 dpx, u32 adv);
49314 int (*get_settings)(struct net_device *, struct ethtool_cmd *);
49315diff --git a/drivers/net/ethernet/sfc/ptp.c b/drivers/net/ethernet/sfc/ptp.c
49316index 6b861e3..204ac86 100644
49317--- a/drivers/net/ethernet/sfc/ptp.c
49318+++ b/drivers/net/ethernet/sfc/ptp.c
49319@@ -822,7 +822,7 @@ static int efx_ptp_synchronize(struct efx_nic *efx, unsigned int num_readings)
49320 ptp->start.dma_addr);
49321
49322 /* Clear flag that signals MC ready */
49323- ACCESS_ONCE(*start) = 0;
49324+ ACCESS_ONCE_RW(*start) = 0;
49325 rc = efx_mcdi_rpc_start(efx, MC_CMD_PTP, synch_buf,
49326 MC_CMD_PTP_IN_SYNCHRONIZE_LEN);
49327 EFX_BUG_ON_PARANOID(rc);
49328diff --git a/drivers/net/ethernet/sfc/selftest.c b/drivers/net/ethernet/sfc/selftest.c
49329index 10b6173..b605dfd5 100644
49330--- a/drivers/net/ethernet/sfc/selftest.c
49331+++ b/drivers/net/ethernet/sfc/selftest.c
49332@@ -46,7 +46,7 @@ struct efx_loopback_payload {
49333 struct iphdr ip;
49334 struct udphdr udp;
49335 __be16 iteration;
49336- const char msg[64];
49337+ char msg[64];
49338 } __packed;
49339
49340 /* Loopback test source MAC address */
49341diff --git a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
49342index 08c483b..2c4a553 100644
49343--- a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
49344+++ b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
49345@@ -140,8 +140,8 @@ void dwmac_mmc_ctrl(void __iomem *ioaddr, unsigned int mode)
49346
49347 writel(value, ioaddr + MMC_CNTRL);
49348
49349- pr_debug("stmmac: MMC ctrl register (offset 0x%x): 0x%08x\n",
49350- MMC_CNTRL, value);
49351+// pr_debug("stmmac: MMC ctrl register (offset 0x%x): 0x%08x\n",
49352+// MMC_CNTRL, value);
49353 }
49354
49355 /* To mask all all interrupts.*/
49356diff --git a/drivers/net/ethernet/via/via-rhine.c b/drivers/net/ethernet/via/via-rhine.c
49357index 17e2766..c332f1e 100644
49358--- a/drivers/net/ethernet/via/via-rhine.c
49359+++ b/drivers/net/ethernet/via/via-rhine.c
49360@@ -2514,7 +2514,7 @@ static struct platform_driver rhine_driver_platform = {
49361 }
49362 };
49363
49364-static struct dmi_system_id rhine_dmi_table[] __initdata = {
49365+static const struct dmi_system_id rhine_dmi_table[] __initconst = {
49366 {
49367 .ident = "EPIA-M",
49368 .matches = {
49369diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
49370index 384ca4f..dd7d4f9 100644
49371--- a/drivers/net/hyperv/hyperv_net.h
49372+++ b/drivers/net/hyperv/hyperv_net.h
49373@@ -171,7 +171,7 @@ struct rndis_device {
49374 enum rndis_device_state state;
49375 bool link_state;
49376 bool link_change;
49377- atomic_t new_req_id;
49378+ atomic_unchecked_t new_req_id;
49379
49380 spinlock_t request_lock;
49381 struct list_head req_list;
49382diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c
49383index 7816d98..7890614 100644
49384--- a/drivers/net/hyperv/rndis_filter.c
49385+++ b/drivers/net/hyperv/rndis_filter.c
49386@@ -102,7 +102,7 @@ static struct rndis_request *get_rndis_request(struct rndis_device *dev,
49387 * template
49388 */
49389 set = &rndis_msg->msg.set_req;
49390- set->req_id = atomic_inc_return(&dev->new_req_id);
49391+ set->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
49392
49393 /* Add to the request list */
49394 spin_lock_irqsave(&dev->request_lock, flags);
49395@@ -918,7 +918,7 @@ static void rndis_filter_halt_device(struct rndis_device *dev)
49396
49397 /* Setup the rndis set */
49398 halt = &request->request_msg.msg.halt_req;
49399- halt->req_id = atomic_inc_return(&dev->new_req_id);
49400+ halt->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
49401
49402 /* Ignore return since this msg is optional. */
49403 rndis_filter_send_request(dev, request);
49404diff --git a/drivers/net/ifb.c b/drivers/net/ifb.c
49405index 34f846b..4a0d5b1 100644
49406--- a/drivers/net/ifb.c
49407+++ b/drivers/net/ifb.c
49408@@ -253,7 +253,7 @@ static int ifb_validate(struct nlattr *tb[], struct nlattr *data[])
49409 return 0;
49410 }
49411
49412-static struct rtnl_link_ops ifb_link_ops __read_mostly = {
49413+static struct rtnl_link_ops ifb_link_ops = {
49414 .kind = "ifb",
49415 .priv_size = sizeof(struct ifb_private),
49416 .setup = ifb_setup,
49417diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
49418index 1df38bd..4bc20b0 100644
49419--- a/drivers/net/macvlan.c
49420+++ b/drivers/net/macvlan.c
49421@@ -335,7 +335,7 @@ static void macvlan_broadcast_enqueue(struct macvlan_port *port,
49422 free_nskb:
49423 kfree_skb(nskb);
49424 err:
49425- atomic_long_inc(&skb->dev->rx_dropped);
49426+ atomic_long_inc_unchecked(&skb->dev->rx_dropped);
49427 }
49428
49429 static void macvlan_flush_sources(struct macvlan_port *port,
49430@@ -1459,13 +1459,15 @@ static const struct nla_policy macvlan_policy[IFLA_MACVLAN_MAX + 1] = {
49431 int macvlan_link_register(struct rtnl_link_ops *ops)
49432 {
49433 /* common fields */
49434- ops->priv_size = sizeof(struct macvlan_dev);
49435- ops->validate = macvlan_validate;
49436- ops->maxtype = IFLA_MACVLAN_MAX;
49437- ops->policy = macvlan_policy;
49438- ops->changelink = macvlan_changelink;
49439- ops->get_size = macvlan_get_size;
49440- ops->fill_info = macvlan_fill_info;
49441+ pax_open_kernel();
49442+ *(size_t *)&ops->priv_size = sizeof(struct macvlan_dev);
49443+ *(void **)&ops->validate = macvlan_validate;
49444+ *(int *)&ops->maxtype = IFLA_MACVLAN_MAX;
49445+ *(const void **)&ops->policy = macvlan_policy;
49446+ *(void **)&ops->changelink = macvlan_changelink;
49447+ *(void **)&ops->get_size = macvlan_get_size;
49448+ *(void **)&ops->fill_info = macvlan_fill_info;
49449+ pax_close_kernel();
49450
49451 return rtnl_link_register(ops);
49452 };
49453@@ -1551,7 +1553,7 @@ static int macvlan_device_event(struct notifier_block *unused,
49454 return NOTIFY_DONE;
49455 }
49456
49457-static struct notifier_block macvlan_notifier_block __read_mostly = {
49458+static struct notifier_block macvlan_notifier_block = {
49459 .notifier_call = macvlan_device_event,
49460 };
49461
49462diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
49463index 27ecc5c..f636328 100644
49464--- a/drivers/net/macvtap.c
49465+++ b/drivers/net/macvtap.c
49466@@ -436,7 +436,7 @@ static void macvtap_setup(struct net_device *dev)
49467 dev->tx_queue_len = TUN_READQ_SIZE;
49468 }
49469
49470-static struct rtnl_link_ops macvtap_link_ops __read_mostly = {
49471+static struct rtnl_link_ops macvtap_link_ops = {
49472 .kind = "macvtap",
49473 .setup = macvtap_setup,
49474 .newlink = macvtap_newlink,
49475@@ -1033,7 +1033,7 @@ static long macvtap_ioctl(struct file *file, unsigned int cmd,
49476
49477 ret = 0;
49478 u = q->flags;
49479- if (copy_to_user(&ifr->ifr_name, vlan->dev->name, IFNAMSIZ) ||
49480+ if (copy_to_user(ifr->ifr_name, vlan->dev->name, IFNAMSIZ) ||
49481 put_user(u, &ifr->ifr_flags))
49482 ret = -EFAULT;
49483 macvtap_put_vlan(vlan);
49484@@ -1217,7 +1217,7 @@ static int macvtap_device_event(struct notifier_block *unused,
49485 return NOTIFY_DONE;
49486 }
49487
49488-static struct notifier_block macvtap_notifier_block __read_mostly = {
49489+static struct notifier_block macvtap_notifier_block = {
49490 .notifier_call = macvtap_device_event,
49491 };
49492
49493diff --git a/drivers/net/nlmon.c b/drivers/net/nlmon.c
49494index 34924df..a747360 100644
49495--- a/drivers/net/nlmon.c
49496+++ b/drivers/net/nlmon.c
49497@@ -154,7 +154,7 @@ static int nlmon_validate(struct nlattr *tb[], struct nlattr *data[])
49498 return 0;
49499 }
49500
49501-static struct rtnl_link_ops nlmon_link_ops __read_mostly = {
49502+static struct rtnl_link_ops nlmon_link_ops = {
49503 .kind = "nlmon",
49504 .priv_size = sizeof(struct nlmon),
49505 .setup = nlmon_setup,
49506diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
49507index bdfe51f..e7845c7 100644
49508--- a/drivers/net/phy/phy_device.c
49509+++ b/drivers/net/phy/phy_device.c
49510@@ -218,7 +218,7 @@ EXPORT_SYMBOL(phy_device_create);
49511 * zero on success.
49512 *
49513 */
49514-static int get_phy_c45_ids(struct mii_bus *bus, int addr, u32 *phy_id,
49515+static int get_phy_c45_ids(struct mii_bus *bus, int addr, int *phy_id,
49516 struct phy_c45_device_ids *c45_ids) {
49517 int phy_reg;
49518 int i, reg_addr;
49519@@ -288,7 +288,7 @@ static int get_phy_c45_ids(struct mii_bus *bus, int addr, u32 *phy_id,
49520 * its return value is in turn returned.
49521 *
49522 */
49523-static int get_phy_id(struct mii_bus *bus, int addr, u32 *phy_id,
49524+static int get_phy_id(struct mii_bus *bus, int addr, int *phy_id,
49525 bool is_c45, struct phy_c45_device_ids *c45_ids)
49526 {
49527 int phy_reg;
49528@@ -326,7 +326,7 @@ static int get_phy_id(struct mii_bus *bus, int addr, u32 *phy_id,
49529 struct phy_device *get_phy_device(struct mii_bus *bus, int addr, bool is_c45)
49530 {
49531 struct phy_c45_device_ids c45_ids = {0};
49532- u32 phy_id = 0;
49533+ int phy_id = 0;
49534 int r;
49535
49536 r = get_phy_id(bus, addr, &phy_id, is_c45, &c45_ids);
49537diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c
49538index 9d15566..5ad4ef6 100644
49539--- a/drivers/net/ppp/ppp_generic.c
49540+++ b/drivers/net/ppp/ppp_generic.c
49541@@ -1022,7 +1022,6 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
49542 void __user *addr = (void __user *) ifr->ifr_ifru.ifru_data;
49543 struct ppp_stats stats;
49544 struct ppp_comp_stats cstats;
49545- char *vers;
49546
49547 switch (cmd) {
49548 case SIOCGPPPSTATS:
49549@@ -1044,8 +1043,7 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
49550 break;
49551
49552 case SIOCGPPPVER:
49553- vers = PPP_VERSION;
49554- if (copy_to_user(addr, vers, strlen(vers) + 1))
49555+ if (copy_to_user(addr, PPP_VERSION, sizeof(PPP_VERSION)))
49556 break;
49557 err = 0;
49558 break;
49559diff --git a/drivers/net/slip/slhc.c b/drivers/net/slip/slhc.c
49560index 079f7ad..b2a2bfa7 100644
49561--- a/drivers/net/slip/slhc.c
49562+++ b/drivers/net/slip/slhc.c
49563@@ -487,7 +487,7 @@ slhc_uncompress(struct slcompress *comp, unsigned char *icp, int isize)
49564 register struct tcphdr *thp;
49565 register struct iphdr *ip;
49566 register struct cstate *cs;
49567- int len, hdrlen;
49568+ long len, hdrlen;
49569 unsigned char *cp = icp;
49570
49571 /* We've got a compressed packet; read the change byte */
49572diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
49573index 7d39484..d58499d 100644
49574--- a/drivers/net/team/team.c
49575+++ b/drivers/net/team/team.c
49576@@ -2099,7 +2099,7 @@ static unsigned int team_get_num_rx_queues(void)
49577 return TEAM_DEFAULT_NUM_RX_QUEUES;
49578 }
49579
49580-static struct rtnl_link_ops team_link_ops __read_mostly = {
49581+static struct rtnl_link_ops team_link_ops = {
49582 .kind = DRV_NAME,
49583 .priv_size = sizeof(struct team),
49584 .setup = team_setup,
49585@@ -2889,7 +2889,7 @@ static int team_device_event(struct notifier_block *unused,
49586 return NOTIFY_DONE;
49587 }
49588
49589-static struct notifier_block team_notifier_block __read_mostly = {
49590+static struct notifier_block team_notifier_block = {
49591 .notifier_call = team_device_event,
49592 };
49593
49594diff --git a/drivers/net/tun.c b/drivers/net/tun.c
49595index 857dca4..642f532 100644
49596--- a/drivers/net/tun.c
49597+++ b/drivers/net/tun.c
49598@@ -1421,7 +1421,7 @@ static int tun_validate(struct nlattr *tb[], struct nlattr *data[])
49599 return -EINVAL;
49600 }
49601
49602-static struct rtnl_link_ops tun_link_ops __read_mostly = {
49603+static struct rtnl_link_ops tun_link_ops = {
49604 .kind = DRV_NAME,
49605 .priv_size = sizeof(struct tun_struct),
49606 .setup = tun_setup,
49607@@ -1830,7 +1830,7 @@ unlock:
49608 }
49609
49610 static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
49611- unsigned long arg, int ifreq_len)
49612+ unsigned long arg, size_t ifreq_len)
49613 {
49614 struct tun_file *tfile = file->private_data;
49615 struct tun_struct *tun;
49616@@ -1844,6 +1844,9 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
49617 int le;
49618 int ret;
49619
49620+ if (ifreq_len > sizeof ifr)
49621+ return -EFAULT;
49622+
49623 if (cmd == TUNSETIFF || cmd == TUNSETQUEUE || _IOC_TYPE(cmd) == 0x89) {
49624 if (copy_from_user(&ifr, argp, ifreq_len))
49625 return -EFAULT;
49626diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
49627index 778e915..58c4d95 100644
49628--- a/drivers/net/usb/hso.c
49629+++ b/drivers/net/usb/hso.c
49630@@ -70,7 +70,7 @@
49631 #include <asm/byteorder.h>
49632 #include <linux/serial_core.h>
49633 #include <linux/serial.h>
49634-
49635+#include <asm/local.h>
49636
49637 #define MOD_AUTHOR "Option Wireless"
49638 #define MOD_DESCRIPTION "USB High Speed Option driver"
49639@@ -1183,7 +1183,7 @@ static void put_rxbuf_data_and_resubmit_ctrl_urb(struct hso_serial *serial)
49640 struct urb *urb;
49641
49642 urb = serial->rx_urb[0];
49643- if (serial->port.count > 0) {
49644+ if (atomic_read(&serial->port.count) > 0) {
49645 count = put_rxbuf_data(urb, serial);
49646 if (count == -1)
49647 return;
49648@@ -1221,7 +1221,7 @@ static void hso_std_serial_read_bulk_callback(struct urb *urb)
49649 DUMP1(urb->transfer_buffer, urb->actual_length);
49650
49651 /* Anyone listening? */
49652- if (serial->port.count == 0)
49653+ if (atomic_read(&serial->port.count) == 0)
49654 return;
49655
49656 if (serial->parent->port_spec & HSO_INFO_CRC_BUG)
49657@@ -1282,8 +1282,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
49658 tty_port_tty_set(&serial->port, tty);
49659
49660 /* check for port already opened, if not set the termios */
49661- serial->port.count++;
49662- if (serial->port.count == 1) {
49663+ if (atomic_inc_return(&serial->port.count) == 1) {
49664 serial->rx_state = RX_IDLE;
49665 /* Force default termio settings */
49666 _hso_serial_set_termios(tty, NULL);
49667@@ -1293,7 +1292,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
49668 result = hso_start_serial_device(serial->parent, GFP_KERNEL);
49669 if (result) {
49670 hso_stop_serial_device(serial->parent);
49671- serial->port.count--;
49672+ atomic_dec(&serial->port.count);
49673 } else {
49674 kref_get(&serial->parent->ref);
49675 }
49676@@ -1331,10 +1330,10 @@ static void hso_serial_close(struct tty_struct *tty, struct file *filp)
49677
49678 /* reset the rts and dtr */
49679 /* do the actual close */
49680- serial->port.count--;
49681+ atomic_dec(&serial->port.count);
49682
49683- if (serial->port.count <= 0) {
49684- serial->port.count = 0;
49685+ if (atomic_read(&serial->port.count) <= 0) {
49686+ atomic_set(&serial->port.count, 0);
49687 tty_port_tty_set(&serial->port, NULL);
49688 if (!usb_gone)
49689 hso_stop_serial_device(serial->parent);
49690@@ -1417,7 +1416,7 @@ static void hso_serial_set_termios(struct tty_struct *tty, struct ktermios *old)
49691
49692 /* the actual setup */
49693 spin_lock_irqsave(&serial->serial_lock, flags);
49694- if (serial->port.count)
49695+ if (atomic_read(&serial->port.count))
49696 _hso_serial_set_termios(tty, old);
49697 else
49698 tty->termios = *old;
49699@@ -1886,7 +1885,7 @@ static void intr_callback(struct urb *urb)
49700 D1("Pending read interrupt on port %d\n", i);
49701 spin_lock(&serial->serial_lock);
49702 if (serial->rx_state == RX_IDLE &&
49703- serial->port.count > 0) {
49704+ atomic_read(&serial->port.count) > 0) {
49705 /* Setup and send a ctrl req read on
49706 * port i */
49707 if (!serial->rx_urb_filled[0]) {
49708@@ -3053,7 +3052,7 @@ static int hso_resume(struct usb_interface *iface)
49709 /* Start all serial ports */
49710 for (i = 0; i < HSO_SERIAL_TTY_MINORS; i++) {
49711 if (serial_table[i] && (serial_table[i]->interface == iface)) {
49712- if (dev2ser(serial_table[i])->port.count) {
49713+ if (atomic_read(&dev2ser(serial_table[i])->port.count)) {
49714 result =
49715 hso_start_serial_device(serial_table[i], GFP_NOIO);
49716 hso_kick_transmit(dev2ser(serial_table[i]));
49717diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
49718index 9f7c0ab..1577b4a 100644
49719--- a/drivers/net/usb/r8152.c
49720+++ b/drivers/net/usb/r8152.c
49721@@ -601,7 +601,7 @@ struct r8152 {
49722 void (*unload)(struct r8152 *);
49723 int (*eee_get)(struct r8152 *, struct ethtool_eee *);
49724 int (*eee_set)(struct r8152 *, struct ethtool_eee *);
49725- } rtl_ops;
49726+ } __no_const rtl_ops;
49727
49728 int intr_interval;
49729 u32 saved_wolopts;
49730diff --git a/drivers/net/usb/sierra_net.c b/drivers/net/usb/sierra_net.c
49731index a2515887..6d13233 100644
49732--- a/drivers/net/usb/sierra_net.c
49733+++ b/drivers/net/usb/sierra_net.c
49734@@ -51,7 +51,7 @@ static const char driver_name[] = "sierra_net";
49735 /* atomic counter partially included in MAC address to make sure 2 devices
49736 * do not end up with the same MAC - concept breaks in case of > 255 ifaces
49737 */
49738-static atomic_t iface_counter = ATOMIC_INIT(0);
49739+static atomic_unchecked_t iface_counter = ATOMIC_INIT(0);
49740
49741 /*
49742 * SYNC Timer Delay definition used to set the expiry time
49743@@ -697,7 +697,7 @@ static int sierra_net_bind(struct usbnet *dev, struct usb_interface *intf)
49744 dev->net->netdev_ops = &sierra_net_device_ops;
49745
49746 /* change MAC addr to include, ifacenum, and to be unique */
49747- dev->net->dev_addr[ETH_ALEN-2] = atomic_inc_return(&iface_counter);
49748+ dev->net->dev_addr[ETH_ALEN-2] = atomic_inc_return_unchecked(&iface_counter);
49749 dev->net->dev_addr[ETH_ALEN-1] = ifacenum;
49750
49751 /* we will have to manufacture ethernet headers, prepare template */
49752diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
49753index 777757a..395a767 100644
49754--- a/drivers/net/usb/usbnet.c
49755+++ b/drivers/net/usb/usbnet.c
49756@@ -1285,7 +1285,7 @@ netdev_tx_t usbnet_start_xmit (struct sk_buff *skb,
49757 struct net_device *net)
49758 {
49759 struct usbnet *dev = netdev_priv(net);
49760- int length;
49761+ unsigned int length;
49762 struct urb *urb = NULL;
49763 struct skb_data *entry;
49764 struct driver_info *info = dev->driver_info;
49765@@ -1413,7 +1413,7 @@ not_drop:
49766 }
49767 } else
49768 netif_dbg(dev, tx_queued, dev->net,
49769- "> tx, len %d, type 0x%x\n", length, skb->protocol);
49770+ "> tx, len %u, type 0x%x\n", length, skb->protocol);
49771 #ifdef CONFIG_PM
49772 deferred:
49773 #endif
49774diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
49775index 59b0e97..a6ed579 100644
49776--- a/drivers/net/virtio_net.c
49777+++ b/drivers/net/virtio_net.c
49778@@ -48,7 +48,7 @@ module_param(gso, bool, 0444);
49779 #define RECEIVE_AVG_WEIGHT 64
49780
49781 /* Minimum alignment for mergeable packet buffers. */
49782-#define MERGEABLE_BUFFER_ALIGN max(L1_CACHE_BYTES, 256)
49783+#define MERGEABLE_BUFFER_ALIGN max(L1_CACHE_BYTES, 256UL)
49784
49785 #define VIRTNET_DRIVER_VERSION "1.0.0"
49786
49787diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
49788index fceb637..37c70fd 100644
49789--- a/drivers/net/vxlan.c
49790+++ b/drivers/net/vxlan.c
49791@@ -2935,7 +2935,7 @@ static struct net *vxlan_get_link_net(const struct net_device *dev)
49792 return vxlan->net;
49793 }
49794
49795-static struct rtnl_link_ops vxlan_link_ops __read_mostly = {
49796+static struct rtnl_link_ops vxlan_link_ops = {
49797 .kind = "vxlan",
49798 .maxtype = IFLA_VXLAN_MAX,
49799 .policy = vxlan_policy,
49800@@ -2983,7 +2983,7 @@ static int vxlan_lowerdev_event(struct notifier_block *unused,
49801 return NOTIFY_DONE;
49802 }
49803
49804-static struct notifier_block vxlan_notifier_block __read_mostly = {
49805+static struct notifier_block vxlan_notifier_block = {
49806 .notifier_call = vxlan_lowerdev_event,
49807 };
49808
49809diff --git a/drivers/net/wan/lmc/lmc_media.c b/drivers/net/wan/lmc/lmc_media.c
49810index 5920c99..ff2e4a5 100644
49811--- a/drivers/net/wan/lmc/lmc_media.c
49812+++ b/drivers/net/wan/lmc/lmc_media.c
49813@@ -95,62 +95,63 @@ static inline void write_av9110_bit (lmc_softc_t *, int);
49814 static void write_av9110(lmc_softc_t *, u32, u32, u32, u32, u32);
49815
49816 lmc_media_t lmc_ds3_media = {
49817- lmc_ds3_init, /* special media init stuff */
49818- lmc_ds3_default, /* reset to default state */
49819- lmc_ds3_set_status, /* reset status to state provided */
49820- lmc_dummy_set_1, /* set clock source */
49821- lmc_dummy_set2_1, /* set line speed */
49822- lmc_ds3_set_100ft, /* set cable length */
49823- lmc_ds3_set_scram, /* set scrambler */
49824- lmc_ds3_get_link_status, /* get link status */
49825- lmc_dummy_set_1, /* set link status */
49826- lmc_ds3_set_crc_length, /* set CRC length */
49827- lmc_dummy_set_1, /* set T1 or E1 circuit type */
49828- lmc_ds3_watchdog
49829+ .init = lmc_ds3_init, /* special media init stuff */
49830+ .defaults = lmc_ds3_default, /* reset to default state */
49831+ .set_status = lmc_ds3_set_status, /* reset status to state provided */
49832+ .set_clock_source = lmc_dummy_set_1, /* set clock source */
49833+ .set_speed = lmc_dummy_set2_1, /* set line speed */
49834+ .set_cable_length = lmc_ds3_set_100ft, /* set cable length */
49835+ .set_scrambler = lmc_ds3_set_scram, /* set scrambler */
49836+ .get_link_status = lmc_ds3_get_link_status, /* get link status */
49837+ .set_link_status = lmc_dummy_set_1, /* set link status */
49838+ .set_crc_length = lmc_ds3_set_crc_length, /* set CRC length */
49839+ .set_circuit_type = lmc_dummy_set_1, /* set T1 or E1 circuit type */
49840+ .watchdog = lmc_ds3_watchdog
49841 };
49842
49843 lmc_media_t lmc_hssi_media = {
49844- lmc_hssi_init, /* special media init stuff */
49845- lmc_hssi_default, /* reset to default state */
49846- lmc_hssi_set_status, /* reset status to state provided */
49847- lmc_hssi_set_clock, /* set clock source */
49848- lmc_dummy_set2_1, /* set line speed */
49849- lmc_dummy_set_1, /* set cable length */
49850- lmc_dummy_set_1, /* set scrambler */
49851- lmc_hssi_get_link_status, /* get link status */
49852- lmc_hssi_set_link_status, /* set link status */
49853- lmc_hssi_set_crc_length, /* set CRC length */
49854- lmc_dummy_set_1, /* set T1 or E1 circuit type */
49855- lmc_hssi_watchdog
49856+ .init = lmc_hssi_init, /* special media init stuff */
49857+ .defaults = lmc_hssi_default, /* reset to default state */
49858+ .set_status = lmc_hssi_set_status, /* reset status to state provided */
49859+ .set_clock_source = lmc_hssi_set_clock, /* set clock source */
49860+ .set_speed = lmc_dummy_set2_1, /* set line speed */
49861+ .set_cable_length = lmc_dummy_set_1, /* set cable length */
49862+ .set_scrambler = lmc_dummy_set_1, /* set scrambler */
49863+ .get_link_status = lmc_hssi_get_link_status, /* get link status */
49864+ .set_link_status = lmc_hssi_set_link_status, /* set link status */
49865+ .set_crc_length = lmc_hssi_set_crc_length, /* set CRC length */
49866+ .set_circuit_type = lmc_dummy_set_1, /* set T1 or E1 circuit type */
49867+ .watchdog = lmc_hssi_watchdog
49868 };
49869
49870-lmc_media_t lmc_ssi_media = { lmc_ssi_init, /* special media init stuff */
49871- lmc_ssi_default, /* reset to default state */
49872- lmc_ssi_set_status, /* reset status to state provided */
49873- lmc_ssi_set_clock, /* set clock source */
49874- lmc_ssi_set_speed, /* set line speed */
49875- lmc_dummy_set_1, /* set cable length */
49876- lmc_dummy_set_1, /* set scrambler */
49877- lmc_ssi_get_link_status, /* get link status */
49878- lmc_ssi_set_link_status, /* set link status */
49879- lmc_ssi_set_crc_length, /* set CRC length */
49880- lmc_dummy_set_1, /* set T1 or E1 circuit type */
49881- lmc_ssi_watchdog
49882+lmc_media_t lmc_ssi_media = {
49883+ .init = lmc_ssi_init, /* special media init stuff */
49884+ .defaults = lmc_ssi_default, /* reset to default state */
49885+ .set_status = lmc_ssi_set_status, /* reset status to state provided */
49886+ .set_clock_source = lmc_ssi_set_clock, /* set clock source */
49887+ .set_speed = lmc_ssi_set_speed, /* set line speed */
49888+ .set_cable_length = lmc_dummy_set_1, /* set cable length */
49889+ .set_scrambler = lmc_dummy_set_1, /* set scrambler */
49890+ .get_link_status = lmc_ssi_get_link_status, /* get link status */
49891+ .set_link_status = lmc_ssi_set_link_status, /* set link status */
49892+ .set_crc_length = lmc_ssi_set_crc_length, /* set CRC length */
49893+ .set_circuit_type = lmc_dummy_set_1, /* set T1 or E1 circuit type */
49894+ .watchdog = lmc_ssi_watchdog
49895 };
49896
49897 lmc_media_t lmc_t1_media = {
49898- lmc_t1_init, /* special media init stuff */
49899- lmc_t1_default, /* reset to default state */
49900- lmc_t1_set_status, /* reset status to state provided */
49901- lmc_t1_set_clock, /* set clock source */
49902- lmc_dummy_set2_1, /* set line speed */
49903- lmc_dummy_set_1, /* set cable length */
49904- lmc_dummy_set_1, /* set scrambler */
49905- lmc_t1_get_link_status, /* get link status */
49906- lmc_dummy_set_1, /* set link status */
49907- lmc_t1_set_crc_length, /* set CRC length */
49908- lmc_t1_set_circuit_type, /* set T1 or E1 circuit type */
49909- lmc_t1_watchdog
49910+ .init = lmc_t1_init, /* special media init stuff */
49911+ .defaults = lmc_t1_default, /* reset to default state */
49912+ .set_status = lmc_t1_set_status, /* reset status to state provided */
49913+ .set_clock_source = lmc_t1_set_clock, /* set clock source */
49914+ .set_speed = lmc_dummy_set2_1, /* set line speed */
49915+ .set_cable_length = lmc_dummy_set_1, /* set cable length */
49916+ .set_scrambler = lmc_dummy_set_1, /* set scrambler */
49917+ .get_link_status = lmc_t1_get_link_status, /* get link status */
49918+ .set_link_status = lmc_dummy_set_1, /* set link status */
49919+ .set_crc_length = lmc_t1_set_crc_length, /* set CRC length */
49920+ .set_circuit_type = lmc_t1_set_circuit_type, /* set T1 or E1 circuit type */
49921+ .watchdog = lmc_t1_watchdog
49922 };
49923
49924 static void
49925diff --git a/drivers/net/wan/z85230.c b/drivers/net/wan/z85230.c
49926index feacc3b..5bac0de 100644
49927--- a/drivers/net/wan/z85230.c
49928+++ b/drivers/net/wan/z85230.c
49929@@ -485,9 +485,9 @@ static void z8530_status(struct z8530_channel *chan)
49930
49931 struct z8530_irqhandler z8530_sync =
49932 {
49933- z8530_rx,
49934- z8530_tx,
49935- z8530_status
49936+ .rx = z8530_rx,
49937+ .tx = z8530_tx,
49938+ .status = z8530_status
49939 };
49940
49941 EXPORT_SYMBOL(z8530_sync);
49942@@ -605,15 +605,15 @@ static void z8530_dma_status(struct z8530_channel *chan)
49943 }
49944
49945 static struct z8530_irqhandler z8530_dma_sync = {
49946- z8530_dma_rx,
49947- z8530_dma_tx,
49948- z8530_dma_status
49949+ .rx = z8530_dma_rx,
49950+ .tx = z8530_dma_tx,
49951+ .status = z8530_dma_status
49952 };
49953
49954 static struct z8530_irqhandler z8530_txdma_sync = {
49955- z8530_rx,
49956- z8530_dma_tx,
49957- z8530_dma_status
49958+ .rx = z8530_rx,
49959+ .tx = z8530_dma_tx,
49960+ .status = z8530_dma_status
49961 };
49962
49963 /**
49964@@ -680,9 +680,9 @@ static void z8530_status_clear(struct z8530_channel *chan)
49965
49966 struct z8530_irqhandler z8530_nop=
49967 {
49968- z8530_rx_clear,
49969- z8530_tx_clear,
49970- z8530_status_clear
49971+ .rx = z8530_rx_clear,
49972+ .tx = z8530_tx_clear,
49973+ .status = z8530_status_clear
49974 };
49975
49976
49977diff --git a/drivers/net/wimax/i2400m/rx.c b/drivers/net/wimax/i2400m/rx.c
49978index 0b60295..b8bfa5b 100644
49979--- a/drivers/net/wimax/i2400m/rx.c
49980+++ b/drivers/net/wimax/i2400m/rx.c
49981@@ -1359,7 +1359,7 @@ int i2400m_rx_setup(struct i2400m *i2400m)
49982 if (i2400m->rx_roq == NULL)
49983 goto error_roq_alloc;
49984
49985- rd = kcalloc(I2400M_RO_CIN + 1, sizeof(*i2400m->rx_roq[0].log),
49986+ rd = kcalloc(sizeof(*i2400m->rx_roq[0].log), I2400M_RO_CIN + 1,
49987 GFP_KERNEL);
49988 if (rd == NULL) {
49989 result = -ENOMEM;
49990diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
49991index e71a2ce..2268d61 100644
49992--- a/drivers/net/wireless/airo.c
49993+++ b/drivers/net/wireless/airo.c
49994@@ -7846,7 +7846,7 @@ static int writerids(struct net_device *dev, aironet_ioctl *comp) {
49995 struct airo_info *ai = dev->ml_priv;
49996 int ridcode;
49997 int enabled;
49998- static int (* writer)(struct airo_info *, u16 rid, const void *, int, int);
49999+ int (* writer)(struct airo_info *, u16 rid, const void *, int, int);
50000 unsigned char *iobuf;
50001
50002 /* Only super-user can write RIDs */
50003diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c
50004index da92bfa..5a9001a 100644
50005--- a/drivers/net/wireless/at76c50x-usb.c
50006+++ b/drivers/net/wireless/at76c50x-usb.c
50007@@ -353,7 +353,7 @@ static int at76_dfu_get_state(struct usb_device *udev, u8 *state)
50008 }
50009
50010 /* Convert timeout from the DFU status to jiffies */
50011-static inline unsigned long at76_get_timeout(struct dfu_status *s)
50012+static inline unsigned long __intentional_overflow(-1) at76_get_timeout(struct dfu_status *s)
50013 {
50014 return msecs_to_jiffies((s->poll_timeout[2] << 16)
50015 | (s->poll_timeout[1] << 8)
50016diff --git a/drivers/net/wireless/ath/ath10k/htc.c b/drivers/net/wireless/ath/ath10k/htc.c
50017index 2fd9e18..3f55bdd 100644
50018--- a/drivers/net/wireless/ath/ath10k/htc.c
50019+++ b/drivers/net/wireless/ath/ath10k/htc.c
50020@@ -849,7 +849,10 @@ int ath10k_htc_start(struct ath10k_htc *htc)
50021 /* registered target arrival callback from the HIF layer */
50022 int ath10k_htc_init(struct ath10k *ar)
50023 {
50024- struct ath10k_hif_cb htc_callbacks;
50025+ static struct ath10k_hif_cb htc_callbacks = {
50026+ .rx_completion = ath10k_htc_rx_completion_handler,
50027+ .tx_completion = ath10k_htc_tx_completion_handler,
50028+ };
50029 struct ath10k_htc_ep *ep = NULL;
50030 struct ath10k_htc *htc = &ar->htc;
50031
50032@@ -858,8 +861,6 @@ int ath10k_htc_init(struct ath10k *ar)
50033 ath10k_htc_reset_endpoint_states(htc);
50034
50035 /* setup HIF layer callbacks */
50036- htc_callbacks.rx_completion = ath10k_htc_rx_completion_handler;
50037- htc_callbacks.tx_completion = ath10k_htc_tx_completion_handler;
50038 htc->ar = ar;
50039
50040 /* Get HIF default pipe for HTC message exchange */
50041diff --git a/drivers/net/wireless/ath/ath10k/htc.h b/drivers/net/wireless/ath/ath10k/htc.h
50042index 527179c..a890150 100644
50043--- a/drivers/net/wireless/ath/ath10k/htc.h
50044+++ b/drivers/net/wireless/ath/ath10k/htc.h
50045@@ -270,13 +270,13 @@ enum ath10k_htc_ep_id {
50046
50047 struct ath10k_htc_ops {
50048 void (*target_send_suspend_complete)(struct ath10k *ar);
50049-};
50050+} __no_const;
50051
50052 struct ath10k_htc_ep_ops {
50053 void (*ep_tx_complete)(struct ath10k *, struct sk_buff *);
50054 void (*ep_rx_complete)(struct ath10k *, struct sk_buff *);
50055 void (*ep_tx_credits)(struct ath10k *);
50056-};
50057+} __no_const;
50058
50059 /* service connection information */
50060 struct ath10k_htc_svc_conn_req {
50061diff --git a/drivers/net/wireless/ath/ath9k/ar9002_mac.c b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
50062index f816909..e56cd8b 100644
50063--- a/drivers/net/wireless/ath/ath9k/ar9002_mac.c
50064+++ b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
50065@@ -220,8 +220,8 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
50066 ads->ds_txstatus6 = ads->ds_txstatus7 = 0;
50067 ads->ds_txstatus8 = ads->ds_txstatus9 = 0;
50068
50069- ACCESS_ONCE(ads->ds_link) = i->link;
50070- ACCESS_ONCE(ads->ds_data) = i->buf_addr[0];
50071+ ACCESS_ONCE_RW(ads->ds_link) = i->link;
50072+ ACCESS_ONCE_RW(ads->ds_data) = i->buf_addr[0];
50073
50074 ctl1 = i->buf_len[0] | (i->is_last ? 0 : AR_TxMore);
50075 ctl6 = SM(i->keytype, AR_EncrType);
50076@@ -235,26 +235,26 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
50077
50078 if ((i->is_first || i->is_last) &&
50079 i->aggr != AGGR_BUF_MIDDLE && i->aggr != AGGR_BUF_LAST) {
50080- ACCESS_ONCE(ads->ds_ctl2) = set11nTries(i->rates, 0)
50081+ ACCESS_ONCE_RW(ads->ds_ctl2) = set11nTries(i->rates, 0)
50082 | set11nTries(i->rates, 1)
50083 | set11nTries(i->rates, 2)
50084 | set11nTries(i->rates, 3)
50085 | (i->dur_update ? AR_DurUpdateEna : 0)
50086 | SM(0, AR_BurstDur);
50087
50088- ACCESS_ONCE(ads->ds_ctl3) = set11nRate(i->rates, 0)
50089+ ACCESS_ONCE_RW(ads->ds_ctl3) = set11nRate(i->rates, 0)
50090 | set11nRate(i->rates, 1)
50091 | set11nRate(i->rates, 2)
50092 | set11nRate(i->rates, 3);
50093 } else {
50094- ACCESS_ONCE(ads->ds_ctl2) = 0;
50095- ACCESS_ONCE(ads->ds_ctl3) = 0;
50096+ ACCESS_ONCE_RW(ads->ds_ctl2) = 0;
50097+ ACCESS_ONCE_RW(ads->ds_ctl3) = 0;
50098 }
50099
50100 if (!i->is_first) {
50101- ACCESS_ONCE(ads->ds_ctl0) = 0;
50102- ACCESS_ONCE(ads->ds_ctl1) = ctl1;
50103- ACCESS_ONCE(ads->ds_ctl6) = ctl6;
50104+ ACCESS_ONCE_RW(ads->ds_ctl0) = 0;
50105+ ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
50106+ ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
50107 return;
50108 }
50109
50110@@ -279,7 +279,7 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
50111 break;
50112 }
50113
50114- ACCESS_ONCE(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
50115+ ACCESS_ONCE_RW(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
50116 | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
50117 | SM(i->txpower[0], AR_XmitPower0)
50118 | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
50119@@ -289,27 +289,27 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
50120 | (i->flags & ATH9K_TXDESC_RTSENA ? AR_RTSEnable :
50121 (i->flags & ATH9K_TXDESC_CTSENA ? AR_CTSEnable : 0));
50122
50123- ACCESS_ONCE(ads->ds_ctl1) = ctl1;
50124- ACCESS_ONCE(ads->ds_ctl6) = ctl6;
50125+ ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
50126+ ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
50127
50128 if (i->aggr == AGGR_BUF_MIDDLE || i->aggr == AGGR_BUF_LAST)
50129 return;
50130
50131- ACCESS_ONCE(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
50132+ ACCESS_ONCE_RW(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
50133 | set11nPktDurRTSCTS(i->rates, 1);
50134
50135- ACCESS_ONCE(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
50136+ ACCESS_ONCE_RW(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
50137 | set11nPktDurRTSCTS(i->rates, 3);
50138
50139- ACCESS_ONCE(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
50140+ ACCESS_ONCE_RW(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
50141 | set11nRateFlags(i->rates, 1)
50142 | set11nRateFlags(i->rates, 2)
50143 | set11nRateFlags(i->rates, 3)
50144 | SM(i->rtscts_rate, AR_RTSCTSRate);
50145
50146- ACCESS_ONCE(ads->ds_ctl9) = SM(i->txpower[1], AR_XmitPower1);
50147- ACCESS_ONCE(ads->ds_ctl10) = SM(i->txpower[2], AR_XmitPower2);
50148- ACCESS_ONCE(ads->ds_ctl11) = SM(i->txpower[3], AR_XmitPower3);
50149+ ACCESS_ONCE_RW(ads->ds_ctl9) = SM(i->txpower[1], AR_XmitPower1);
50150+ ACCESS_ONCE_RW(ads->ds_ctl10) = SM(i->txpower[2], AR_XmitPower2);
50151+ ACCESS_ONCE_RW(ads->ds_ctl11) = SM(i->txpower[3], AR_XmitPower3);
50152 }
50153
50154 static int ar9002_hw_proc_txdesc(struct ath_hw *ah, void *ds,
50155diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mac.c b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
50156index da84b70..83e4978 100644
50157--- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
50158+++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
50159@@ -39,47 +39,47 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
50160 (i->qcu << AR_TxQcuNum_S) | desc_len;
50161
50162 checksum += val;
50163- ACCESS_ONCE(ads->info) = val;
50164+ ACCESS_ONCE_RW(ads->info) = val;
50165
50166 checksum += i->link;
50167- ACCESS_ONCE(ads->link) = i->link;
50168+ ACCESS_ONCE_RW(ads->link) = i->link;
50169
50170 checksum += i->buf_addr[0];
50171- ACCESS_ONCE(ads->data0) = i->buf_addr[0];
50172+ ACCESS_ONCE_RW(ads->data0) = i->buf_addr[0];
50173 checksum += i->buf_addr[1];
50174- ACCESS_ONCE(ads->data1) = i->buf_addr[1];
50175+ ACCESS_ONCE_RW(ads->data1) = i->buf_addr[1];
50176 checksum += i->buf_addr[2];
50177- ACCESS_ONCE(ads->data2) = i->buf_addr[2];
50178+ ACCESS_ONCE_RW(ads->data2) = i->buf_addr[2];
50179 checksum += i->buf_addr[3];
50180- ACCESS_ONCE(ads->data3) = i->buf_addr[3];
50181+ ACCESS_ONCE_RW(ads->data3) = i->buf_addr[3];
50182
50183 checksum += (val = (i->buf_len[0] << AR_BufLen_S) & AR_BufLen);
50184- ACCESS_ONCE(ads->ctl3) = val;
50185+ ACCESS_ONCE_RW(ads->ctl3) = val;
50186 checksum += (val = (i->buf_len[1] << AR_BufLen_S) & AR_BufLen);
50187- ACCESS_ONCE(ads->ctl5) = val;
50188+ ACCESS_ONCE_RW(ads->ctl5) = val;
50189 checksum += (val = (i->buf_len[2] << AR_BufLen_S) & AR_BufLen);
50190- ACCESS_ONCE(ads->ctl7) = val;
50191+ ACCESS_ONCE_RW(ads->ctl7) = val;
50192 checksum += (val = (i->buf_len[3] << AR_BufLen_S) & AR_BufLen);
50193- ACCESS_ONCE(ads->ctl9) = val;
50194+ ACCESS_ONCE_RW(ads->ctl9) = val;
50195
50196 checksum = (u16) (((checksum & 0xffff) + (checksum >> 16)) & 0xffff);
50197- ACCESS_ONCE(ads->ctl10) = checksum;
50198+ ACCESS_ONCE_RW(ads->ctl10) = checksum;
50199
50200 if (i->is_first || i->is_last) {
50201- ACCESS_ONCE(ads->ctl13) = set11nTries(i->rates, 0)
50202+ ACCESS_ONCE_RW(ads->ctl13) = set11nTries(i->rates, 0)
50203 | set11nTries(i->rates, 1)
50204 | set11nTries(i->rates, 2)
50205 | set11nTries(i->rates, 3)
50206 | (i->dur_update ? AR_DurUpdateEna : 0)
50207 | SM(0, AR_BurstDur);
50208
50209- ACCESS_ONCE(ads->ctl14) = set11nRate(i->rates, 0)
50210+ ACCESS_ONCE_RW(ads->ctl14) = set11nRate(i->rates, 0)
50211 | set11nRate(i->rates, 1)
50212 | set11nRate(i->rates, 2)
50213 | set11nRate(i->rates, 3);
50214 } else {
50215- ACCESS_ONCE(ads->ctl13) = 0;
50216- ACCESS_ONCE(ads->ctl14) = 0;
50217+ ACCESS_ONCE_RW(ads->ctl13) = 0;
50218+ ACCESS_ONCE_RW(ads->ctl14) = 0;
50219 }
50220
50221 ads->ctl20 = 0;
50222@@ -89,17 +89,17 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
50223
50224 ctl17 = SM(i->keytype, AR_EncrType);
50225 if (!i->is_first) {
50226- ACCESS_ONCE(ads->ctl11) = 0;
50227- ACCESS_ONCE(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
50228- ACCESS_ONCE(ads->ctl15) = 0;
50229- ACCESS_ONCE(ads->ctl16) = 0;
50230- ACCESS_ONCE(ads->ctl17) = ctl17;
50231- ACCESS_ONCE(ads->ctl18) = 0;
50232- ACCESS_ONCE(ads->ctl19) = 0;
50233+ ACCESS_ONCE_RW(ads->ctl11) = 0;
50234+ ACCESS_ONCE_RW(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
50235+ ACCESS_ONCE_RW(ads->ctl15) = 0;
50236+ ACCESS_ONCE_RW(ads->ctl16) = 0;
50237+ ACCESS_ONCE_RW(ads->ctl17) = ctl17;
50238+ ACCESS_ONCE_RW(ads->ctl18) = 0;
50239+ ACCESS_ONCE_RW(ads->ctl19) = 0;
50240 return;
50241 }
50242
50243- ACCESS_ONCE(ads->ctl11) = (i->pkt_len & AR_FrameLen)
50244+ ACCESS_ONCE_RW(ads->ctl11) = (i->pkt_len & AR_FrameLen)
50245 | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
50246 | SM(i->txpower[0], AR_XmitPower0)
50247 | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
50248@@ -135,26 +135,26 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
50249 val = (i->flags & ATH9K_TXDESC_PAPRD) >> ATH9K_TXDESC_PAPRD_S;
50250 ctl12 |= SM(val, AR_PAPRDChainMask);
50251
50252- ACCESS_ONCE(ads->ctl12) = ctl12;
50253- ACCESS_ONCE(ads->ctl17) = ctl17;
50254+ ACCESS_ONCE_RW(ads->ctl12) = ctl12;
50255+ ACCESS_ONCE_RW(ads->ctl17) = ctl17;
50256
50257- ACCESS_ONCE(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
50258+ ACCESS_ONCE_RW(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
50259 | set11nPktDurRTSCTS(i->rates, 1);
50260
50261- ACCESS_ONCE(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
50262+ ACCESS_ONCE_RW(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
50263 | set11nPktDurRTSCTS(i->rates, 3);
50264
50265- ACCESS_ONCE(ads->ctl18) = set11nRateFlags(i->rates, 0)
50266+ ACCESS_ONCE_RW(ads->ctl18) = set11nRateFlags(i->rates, 0)
50267 | set11nRateFlags(i->rates, 1)
50268 | set11nRateFlags(i->rates, 2)
50269 | set11nRateFlags(i->rates, 3)
50270 | SM(i->rtscts_rate, AR_RTSCTSRate);
50271
50272- ACCESS_ONCE(ads->ctl19) = AR_Not_Sounding;
50273+ ACCESS_ONCE_RW(ads->ctl19) = AR_Not_Sounding;
50274
50275- ACCESS_ONCE(ads->ctl20) = SM(i->txpower[1], AR_XmitPower1);
50276- ACCESS_ONCE(ads->ctl21) = SM(i->txpower[2], AR_XmitPower2);
50277- ACCESS_ONCE(ads->ctl22) = SM(i->txpower[3], AR_XmitPower3);
50278+ ACCESS_ONCE_RW(ads->ctl20) = SM(i->txpower[1], AR_XmitPower1);
50279+ ACCESS_ONCE_RW(ads->ctl21) = SM(i->txpower[2], AR_XmitPower2);
50280+ ACCESS_ONCE_RW(ads->ctl22) = SM(i->txpower[3], AR_XmitPower3);
50281 }
50282
50283 static u16 ar9003_calc_ptr_chksum(struct ar9003_txc *ads)
50284diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
50285index e82e570..8c3cf90 100644
50286--- a/drivers/net/wireless/ath/ath9k/hw.h
50287+++ b/drivers/net/wireless/ath/ath9k/hw.h
50288@@ -646,7 +646,7 @@ struct ath_hw_private_ops {
50289
50290 /* ANI */
50291 void (*ani_cache_ini_regs)(struct ath_hw *ah);
50292-};
50293+} __no_const;
50294
50295 /**
50296 * struct ath_spec_scan - parameters for Atheros spectral scan
50297@@ -722,7 +722,7 @@ struct ath_hw_ops {
50298 #ifdef CONFIG_ATH9K_BTCOEX_SUPPORT
50299 void (*set_bt_ant_diversity)(struct ath_hw *hw, bool enable);
50300 #endif
50301-};
50302+} __no_const;
50303
50304 struct ath_nf_limits {
50305 s16 max;
50306diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
50307index 9ede991..a8f08fb 100644
50308--- a/drivers/net/wireless/ath/ath9k/main.c
50309+++ b/drivers/net/wireless/ath/ath9k/main.c
50310@@ -2537,16 +2537,18 @@ void ath9k_fill_chanctx_ops(void)
50311 if (!ath9k_is_chanctx_enabled())
50312 return;
50313
50314- ath9k_ops.hw_scan = ath9k_hw_scan;
50315- ath9k_ops.cancel_hw_scan = ath9k_cancel_hw_scan;
50316- ath9k_ops.remain_on_channel = ath9k_remain_on_channel;
50317- ath9k_ops.cancel_remain_on_channel = ath9k_cancel_remain_on_channel;
50318- ath9k_ops.add_chanctx = ath9k_add_chanctx;
50319- ath9k_ops.remove_chanctx = ath9k_remove_chanctx;
50320- ath9k_ops.change_chanctx = ath9k_change_chanctx;
50321- ath9k_ops.assign_vif_chanctx = ath9k_assign_vif_chanctx;
50322- ath9k_ops.unassign_vif_chanctx = ath9k_unassign_vif_chanctx;
50323- ath9k_ops.mgd_prepare_tx = ath9k_mgd_prepare_tx;
50324+ pax_open_kernel();
50325+ *(void **)&ath9k_ops.hw_scan = ath9k_hw_scan;
50326+ *(void **)&ath9k_ops.cancel_hw_scan = ath9k_cancel_hw_scan;
50327+ *(void **)&ath9k_ops.remain_on_channel = ath9k_remain_on_channel;
50328+ *(void **)&ath9k_ops.cancel_remain_on_channel = ath9k_cancel_remain_on_channel;
50329+ *(void **)&ath9k_ops.add_chanctx = ath9k_add_chanctx;
50330+ *(void **)&ath9k_ops.remove_chanctx = ath9k_remove_chanctx;
50331+ *(void **)&ath9k_ops.change_chanctx = ath9k_change_chanctx;
50332+ *(void **)&ath9k_ops.assign_vif_chanctx = ath9k_assign_vif_chanctx;
50333+ *(void **)&ath9k_ops.unassign_vif_chanctx = ath9k_unassign_vif_chanctx;
50334+ *(void **)&ath9k_ops.mgd_prepare_tx = ath9k_mgd_prepare_tx;
50335+ pax_close_kernel();
50336 }
50337
50338 #endif
50339diff --git a/drivers/net/wireless/b43/phy_lp.c b/drivers/net/wireless/b43/phy_lp.c
50340index 058a9f2..d5cb1ba 100644
50341--- a/drivers/net/wireless/b43/phy_lp.c
50342+++ b/drivers/net/wireless/b43/phy_lp.c
50343@@ -2502,7 +2502,7 @@ static int lpphy_b2063_tune(struct b43_wldev *dev,
50344 {
50345 struct ssb_bus *bus = dev->dev->sdev->bus;
50346
50347- static const struct b206x_channel *chandata = NULL;
50348+ const struct b206x_channel *chandata = NULL;
50349 u32 crystal_freq = bus->chipco.pmu.crystalfreq * 1000;
50350 u32 freqref, vco_freq, val1, val2, val3, timeout, timeoutref, count;
50351 u16 old_comm15, scale;
50352diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c
50353index e566580..2c218ca 100644
50354--- a/drivers/net/wireless/iwlegacy/3945-mac.c
50355+++ b/drivers/net/wireless/iwlegacy/3945-mac.c
50356@@ -3631,7 +3631,9 @@ il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
50357 */
50358 if (il3945_mod_params.disable_hw_scan) {
50359 D_INFO("Disabling hw_scan\n");
50360- il3945_mac_ops.hw_scan = NULL;
50361+ pax_open_kernel();
50362+ *(void **)&il3945_mac_ops.hw_scan = NULL;
50363+ pax_close_kernel();
50364 }
50365
50366 D_INFO("*** LOAD DRIVER ***\n");
50367diff --git a/drivers/net/wireless/iwlwifi/dvm/debugfs.c b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
50368index 0ffb6ff..c0b7f0e 100644
50369--- a/drivers/net/wireless/iwlwifi/dvm/debugfs.c
50370+++ b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
50371@@ -188,7 +188,7 @@ static ssize_t iwl_dbgfs_sram_write(struct file *file,
50372 {
50373 struct iwl_priv *priv = file->private_data;
50374 char buf[64];
50375- int buf_size;
50376+ size_t buf_size;
50377 u32 offset, len;
50378
50379 memset(buf, 0, sizeof(buf));
50380@@ -458,7 +458,7 @@ static ssize_t iwl_dbgfs_rx_handlers_write(struct file *file,
50381 struct iwl_priv *priv = file->private_data;
50382
50383 char buf[8];
50384- int buf_size;
50385+ size_t buf_size;
50386 u32 reset_flag;
50387
50388 memset(buf, 0, sizeof(buf));
50389@@ -539,7 +539,7 @@ static ssize_t iwl_dbgfs_disable_ht40_write(struct file *file,
50390 {
50391 struct iwl_priv *priv = file->private_data;
50392 char buf[8];
50393- int buf_size;
50394+ size_t buf_size;
50395 int ht40;
50396
50397 memset(buf, 0, sizeof(buf));
50398@@ -591,7 +591,7 @@ static ssize_t iwl_dbgfs_sleep_level_override_write(struct file *file,
50399 {
50400 struct iwl_priv *priv = file->private_data;
50401 char buf[8];
50402- int buf_size;
50403+ size_t buf_size;
50404 int value;
50405
50406 memset(buf, 0, sizeof(buf));
50407@@ -683,10 +683,10 @@ DEBUGFS_READ_FILE_OPS(temperature);
50408 DEBUGFS_READ_WRITE_FILE_OPS(sleep_level_override);
50409 DEBUGFS_READ_FILE_OPS(current_sleep_command);
50410
50411-static const char *fmt_value = " %-30s %10u\n";
50412-static const char *fmt_hex = " %-30s 0x%02X\n";
50413-static const char *fmt_table = " %-30s %10u %10u %10u %10u\n";
50414-static const char *fmt_header =
50415+static const char fmt_value[] = " %-30s %10u\n";
50416+static const char fmt_hex[] = " %-30s 0x%02X\n";
50417+static const char fmt_table[] = " %-30s %10u %10u %10u %10u\n";
50418+static const char fmt_header[] =
50419 "%-32s current cumulative delta max\n";
50420
50421 static int iwl_statistics_flag(struct iwl_priv *priv, char *buf, int bufsz)
50422@@ -1856,7 +1856,7 @@ static ssize_t iwl_dbgfs_clear_ucode_statistics_write(struct file *file,
50423 {
50424 struct iwl_priv *priv = file->private_data;
50425 char buf[8];
50426- int buf_size;
50427+ size_t buf_size;
50428 int clear;
50429
50430 memset(buf, 0, sizeof(buf));
50431@@ -1901,7 +1901,7 @@ static ssize_t iwl_dbgfs_ucode_tracing_write(struct file *file,
50432 {
50433 struct iwl_priv *priv = file->private_data;
50434 char buf[8];
50435- int buf_size;
50436+ size_t buf_size;
50437 int trace;
50438
50439 memset(buf, 0, sizeof(buf));
50440@@ -1972,7 +1972,7 @@ static ssize_t iwl_dbgfs_missed_beacon_write(struct file *file,
50441 {
50442 struct iwl_priv *priv = file->private_data;
50443 char buf[8];
50444- int buf_size;
50445+ size_t buf_size;
50446 int missed;
50447
50448 memset(buf, 0, sizeof(buf));
50449@@ -2013,7 +2013,7 @@ static ssize_t iwl_dbgfs_plcp_delta_write(struct file *file,
50450
50451 struct iwl_priv *priv = file->private_data;
50452 char buf[8];
50453- int buf_size;
50454+ size_t buf_size;
50455 int plcp;
50456
50457 memset(buf, 0, sizeof(buf));
50458@@ -2073,7 +2073,7 @@ static ssize_t iwl_dbgfs_txfifo_flush_write(struct file *file,
50459
50460 struct iwl_priv *priv = file->private_data;
50461 char buf[8];
50462- int buf_size;
50463+ size_t buf_size;
50464 int flush;
50465
50466 memset(buf, 0, sizeof(buf));
50467@@ -2163,7 +2163,7 @@ static ssize_t iwl_dbgfs_protection_mode_write(struct file *file,
50468
50469 struct iwl_priv *priv = file->private_data;
50470 char buf[8];
50471- int buf_size;
50472+ size_t buf_size;
50473 int rts;
50474
50475 if (!priv->cfg->ht_params)
50476@@ -2204,7 +2204,7 @@ static ssize_t iwl_dbgfs_echo_test_write(struct file *file,
50477 {
50478 struct iwl_priv *priv = file->private_data;
50479 char buf[8];
50480- int buf_size;
50481+ size_t buf_size;
50482
50483 memset(buf, 0, sizeof(buf));
50484 buf_size = min(count, sizeof(buf) - 1);
50485@@ -2238,7 +2238,7 @@ static ssize_t iwl_dbgfs_log_event_write(struct file *file,
50486 struct iwl_priv *priv = file->private_data;
50487 u32 event_log_flag;
50488 char buf[8];
50489- int buf_size;
50490+ size_t buf_size;
50491
50492 /* check that the interface is up */
50493 if (!iwl_is_ready(priv))
50494@@ -2292,7 +2292,7 @@ static ssize_t iwl_dbgfs_calib_disabled_write(struct file *file,
50495 struct iwl_priv *priv = file->private_data;
50496 char buf[8];
50497 u32 calib_disabled;
50498- int buf_size;
50499+ size_t buf_size;
50500
50501 memset(buf, 0, sizeof(buf));
50502 buf_size = min(count, sizeof(buf) - 1);
50503diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c b/drivers/net/wireless/iwlwifi/pcie/trans.c
50504index cb72edb..242b24f 100644
50505--- a/drivers/net/wireless/iwlwifi/pcie/trans.c
50506+++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
50507@@ -1837,7 +1837,7 @@ static ssize_t iwl_dbgfs_interrupt_write(struct file *file,
50508 struct isr_statistics *isr_stats = &trans_pcie->isr_stats;
50509
50510 char buf[8];
50511- int buf_size;
50512+ size_t buf_size;
50513 u32 reset_flag;
50514
50515 memset(buf, 0, sizeof(buf));
50516@@ -1858,7 +1858,7 @@ static ssize_t iwl_dbgfs_csr_write(struct file *file,
50517 {
50518 struct iwl_trans *trans = file->private_data;
50519 char buf[8];
50520- int buf_size;
50521+ size_t buf_size;
50522 int csr;
50523
50524 memset(buf, 0, sizeof(buf));
50525diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
50526index 8908be6..fe97ddd 100644
50527--- a/drivers/net/wireless/mac80211_hwsim.c
50528+++ b/drivers/net/wireless/mac80211_hwsim.c
50529@@ -3070,20 +3070,20 @@ static int __init init_mac80211_hwsim(void)
50530 if (channels < 1)
50531 return -EINVAL;
50532
50533- mac80211_hwsim_mchan_ops = mac80211_hwsim_ops;
50534- mac80211_hwsim_mchan_ops.hw_scan = mac80211_hwsim_hw_scan;
50535- mac80211_hwsim_mchan_ops.cancel_hw_scan = mac80211_hwsim_cancel_hw_scan;
50536- mac80211_hwsim_mchan_ops.sw_scan_start = NULL;
50537- mac80211_hwsim_mchan_ops.sw_scan_complete = NULL;
50538- mac80211_hwsim_mchan_ops.remain_on_channel = mac80211_hwsim_roc;
50539- mac80211_hwsim_mchan_ops.cancel_remain_on_channel = mac80211_hwsim_croc;
50540- mac80211_hwsim_mchan_ops.add_chanctx = mac80211_hwsim_add_chanctx;
50541- mac80211_hwsim_mchan_ops.remove_chanctx = mac80211_hwsim_remove_chanctx;
50542- mac80211_hwsim_mchan_ops.change_chanctx = mac80211_hwsim_change_chanctx;
50543- mac80211_hwsim_mchan_ops.assign_vif_chanctx =
50544- mac80211_hwsim_assign_vif_chanctx;
50545- mac80211_hwsim_mchan_ops.unassign_vif_chanctx =
50546- mac80211_hwsim_unassign_vif_chanctx;
50547+ pax_open_kernel();
50548+ memcpy((void *)&mac80211_hwsim_mchan_ops, &mac80211_hwsim_ops, sizeof mac80211_hwsim_mchan_ops);
50549+ *(void **)&mac80211_hwsim_mchan_ops.hw_scan = mac80211_hwsim_hw_scan;
50550+ *(void **)&mac80211_hwsim_mchan_ops.cancel_hw_scan = mac80211_hwsim_cancel_hw_scan;
50551+ *(void **)&mac80211_hwsim_mchan_ops.sw_scan_start = NULL;
50552+ *(void **)&mac80211_hwsim_mchan_ops.sw_scan_complete = NULL;
50553+ *(void **)&mac80211_hwsim_mchan_ops.remain_on_channel = mac80211_hwsim_roc;
50554+ *(void **)&mac80211_hwsim_mchan_ops.cancel_remain_on_channel = mac80211_hwsim_croc;
50555+ *(void **)&mac80211_hwsim_mchan_ops.add_chanctx = mac80211_hwsim_add_chanctx;
50556+ *(void **)&mac80211_hwsim_mchan_ops.remove_chanctx = mac80211_hwsim_remove_chanctx;
50557+ *(void **)&mac80211_hwsim_mchan_ops.change_chanctx = mac80211_hwsim_change_chanctx;
50558+ *(void **)&mac80211_hwsim_mchan_ops.assign_vif_chanctx = mac80211_hwsim_assign_vif_chanctx;
50559+ *(void **)&mac80211_hwsim_mchan_ops.unassign_vif_chanctx = mac80211_hwsim_unassign_vif_chanctx;
50560+ pax_close_kernel();
50561
50562 spin_lock_init(&hwsim_radio_lock);
50563 INIT_LIST_HEAD(&hwsim_radios);
50564diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
50565index 60d44ce..884dd1c 100644
50566--- a/drivers/net/wireless/rndis_wlan.c
50567+++ b/drivers/net/wireless/rndis_wlan.c
50568@@ -1236,7 +1236,7 @@ static int set_rts_threshold(struct usbnet *usbdev, u32 rts_threshold)
50569
50570 netdev_dbg(usbdev->net, "%s(): %i\n", __func__, rts_threshold);
50571
50572- if (rts_threshold < 0 || rts_threshold > 2347)
50573+ if (rts_threshold > 2347)
50574 rts_threshold = 2347;
50575
50576 tmp = cpu_to_le32(rts_threshold);
50577diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
50578index 9bb398b..b0cc047 100644
50579--- a/drivers/net/wireless/rt2x00/rt2x00.h
50580+++ b/drivers/net/wireless/rt2x00/rt2x00.h
50581@@ -375,7 +375,7 @@ struct rt2x00_intf {
50582 * for hardware which doesn't support hardware
50583 * sequence counting.
50584 */
50585- atomic_t seqno;
50586+ atomic_unchecked_t seqno;
50587 };
50588
50589 static inline struct rt2x00_intf* vif_to_intf(struct ieee80211_vif *vif)
50590diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c
50591index 68b620b..92ecd9e 100644
50592--- a/drivers/net/wireless/rt2x00/rt2x00queue.c
50593+++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
50594@@ -224,9 +224,9 @@ static void rt2x00queue_create_tx_descriptor_seq(struct rt2x00_dev *rt2x00dev,
50595 * sequence counter given by mac80211.
50596 */
50597 if (test_bit(ENTRY_TXD_FIRST_FRAGMENT, &txdesc->flags))
50598- seqno = atomic_add_return(0x10, &intf->seqno);
50599+ seqno = atomic_add_return_unchecked(0x10, &intf->seqno);
50600 else
50601- seqno = atomic_read(&intf->seqno);
50602+ seqno = atomic_read_unchecked(&intf->seqno);
50603
50604 hdr->seq_ctrl &= cpu_to_le16(IEEE80211_SCTL_FRAG);
50605 hdr->seq_ctrl |= cpu_to_le16(seqno);
50606diff --git a/drivers/net/wireless/ti/wl1251/sdio.c b/drivers/net/wireless/ti/wl1251/sdio.c
50607index b661f896..ddf7d2b 100644
50608--- a/drivers/net/wireless/ti/wl1251/sdio.c
50609+++ b/drivers/net/wireless/ti/wl1251/sdio.c
50610@@ -282,13 +282,17 @@ static int wl1251_sdio_probe(struct sdio_func *func,
50611
50612 irq_set_irq_type(wl->irq, IRQ_TYPE_EDGE_RISING);
50613
50614- wl1251_sdio_ops.enable_irq = wl1251_enable_line_irq;
50615- wl1251_sdio_ops.disable_irq = wl1251_disable_line_irq;
50616+ pax_open_kernel();
50617+ *(void **)&wl1251_sdio_ops.enable_irq = wl1251_enable_line_irq;
50618+ *(void **)&wl1251_sdio_ops.disable_irq = wl1251_disable_line_irq;
50619+ pax_close_kernel();
50620
50621 wl1251_info("using dedicated interrupt line");
50622 } else {
50623- wl1251_sdio_ops.enable_irq = wl1251_sdio_enable_irq;
50624- wl1251_sdio_ops.disable_irq = wl1251_sdio_disable_irq;
50625+ pax_open_kernel();
50626+ *(void **)&wl1251_sdio_ops.enable_irq = wl1251_sdio_enable_irq;
50627+ *(void **)&wl1251_sdio_ops.disable_irq = wl1251_sdio_disable_irq;
50628+ pax_close_kernel();
50629
50630 wl1251_info("using SDIO interrupt");
50631 }
50632diff --git a/drivers/net/wireless/ti/wl12xx/main.c b/drivers/net/wireless/ti/wl12xx/main.c
50633index 144d1f8..7030936 100644
50634--- a/drivers/net/wireless/ti/wl12xx/main.c
50635+++ b/drivers/net/wireless/ti/wl12xx/main.c
50636@@ -657,7 +657,9 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
50637 sizeof(wl->conf.mem));
50638
50639 /* read data preparation is only needed by wl127x */
50640- wl->ops->prepare_read = wl127x_prepare_read;
50641+ pax_open_kernel();
50642+ *(void **)&wl->ops->prepare_read = wl127x_prepare_read;
50643+ pax_close_kernel();
50644
50645 wlcore_set_min_fw_ver(wl, WL127X_CHIP_VER,
50646 WL127X_IFTYPE_SR_VER, WL127X_MAJOR_SR_VER,
50647@@ -682,7 +684,9 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
50648 sizeof(wl->conf.mem));
50649
50650 /* read data preparation is only needed by wl127x */
50651- wl->ops->prepare_read = wl127x_prepare_read;
50652+ pax_open_kernel();
50653+ *(void **)&wl->ops->prepare_read = wl127x_prepare_read;
50654+ pax_close_kernel();
50655
50656 wlcore_set_min_fw_ver(wl, WL127X_CHIP_VER,
50657 WL127X_IFTYPE_SR_VER, WL127X_MAJOR_SR_VER,
50658diff --git a/drivers/net/wireless/ti/wl18xx/main.c b/drivers/net/wireless/ti/wl18xx/main.c
50659index 717c4f5..a813aeb 100644
50660--- a/drivers/net/wireless/ti/wl18xx/main.c
50661+++ b/drivers/net/wireless/ti/wl18xx/main.c
50662@@ -1923,8 +1923,10 @@ static int wl18xx_setup(struct wl1271 *wl)
50663 }
50664
50665 if (!checksum_param) {
50666- wl18xx_ops.set_rx_csum = NULL;
50667- wl18xx_ops.init_vif = NULL;
50668+ pax_open_kernel();
50669+ *(void **)&wl18xx_ops.set_rx_csum = NULL;
50670+ *(void **)&wl18xx_ops.init_vif = NULL;
50671+ pax_close_kernel();
50672 }
50673
50674 /* Enable 11a Band only if we have 5G antennas */
50675diff --git a/drivers/net/wireless/zd1211rw/zd_usb.c b/drivers/net/wireless/zd1211rw/zd_usb.c
50676index a912dc0..a8225ba 100644
50677--- a/drivers/net/wireless/zd1211rw/zd_usb.c
50678+++ b/drivers/net/wireless/zd1211rw/zd_usb.c
50679@@ -385,7 +385,7 @@ static inline void handle_regs_int(struct urb *urb)
50680 {
50681 struct zd_usb *usb = urb->context;
50682 struct zd_usb_interrupt *intr = &usb->intr;
50683- int len;
50684+ unsigned int len;
50685 u16 int_num;
50686
50687 ZD_ASSERT(in_interrupt());
50688diff --git a/drivers/nfc/nfcwilink.c b/drivers/nfc/nfcwilink.c
50689index ce2e2cf..f81e500 100644
50690--- a/drivers/nfc/nfcwilink.c
50691+++ b/drivers/nfc/nfcwilink.c
50692@@ -497,7 +497,7 @@ static struct nci_ops nfcwilink_ops = {
50693
50694 static int nfcwilink_probe(struct platform_device *pdev)
50695 {
50696- static struct nfcwilink *drv;
50697+ struct nfcwilink *drv;
50698 int rc;
50699 __u32 protocols;
50700
50701diff --git a/drivers/nfc/st21nfca/st21nfca.c b/drivers/nfc/st21nfca/st21nfca.c
50702index 24d3d24..ff70d28 100644
50703--- a/drivers/nfc/st21nfca/st21nfca.c
50704+++ b/drivers/nfc/st21nfca/st21nfca.c
50705@@ -588,7 +588,7 @@ static int st21nfca_get_iso14443_3_uid(struct nfc_hci_dev *hdev, u8 *gate,
50706 goto exit;
50707 }
50708
50709- gate = uid_skb->data;
50710+ memcpy(gate, uid_skb->data, uid_skb->len);
50711 *len = uid_skb->len;
50712 exit:
50713 kfree_skb(uid_skb);
50714diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
50715index 3a896c9..ac7b1c8 100644
50716--- a/drivers/of/fdt.c
50717+++ b/drivers/of/fdt.c
50718@@ -1118,7 +1118,9 @@ static int __init of_fdt_raw_init(void)
50719 pr_warn("fdt: not creating '/sys/firmware/fdt': CRC check failed\n");
50720 return 0;
50721 }
50722- of_fdt_raw_attr.size = fdt_totalsize(initial_boot_params);
50723+ pax_open_kernel();
50724+ *(size_t *)&of_fdt_raw_attr.size = fdt_totalsize(initial_boot_params);
50725+ pax_close_kernel();
50726 return sysfs_create_bin_file(firmware_kobj, &of_fdt_raw_attr);
50727 }
50728 late_initcall(of_fdt_raw_init);
50729diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c
50730index d93b2b6..ae50401 100644
50731--- a/drivers/oprofile/buffer_sync.c
50732+++ b/drivers/oprofile/buffer_sync.c
50733@@ -332,7 +332,7 @@ static void add_data(struct op_entry *entry, struct mm_struct *mm)
50734 if (cookie == NO_COOKIE)
50735 offset = pc;
50736 if (cookie == INVALID_COOKIE) {
50737- atomic_inc(&oprofile_stats.sample_lost_no_mapping);
50738+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
50739 offset = pc;
50740 }
50741 if (cookie != last_cookie) {
50742@@ -376,14 +376,14 @@ add_sample(struct mm_struct *mm, struct op_sample *s, int in_kernel)
50743 /* add userspace sample */
50744
50745 if (!mm) {
50746- atomic_inc(&oprofile_stats.sample_lost_no_mm);
50747+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mm);
50748 return 0;
50749 }
50750
50751 cookie = lookup_dcookie(mm, s->eip, &offset);
50752
50753 if (cookie == INVALID_COOKIE) {
50754- atomic_inc(&oprofile_stats.sample_lost_no_mapping);
50755+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
50756 return 0;
50757 }
50758
50759@@ -552,7 +552,7 @@ void sync_buffer(int cpu)
50760 /* ignore backtraces if failed to add a sample */
50761 if (state == sb_bt_start) {
50762 state = sb_bt_ignore;
50763- atomic_inc(&oprofile_stats.bt_lost_no_mapping);
50764+ atomic_inc_unchecked(&oprofile_stats.bt_lost_no_mapping);
50765 }
50766 }
50767 release_mm(mm);
50768diff --git a/drivers/oprofile/event_buffer.c b/drivers/oprofile/event_buffer.c
50769index c0cc4e7..44d4e54 100644
50770--- a/drivers/oprofile/event_buffer.c
50771+++ b/drivers/oprofile/event_buffer.c
50772@@ -53,7 +53,7 @@ void add_event_entry(unsigned long value)
50773 }
50774
50775 if (buffer_pos == buffer_size) {
50776- atomic_inc(&oprofile_stats.event_lost_overflow);
50777+ atomic_inc_unchecked(&oprofile_stats.event_lost_overflow);
50778 return;
50779 }
50780
50781diff --git a/drivers/oprofile/oprof.c b/drivers/oprofile/oprof.c
50782index ed2c3ec..deda85a 100644
50783--- a/drivers/oprofile/oprof.c
50784+++ b/drivers/oprofile/oprof.c
50785@@ -110,7 +110,7 @@ static void switch_worker(struct work_struct *work)
50786 if (oprofile_ops.switch_events())
50787 return;
50788
50789- atomic_inc(&oprofile_stats.multiplex_counter);
50790+ atomic_inc_unchecked(&oprofile_stats.multiplex_counter);
50791 start_switch_worker();
50792 }
50793
50794diff --git a/drivers/oprofile/oprofile_files.c b/drivers/oprofile/oprofile_files.c
50795index ee2cfce..7f8f699 100644
50796--- a/drivers/oprofile/oprofile_files.c
50797+++ b/drivers/oprofile/oprofile_files.c
50798@@ -27,7 +27,7 @@ unsigned long oprofile_time_slice;
50799
50800 #ifdef CONFIG_OPROFILE_EVENT_MULTIPLEX
50801
50802-static ssize_t timeout_read(struct file *file, char __user *buf,
50803+static ssize_t __intentional_overflow(-1) timeout_read(struct file *file, char __user *buf,
50804 size_t count, loff_t *offset)
50805 {
50806 return oprofilefs_ulong_to_user(jiffies_to_msecs(oprofile_time_slice),
50807diff --git a/drivers/oprofile/oprofile_stats.c b/drivers/oprofile/oprofile_stats.c
50808index 59659ce..6c860a0 100644
50809--- a/drivers/oprofile/oprofile_stats.c
50810+++ b/drivers/oprofile/oprofile_stats.c
50811@@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
50812 cpu_buf->sample_invalid_eip = 0;
50813 }
50814
50815- atomic_set(&oprofile_stats.sample_lost_no_mm, 0);
50816- atomic_set(&oprofile_stats.sample_lost_no_mapping, 0);
50817- atomic_set(&oprofile_stats.event_lost_overflow, 0);
50818- atomic_set(&oprofile_stats.bt_lost_no_mapping, 0);
50819- atomic_set(&oprofile_stats.multiplex_counter, 0);
50820+ atomic_set_unchecked(&oprofile_stats.sample_lost_no_mm, 0);
50821+ atomic_set_unchecked(&oprofile_stats.sample_lost_no_mapping, 0);
50822+ atomic_set_unchecked(&oprofile_stats.event_lost_overflow, 0);
50823+ atomic_set_unchecked(&oprofile_stats.bt_lost_no_mapping, 0);
50824+ atomic_set_unchecked(&oprofile_stats.multiplex_counter, 0);
50825 }
50826
50827
50828diff --git a/drivers/oprofile/oprofile_stats.h b/drivers/oprofile/oprofile_stats.h
50829index 1fc622b..8c48fc3 100644
50830--- a/drivers/oprofile/oprofile_stats.h
50831+++ b/drivers/oprofile/oprofile_stats.h
50832@@ -13,11 +13,11 @@
50833 #include <linux/atomic.h>
50834
50835 struct oprofile_stat_struct {
50836- atomic_t sample_lost_no_mm;
50837- atomic_t sample_lost_no_mapping;
50838- atomic_t bt_lost_no_mapping;
50839- atomic_t event_lost_overflow;
50840- atomic_t multiplex_counter;
50841+ atomic_unchecked_t sample_lost_no_mm;
50842+ atomic_unchecked_t sample_lost_no_mapping;
50843+ atomic_unchecked_t bt_lost_no_mapping;
50844+ atomic_unchecked_t event_lost_overflow;
50845+ atomic_unchecked_t multiplex_counter;
50846 };
50847
50848 extern struct oprofile_stat_struct oprofile_stats;
50849diff --git a/drivers/oprofile/oprofilefs.c b/drivers/oprofile/oprofilefs.c
50850index 3f49345..c750d0b 100644
50851--- a/drivers/oprofile/oprofilefs.c
50852+++ b/drivers/oprofile/oprofilefs.c
50853@@ -176,8 +176,8 @@ int oprofilefs_create_ro_ulong(struct dentry *root,
50854
50855 static ssize_t atomic_read_file(struct file *file, char __user *buf, size_t count, loff_t *offset)
50856 {
50857- atomic_t *val = file->private_data;
50858- return oprofilefs_ulong_to_user(atomic_read(val), buf, count, offset);
50859+ atomic_unchecked_t *val = file->private_data;
50860+ return oprofilefs_ulong_to_user(atomic_read_unchecked(val), buf, count, offset);
50861 }
50862
50863
50864@@ -189,7 +189,7 @@ static const struct file_operations atomic_ro_fops = {
50865
50866
50867 int oprofilefs_create_ro_atomic(struct dentry *root,
50868- char const *name, atomic_t *val)
50869+ char const *name, atomic_unchecked_t *val)
50870 {
50871 return __oprofilefs_create_file(root, name,
50872 &atomic_ro_fops, 0444, val);
50873diff --git a/drivers/oprofile/timer_int.c b/drivers/oprofile/timer_int.c
50874index bdef916..88c7dee 100644
50875--- a/drivers/oprofile/timer_int.c
50876+++ b/drivers/oprofile/timer_int.c
50877@@ -93,7 +93,7 @@ static int oprofile_cpu_notify(struct notifier_block *self,
50878 return NOTIFY_OK;
50879 }
50880
50881-static struct notifier_block __refdata oprofile_cpu_notifier = {
50882+static struct notifier_block oprofile_cpu_notifier = {
50883 .notifier_call = oprofile_cpu_notify,
50884 };
50885
50886diff --git a/drivers/parport/procfs.c b/drivers/parport/procfs.c
50887index 3b47080..6cd05dd 100644
50888--- a/drivers/parport/procfs.c
50889+++ b/drivers/parport/procfs.c
50890@@ -64,7 +64,7 @@ static int do_active_device(struct ctl_table *table, int write,
50891
50892 *ppos += len;
50893
50894- return copy_to_user(result, buffer, len) ? -EFAULT : 0;
50895+ return (len > sizeof buffer || copy_to_user(result, buffer, len)) ? -EFAULT : 0;
50896 }
50897
50898 #ifdef CONFIG_PARPORT_1284
50899@@ -106,7 +106,7 @@ static int do_autoprobe(struct ctl_table *table, int write,
50900
50901 *ppos += len;
50902
50903- return copy_to_user (result, buffer, len) ? -EFAULT : 0;
50904+ return (len > sizeof buffer || copy_to_user (result, buffer, len)) ? -EFAULT : 0;
50905 }
50906 #endif /* IEEE1284.3 support. */
50907
50908diff --git a/drivers/pci/host/pci-host-generic.c b/drivers/pci/host/pci-host-generic.c
50909index ba46e58..90cfc24 100644
50910--- a/drivers/pci/host/pci-host-generic.c
50911+++ b/drivers/pci/host/pci-host-generic.c
50912@@ -26,9 +26,9 @@
50913 #include <linux/platform_device.h>
50914
50915 struct gen_pci_cfg_bus_ops {
50916+ struct pci_ops ops;
50917 u32 bus_shift;
50918- void __iomem *(*map_bus)(struct pci_bus *, unsigned int, int);
50919-};
50920+} __do_const;
50921
50922 struct gen_pci_cfg_windows {
50923 struct resource res;
50924@@ -56,8 +56,12 @@ static void __iomem *gen_pci_map_cfg_bus_cam(struct pci_bus *bus,
50925 }
50926
50927 static struct gen_pci_cfg_bus_ops gen_pci_cfg_cam_bus_ops = {
50928+ .ops = {
50929+ .map_bus = gen_pci_map_cfg_bus_cam,
50930+ .read = pci_generic_config_read,
50931+ .write = pci_generic_config_write,
50932+ },
50933 .bus_shift = 16,
50934- .map_bus = gen_pci_map_cfg_bus_cam,
50935 };
50936
50937 static void __iomem *gen_pci_map_cfg_bus_ecam(struct pci_bus *bus,
50938@@ -72,13 +76,12 @@ static void __iomem *gen_pci_map_cfg_bus_ecam(struct pci_bus *bus,
50939 }
50940
50941 static struct gen_pci_cfg_bus_ops gen_pci_cfg_ecam_bus_ops = {
50942+ .ops = {
50943+ .map_bus = gen_pci_map_cfg_bus_ecam,
50944+ .read = pci_generic_config_read,
50945+ .write = pci_generic_config_write,
50946+ },
50947 .bus_shift = 20,
50948- .map_bus = gen_pci_map_cfg_bus_ecam,
50949-};
50950-
50951-static struct pci_ops gen_pci_ops = {
50952- .read = pci_generic_config_read,
50953- .write = pci_generic_config_write,
50954 };
50955
50956 static const struct of_device_id gen_pci_of_match[] = {
50957@@ -219,7 +222,6 @@ static int gen_pci_probe(struct platform_device *pdev)
50958 .private_data = (void **)&pci,
50959 .setup = gen_pci_setup,
50960 .map_irq = of_irq_parse_and_map_pci,
50961- .ops = &gen_pci_ops,
50962 };
50963
50964 if (!pci)
50965@@ -241,7 +243,7 @@ static int gen_pci_probe(struct platform_device *pdev)
50966
50967 of_id = of_match_node(gen_pci_of_match, np);
50968 pci->cfg.ops = of_id->data;
50969- gen_pci_ops.map_bus = pci->cfg.ops->map_bus;
50970+ hw.ops = &pci->cfg.ops->ops;
50971 pci->host.dev.parent = dev;
50972 INIT_LIST_HEAD(&pci->host.windows);
50973 INIT_LIST_HEAD(&pci->resources);
50974diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c
50975index 6ca2399..68d866b 100644
50976--- a/drivers/pci/hotplug/acpiphp_ibm.c
50977+++ b/drivers/pci/hotplug/acpiphp_ibm.c
50978@@ -452,7 +452,9 @@ static int __init ibm_acpiphp_init(void)
50979 goto init_cleanup;
50980 }
50981
50982- ibm_apci_table_attr.size = ibm_get_table_from_acpi(NULL);
50983+ pax_open_kernel();
50984+ *(size_t *)&ibm_apci_table_attr.size = ibm_get_table_from_acpi(NULL);
50985+ pax_close_kernel();
50986 retval = sysfs_create_bin_file(sysdir, &ibm_apci_table_attr);
50987
50988 return retval;
50989diff --git a/drivers/pci/hotplug/cpcihp_generic.c b/drivers/pci/hotplug/cpcihp_generic.c
50990index 66b7bbe..26bee78 100644
50991--- a/drivers/pci/hotplug/cpcihp_generic.c
50992+++ b/drivers/pci/hotplug/cpcihp_generic.c
50993@@ -73,7 +73,6 @@ static u16 port;
50994 static unsigned int enum_bit;
50995 static u8 enum_mask;
50996
50997-static struct cpci_hp_controller_ops generic_hpc_ops;
50998 static struct cpci_hp_controller generic_hpc;
50999
51000 static int __init validate_parameters(void)
51001@@ -139,6 +138,10 @@ static int query_enum(void)
51002 return ((value & enum_mask) == enum_mask);
51003 }
51004
51005+static struct cpci_hp_controller_ops generic_hpc_ops = {
51006+ .query_enum = query_enum,
51007+};
51008+
51009 static int __init cpcihp_generic_init(void)
51010 {
51011 int status;
51012@@ -165,7 +168,6 @@ static int __init cpcihp_generic_init(void)
51013 pci_dev_put(dev);
51014
51015 memset(&generic_hpc, 0, sizeof (struct cpci_hp_controller));
51016- generic_hpc_ops.query_enum = query_enum;
51017 generic_hpc.ops = &generic_hpc_ops;
51018
51019 status = cpci_hp_register_controller(&generic_hpc);
51020diff --git a/drivers/pci/hotplug/cpcihp_zt5550.c b/drivers/pci/hotplug/cpcihp_zt5550.c
51021index 7ecf34e..effed62 100644
51022--- a/drivers/pci/hotplug/cpcihp_zt5550.c
51023+++ b/drivers/pci/hotplug/cpcihp_zt5550.c
51024@@ -59,7 +59,6 @@
51025 /* local variables */
51026 static bool debug;
51027 static bool poll;
51028-static struct cpci_hp_controller_ops zt5550_hpc_ops;
51029 static struct cpci_hp_controller zt5550_hpc;
51030
51031 /* Primary cPCI bus bridge device */
51032@@ -204,6 +203,10 @@ static int zt5550_hc_disable_irq(void)
51033 return 0;
51034 }
51035
51036+static struct cpci_hp_controller_ops zt5550_hpc_ops = {
51037+ .query_enum = zt5550_hc_query_enum,
51038+};
51039+
51040 static int zt5550_hc_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
51041 {
51042 int status;
51043@@ -215,16 +218,17 @@ static int zt5550_hc_init_one (struct pci_dev *pdev, const struct pci_device_id
51044 dbg("returned from zt5550_hc_config");
51045
51046 memset(&zt5550_hpc, 0, sizeof (struct cpci_hp_controller));
51047- zt5550_hpc_ops.query_enum = zt5550_hc_query_enum;
51048 zt5550_hpc.ops = &zt5550_hpc_ops;
51049 if (!poll) {
51050 zt5550_hpc.irq = hc_dev->irq;
51051 zt5550_hpc.irq_flags = IRQF_SHARED;
51052 zt5550_hpc.dev_id = hc_dev;
51053
51054- zt5550_hpc_ops.enable_irq = zt5550_hc_enable_irq;
51055- zt5550_hpc_ops.disable_irq = zt5550_hc_disable_irq;
51056- zt5550_hpc_ops.check_irq = zt5550_hc_check_irq;
51057+ pax_open_kernel();
51058+ *(void **)&zt5550_hpc_ops.enable_irq = zt5550_hc_enable_irq;
51059+ *(void **)&zt5550_hpc_ops.disable_irq = zt5550_hc_disable_irq;
51060+ *(void **)&zt5550_hpc_ops.check_irq = zt5550_hc_check_irq;
51061+ pax_open_kernel();
51062 } else {
51063 info("using ENUM# polling mode");
51064 }
51065diff --git a/drivers/pci/hotplug/cpqphp_nvram.c b/drivers/pci/hotplug/cpqphp_nvram.c
51066index 1e08ff8c..3cd145f 100644
51067--- a/drivers/pci/hotplug/cpqphp_nvram.c
51068+++ b/drivers/pci/hotplug/cpqphp_nvram.c
51069@@ -425,8 +425,10 @@ static u32 store_HRT (void __iomem *rom_start)
51070
51071 void compaq_nvram_init (void __iomem *rom_start)
51072 {
51073+#ifndef CONFIG_PAX_KERNEXEC
51074 if (rom_start)
51075 compaq_int15_entry_point = (rom_start + ROM_INT15_PHY_ADDR - ROM_PHY_ADDR);
51076+#endif
51077
51078 dbg("int15 entry = %p\n", compaq_int15_entry_point);
51079
51080diff --git a/drivers/pci/hotplug/pci_hotplug_core.c b/drivers/pci/hotplug/pci_hotplug_core.c
51081index 56d8486..f26113f 100644
51082--- a/drivers/pci/hotplug/pci_hotplug_core.c
51083+++ b/drivers/pci/hotplug/pci_hotplug_core.c
51084@@ -436,8 +436,10 @@ int __pci_hp_register(struct hotplug_slot *slot, struct pci_bus *bus,
51085 return -EINVAL;
51086 }
51087
51088- slot->ops->owner = owner;
51089- slot->ops->mod_name = mod_name;
51090+ pax_open_kernel();
51091+ *(struct module **)&slot->ops->owner = owner;
51092+ *(const char **)&slot->ops->mod_name = mod_name;
51093+ pax_close_kernel();
51094
51095 mutex_lock(&pci_hp_mutex);
51096 /*
51097diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
51098index 07aa722..84514b4 100644
51099--- a/drivers/pci/hotplug/pciehp_core.c
51100+++ b/drivers/pci/hotplug/pciehp_core.c
51101@@ -92,7 +92,7 @@ static int init_slot(struct controller *ctrl)
51102 struct slot *slot = ctrl->slot;
51103 struct hotplug_slot *hotplug = NULL;
51104 struct hotplug_slot_info *info = NULL;
51105- struct hotplug_slot_ops *ops = NULL;
51106+ hotplug_slot_ops_no_const *ops = NULL;
51107 char name[SLOT_NAME_SIZE];
51108 int retval = -ENOMEM;
51109
51110diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
51111index c3e7dfc..cbd9625 100644
51112--- a/drivers/pci/msi.c
51113+++ b/drivers/pci/msi.c
51114@@ -513,8 +513,8 @@ static int populate_msi_sysfs(struct pci_dev *pdev)
51115 {
51116 struct attribute **msi_attrs;
51117 struct attribute *msi_attr;
51118- struct device_attribute *msi_dev_attr;
51119- struct attribute_group *msi_irq_group;
51120+ device_attribute_no_const *msi_dev_attr;
51121+ attribute_group_no_const *msi_irq_group;
51122 const struct attribute_group **msi_irq_groups;
51123 struct msi_desc *entry;
51124 int ret = -ENOMEM;
51125@@ -573,7 +573,7 @@ error_attrs:
51126 count = 0;
51127 msi_attr = msi_attrs[count];
51128 while (msi_attr) {
51129- msi_dev_attr = container_of(msi_attr, struct device_attribute, attr);
51130+ msi_dev_attr = container_of(msi_attr, device_attribute_no_const, attr);
51131 kfree(msi_attr->name);
51132 kfree(msi_dev_attr);
51133 ++count;
51134diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
51135index 312f23a..d21181c 100644
51136--- a/drivers/pci/pci-sysfs.c
51137+++ b/drivers/pci/pci-sysfs.c
51138@@ -1140,7 +1140,7 @@ static int pci_create_attr(struct pci_dev *pdev, int num, int write_combine)
51139 {
51140 /* allocate attribute structure, piggyback attribute name */
51141 int name_len = write_combine ? 13 : 10;
51142- struct bin_attribute *res_attr;
51143+ bin_attribute_no_const *res_attr;
51144 int retval;
51145
51146 res_attr = kzalloc(sizeof(*res_attr) + name_len, GFP_ATOMIC);
51147@@ -1317,7 +1317,7 @@ static struct device_attribute reset_attr = __ATTR(reset, 0200, NULL, reset_stor
51148 static int pci_create_capabilities_sysfs(struct pci_dev *dev)
51149 {
51150 int retval;
51151- struct bin_attribute *attr;
51152+ bin_attribute_no_const *attr;
51153
51154 /* If the device has VPD, try to expose it in sysfs. */
51155 if (dev->vpd) {
51156@@ -1364,7 +1364,7 @@ int __must_check pci_create_sysfs_dev_files(struct pci_dev *pdev)
51157 {
51158 int retval;
51159 int rom_size = 0;
51160- struct bin_attribute *attr;
51161+ bin_attribute_no_const *attr;
51162
51163 if (!sysfs_initialized)
51164 return -EACCES;
51165diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
51166index 4091f82..7d98eef 100644
51167--- a/drivers/pci/pci.h
51168+++ b/drivers/pci/pci.h
51169@@ -99,7 +99,7 @@ struct pci_vpd_ops {
51170 struct pci_vpd {
51171 unsigned int len;
51172 const struct pci_vpd_ops *ops;
51173- struct bin_attribute *attr; /* descriptor for sysfs VPD entry */
51174+ bin_attribute_no_const *attr; /* descriptor for sysfs VPD entry */
51175 };
51176
51177 int pci_vpd_pci22_init(struct pci_dev *dev);
51178diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
51179index 820740a..8b1c673 100644
51180--- a/drivers/pci/pcie/aspm.c
51181+++ b/drivers/pci/pcie/aspm.c
51182@@ -27,9 +27,9 @@
51183 #define MODULE_PARAM_PREFIX "pcie_aspm."
51184
51185 /* Note: those are not register definitions */
51186-#define ASPM_STATE_L0S_UP (1) /* Upstream direction L0s state */
51187-#define ASPM_STATE_L0S_DW (2) /* Downstream direction L0s state */
51188-#define ASPM_STATE_L1 (4) /* L1 state */
51189+#define ASPM_STATE_L0S_UP (1U) /* Upstream direction L0s state */
51190+#define ASPM_STATE_L0S_DW (2U) /* Downstream direction L0s state */
51191+#define ASPM_STATE_L1 (4U) /* L1 state */
51192 #define ASPM_STATE_L0S (ASPM_STATE_L0S_UP | ASPM_STATE_L0S_DW)
51193 #define ASPM_STATE_ALL (ASPM_STATE_L0S | ASPM_STATE_L1)
51194
51195diff --git a/drivers/pci/pcie/portdrv_pci.c b/drivers/pci/pcie/portdrv_pci.c
51196index be35da2..ec16cdb 100644
51197--- a/drivers/pci/pcie/portdrv_pci.c
51198+++ b/drivers/pci/pcie/portdrv_pci.c
51199@@ -324,7 +324,7 @@ static int __init dmi_pcie_pme_disable_msi(const struct dmi_system_id *d)
51200 return 0;
51201 }
51202
51203-static struct dmi_system_id __initdata pcie_portdrv_dmi_table[] = {
51204+static const struct dmi_system_id __initconst pcie_portdrv_dmi_table[] = {
51205 /*
51206 * Boxes that should not use MSI for PCIe PME signaling.
51207 */
51208diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
51209index 8d2f400..c97cc91 100644
51210--- a/drivers/pci/probe.c
51211+++ b/drivers/pci/probe.c
51212@@ -175,7 +175,7 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
51213 u16 orig_cmd;
51214 struct pci_bus_region region, inverted_region;
51215
51216- mask = type ? PCI_ROM_ADDRESS_MASK : ~0;
51217+ mask = type ? (u32)PCI_ROM_ADDRESS_MASK : ~0;
51218
51219 /* No printks while decoding is disabled! */
51220 if (!dev->mmio_always_on) {
51221diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
51222index 3f155e7..0f4b1f0 100644
51223--- a/drivers/pci/proc.c
51224+++ b/drivers/pci/proc.c
51225@@ -434,7 +434,16 @@ static const struct file_operations proc_bus_pci_dev_operations = {
51226 static int __init pci_proc_init(void)
51227 {
51228 struct pci_dev *dev = NULL;
51229+
51230+#ifdef CONFIG_GRKERNSEC_PROC_ADD
51231+#ifdef CONFIG_GRKERNSEC_PROC_USER
51232+ proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR, NULL);
51233+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
51234+ proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
51235+#endif
51236+#else
51237 proc_bus_pci_dir = proc_mkdir("bus/pci", NULL);
51238+#endif
51239 proc_create("devices", 0, proc_bus_pci_dir,
51240 &proc_bus_pci_dev_operations);
51241 proc_initialized = 1;
51242diff --git a/drivers/platform/chrome/chromeos_pstore.c b/drivers/platform/chrome/chromeos_pstore.c
51243index 3474920..acc9581 100644
51244--- a/drivers/platform/chrome/chromeos_pstore.c
51245+++ b/drivers/platform/chrome/chromeos_pstore.c
51246@@ -13,7 +13,7 @@
51247 #include <linux/platform_device.h>
51248 #include <linux/pstore_ram.h>
51249
51250-static struct dmi_system_id chromeos_pstore_dmi_table[] __initdata = {
51251+static const struct dmi_system_id chromeos_pstore_dmi_table[] __initconst = {
51252 {
51253 /*
51254 * Today all Chromebooks/boxes ship with Google_* as version and
51255diff --git a/drivers/platform/x86/alienware-wmi.c b/drivers/platform/x86/alienware-wmi.c
51256index 1e1e594..8fe59c5 100644
51257--- a/drivers/platform/x86/alienware-wmi.c
51258+++ b/drivers/platform/x86/alienware-wmi.c
51259@@ -150,7 +150,7 @@ struct wmax_led_args {
51260 } __packed;
51261
51262 static struct platform_device *platform_device;
51263-static struct device_attribute *zone_dev_attrs;
51264+static device_attribute_no_const *zone_dev_attrs;
51265 static struct attribute **zone_attrs;
51266 static struct platform_zone *zone_data;
51267
51268@@ -160,7 +160,7 @@ static struct platform_driver platform_driver = {
51269 }
51270 };
51271
51272-static struct attribute_group zone_attribute_group = {
51273+static attribute_group_no_const zone_attribute_group = {
51274 .name = "rgb_zones",
51275 };
51276
51277diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
51278index 7543a56..367ca8ed 100644
51279--- a/drivers/platform/x86/asus-wmi.c
51280+++ b/drivers/platform/x86/asus-wmi.c
51281@@ -1589,6 +1589,10 @@ static int show_dsts(struct seq_file *m, void *data)
51282 int err;
51283 u32 retval = -1;
51284
51285+#ifdef CONFIG_GRKERNSEC_KMEM
51286+ return -EPERM;
51287+#endif
51288+
51289 err = asus_wmi_get_devstate(asus, asus->debug.dev_id, &retval);
51290
51291 if (err < 0)
51292@@ -1605,6 +1609,10 @@ static int show_devs(struct seq_file *m, void *data)
51293 int err;
51294 u32 retval = -1;
51295
51296+#ifdef CONFIG_GRKERNSEC_KMEM
51297+ return -EPERM;
51298+#endif
51299+
51300 err = asus_wmi_set_devstate(asus->debug.dev_id, asus->debug.ctrl_param,
51301 &retval);
51302
51303@@ -1629,6 +1637,10 @@ static int show_call(struct seq_file *m, void *data)
51304 union acpi_object *obj;
51305 acpi_status status;
51306
51307+#ifdef CONFIG_GRKERNSEC_KMEM
51308+ return -EPERM;
51309+#endif
51310+
51311 status = wmi_evaluate_method(ASUS_WMI_MGMT_GUID,
51312 1, asus->debug.method_id,
51313 &input, &output);
51314diff --git a/drivers/platform/x86/compal-laptop.c b/drivers/platform/x86/compal-laptop.c
51315index bceb30b..bf063d4 100644
51316--- a/drivers/platform/x86/compal-laptop.c
51317+++ b/drivers/platform/x86/compal-laptop.c
51318@@ -766,7 +766,7 @@ static int dmi_check_cb_extra(const struct dmi_system_id *id)
51319 return 1;
51320 }
51321
51322-static struct dmi_system_id __initdata compal_dmi_table[] = {
51323+static const struct dmi_system_id __initconst compal_dmi_table[] = {
51324 {
51325 .ident = "FL90/IFL90",
51326 .matches = {
51327diff --git a/drivers/platform/x86/hdaps.c b/drivers/platform/x86/hdaps.c
51328index 458e6c9..089aee7 100644
51329--- a/drivers/platform/x86/hdaps.c
51330+++ b/drivers/platform/x86/hdaps.c
51331@@ -514,7 +514,7 @@ static int __init hdaps_dmi_match_invert(const struct dmi_system_id *id)
51332 "ThinkPad T42p", so the order of the entries matters.
51333 If your ThinkPad is not recognized, please update to latest
51334 BIOS. This is especially the case for some R52 ThinkPads. */
51335-static struct dmi_system_id __initdata hdaps_whitelist[] = {
51336+static const struct dmi_system_id __initconst hdaps_whitelist[] = {
51337 HDAPS_DMI_MATCH_INVERT("IBM", "ThinkPad R50p", HDAPS_BOTH_AXES),
51338 HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R50"),
51339 HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R51"),
51340diff --git a/drivers/platform/x86/ibm_rtl.c b/drivers/platform/x86/ibm_rtl.c
51341index 97c2be1..2ee50ce 100644
51342--- a/drivers/platform/x86/ibm_rtl.c
51343+++ b/drivers/platform/x86/ibm_rtl.c
51344@@ -227,7 +227,7 @@ static void rtl_teardown_sysfs(void) {
51345 }
51346
51347
51348-static struct dmi_system_id __initdata ibm_rtl_dmi_table[] = {
51349+static const struct dmi_system_id __initconst ibm_rtl_dmi_table[] = {
51350 { \
51351 .matches = { \
51352 DMI_MATCH(DMI_SYS_VENDOR, "IBM"), \
51353diff --git a/drivers/platform/x86/intel_oaktrail.c b/drivers/platform/x86/intel_oaktrail.c
51354index a4a4258..a58a04c 100644
51355--- a/drivers/platform/x86/intel_oaktrail.c
51356+++ b/drivers/platform/x86/intel_oaktrail.c
51357@@ -298,7 +298,7 @@ static int dmi_check_cb(const struct dmi_system_id *id)
51358 return 0;
51359 }
51360
51361-static struct dmi_system_id __initdata oaktrail_dmi_table[] = {
51362+static const struct dmi_system_id __initconst oaktrail_dmi_table[] = {
51363 {
51364 .ident = "OakTrail platform",
51365 .matches = {
51366diff --git a/drivers/platform/x86/msi-laptop.c b/drivers/platform/x86/msi-laptop.c
51367index 0859877..59d596d 100644
51368--- a/drivers/platform/x86/msi-laptop.c
51369+++ b/drivers/platform/x86/msi-laptop.c
51370@@ -604,7 +604,7 @@ static int dmi_check_cb(const struct dmi_system_id *dmi)
51371 return 1;
51372 }
51373
51374-static struct dmi_system_id __initdata msi_dmi_table[] = {
51375+static const struct dmi_system_id __initconst msi_dmi_table[] = {
51376 {
51377 .ident = "MSI S270",
51378 .matches = {
51379@@ -999,12 +999,14 @@ static int __init load_scm_model_init(struct platform_device *sdev)
51380
51381 if (!quirks->ec_read_only) {
51382 /* allow userland write sysfs file */
51383- dev_attr_bluetooth.store = store_bluetooth;
51384- dev_attr_wlan.store = store_wlan;
51385- dev_attr_threeg.store = store_threeg;
51386- dev_attr_bluetooth.attr.mode |= S_IWUSR;
51387- dev_attr_wlan.attr.mode |= S_IWUSR;
51388- dev_attr_threeg.attr.mode |= S_IWUSR;
51389+ pax_open_kernel();
51390+ *(void **)&dev_attr_bluetooth.store = store_bluetooth;
51391+ *(void **)&dev_attr_wlan.store = store_wlan;
51392+ *(void **)&dev_attr_threeg.store = store_threeg;
51393+ *(umode_t *)&dev_attr_bluetooth.attr.mode |= S_IWUSR;
51394+ *(umode_t *)&dev_attr_wlan.attr.mode |= S_IWUSR;
51395+ *(umode_t *)&dev_attr_threeg.attr.mode |= S_IWUSR;
51396+ pax_close_kernel();
51397 }
51398
51399 /* disable hardware control by fn key */
51400diff --git a/drivers/platform/x86/msi-wmi.c b/drivers/platform/x86/msi-wmi.c
51401index 6d2bac0..ec2b029 100644
51402--- a/drivers/platform/x86/msi-wmi.c
51403+++ b/drivers/platform/x86/msi-wmi.c
51404@@ -183,7 +183,7 @@ static const struct backlight_ops msi_backlight_ops = {
51405 static void msi_wmi_notify(u32 value, void *context)
51406 {
51407 struct acpi_buffer response = { ACPI_ALLOCATE_BUFFER, NULL };
51408- static struct key_entry *key;
51409+ struct key_entry *key;
51410 union acpi_object *obj;
51411 acpi_status status;
51412
51413diff --git a/drivers/platform/x86/samsung-laptop.c b/drivers/platform/x86/samsung-laptop.c
51414index 9e701b2..c68a7b5 100644
51415--- a/drivers/platform/x86/samsung-laptop.c
51416+++ b/drivers/platform/x86/samsung-laptop.c
51417@@ -1567,7 +1567,7 @@ static int __init samsung_dmi_matched(const struct dmi_system_id *d)
51418 return 0;
51419 }
51420
51421-static struct dmi_system_id __initdata samsung_dmi_table[] = {
51422+static const struct dmi_system_id __initconst samsung_dmi_table[] = {
51423 {
51424 .matches = {
51425 DMI_MATCH(DMI_SYS_VENDOR,
51426diff --git a/drivers/platform/x86/samsung-q10.c b/drivers/platform/x86/samsung-q10.c
51427index e6aac72..e11ff24 100644
51428--- a/drivers/platform/x86/samsung-q10.c
51429+++ b/drivers/platform/x86/samsung-q10.c
51430@@ -95,7 +95,7 @@ static int __init dmi_check_callback(const struct dmi_system_id *id)
51431 return 1;
51432 }
51433
51434-static struct dmi_system_id __initdata samsungq10_dmi_table[] = {
51435+static const struct dmi_system_id __initconst samsungq10_dmi_table[] = {
51436 {
51437 .ident = "Samsung Q10",
51438 .matches = {
51439diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
51440index e51c1e7..71bb385 100644
51441--- a/drivers/platform/x86/sony-laptop.c
51442+++ b/drivers/platform/x86/sony-laptop.c
51443@@ -2526,7 +2526,7 @@ static void sony_nc_gfx_switch_cleanup(struct platform_device *pd)
51444 }
51445
51446 /* High speed charging function */
51447-static struct device_attribute *hsc_handle;
51448+static device_attribute_no_const *hsc_handle;
51449
51450 static ssize_t sony_nc_highspeed_charging_store(struct device *dev,
51451 struct device_attribute *attr,
51452@@ -2600,7 +2600,7 @@ static void sony_nc_highspeed_charging_cleanup(struct platform_device *pd)
51453 }
51454
51455 /* low battery function */
51456-static struct device_attribute *lowbatt_handle;
51457+static device_attribute_no_const *lowbatt_handle;
51458
51459 static ssize_t sony_nc_lowbatt_store(struct device *dev,
51460 struct device_attribute *attr,
51461@@ -2666,7 +2666,7 @@ static void sony_nc_lowbatt_cleanup(struct platform_device *pd)
51462 }
51463
51464 /* fan speed function */
51465-static struct device_attribute *fan_handle, *hsf_handle;
51466+static device_attribute_no_const *fan_handle, *hsf_handle;
51467
51468 static ssize_t sony_nc_hsfan_store(struct device *dev,
51469 struct device_attribute *attr,
51470@@ -2773,7 +2773,7 @@ static void sony_nc_fanspeed_cleanup(struct platform_device *pd)
51471 }
51472
51473 /* USB charge function */
51474-static struct device_attribute *uc_handle;
51475+static device_attribute_no_const *uc_handle;
51476
51477 static ssize_t sony_nc_usb_charge_store(struct device *dev,
51478 struct device_attribute *attr,
51479@@ -2847,7 +2847,7 @@ static void sony_nc_usb_charge_cleanup(struct platform_device *pd)
51480 }
51481
51482 /* Panel ID function */
51483-static struct device_attribute *panel_handle;
51484+static device_attribute_no_const *panel_handle;
51485
51486 static ssize_t sony_nc_panelid_show(struct device *dev,
51487 struct device_attribute *attr, char *buffer)
51488@@ -2894,7 +2894,7 @@ static void sony_nc_panelid_cleanup(struct platform_device *pd)
51489 }
51490
51491 /* smart connect function */
51492-static struct device_attribute *sc_handle;
51493+static device_attribute_no_const *sc_handle;
51494
51495 static ssize_t sony_nc_smart_conn_store(struct device *dev,
51496 struct device_attribute *attr,
51497@@ -4854,7 +4854,7 @@ static struct acpi_driver sony_pic_driver = {
51498 .drv.pm = &sony_pic_pm,
51499 };
51500
51501-static struct dmi_system_id __initdata sonypi_dmi_table[] = {
51502+static const struct dmi_system_id __initconst sonypi_dmi_table[] = {
51503 {
51504 .ident = "Sony Vaio",
51505 .matches = {
51506diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
51507index 3b8ceee..e18652c 100644
51508--- a/drivers/platform/x86/thinkpad_acpi.c
51509+++ b/drivers/platform/x86/thinkpad_acpi.c
51510@@ -2093,7 +2093,7 @@ static int hotkey_mask_get(void)
51511 return 0;
51512 }
51513
51514-void static hotkey_mask_warn_incomplete_mask(void)
51515+static void hotkey_mask_warn_incomplete_mask(void)
51516 {
51517 /* log only what the user can fix... */
51518 const u32 wantedmask = hotkey_driver_mask &
51519@@ -2437,10 +2437,10 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
51520 && !tp_features.bright_unkfw)
51521 TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
51522 }
51523+}
51524
51525 #undef TPACPI_COMPARE_KEY
51526 #undef TPACPI_MAY_SEND_KEY
51527-}
51528
51529 /*
51530 * Polling driver
51531diff --git a/drivers/pnp/pnpbios/bioscalls.c b/drivers/pnp/pnpbios/bioscalls.c
51532index 438d4c7..ca8a2fb 100644
51533--- a/drivers/pnp/pnpbios/bioscalls.c
51534+++ b/drivers/pnp/pnpbios/bioscalls.c
51535@@ -59,7 +59,7 @@ do { \
51536 set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
51537 } while(0)
51538
51539-static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
51540+static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
51541 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
51542
51543 /*
51544@@ -96,7 +96,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
51545
51546 cpu = get_cpu();
51547 save_desc_40 = get_cpu_gdt_table(cpu)[0x40 / 8];
51548+
51549+ pax_open_kernel();
51550 get_cpu_gdt_table(cpu)[0x40 / 8] = bad_bios_desc;
51551+ pax_close_kernel();
51552
51553 /* On some boxes IRQ's during PnP BIOS calls are deadly. */
51554 spin_lock_irqsave(&pnp_bios_lock, flags);
51555@@ -134,7 +137,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
51556 :"memory");
51557 spin_unlock_irqrestore(&pnp_bios_lock, flags);
51558
51559+ pax_open_kernel();
51560 get_cpu_gdt_table(cpu)[0x40 / 8] = save_desc_40;
51561+ pax_close_kernel();
51562+
51563 put_cpu();
51564
51565 /* If we get here and this is set then the PnP BIOS faulted on us. */
51566@@ -468,7 +474,7 @@ int pnp_bios_read_escd(char *data, u32 nvram_base)
51567 return status;
51568 }
51569
51570-void pnpbios_calls_init(union pnp_bios_install_struct *header)
51571+void __init pnpbios_calls_init(union pnp_bios_install_struct *header)
51572 {
51573 int i;
51574
51575@@ -476,6 +482,8 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
51576 pnp_bios_callpoint.offset = header->fields.pm16offset;
51577 pnp_bios_callpoint.segment = PNP_CS16;
51578
51579+ pax_open_kernel();
51580+
51581 for_each_possible_cpu(i) {
51582 struct desc_struct *gdt = get_cpu_gdt_table(i);
51583 if (!gdt)
51584@@ -487,4 +495,6 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
51585 set_desc_base(&gdt[GDT_ENTRY_PNPBIOS_DS],
51586 (unsigned long)__va(header->fields.pm16dseg));
51587 }
51588+
51589+ pax_close_kernel();
51590 }
51591diff --git a/drivers/pnp/pnpbios/core.c b/drivers/pnp/pnpbios/core.c
51592index facd43b..b291260 100644
51593--- a/drivers/pnp/pnpbios/core.c
51594+++ b/drivers/pnp/pnpbios/core.c
51595@@ -494,7 +494,7 @@ static int __init exploding_pnp_bios(const struct dmi_system_id *d)
51596 return 0;
51597 }
51598
51599-static struct dmi_system_id pnpbios_dmi_table[] __initdata = {
51600+static const struct dmi_system_id pnpbios_dmi_table[] __initconst = {
51601 { /* PnPBIOS GPF on boot */
51602 .callback = exploding_pnp_bios,
51603 .ident = "Higraded P14H",
51604diff --git a/drivers/power/pda_power.c b/drivers/power/pda_power.c
51605index 0c52e2a..3421ab7 100644
51606--- a/drivers/power/pda_power.c
51607+++ b/drivers/power/pda_power.c
51608@@ -37,7 +37,11 @@ static int polling;
51609
51610 #if IS_ENABLED(CONFIG_USB_PHY)
51611 static struct usb_phy *transceiver;
51612-static struct notifier_block otg_nb;
51613+static int otg_handle_notification(struct notifier_block *nb,
51614+ unsigned long event, void *unused);
51615+static struct notifier_block otg_nb = {
51616+ .notifier_call = otg_handle_notification
51617+};
51618 #endif
51619
51620 static struct regulator *ac_draw;
51621@@ -369,7 +373,6 @@ static int pda_power_probe(struct platform_device *pdev)
51622
51623 #if IS_ENABLED(CONFIG_USB_PHY)
51624 if (!IS_ERR_OR_NULL(transceiver) && pdata->use_otg_notifier) {
51625- otg_nb.notifier_call = otg_handle_notification;
51626 ret = usb_register_notifier(transceiver, &otg_nb);
51627 if (ret) {
51628 dev_err(dev, "failure to register otg notifier\n");
51629diff --git a/drivers/power/power_supply.h b/drivers/power/power_supply.h
51630index cc439fd..8fa30df 100644
51631--- a/drivers/power/power_supply.h
51632+++ b/drivers/power/power_supply.h
51633@@ -16,12 +16,12 @@ struct power_supply;
51634
51635 #ifdef CONFIG_SYSFS
51636
51637-extern void power_supply_init_attrs(struct device_type *dev_type);
51638+extern void power_supply_init_attrs(void);
51639 extern int power_supply_uevent(struct device *dev, struct kobj_uevent_env *env);
51640
51641 #else
51642
51643-static inline void power_supply_init_attrs(struct device_type *dev_type) {}
51644+static inline void power_supply_init_attrs(void) {}
51645 #define power_supply_uevent NULL
51646
51647 #endif /* CONFIG_SYSFS */
51648diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c
51649index 694e8cd..9f03483 100644
51650--- a/drivers/power/power_supply_core.c
51651+++ b/drivers/power/power_supply_core.c
51652@@ -28,7 +28,10 @@ EXPORT_SYMBOL_GPL(power_supply_class);
51653 ATOMIC_NOTIFIER_HEAD(power_supply_notifier);
51654 EXPORT_SYMBOL_GPL(power_supply_notifier);
51655
51656-static struct device_type power_supply_dev_type;
51657+extern const struct attribute_group *power_supply_attr_groups[];
51658+static struct device_type power_supply_dev_type = {
51659+ .groups = power_supply_attr_groups,
51660+};
51661
51662 static bool __power_supply_is_supplied_by(struct power_supply *supplier,
51663 struct power_supply *supply)
51664@@ -637,7 +640,7 @@ static int __init power_supply_class_init(void)
51665 return PTR_ERR(power_supply_class);
51666
51667 power_supply_class->dev_uevent = power_supply_uevent;
51668- power_supply_init_attrs(&power_supply_dev_type);
51669+ power_supply_init_attrs();
51670
51671 return 0;
51672 }
51673diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c
51674index 62653f5..d0bb485 100644
51675--- a/drivers/power/power_supply_sysfs.c
51676+++ b/drivers/power/power_supply_sysfs.c
51677@@ -238,17 +238,15 @@ static struct attribute_group power_supply_attr_group = {
51678 .is_visible = power_supply_attr_is_visible,
51679 };
51680
51681-static const struct attribute_group *power_supply_attr_groups[] = {
51682+const struct attribute_group *power_supply_attr_groups[] = {
51683 &power_supply_attr_group,
51684 NULL,
51685 };
51686
51687-void power_supply_init_attrs(struct device_type *dev_type)
51688+void power_supply_init_attrs(void)
51689 {
51690 int i;
51691
51692- dev_type->groups = power_supply_attr_groups;
51693-
51694 for (i = 0; i < ARRAY_SIZE(power_supply_attrs); i++)
51695 __power_supply_attrs[i] = &power_supply_attrs[i].attr;
51696 }
51697diff --git a/drivers/powercap/powercap_sys.c b/drivers/powercap/powercap_sys.c
51698index 84419af..268ede8 100644
51699--- a/drivers/powercap/powercap_sys.c
51700+++ b/drivers/powercap/powercap_sys.c
51701@@ -154,8 +154,77 @@ struct powercap_constraint_attr {
51702 struct device_attribute name_attr;
51703 };
51704
51705+static ssize_t show_constraint_name(struct device *dev,
51706+ struct device_attribute *dev_attr,
51707+ char *buf);
51708+
51709 static struct powercap_constraint_attr
51710- constraint_attrs[MAX_CONSTRAINTS_PER_ZONE];
51711+ constraint_attrs[MAX_CONSTRAINTS_PER_ZONE] = {
51712+ [0 ... MAX_CONSTRAINTS_PER_ZONE - 1] = {
51713+ .power_limit_attr = {
51714+ .attr = {
51715+ .name = NULL,
51716+ .mode = S_IWUSR | S_IRUGO
51717+ },
51718+ .show = show_constraint_power_limit_uw,
51719+ .store = store_constraint_power_limit_uw
51720+ },
51721+
51722+ .time_window_attr = {
51723+ .attr = {
51724+ .name = NULL,
51725+ .mode = S_IWUSR | S_IRUGO
51726+ },
51727+ .show = show_constraint_time_window_us,
51728+ .store = store_constraint_time_window_us
51729+ },
51730+
51731+ .max_power_attr = {
51732+ .attr = {
51733+ .name = NULL,
51734+ .mode = S_IRUGO
51735+ },
51736+ .show = show_constraint_max_power_uw,
51737+ .store = NULL
51738+ },
51739+
51740+ .min_power_attr = {
51741+ .attr = {
51742+ .name = NULL,
51743+ .mode = S_IRUGO
51744+ },
51745+ .show = show_constraint_min_power_uw,
51746+ .store = NULL
51747+ },
51748+
51749+ .max_time_window_attr = {
51750+ .attr = {
51751+ .name = NULL,
51752+ .mode = S_IRUGO
51753+ },
51754+ .show = show_constraint_max_time_window_us,
51755+ .store = NULL
51756+ },
51757+
51758+ .min_time_window_attr = {
51759+ .attr = {
51760+ .name = NULL,
51761+ .mode = S_IRUGO
51762+ },
51763+ .show = show_constraint_min_time_window_us,
51764+ .store = NULL
51765+ },
51766+
51767+ .name_attr = {
51768+ .attr = {
51769+ .name = NULL,
51770+ .mode = S_IRUGO
51771+ },
51772+ .show = show_constraint_name,
51773+ .store = NULL
51774+ }
51775+ }
51776+};
51777
51778 /* A list of powercap control_types */
51779 static LIST_HEAD(powercap_cntrl_list);
51780@@ -193,23 +262,16 @@ static ssize_t show_constraint_name(struct device *dev,
51781 }
51782
51783 static int create_constraint_attribute(int id, const char *name,
51784- int mode,
51785- struct device_attribute *dev_attr,
51786- ssize_t (*show)(struct device *,
51787- struct device_attribute *, char *),
51788- ssize_t (*store)(struct device *,
51789- struct device_attribute *,
51790- const char *, size_t)
51791- )
51792+ struct device_attribute *dev_attr)
51793 {
51794+ name = kasprintf(GFP_KERNEL, "constraint_%d_%s", id, name);
51795
51796- dev_attr->attr.name = kasprintf(GFP_KERNEL, "constraint_%d_%s",
51797- id, name);
51798- if (!dev_attr->attr.name)
51799+ if (!name)
51800 return -ENOMEM;
51801- dev_attr->attr.mode = mode;
51802- dev_attr->show = show;
51803- dev_attr->store = store;
51804+
51805+ pax_open_kernel();
51806+ *(const char **)&dev_attr->attr.name = name;
51807+ pax_close_kernel();
51808
51809 return 0;
51810 }
51811@@ -236,49 +298,31 @@ static int seed_constraint_attributes(void)
51812
51813 for (i = 0; i < MAX_CONSTRAINTS_PER_ZONE; ++i) {
51814 ret = create_constraint_attribute(i, "power_limit_uw",
51815- S_IWUSR | S_IRUGO,
51816- &constraint_attrs[i].power_limit_attr,
51817- show_constraint_power_limit_uw,
51818- store_constraint_power_limit_uw);
51819+ &constraint_attrs[i].power_limit_attr);
51820 if (ret)
51821 goto err_alloc;
51822 ret = create_constraint_attribute(i, "time_window_us",
51823- S_IWUSR | S_IRUGO,
51824- &constraint_attrs[i].time_window_attr,
51825- show_constraint_time_window_us,
51826- store_constraint_time_window_us);
51827+ &constraint_attrs[i].time_window_attr);
51828 if (ret)
51829 goto err_alloc;
51830- ret = create_constraint_attribute(i, "name", S_IRUGO,
51831- &constraint_attrs[i].name_attr,
51832- show_constraint_name,
51833- NULL);
51834+ ret = create_constraint_attribute(i, "name",
51835+ &constraint_attrs[i].name_attr);
51836 if (ret)
51837 goto err_alloc;
51838- ret = create_constraint_attribute(i, "max_power_uw", S_IRUGO,
51839- &constraint_attrs[i].max_power_attr,
51840- show_constraint_max_power_uw,
51841- NULL);
51842+ ret = create_constraint_attribute(i, "max_power_uw",
51843+ &constraint_attrs[i].max_power_attr);
51844 if (ret)
51845 goto err_alloc;
51846- ret = create_constraint_attribute(i, "min_power_uw", S_IRUGO,
51847- &constraint_attrs[i].min_power_attr,
51848- show_constraint_min_power_uw,
51849- NULL);
51850+ ret = create_constraint_attribute(i, "min_power_uw",
51851+ &constraint_attrs[i].min_power_attr);
51852 if (ret)
51853 goto err_alloc;
51854 ret = create_constraint_attribute(i, "max_time_window_us",
51855- S_IRUGO,
51856- &constraint_attrs[i].max_time_window_attr,
51857- show_constraint_max_time_window_us,
51858- NULL);
51859+ &constraint_attrs[i].max_time_window_attr);
51860 if (ret)
51861 goto err_alloc;
51862 ret = create_constraint_attribute(i, "min_time_window_us",
51863- S_IRUGO,
51864- &constraint_attrs[i].min_time_window_attr,
51865- show_constraint_min_time_window_us,
51866- NULL);
51867+ &constraint_attrs[i].min_time_window_attr);
51868 if (ret)
51869 goto err_alloc;
51870
51871@@ -378,10 +422,12 @@ static void create_power_zone_common_attributes(
51872 power_zone->zone_dev_attrs[count++] =
51873 &dev_attr_max_energy_range_uj.attr;
51874 if (power_zone->ops->get_energy_uj) {
51875+ pax_open_kernel();
51876 if (power_zone->ops->reset_energy_uj)
51877- dev_attr_energy_uj.attr.mode = S_IWUSR | S_IRUGO;
51878+ *(umode_t *)&dev_attr_energy_uj.attr.mode = S_IWUSR | S_IRUGO;
51879 else
51880- dev_attr_energy_uj.attr.mode = S_IRUGO;
51881+ *(umode_t *)&dev_attr_energy_uj.attr.mode = S_IRUGO;
51882+ pax_close_kernel();
51883 power_zone->zone_dev_attrs[count++] =
51884 &dev_attr_energy_uj.attr;
51885 }
51886diff --git a/drivers/ptp/ptp_private.h b/drivers/ptp/ptp_private.h
51887index 9c5d414..c7900ce 100644
51888--- a/drivers/ptp/ptp_private.h
51889+++ b/drivers/ptp/ptp_private.h
51890@@ -51,7 +51,7 @@ struct ptp_clock {
51891 struct mutex pincfg_mux; /* protect concurrent info->pin_config access */
51892 wait_queue_head_t tsev_wq;
51893 int defunct; /* tells readers to go away when clock is being removed */
51894- struct device_attribute *pin_dev_attr;
51895+ device_attribute_no_const *pin_dev_attr;
51896 struct attribute **pin_attr;
51897 struct attribute_group pin_attr_group;
51898 };
51899diff --git a/drivers/ptp/ptp_sysfs.c b/drivers/ptp/ptp_sysfs.c
51900index 302e626..12579af 100644
51901--- a/drivers/ptp/ptp_sysfs.c
51902+++ b/drivers/ptp/ptp_sysfs.c
51903@@ -280,7 +280,7 @@ static int ptp_populate_pins(struct ptp_clock *ptp)
51904 goto no_pin_attr;
51905
51906 for (i = 0; i < n_pins; i++) {
51907- struct device_attribute *da = &ptp->pin_dev_attr[i];
51908+ device_attribute_no_const *da = &ptp->pin_dev_attr[i];
51909 sysfs_attr_init(&da->attr);
51910 da->attr.name = info->pin_config[i].name;
51911 da->attr.mode = 0644;
51912diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
51913index a4a8a6d..a3456f4 100644
51914--- a/drivers/regulator/core.c
51915+++ b/drivers/regulator/core.c
51916@@ -3529,7 +3529,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
51917 const struct regulation_constraints *constraints = NULL;
51918 const struct regulator_init_data *init_data;
51919 struct regulator_config *config = NULL;
51920- static atomic_t regulator_no = ATOMIC_INIT(-1);
51921+ static atomic_unchecked_t regulator_no = ATOMIC_INIT(-1);
51922 struct regulator_dev *rdev;
51923 struct device *dev;
51924 int ret, i;
51925@@ -3613,7 +3613,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
51926 rdev->dev.class = &regulator_class;
51927 rdev->dev.parent = dev;
51928 dev_set_name(&rdev->dev, "regulator.%lu",
51929- (unsigned long) atomic_inc_return(&regulator_no));
51930+ (unsigned long) atomic_inc_return_unchecked(&regulator_no));
51931 ret = device_register(&rdev->dev);
51932 if (ret != 0) {
51933 put_device(&rdev->dev);
51934diff --git a/drivers/regulator/max8660.c b/drivers/regulator/max8660.c
51935index 7eee2ca..4024513 100644
51936--- a/drivers/regulator/max8660.c
51937+++ b/drivers/regulator/max8660.c
51938@@ -424,8 +424,10 @@ static int max8660_probe(struct i2c_client *client,
51939 max8660->shadow_regs[MAX8660_OVER1] = 5;
51940 } else {
51941 /* Otherwise devices can be toggled via software */
51942- max8660_dcdc_ops.enable = max8660_dcdc_enable;
51943- max8660_dcdc_ops.disable = max8660_dcdc_disable;
51944+ pax_open_kernel();
51945+ *(void **)&max8660_dcdc_ops.enable = max8660_dcdc_enable;
51946+ *(void **)&max8660_dcdc_ops.disable = max8660_dcdc_disable;
51947+ pax_close_kernel();
51948 }
51949
51950 /*
51951diff --git a/drivers/regulator/max8973-regulator.c b/drivers/regulator/max8973-regulator.c
51952index c3d55c2..0dddfe6 100644
51953--- a/drivers/regulator/max8973-regulator.c
51954+++ b/drivers/regulator/max8973-regulator.c
51955@@ -403,9 +403,11 @@ static int max8973_probe(struct i2c_client *client,
51956 if (!pdata || !pdata->enable_ext_control) {
51957 max->desc.enable_reg = MAX8973_VOUT;
51958 max->desc.enable_mask = MAX8973_VOUT_ENABLE;
51959- max->ops.enable = regulator_enable_regmap;
51960- max->ops.disable = regulator_disable_regmap;
51961- max->ops.is_enabled = regulator_is_enabled_regmap;
51962+ pax_open_kernel();
51963+ *(void **)&max->ops.enable = regulator_enable_regmap;
51964+ *(void **)&max->ops.disable = regulator_disable_regmap;
51965+ *(void **)&max->ops.is_enabled = regulator_is_enabled_regmap;
51966+ pax_close_kernel();
51967 }
51968
51969 if (pdata) {
51970diff --git a/drivers/regulator/mc13892-regulator.c b/drivers/regulator/mc13892-regulator.c
51971index 0d17c92..a29f627 100644
51972--- a/drivers/regulator/mc13892-regulator.c
51973+++ b/drivers/regulator/mc13892-regulator.c
51974@@ -584,10 +584,12 @@ static int mc13892_regulator_probe(struct platform_device *pdev)
51975 mc13xxx_unlock(mc13892);
51976
51977 /* update mc13892_vcam ops */
51978- memcpy(&mc13892_vcam_ops, mc13892_regulators[MC13892_VCAM].desc.ops,
51979+ pax_open_kernel();
51980+ memcpy((void *)&mc13892_vcam_ops, mc13892_regulators[MC13892_VCAM].desc.ops,
51981 sizeof(struct regulator_ops));
51982- mc13892_vcam_ops.set_mode = mc13892_vcam_set_mode,
51983- mc13892_vcam_ops.get_mode = mc13892_vcam_get_mode,
51984+ *(void **)&mc13892_vcam_ops.set_mode = mc13892_vcam_set_mode,
51985+ *(void **)&mc13892_vcam_ops.get_mode = mc13892_vcam_get_mode,
51986+ pax_close_kernel();
51987 mc13892_regulators[MC13892_VCAM].desc.ops = &mc13892_vcam_ops;
51988
51989 mc13xxx_data = mc13xxx_parse_regulators_dt(pdev, mc13892_regulators,
51990diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
51991index 5b2e761..c8c8a4a 100644
51992--- a/drivers/rtc/rtc-cmos.c
51993+++ b/drivers/rtc/rtc-cmos.c
51994@@ -789,7 +789,9 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)
51995 hpet_rtc_timer_init();
51996
51997 /* export at least the first block of NVRAM */
51998- nvram.size = address_space - NVRAM_OFFSET;
51999+ pax_open_kernel();
52000+ *(size_t *)&nvram.size = address_space - NVRAM_OFFSET;
52001+ pax_close_kernel();
52002 retval = sysfs_create_bin_file(&dev->kobj, &nvram);
52003 if (retval < 0) {
52004 dev_dbg(dev, "can't create nvram file? %d\n", retval);
52005diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c
52006index 799c34b..8e9786a 100644
52007--- a/drivers/rtc/rtc-dev.c
52008+++ b/drivers/rtc/rtc-dev.c
52009@@ -16,6 +16,7 @@
52010 #include <linux/module.h>
52011 #include <linux/rtc.h>
52012 #include <linux/sched.h>
52013+#include <linux/grsecurity.h>
52014 #include "rtc-core.h"
52015
52016 static dev_t rtc_devt;
52017@@ -347,6 +348,8 @@ static long rtc_dev_ioctl(struct file *file,
52018 if (copy_from_user(&tm, uarg, sizeof(tm)))
52019 return -EFAULT;
52020
52021+ gr_log_timechange();
52022+
52023 return rtc_set_time(rtc, &tm);
52024
52025 case RTC_PIE_ON:
52026diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c
52027index 4ffabb3..1f87fca 100644
52028--- a/drivers/rtc/rtc-ds1307.c
52029+++ b/drivers/rtc/rtc-ds1307.c
52030@@ -107,7 +107,7 @@ struct ds1307 {
52031 u8 offset; /* register's offset */
52032 u8 regs[11];
52033 u16 nvram_offset;
52034- struct bin_attribute *nvram;
52035+ bin_attribute_no_const *nvram;
52036 enum ds_type type;
52037 unsigned long flags;
52038 #define HAS_NVRAM 0 /* bit 0 == sysfs file active */
52039diff --git a/drivers/rtc/rtc-m48t59.c b/drivers/rtc/rtc-m48t59.c
52040index 90abb5b..e0bf6dd 100644
52041--- a/drivers/rtc/rtc-m48t59.c
52042+++ b/drivers/rtc/rtc-m48t59.c
52043@@ -483,7 +483,9 @@ static int m48t59_rtc_probe(struct platform_device *pdev)
52044 if (IS_ERR(m48t59->rtc))
52045 return PTR_ERR(m48t59->rtc);
52046
52047- m48t59_nvram_attr.size = pdata->offset;
52048+ pax_open_kernel();
52049+ *(size_t *)&m48t59_nvram_attr.size = pdata->offset;
52050+ pax_close_kernel();
52051
52052 ret = sysfs_create_bin_file(&pdev->dev.kobj, &m48t59_nvram_attr);
52053 if (ret)
52054diff --git a/drivers/scsi/bfa/bfa_fcpim.h b/drivers/scsi/bfa/bfa_fcpim.h
52055index e693af6..2e525b6 100644
52056--- a/drivers/scsi/bfa/bfa_fcpim.h
52057+++ b/drivers/scsi/bfa/bfa_fcpim.h
52058@@ -36,7 +36,7 @@ struct bfa_iotag_s {
52059
52060 struct bfa_itn_s {
52061 bfa_isr_func_t isr;
52062-};
52063+} __no_const;
52064
52065 void bfa_itn_create(struct bfa_s *bfa, struct bfa_rport_s *rport,
52066 void (*isr)(struct bfa_s *bfa, struct bfi_msg_s *m));
52067diff --git a/drivers/scsi/bfa/bfa_fcs.c b/drivers/scsi/bfa/bfa_fcs.c
52068index 0f19455..ef7adb5 100644
52069--- a/drivers/scsi/bfa/bfa_fcs.c
52070+++ b/drivers/scsi/bfa/bfa_fcs.c
52071@@ -38,10 +38,21 @@ struct bfa_fcs_mod_s {
52072 #define BFA_FCS_MODULE(_mod) { _mod ## _modinit, _mod ## _modexit }
52073
52074 static struct bfa_fcs_mod_s fcs_modules[] = {
52075- { bfa_fcs_port_attach, NULL, NULL },
52076- { bfa_fcs_uf_attach, NULL, NULL },
52077- { bfa_fcs_fabric_attach, bfa_fcs_fabric_modinit,
52078- bfa_fcs_fabric_modexit },
52079+ {
52080+ .attach = bfa_fcs_port_attach,
52081+ .modinit = NULL,
52082+ .modexit = NULL
52083+ },
52084+ {
52085+ .attach = bfa_fcs_uf_attach,
52086+ .modinit = NULL,
52087+ .modexit = NULL
52088+ },
52089+ {
52090+ .attach = bfa_fcs_fabric_attach,
52091+ .modinit = bfa_fcs_fabric_modinit,
52092+ .modexit = bfa_fcs_fabric_modexit
52093+ },
52094 };
52095
52096 /*
52097diff --git a/drivers/scsi/bfa/bfa_fcs_lport.c b/drivers/scsi/bfa/bfa_fcs_lport.c
52098index ff75ef8..2dfe00a 100644
52099--- a/drivers/scsi/bfa/bfa_fcs_lport.c
52100+++ b/drivers/scsi/bfa/bfa_fcs_lport.c
52101@@ -89,15 +89,26 @@ static struct {
52102 void (*offline) (struct bfa_fcs_lport_s *port);
52103 } __port_action[] = {
52104 {
52105- bfa_fcs_lport_unknown_init, bfa_fcs_lport_unknown_online,
52106- bfa_fcs_lport_unknown_offline}, {
52107- bfa_fcs_lport_fab_init, bfa_fcs_lport_fab_online,
52108- bfa_fcs_lport_fab_offline}, {
52109- bfa_fcs_lport_n2n_init, bfa_fcs_lport_n2n_online,
52110- bfa_fcs_lport_n2n_offline}, {
52111- bfa_fcs_lport_loop_init, bfa_fcs_lport_loop_online,
52112- bfa_fcs_lport_loop_offline},
52113- };
52114+ .init = bfa_fcs_lport_unknown_init,
52115+ .online = bfa_fcs_lport_unknown_online,
52116+ .offline = bfa_fcs_lport_unknown_offline
52117+ },
52118+ {
52119+ .init = bfa_fcs_lport_fab_init,
52120+ .online = bfa_fcs_lport_fab_online,
52121+ .offline = bfa_fcs_lport_fab_offline
52122+ },
52123+ {
52124+ .init = bfa_fcs_lport_n2n_init,
52125+ .online = bfa_fcs_lport_n2n_online,
52126+ .offline = bfa_fcs_lport_n2n_offline
52127+ },
52128+ {
52129+ .init = bfa_fcs_lport_loop_init,
52130+ .online = bfa_fcs_lport_loop_online,
52131+ .offline = bfa_fcs_lport_loop_offline
52132+ },
52133+};
52134
52135 /*
52136 * fcs_port_sm FCS logical port state machine
52137diff --git a/drivers/scsi/bfa/bfa_ioc.h b/drivers/scsi/bfa/bfa_ioc.h
52138index a38aafa0..fe8f03b 100644
52139--- a/drivers/scsi/bfa/bfa_ioc.h
52140+++ b/drivers/scsi/bfa/bfa_ioc.h
52141@@ -258,7 +258,7 @@ struct bfa_ioc_cbfn_s {
52142 bfa_ioc_disable_cbfn_t disable_cbfn;
52143 bfa_ioc_hbfail_cbfn_t hbfail_cbfn;
52144 bfa_ioc_reset_cbfn_t reset_cbfn;
52145-};
52146+} __no_const;
52147
52148 /*
52149 * IOC event notification mechanism.
52150@@ -352,7 +352,7 @@ struct bfa_ioc_hwif_s {
52151 void (*ioc_set_alt_fwstate) (struct bfa_ioc_s *ioc,
52152 enum bfi_ioc_state fwstate);
52153 enum bfi_ioc_state (*ioc_get_alt_fwstate) (struct bfa_ioc_s *ioc);
52154-};
52155+} __no_const;
52156
52157 /*
52158 * Queue element to wait for room in request queue. FIFO order is
52159diff --git a/drivers/scsi/bfa/bfa_modules.h b/drivers/scsi/bfa/bfa_modules.h
52160index a14c784..6de6790 100644
52161--- a/drivers/scsi/bfa/bfa_modules.h
52162+++ b/drivers/scsi/bfa/bfa_modules.h
52163@@ -78,12 +78,12 @@ enum {
52164 \
52165 extern struct bfa_module_s hal_mod_ ## __mod; \
52166 struct bfa_module_s hal_mod_ ## __mod = { \
52167- bfa_ ## __mod ## _meminfo, \
52168- bfa_ ## __mod ## _attach, \
52169- bfa_ ## __mod ## _detach, \
52170- bfa_ ## __mod ## _start, \
52171- bfa_ ## __mod ## _stop, \
52172- bfa_ ## __mod ## _iocdisable, \
52173+ .meminfo = bfa_ ## __mod ## _meminfo, \
52174+ .attach = bfa_ ## __mod ## _attach, \
52175+ .detach = bfa_ ## __mod ## _detach, \
52176+ .start = bfa_ ## __mod ## _start, \
52177+ .stop = bfa_ ## __mod ## _stop, \
52178+ .iocdisable = bfa_ ## __mod ## _iocdisable, \
52179 }
52180
52181 #define BFA_CACHELINE_SZ (256)
52182diff --git a/drivers/scsi/fcoe/fcoe_sysfs.c b/drivers/scsi/fcoe/fcoe_sysfs.c
52183index 045c4e1..13de803 100644
52184--- a/drivers/scsi/fcoe/fcoe_sysfs.c
52185+++ b/drivers/scsi/fcoe/fcoe_sysfs.c
52186@@ -33,8 +33,8 @@
52187 */
52188 #include "libfcoe.h"
52189
52190-static atomic_t ctlr_num;
52191-static atomic_t fcf_num;
52192+static atomic_unchecked_t ctlr_num;
52193+static atomic_unchecked_t fcf_num;
52194
52195 /*
52196 * fcoe_fcf_dev_loss_tmo: the default number of seconds that fcoe sysfs
52197@@ -685,7 +685,7 @@ struct fcoe_ctlr_device *fcoe_ctlr_device_add(struct device *parent,
52198 if (!ctlr)
52199 goto out;
52200
52201- ctlr->id = atomic_inc_return(&ctlr_num) - 1;
52202+ ctlr->id = atomic_inc_return_unchecked(&ctlr_num) - 1;
52203 ctlr->f = f;
52204 ctlr->mode = FIP_CONN_TYPE_FABRIC;
52205 INIT_LIST_HEAD(&ctlr->fcfs);
52206@@ -902,7 +902,7 @@ struct fcoe_fcf_device *fcoe_fcf_device_add(struct fcoe_ctlr_device *ctlr,
52207 fcf->dev.parent = &ctlr->dev;
52208 fcf->dev.bus = &fcoe_bus_type;
52209 fcf->dev.type = &fcoe_fcf_device_type;
52210- fcf->id = atomic_inc_return(&fcf_num) - 1;
52211+ fcf->id = atomic_inc_return_unchecked(&fcf_num) - 1;
52212 fcf->state = FCOE_FCF_STATE_UNKNOWN;
52213
52214 fcf->dev_loss_tmo = ctlr->fcf_dev_loss_tmo;
52215@@ -938,8 +938,8 @@ int __init fcoe_sysfs_setup(void)
52216 {
52217 int error;
52218
52219- atomic_set(&ctlr_num, 0);
52220- atomic_set(&fcf_num, 0);
52221+ atomic_set_unchecked(&ctlr_num, 0);
52222+ atomic_set_unchecked(&fcf_num, 0);
52223
52224 error = bus_register(&fcoe_bus_type);
52225 if (error)
52226diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
52227index 8bb173e..20236b4 100644
52228--- a/drivers/scsi/hosts.c
52229+++ b/drivers/scsi/hosts.c
52230@@ -42,7 +42,7 @@
52231 #include "scsi_logging.h"
52232
52233
52234-static atomic_t scsi_host_next_hn = ATOMIC_INIT(0); /* host_no for next new host */
52235+static atomic_unchecked_t scsi_host_next_hn = ATOMIC_INIT(0); /* host_no for next new host */
52236
52237
52238 static void scsi_host_cls_release(struct device *dev)
52239@@ -392,7 +392,7 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
52240 * subtract one because we increment first then return, but we need to
52241 * know what the next host number was before increment
52242 */
52243- shost->host_no = atomic_inc_return(&scsi_host_next_hn) - 1;
52244+ shost->host_no = atomic_inc_return_unchecked(&scsi_host_next_hn) - 1;
52245 shost->dma_channel = 0xff;
52246
52247 /* These three are default values which can be overridden */
52248diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
52249index a1cfbd3..d7f8ebc 100644
52250--- a/drivers/scsi/hpsa.c
52251+++ b/drivers/scsi/hpsa.c
52252@@ -697,10 +697,10 @@ static inline u32 next_command(struct ctlr_info *h, u8 q)
52253 struct reply_queue_buffer *rq = &h->reply_queue[q];
52254
52255 if (h->transMethod & CFGTBL_Trans_io_accel1)
52256- return h->access.command_completed(h, q);
52257+ return h->access->command_completed(h, q);
52258
52259 if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
52260- return h->access.command_completed(h, q);
52261+ return h->access->command_completed(h, q);
52262
52263 if ((rq->head[rq->current_entry] & 1) == rq->wraparound) {
52264 a = rq->head[rq->current_entry];
52265@@ -837,7 +837,7 @@ static void enqueue_cmd_and_start_io(struct ctlr_info *h,
52266 break;
52267 default:
52268 set_performant_mode(h, c);
52269- h->access.submit_command(h, c);
52270+ h->access->submit_command(h, c);
52271 }
52272 }
52273
52274@@ -5369,17 +5369,17 @@ static void __iomem *remap_pci_mem(ulong base, ulong size)
52275
52276 static inline unsigned long get_next_completion(struct ctlr_info *h, u8 q)
52277 {
52278- return h->access.command_completed(h, q);
52279+ return h->access->command_completed(h, q);
52280 }
52281
52282 static inline bool interrupt_pending(struct ctlr_info *h)
52283 {
52284- return h->access.intr_pending(h);
52285+ return h->access->intr_pending(h);
52286 }
52287
52288 static inline long interrupt_not_for_us(struct ctlr_info *h)
52289 {
52290- return (h->access.intr_pending(h) == 0) ||
52291+ return (h->access->intr_pending(h) == 0) ||
52292 (h->interrupts_enabled == 0);
52293 }
52294
52295@@ -6270,7 +6270,7 @@ static int hpsa_pci_init(struct ctlr_info *h)
52296 if (prod_index < 0)
52297 return prod_index;
52298 h->product_name = products[prod_index].product_name;
52299- h->access = *(products[prod_index].access);
52300+ h->access = products[prod_index].access;
52301
52302 pci_disable_link_state(h->pdev, PCIE_LINK_STATE_L0S |
52303 PCIE_LINK_STATE_L1 | PCIE_LINK_STATE_CLKPM);
52304@@ -6649,7 +6649,7 @@ static void controller_lockup_detected(struct ctlr_info *h)
52305 unsigned long flags;
52306 u32 lockup_detected;
52307
52308- h->access.set_intr_mask(h, HPSA_INTR_OFF);
52309+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
52310 spin_lock_irqsave(&h->lock, flags);
52311 lockup_detected = readl(h->vaddr + SA5_SCRATCHPAD_OFFSET);
52312 if (!lockup_detected) {
52313@@ -6924,7 +6924,7 @@ reinit_after_soft_reset:
52314 }
52315
52316 /* make sure the board interrupts are off */
52317- h->access.set_intr_mask(h, HPSA_INTR_OFF);
52318+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
52319
52320 if (hpsa_request_irqs(h, do_hpsa_intr_msi, do_hpsa_intr_intx))
52321 goto clean2;
52322@@ -6960,7 +6960,7 @@ reinit_after_soft_reset:
52323 * fake ones to scoop up any residual completions.
52324 */
52325 spin_lock_irqsave(&h->lock, flags);
52326- h->access.set_intr_mask(h, HPSA_INTR_OFF);
52327+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
52328 spin_unlock_irqrestore(&h->lock, flags);
52329 hpsa_free_irqs(h);
52330 rc = hpsa_request_irqs(h, hpsa_msix_discard_completions,
52331@@ -6979,9 +6979,9 @@ reinit_after_soft_reset:
52332 dev_info(&h->pdev->dev, "Board READY.\n");
52333 dev_info(&h->pdev->dev,
52334 "Waiting for stale completions to drain.\n");
52335- h->access.set_intr_mask(h, HPSA_INTR_ON);
52336+ h->access->set_intr_mask(h, HPSA_INTR_ON);
52337 msleep(10000);
52338- h->access.set_intr_mask(h, HPSA_INTR_OFF);
52339+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
52340
52341 rc = controller_reset_failed(h->cfgtable);
52342 if (rc)
52343@@ -7006,7 +7006,7 @@ reinit_after_soft_reset:
52344
52345
52346 /* Turn the interrupts on so we can service requests */
52347- h->access.set_intr_mask(h, HPSA_INTR_ON);
52348+ h->access->set_intr_mask(h, HPSA_INTR_ON);
52349
52350 hpsa_hba_inquiry(h);
52351 hpsa_register_scsi(h); /* hook ourselves into SCSI subsystem */
52352@@ -7079,7 +7079,7 @@ static void hpsa_shutdown(struct pci_dev *pdev)
52353 * To write all data in the battery backed cache to disks
52354 */
52355 hpsa_flush_cache(h);
52356- h->access.set_intr_mask(h, HPSA_INTR_OFF);
52357+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
52358 hpsa_free_irqs_and_disable_msix(h);
52359 }
52360
52361@@ -7200,7 +7200,7 @@ static int hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
52362 CFGTBL_Trans_enable_directed_msix |
52363 (trans_support & (CFGTBL_Trans_io_accel1 |
52364 CFGTBL_Trans_io_accel2));
52365- struct access_method access = SA5_performant_access;
52366+ struct access_method *access = &SA5_performant_access;
52367
52368 /* This is a bit complicated. There are 8 registers on
52369 * the controller which we write to to tell it 8 different
52370@@ -7242,7 +7242,7 @@ static int hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
52371 * perform the superfluous readl() after each command submission.
52372 */
52373 if (trans_support & (CFGTBL_Trans_io_accel1 | CFGTBL_Trans_io_accel2))
52374- access = SA5_performant_access_no_read;
52375+ access = &SA5_performant_access_no_read;
52376
52377 /* Controller spec: zero out this buffer. */
52378 for (i = 0; i < h->nreply_queues; i++)
52379@@ -7272,12 +7272,12 @@ static int hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
52380 * enable outbound interrupt coalescing in accelerator mode;
52381 */
52382 if (trans_support & CFGTBL_Trans_io_accel1) {
52383- access = SA5_ioaccel_mode1_access;
52384+ access = &SA5_ioaccel_mode1_access;
52385 writel(10, &h->cfgtable->HostWrite.CoalIntDelay);
52386 writel(4, &h->cfgtable->HostWrite.CoalIntCount);
52387 } else {
52388 if (trans_support & CFGTBL_Trans_io_accel2) {
52389- access = SA5_ioaccel_mode2_access;
52390+ access = &SA5_ioaccel_mode2_access;
52391 writel(10, &h->cfgtable->HostWrite.CoalIntDelay);
52392 writel(4, &h->cfgtable->HostWrite.CoalIntCount);
52393 }
52394diff --git a/drivers/scsi/hpsa.h b/drivers/scsi/hpsa.h
52395index 6577130..955f9a4 100644
52396--- a/drivers/scsi/hpsa.h
52397+++ b/drivers/scsi/hpsa.h
52398@@ -143,7 +143,7 @@ struct ctlr_info {
52399 unsigned int msix_vector;
52400 unsigned int msi_vector;
52401 int intr_mode; /* either PERF_MODE_INT or SIMPLE_MODE_INT */
52402- struct access_method access;
52403+ struct access_method *access;
52404 char hba_mode_enabled;
52405
52406 /* queue and queue Info */
52407@@ -525,38 +525,38 @@ static unsigned long SA5_ioaccel_mode1_completed(struct ctlr_info *h, u8 q)
52408 }
52409
52410 static struct access_method SA5_access = {
52411- SA5_submit_command,
52412- SA5_intr_mask,
52413- SA5_intr_pending,
52414- SA5_completed,
52415+ .submit_command = SA5_submit_command,
52416+ .set_intr_mask = SA5_intr_mask,
52417+ .intr_pending = SA5_intr_pending,
52418+ .command_completed = SA5_completed,
52419 };
52420
52421 static struct access_method SA5_ioaccel_mode1_access = {
52422- SA5_submit_command,
52423- SA5_performant_intr_mask,
52424- SA5_ioaccel_mode1_intr_pending,
52425- SA5_ioaccel_mode1_completed,
52426+ .submit_command = SA5_submit_command,
52427+ .set_intr_mask = SA5_performant_intr_mask,
52428+ .intr_pending = SA5_ioaccel_mode1_intr_pending,
52429+ .command_completed = SA5_ioaccel_mode1_completed,
52430 };
52431
52432 static struct access_method SA5_ioaccel_mode2_access = {
52433- SA5_submit_command_ioaccel2,
52434- SA5_performant_intr_mask,
52435- SA5_performant_intr_pending,
52436- SA5_performant_completed,
52437+ .submit_command = SA5_submit_command_ioaccel2,
52438+ .set_intr_mask = SA5_performant_intr_mask,
52439+ .intr_pending = SA5_performant_intr_pending,
52440+ .command_completed = SA5_performant_completed,
52441 };
52442
52443 static struct access_method SA5_performant_access = {
52444- SA5_submit_command,
52445- SA5_performant_intr_mask,
52446- SA5_performant_intr_pending,
52447- SA5_performant_completed,
52448+ .submit_command = SA5_submit_command,
52449+ .set_intr_mask = SA5_performant_intr_mask,
52450+ .intr_pending = SA5_performant_intr_pending,
52451+ .command_completed = SA5_performant_completed,
52452 };
52453
52454 static struct access_method SA5_performant_access_no_read = {
52455- SA5_submit_command_no_read,
52456- SA5_performant_intr_mask,
52457- SA5_performant_intr_pending,
52458- SA5_performant_completed,
52459+ .submit_command = SA5_submit_command_no_read,
52460+ .set_intr_mask = SA5_performant_intr_mask,
52461+ .intr_pending = SA5_performant_intr_pending,
52462+ .command_completed = SA5_performant_completed,
52463 };
52464
52465 struct board_type {
52466diff --git a/drivers/scsi/libfc/fc_exch.c b/drivers/scsi/libfc/fc_exch.c
52467index 1b3a094..068e683 100644
52468--- a/drivers/scsi/libfc/fc_exch.c
52469+++ b/drivers/scsi/libfc/fc_exch.c
52470@@ -101,12 +101,12 @@ struct fc_exch_mgr {
52471 u16 pool_max_index;
52472
52473 struct {
52474- atomic_t no_free_exch;
52475- atomic_t no_free_exch_xid;
52476- atomic_t xid_not_found;
52477- atomic_t xid_busy;
52478- atomic_t seq_not_found;
52479- atomic_t non_bls_resp;
52480+ atomic_unchecked_t no_free_exch;
52481+ atomic_unchecked_t no_free_exch_xid;
52482+ atomic_unchecked_t xid_not_found;
52483+ atomic_unchecked_t xid_busy;
52484+ atomic_unchecked_t seq_not_found;
52485+ atomic_unchecked_t non_bls_resp;
52486 } stats;
52487 };
52488
52489@@ -811,7 +811,7 @@ static struct fc_exch *fc_exch_em_alloc(struct fc_lport *lport,
52490 /* allocate memory for exchange */
52491 ep = mempool_alloc(mp->ep_pool, GFP_ATOMIC);
52492 if (!ep) {
52493- atomic_inc(&mp->stats.no_free_exch);
52494+ atomic_inc_unchecked(&mp->stats.no_free_exch);
52495 goto out;
52496 }
52497 memset(ep, 0, sizeof(*ep));
52498@@ -874,7 +874,7 @@ out:
52499 return ep;
52500 err:
52501 spin_unlock_bh(&pool->lock);
52502- atomic_inc(&mp->stats.no_free_exch_xid);
52503+ atomic_inc_unchecked(&mp->stats.no_free_exch_xid);
52504 mempool_free(ep, mp->ep_pool);
52505 return NULL;
52506 }
52507@@ -1023,7 +1023,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
52508 xid = ntohs(fh->fh_ox_id); /* we originated exch */
52509 ep = fc_exch_find(mp, xid);
52510 if (!ep) {
52511- atomic_inc(&mp->stats.xid_not_found);
52512+ atomic_inc_unchecked(&mp->stats.xid_not_found);
52513 reject = FC_RJT_OX_ID;
52514 goto out;
52515 }
52516@@ -1053,7 +1053,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
52517 ep = fc_exch_find(mp, xid);
52518 if ((f_ctl & FC_FC_FIRST_SEQ) && fc_sof_is_init(fr_sof(fp))) {
52519 if (ep) {
52520- atomic_inc(&mp->stats.xid_busy);
52521+ atomic_inc_unchecked(&mp->stats.xid_busy);
52522 reject = FC_RJT_RX_ID;
52523 goto rel;
52524 }
52525@@ -1064,7 +1064,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
52526 }
52527 xid = ep->xid; /* get our XID */
52528 } else if (!ep) {
52529- atomic_inc(&mp->stats.xid_not_found);
52530+ atomic_inc_unchecked(&mp->stats.xid_not_found);
52531 reject = FC_RJT_RX_ID; /* XID not found */
52532 goto out;
52533 }
52534@@ -1082,7 +1082,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
52535 } else {
52536 sp = &ep->seq;
52537 if (sp->id != fh->fh_seq_id) {
52538- atomic_inc(&mp->stats.seq_not_found);
52539+ atomic_inc_unchecked(&mp->stats.seq_not_found);
52540 if (f_ctl & FC_FC_END_SEQ) {
52541 /*
52542 * Update sequence_id based on incoming last
52543@@ -1533,22 +1533,22 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
52544
52545 ep = fc_exch_find(mp, ntohs(fh->fh_ox_id));
52546 if (!ep) {
52547- atomic_inc(&mp->stats.xid_not_found);
52548+ atomic_inc_unchecked(&mp->stats.xid_not_found);
52549 goto out;
52550 }
52551 if (ep->esb_stat & ESB_ST_COMPLETE) {
52552- atomic_inc(&mp->stats.xid_not_found);
52553+ atomic_inc_unchecked(&mp->stats.xid_not_found);
52554 goto rel;
52555 }
52556 if (ep->rxid == FC_XID_UNKNOWN)
52557 ep->rxid = ntohs(fh->fh_rx_id);
52558 if (ep->sid != 0 && ep->sid != ntoh24(fh->fh_d_id)) {
52559- atomic_inc(&mp->stats.xid_not_found);
52560+ atomic_inc_unchecked(&mp->stats.xid_not_found);
52561 goto rel;
52562 }
52563 if (ep->did != ntoh24(fh->fh_s_id) &&
52564 ep->did != FC_FID_FLOGI) {
52565- atomic_inc(&mp->stats.xid_not_found);
52566+ atomic_inc_unchecked(&mp->stats.xid_not_found);
52567 goto rel;
52568 }
52569 sof = fr_sof(fp);
52570@@ -1557,7 +1557,7 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
52571 sp->ssb_stat |= SSB_ST_RESP;
52572 sp->id = fh->fh_seq_id;
52573 } else if (sp->id != fh->fh_seq_id) {
52574- atomic_inc(&mp->stats.seq_not_found);
52575+ atomic_inc_unchecked(&mp->stats.seq_not_found);
52576 goto rel;
52577 }
52578
52579@@ -1619,9 +1619,9 @@ static void fc_exch_recv_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
52580 sp = fc_seq_lookup_orig(mp, fp); /* doesn't hold sequence */
52581
52582 if (!sp)
52583- atomic_inc(&mp->stats.xid_not_found);
52584+ atomic_inc_unchecked(&mp->stats.xid_not_found);
52585 else
52586- atomic_inc(&mp->stats.non_bls_resp);
52587+ atomic_inc_unchecked(&mp->stats.non_bls_resp);
52588
52589 fc_frame_free(fp);
52590 }
52591@@ -2261,13 +2261,13 @@ void fc_exch_update_stats(struct fc_lport *lport)
52592
52593 list_for_each_entry(ema, &lport->ema_list, ema_list) {
52594 mp = ema->mp;
52595- st->fc_no_free_exch += atomic_read(&mp->stats.no_free_exch);
52596+ st->fc_no_free_exch += atomic_read_unchecked(&mp->stats.no_free_exch);
52597 st->fc_no_free_exch_xid +=
52598- atomic_read(&mp->stats.no_free_exch_xid);
52599- st->fc_xid_not_found += atomic_read(&mp->stats.xid_not_found);
52600- st->fc_xid_busy += atomic_read(&mp->stats.xid_busy);
52601- st->fc_seq_not_found += atomic_read(&mp->stats.seq_not_found);
52602- st->fc_non_bls_resp += atomic_read(&mp->stats.non_bls_resp);
52603+ atomic_read_unchecked(&mp->stats.no_free_exch_xid);
52604+ st->fc_xid_not_found += atomic_read_unchecked(&mp->stats.xid_not_found);
52605+ st->fc_xid_busy += atomic_read_unchecked(&mp->stats.xid_busy);
52606+ st->fc_seq_not_found += atomic_read_unchecked(&mp->stats.seq_not_found);
52607+ st->fc_non_bls_resp += atomic_read_unchecked(&mp->stats.non_bls_resp);
52608 }
52609 }
52610 EXPORT_SYMBOL(fc_exch_update_stats);
52611diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
52612index 9c706d8..d3e3ed2 100644
52613--- a/drivers/scsi/libsas/sas_ata.c
52614+++ b/drivers/scsi/libsas/sas_ata.c
52615@@ -535,7 +535,7 @@ static struct ata_port_operations sas_sata_ops = {
52616 .postreset = ata_std_postreset,
52617 .error_handler = ata_std_error_handler,
52618 .post_internal_cmd = sas_ata_post_internal,
52619- .qc_defer = ata_std_qc_defer,
52620+ .qc_defer = ata_std_qc_defer,
52621 .qc_prep = ata_noop_qc_prep,
52622 .qc_issue = sas_ata_qc_issue,
52623 .qc_fill_rtf = sas_ata_qc_fill_rtf,
52624diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h
52625index 434e903..5a4a79b 100644
52626--- a/drivers/scsi/lpfc/lpfc.h
52627+++ b/drivers/scsi/lpfc/lpfc.h
52628@@ -430,7 +430,7 @@ struct lpfc_vport {
52629 struct dentry *debug_nodelist;
52630 struct dentry *vport_debugfs_root;
52631 struct lpfc_debugfs_trc *disc_trc;
52632- atomic_t disc_trc_cnt;
52633+ atomic_unchecked_t disc_trc_cnt;
52634 #endif
52635 uint8_t stat_data_enabled;
52636 uint8_t stat_data_blocked;
52637@@ -880,8 +880,8 @@ struct lpfc_hba {
52638 struct timer_list fabric_block_timer;
52639 unsigned long bit_flags;
52640 #define FABRIC_COMANDS_BLOCKED 0
52641- atomic_t num_rsrc_err;
52642- atomic_t num_cmd_success;
52643+ atomic_unchecked_t num_rsrc_err;
52644+ atomic_unchecked_t num_cmd_success;
52645 unsigned long last_rsrc_error_time;
52646 unsigned long last_ramp_down_time;
52647 #ifdef CONFIG_SCSI_LPFC_DEBUG_FS
52648@@ -916,7 +916,7 @@ struct lpfc_hba {
52649
52650 struct dentry *debug_slow_ring_trc;
52651 struct lpfc_debugfs_trc *slow_ring_trc;
52652- atomic_t slow_ring_trc_cnt;
52653+ atomic_unchecked_t slow_ring_trc_cnt;
52654 /* iDiag debugfs sub-directory */
52655 struct dentry *idiag_root;
52656 struct dentry *idiag_pci_cfg;
52657diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c
52658index 5633e7d..8272114 100644
52659--- a/drivers/scsi/lpfc/lpfc_debugfs.c
52660+++ b/drivers/scsi/lpfc/lpfc_debugfs.c
52661@@ -106,7 +106,7 @@ MODULE_PARM_DESC(lpfc_debugfs_mask_disc_trc,
52662
52663 #include <linux/debugfs.h>
52664
52665-static atomic_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
52666+static atomic_unchecked_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
52667 static unsigned long lpfc_debugfs_start_time = 0L;
52668
52669 /* iDiag */
52670@@ -147,7 +147,7 @@ lpfc_debugfs_disc_trc_data(struct lpfc_vport *vport, char *buf, int size)
52671 lpfc_debugfs_enable = 0;
52672
52673 len = 0;
52674- index = (atomic_read(&vport->disc_trc_cnt) + 1) &
52675+ index = (atomic_read_unchecked(&vport->disc_trc_cnt) + 1) &
52676 (lpfc_debugfs_max_disc_trc - 1);
52677 for (i = index; i < lpfc_debugfs_max_disc_trc; i++) {
52678 dtp = vport->disc_trc + i;
52679@@ -213,7 +213,7 @@ lpfc_debugfs_slow_ring_trc_data(struct lpfc_hba *phba, char *buf, int size)
52680 lpfc_debugfs_enable = 0;
52681
52682 len = 0;
52683- index = (atomic_read(&phba->slow_ring_trc_cnt) + 1) &
52684+ index = (atomic_read_unchecked(&phba->slow_ring_trc_cnt) + 1) &
52685 (lpfc_debugfs_max_slow_ring_trc - 1);
52686 for (i = index; i < lpfc_debugfs_max_slow_ring_trc; i++) {
52687 dtp = phba->slow_ring_trc + i;
52688@@ -646,14 +646,14 @@ lpfc_debugfs_disc_trc(struct lpfc_vport *vport, int mask, char *fmt,
52689 !vport || !vport->disc_trc)
52690 return;
52691
52692- index = atomic_inc_return(&vport->disc_trc_cnt) &
52693+ index = atomic_inc_return_unchecked(&vport->disc_trc_cnt) &
52694 (lpfc_debugfs_max_disc_trc - 1);
52695 dtp = vport->disc_trc + index;
52696 dtp->fmt = fmt;
52697 dtp->data1 = data1;
52698 dtp->data2 = data2;
52699 dtp->data3 = data3;
52700- dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
52701+ dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
52702 dtp->jif = jiffies;
52703 #endif
52704 return;
52705@@ -684,14 +684,14 @@ lpfc_debugfs_slow_ring_trc(struct lpfc_hba *phba, char *fmt,
52706 !phba || !phba->slow_ring_trc)
52707 return;
52708
52709- index = atomic_inc_return(&phba->slow_ring_trc_cnt) &
52710+ index = atomic_inc_return_unchecked(&phba->slow_ring_trc_cnt) &
52711 (lpfc_debugfs_max_slow_ring_trc - 1);
52712 dtp = phba->slow_ring_trc + index;
52713 dtp->fmt = fmt;
52714 dtp->data1 = data1;
52715 dtp->data2 = data2;
52716 dtp->data3 = data3;
52717- dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
52718+ dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
52719 dtp->jif = jiffies;
52720 #endif
52721 return;
52722@@ -4268,7 +4268,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
52723 "slow_ring buffer\n");
52724 goto debug_failed;
52725 }
52726- atomic_set(&phba->slow_ring_trc_cnt, 0);
52727+ atomic_set_unchecked(&phba->slow_ring_trc_cnt, 0);
52728 memset(phba->slow_ring_trc, 0,
52729 (sizeof(struct lpfc_debugfs_trc) *
52730 lpfc_debugfs_max_slow_ring_trc));
52731@@ -4314,7 +4314,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
52732 "buffer\n");
52733 goto debug_failed;
52734 }
52735- atomic_set(&vport->disc_trc_cnt, 0);
52736+ atomic_set_unchecked(&vport->disc_trc_cnt, 0);
52737
52738 snprintf(name, sizeof(name), "discovery_trace");
52739 vport->debug_disc_trc =
52740diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
52741index 0b2c53a..aec2b45 100644
52742--- a/drivers/scsi/lpfc/lpfc_init.c
52743+++ b/drivers/scsi/lpfc/lpfc_init.c
52744@@ -11290,8 +11290,10 @@ lpfc_init(void)
52745 "misc_register returned with status %d", error);
52746
52747 if (lpfc_enable_npiv) {
52748- lpfc_transport_functions.vport_create = lpfc_vport_create;
52749- lpfc_transport_functions.vport_delete = lpfc_vport_delete;
52750+ pax_open_kernel();
52751+ *(void **)&lpfc_transport_functions.vport_create = lpfc_vport_create;
52752+ *(void **)&lpfc_transport_functions.vport_delete = lpfc_vport_delete;
52753+ pax_close_kernel();
52754 }
52755 lpfc_transport_template =
52756 fc_attach_transport(&lpfc_transport_functions);
52757diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
52758index 4f9222e..f1850e3 100644
52759--- a/drivers/scsi/lpfc/lpfc_scsi.c
52760+++ b/drivers/scsi/lpfc/lpfc_scsi.c
52761@@ -261,7 +261,7 @@ lpfc_rampdown_queue_depth(struct lpfc_hba *phba)
52762 unsigned long expires;
52763
52764 spin_lock_irqsave(&phba->hbalock, flags);
52765- atomic_inc(&phba->num_rsrc_err);
52766+ atomic_inc_unchecked(&phba->num_rsrc_err);
52767 phba->last_rsrc_error_time = jiffies;
52768
52769 expires = phba->last_ramp_down_time + QUEUE_RAMP_DOWN_INTERVAL;
52770@@ -303,8 +303,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
52771 unsigned long num_rsrc_err, num_cmd_success;
52772 int i;
52773
52774- num_rsrc_err = atomic_read(&phba->num_rsrc_err);
52775- num_cmd_success = atomic_read(&phba->num_cmd_success);
52776+ num_rsrc_err = atomic_read_unchecked(&phba->num_rsrc_err);
52777+ num_cmd_success = atomic_read_unchecked(&phba->num_cmd_success);
52778
52779 /*
52780 * The error and success command counters are global per
52781@@ -331,8 +331,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
52782 }
52783 }
52784 lpfc_destroy_vport_work_array(phba, vports);
52785- atomic_set(&phba->num_rsrc_err, 0);
52786- atomic_set(&phba->num_cmd_success, 0);
52787+ atomic_set_unchecked(&phba->num_rsrc_err, 0);
52788+ atomic_set_unchecked(&phba->num_cmd_success, 0);
52789 }
52790
52791 /**
52792diff --git a/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
52793index 3f26147..ee8efd1 100644
52794--- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c
52795+++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
52796@@ -1509,7 +1509,7 @@ _scsih_get_resync(struct device *dev)
52797 {
52798 struct scsi_device *sdev = to_scsi_device(dev);
52799 struct MPT2SAS_ADAPTER *ioc = shost_priv(sdev->host);
52800- static struct _raid_device *raid_device;
52801+ struct _raid_device *raid_device;
52802 unsigned long flags;
52803 Mpi2RaidVolPage0_t vol_pg0;
52804 Mpi2ConfigReply_t mpi_reply;
52805@@ -1561,7 +1561,7 @@ _scsih_get_state(struct device *dev)
52806 {
52807 struct scsi_device *sdev = to_scsi_device(dev);
52808 struct MPT2SAS_ADAPTER *ioc = shost_priv(sdev->host);
52809- static struct _raid_device *raid_device;
52810+ struct _raid_device *raid_device;
52811 unsigned long flags;
52812 Mpi2RaidVolPage0_t vol_pg0;
52813 Mpi2ConfigReply_t mpi_reply;
52814@@ -6641,7 +6641,7 @@ _scsih_sas_ir_operation_status_event(struct MPT2SAS_ADAPTER *ioc,
52815 Mpi2EventDataIrOperationStatus_t *event_data =
52816 (Mpi2EventDataIrOperationStatus_t *)
52817 fw_event->event_data;
52818- static struct _raid_device *raid_device;
52819+ struct _raid_device *raid_device;
52820 unsigned long flags;
52821 u16 handle;
52822
52823@@ -7112,7 +7112,7 @@ _scsih_scan_for_devices_after_reset(struct MPT2SAS_ADAPTER *ioc)
52824 u64 sas_address;
52825 struct _sas_device *sas_device;
52826 struct _sas_node *expander_device;
52827- static struct _raid_device *raid_device;
52828+ struct _raid_device *raid_device;
52829 u8 retry_count;
52830 unsigned long flags;
52831
52832diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
52833index ed31d8c..ab856b3 100644
52834--- a/drivers/scsi/pmcraid.c
52835+++ b/drivers/scsi/pmcraid.c
52836@@ -200,8 +200,8 @@ static int pmcraid_slave_alloc(struct scsi_device *scsi_dev)
52837 res->scsi_dev = scsi_dev;
52838 scsi_dev->hostdata = res;
52839 res->change_detected = 0;
52840- atomic_set(&res->read_failures, 0);
52841- atomic_set(&res->write_failures, 0);
52842+ atomic_set_unchecked(&res->read_failures, 0);
52843+ atomic_set_unchecked(&res->write_failures, 0);
52844 rc = 0;
52845 }
52846 spin_unlock_irqrestore(&pinstance->resource_lock, lock_flags);
52847@@ -2640,9 +2640,9 @@ static int pmcraid_error_handler(struct pmcraid_cmd *cmd)
52848
52849 /* If this was a SCSI read/write command keep count of errors */
52850 if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_READ_CMD)
52851- atomic_inc(&res->read_failures);
52852+ atomic_inc_unchecked(&res->read_failures);
52853 else if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_WRITE_CMD)
52854- atomic_inc(&res->write_failures);
52855+ atomic_inc_unchecked(&res->write_failures);
52856
52857 if (!RES_IS_GSCSI(res->cfg_entry) &&
52858 masked_ioasc != PMCRAID_IOASC_HW_DEVICE_BUS_STATUS_ERROR) {
52859@@ -3468,7 +3468,7 @@ static int pmcraid_queuecommand_lck(
52860 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
52861 * hrrq_id assigned here in queuecommand
52862 */
52863- ioarcb->hrrq_id = atomic_add_return(1, &(pinstance->last_message_id)) %
52864+ ioarcb->hrrq_id = atomic_add_return_unchecked(1, &(pinstance->last_message_id)) %
52865 pinstance->num_hrrq;
52866 cmd->cmd_done = pmcraid_io_done;
52867
52868@@ -3782,7 +3782,7 @@ static long pmcraid_ioctl_passthrough(
52869 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
52870 * hrrq_id assigned here in queuecommand
52871 */
52872- ioarcb->hrrq_id = atomic_add_return(1, &(pinstance->last_message_id)) %
52873+ ioarcb->hrrq_id = atomic_add_return_unchecked(1, &(pinstance->last_message_id)) %
52874 pinstance->num_hrrq;
52875
52876 if (request_size) {
52877@@ -4420,7 +4420,7 @@ static void pmcraid_worker_function(struct work_struct *workp)
52878
52879 pinstance = container_of(workp, struct pmcraid_instance, worker_q);
52880 /* add resources only after host is added into system */
52881- if (!atomic_read(&pinstance->expose_resources))
52882+ if (!atomic_read_unchecked(&pinstance->expose_resources))
52883 return;
52884
52885 fw_version = be16_to_cpu(pinstance->inq_data->fw_version);
52886@@ -5237,8 +5237,8 @@ static int pmcraid_init_instance(struct pci_dev *pdev, struct Scsi_Host *host,
52887 init_waitqueue_head(&pinstance->reset_wait_q);
52888
52889 atomic_set(&pinstance->outstanding_cmds, 0);
52890- atomic_set(&pinstance->last_message_id, 0);
52891- atomic_set(&pinstance->expose_resources, 0);
52892+ atomic_set_unchecked(&pinstance->last_message_id, 0);
52893+ atomic_set_unchecked(&pinstance->expose_resources, 0);
52894
52895 INIT_LIST_HEAD(&pinstance->free_res_q);
52896 INIT_LIST_HEAD(&pinstance->used_res_q);
52897@@ -5951,7 +5951,7 @@ static int pmcraid_probe(struct pci_dev *pdev,
52898 /* Schedule worker thread to handle CCN and take care of adding and
52899 * removing devices to OS
52900 */
52901- atomic_set(&pinstance->expose_resources, 1);
52902+ atomic_set_unchecked(&pinstance->expose_resources, 1);
52903 schedule_work(&pinstance->worker_q);
52904 return rc;
52905
52906diff --git a/drivers/scsi/pmcraid.h b/drivers/scsi/pmcraid.h
52907index e1d150f..6c6df44 100644
52908--- a/drivers/scsi/pmcraid.h
52909+++ b/drivers/scsi/pmcraid.h
52910@@ -748,7 +748,7 @@ struct pmcraid_instance {
52911 struct pmcraid_isr_param hrrq_vector[PMCRAID_NUM_MSIX_VECTORS];
52912
52913 /* Message id as filled in last fired IOARCB, used to identify HRRQ */
52914- atomic_t last_message_id;
52915+ atomic_unchecked_t last_message_id;
52916
52917 /* configuration table */
52918 struct pmcraid_config_table *cfg_table;
52919@@ -777,7 +777,7 @@ struct pmcraid_instance {
52920 atomic_t outstanding_cmds;
52921
52922 /* should add/delete resources to mid-layer now ?*/
52923- atomic_t expose_resources;
52924+ atomic_unchecked_t expose_resources;
52925
52926
52927
52928@@ -813,8 +813,8 @@ struct pmcraid_resource_entry {
52929 struct pmcraid_config_table_entry_ext cfg_entry_ext;
52930 };
52931 struct scsi_device *scsi_dev; /* Link scsi_device structure */
52932- atomic_t read_failures; /* count of failed READ commands */
52933- atomic_t write_failures; /* count of failed WRITE commands */
52934+ atomic_unchecked_t read_failures; /* count of failed READ commands */
52935+ atomic_unchecked_t write_failures; /* count of failed WRITE commands */
52936
52937 /* To indicate add/delete/modify during CCN */
52938 u8 change_detected;
52939diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
52940index 82b92c4..3178171 100644
52941--- a/drivers/scsi/qla2xxx/qla_attr.c
52942+++ b/drivers/scsi/qla2xxx/qla_attr.c
52943@@ -2192,7 +2192,7 @@ qla24xx_vport_disable(struct fc_vport *fc_vport, bool disable)
52944 return 0;
52945 }
52946
52947-struct fc_function_template qla2xxx_transport_functions = {
52948+fc_function_template_no_const qla2xxx_transport_functions = {
52949
52950 .show_host_node_name = 1,
52951 .show_host_port_name = 1,
52952@@ -2240,7 +2240,7 @@ struct fc_function_template qla2xxx_transport_functions = {
52953 .bsg_timeout = qla24xx_bsg_timeout,
52954 };
52955
52956-struct fc_function_template qla2xxx_transport_vport_functions = {
52957+fc_function_template_no_const qla2xxx_transport_vport_functions = {
52958
52959 .show_host_node_name = 1,
52960 .show_host_port_name = 1,
52961diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
52962index 7686bfe..4710893 100644
52963--- a/drivers/scsi/qla2xxx/qla_gbl.h
52964+++ b/drivers/scsi/qla2xxx/qla_gbl.h
52965@@ -571,8 +571,8 @@ extern void qla2x00_get_sym_node_name(scsi_qla_host_t *, uint8_t *, size_t);
52966 struct device_attribute;
52967 extern struct device_attribute *qla2x00_host_attrs[];
52968 struct fc_function_template;
52969-extern struct fc_function_template qla2xxx_transport_functions;
52970-extern struct fc_function_template qla2xxx_transport_vport_functions;
52971+extern fc_function_template_no_const qla2xxx_transport_functions;
52972+extern fc_function_template_no_const qla2xxx_transport_vport_functions;
52973 extern void qla2x00_alloc_sysfs_attr(scsi_qla_host_t *);
52974 extern void qla2x00_free_sysfs_attr(scsi_qla_host_t *, bool);
52975 extern void qla2x00_init_host_attr(scsi_qla_host_t *);
52976diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
52977index cce1cbc..5b9f0fe 100644
52978--- a/drivers/scsi/qla2xxx/qla_os.c
52979+++ b/drivers/scsi/qla2xxx/qla_os.c
52980@@ -1435,8 +1435,10 @@ qla2x00_config_dma_addressing(struct qla_hw_data *ha)
52981 !pci_set_consistent_dma_mask(ha->pdev, DMA_BIT_MASK(64))) {
52982 /* Ok, a 64bit DMA mask is applicable. */
52983 ha->flags.enable_64bit_addressing = 1;
52984- ha->isp_ops->calc_req_entries = qla2x00_calc_iocbs_64;
52985- ha->isp_ops->build_iocbs = qla2x00_build_scsi_iocbs_64;
52986+ pax_open_kernel();
52987+ *(void **)&ha->isp_ops->calc_req_entries = qla2x00_calc_iocbs_64;
52988+ *(void **)&ha->isp_ops->build_iocbs = qla2x00_build_scsi_iocbs_64;
52989+ pax_close_kernel();
52990 return;
52991 }
52992 }
52993diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h
52994index 8f6d0fb..1b21097 100644
52995--- a/drivers/scsi/qla4xxx/ql4_def.h
52996+++ b/drivers/scsi/qla4xxx/ql4_def.h
52997@@ -305,7 +305,7 @@ struct ddb_entry {
52998 * (4000 only) */
52999 atomic_t relogin_timer; /* Max Time to wait for
53000 * relogin to complete */
53001- atomic_t relogin_retry_count; /* Num of times relogin has been
53002+ atomic_unchecked_t relogin_retry_count; /* Num of times relogin has been
53003 * retried */
53004 uint32_t default_time2wait; /* Default Min time between
53005 * relogins (+aens) */
53006diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
53007index 6d25879..3031a9f 100644
53008--- a/drivers/scsi/qla4xxx/ql4_os.c
53009+++ b/drivers/scsi/qla4xxx/ql4_os.c
53010@@ -4491,12 +4491,12 @@ static void qla4xxx_check_relogin_flash_ddb(struct iscsi_cls_session *cls_sess)
53011 */
53012 if (!iscsi_is_session_online(cls_sess)) {
53013 /* Reset retry relogin timer */
53014- atomic_inc(&ddb_entry->relogin_retry_count);
53015+ atomic_inc_unchecked(&ddb_entry->relogin_retry_count);
53016 DEBUG2(ql4_printk(KERN_INFO, ha,
53017 "%s: index[%d] relogin timed out-retrying"
53018 " relogin (%d), retry (%d)\n", __func__,
53019 ddb_entry->fw_ddb_index,
53020- atomic_read(&ddb_entry->relogin_retry_count),
53021+ atomic_read_unchecked(&ddb_entry->relogin_retry_count),
53022 ddb_entry->default_time2wait + 4));
53023 set_bit(DPC_RELOGIN_DEVICE, &ha->dpc_flags);
53024 atomic_set(&ddb_entry->retry_relogin_timer,
53025@@ -6604,7 +6604,7 @@ static void qla4xxx_setup_flash_ddb_entry(struct scsi_qla_host *ha,
53026
53027 atomic_set(&ddb_entry->retry_relogin_timer, INVALID_ENTRY);
53028 atomic_set(&ddb_entry->relogin_timer, 0);
53029- atomic_set(&ddb_entry->relogin_retry_count, 0);
53030+ atomic_set_unchecked(&ddb_entry->relogin_retry_count, 0);
53031 def_timeout = le16_to_cpu(ddb_entry->fw_ddb_entry.def_timeout);
53032 ddb_entry->default_relogin_timeout =
53033 (def_timeout > LOGIN_TOV) && (def_timeout < LOGIN_TOV * 10) ?
53034diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
53035index c9c3b57..22a8e41 100644
53036--- a/drivers/scsi/scsi.c
53037+++ b/drivers/scsi/scsi.c
53038@@ -637,7 +637,7 @@ void scsi_finish_command(struct scsi_cmnd *cmd)
53039
53040 good_bytes = scsi_bufflen(cmd);
53041 if (cmd->request->cmd_type != REQ_TYPE_BLOCK_PC) {
53042- int old_good_bytes = good_bytes;
53043+ unsigned int old_good_bytes = good_bytes;
53044 drv = scsi_cmd_to_driver(cmd);
53045 if (drv->done)
53046 good_bytes = drv->done(cmd);
53047diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
53048index b1a2631..5bcd9c8 100644
53049--- a/drivers/scsi/scsi_lib.c
53050+++ b/drivers/scsi/scsi_lib.c
53051@@ -1597,7 +1597,7 @@ static void scsi_kill_request(struct request *req, struct request_queue *q)
53052 shost = sdev->host;
53053 scsi_init_cmd_errh(cmd);
53054 cmd->result = DID_NO_CONNECT << 16;
53055- atomic_inc(&cmd->device->iorequest_cnt);
53056+ atomic_inc_unchecked(&cmd->device->iorequest_cnt);
53057
53058 /*
53059 * SCSI request completion path will do scsi_device_unbusy(),
53060@@ -1620,9 +1620,9 @@ static void scsi_softirq_done(struct request *rq)
53061
53062 INIT_LIST_HEAD(&cmd->eh_entry);
53063
53064- atomic_inc(&cmd->device->iodone_cnt);
53065+ atomic_inc_unchecked(&cmd->device->iodone_cnt);
53066 if (cmd->result)
53067- atomic_inc(&cmd->device->ioerr_cnt);
53068+ atomic_inc_unchecked(&cmd->device->ioerr_cnt);
53069
53070 disposition = scsi_decide_disposition(cmd);
53071 if (disposition != SUCCESS &&
53072@@ -1663,7 +1663,7 @@ static int scsi_dispatch_cmd(struct scsi_cmnd *cmd)
53073 struct Scsi_Host *host = cmd->device->host;
53074 int rtn = 0;
53075
53076- atomic_inc(&cmd->device->iorequest_cnt);
53077+ atomic_inc_unchecked(&cmd->device->iorequest_cnt);
53078
53079 /* check if the device is still usable */
53080 if (unlikely(cmd->device->sdev_state == SDEV_DEL)) {
53081diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
53082index 1ac38e7..6acc656 100644
53083--- a/drivers/scsi/scsi_sysfs.c
53084+++ b/drivers/scsi/scsi_sysfs.c
53085@@ -788,7 +788,7 @@ show_iostat_##field(struct device *dev, struct device_attribute *attr, \
53086 char *buf) \
53087 { \
53088 struct scsi_device *sdev = to_scsi_device(dev); \
53089- unsigned long long count = atomic_read(&sdev->field); \
53090+ unsigned long long count = atomic_read_unchecked(&sdev->field); \
53091 return snprintf(buf, 20, "0x%llx\n", count); \
53092 } \
53093 static DEVICE_ATTR(field, S_IRUGO, show_iostat_##field, NULL)
53094diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
53095index 5d6f348..18778a6b 100644
53096--- a/drivers/scsi/scsi_transport_fc.c
53097+++ b/drivers/scsi/scsi_transport_fc.c
53098@@ -501,7 +501,7 @@ static DECLARE_TRANSPORT_CLASS(fc_vport_class,
53099 * Netlink Infrastructure
53100 */
53101
53102-static atomic_t fc_event_seq;
53103+static atomic_unchecked_t fc_event_seq;
53104
53105 /**
53106 * fc_get_event_number - Obtain the next sequential FC event number
53107@@ -514,7 +514,7 @@ static atomic_t fc_event_seq;
53108 u32
53109 fc_get_event_number(void)
53110 {
53111- return atomic_add_return(1, &fc_event_seq);
53112+ return atomic_add_return_unchecked(1, &fc_event_seq);
53113 }
53114 EXPORT_SYMBOL(fc_get_event_number);
53115
53116@@ -658,7 +658,7 @@ static __init int fc_transport_init(void)
53117 {
53118 int error;
53119
53120- atomic_set(&fc_event_seq, 0);
53121+ atomic_set_unchecked(&fc_event_seq, 0);
53122
53123 error = transport_class_register(&fc_host_class);
53124 if (error)
53125@@ -848,7 +848,7 @@ static int fc_str_to_dev_loss(const char *buf, unsigned long *val)
53126 char *cp;
53127
53128 *val = simple_strtoul(buf, &cp, 0);
53129- if ((*cp && (*cp != '\n')) || (*val < 0))
53130+ if (*cp && (*cp != '\n'))
53131 return -EINVAL;
53132 /*
53133 * Check for overflow; dev_loss_tmo is u32
53134diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
53135index 67d43e3..8cee73c 100644
53136--- a/drivers/scsi/scsi_transport_iscsi.c
53137+++ b/drivers/scsi/scsi_transport_iscsi.c
53138@@ -79,7 +79,7 @@ struct iscsi_internal {
53139 struct transport_container session_cont;
53140 };
53141
53142-static atomic_t iscsi_session_nr; /* sysfs session id for next new session */
53143+static atomic_unchecked_t iscsi_session_nr; /* sysfs session id for next new session */
53144 static struct workqueue_struct *iscsi_eh_timer_workq;
53145
53146 static DEFINE_IDA(iscsi_sess_ida);
53147@@ -2071,7 +2071,7 @@ int iscsi_add_session(struct iscsi_cls_session *session, unsigned int target_id)
53148 int err;
53149
53150 ihost = shost->shost_data;
53151- session->sid = atomic_add_return(1, &iscsi_session_nr);
53152+ session->sid = atomic_add_return_unchecked(1, &iscsi_session_nr);
53153
53154 if (target_id == ISCSI_MAX_TARGET) {
53155 id = ida_simple_get(&iscsi_sess_ida, 0, 0, GFP_KERNEL);
53156@@ -4515,7 +4515,7 @@ static __init int iscsi_transport_init(void)
53157 printk(KERN_INFO "Loading iSCSI transport class v%s.\n",
53158 ISCSI_TRANSPORT_VERSION);
53159
53160- atomic_set(&iscsi_session_nr, 0);
53161+ atomic_set_unchecked(&iscsi_session_nr, 0);
53162
53163 err = class_register(&iscsi_transport_class);
53164 if (err)
53165diff --git a/drivers/scsi/scsi_transport_srp.c b/drivers/scsi/scsi_transport_srp.c
53166index ae45bd9..c32a586 100644
53167--- a/drivers/scsi/scsi_transport_srp.c
53168+++ b/drivers/scsi/scsi_transport_srp.c
53169@@ -35,7 +35,7 @@
53170 #include "scsi_priv.h"
53171
53172 struct srp_host_attrs {
53173- atomic_t next_port_id;
53174+ atomic_unchecked_t next_port_id;
53175 };
53176 #define to_srp_host_attrs(host) ((struct srp_host_attrs *)(host)->shost_data)
53177
53178@@ -100,7 +100,7 @@ static int srp_host_setup(struct transport_container *tc, struct device *dev,
53179 struct Scsi_Host *shost = dev_to_shost(dev);
53180 struct srp_host_attrs *srp_host = to_srp_host_attrs(shost);
53181
53182- atomic_set(&srp_host->next_port_id, 0);
53183+ atomic_set_unchecked(&srp_host->next_port_id, 0);
53184 return 0;
53185 }
53186
53187@@ -734,7 +734,7 @@ struct srp_rport *srp_rport_add(struct Scsi_Host *shost,
53188 rport_fast_io_fail_timedout);
53189 INIT_DELAYED_WORK(&rport->dev_loss_work, rport_dev_loss_timedout);
53190
53191- id = atomic_inc_return(&to_srp_host_attrs(shost)->next_port_id);
53192+ id = atomic_inc_return_unchecked(&to_srp_host_attrs(shost)->next_port_id);
53193 dev_set_name(&rport->dev, "port-%d:%d", shost->host_no, id);
53194
53195 transport_setup_device(&rport->dev);
53196diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
53197index a661d33..1b233fa 100644
53198--- a/drivers/scsi/sd.c
53199+++ b/drivers/scsi/sd.c
53200@@ -111,7 +111,7 @@ static int sd_resume(struct device *);
53201 static void sd_rescan(struct device *);
53202 static int sd_init_command(struct scsi_cmnd *SCpnt);
53203 static void sd_uninit_command(struct scsi_cmnd *SCpnt);
53204-static int sd_done(struct scsi_cmnd *);
53205+static unsigned int sd_done(struct scsi_cmnd *);
53206 static int sd_eh_action(struct scsi_cmnd *, int);
53207 static void sd_read_capacity(struct scsi_disk *sdkp, unsigned char *buffer);
53208 static void scsi_disk_release(struct device *cdev);
53209@@ -1670,7 +1670,7 @@ static unsigned int sd_completed_bytes(struct scsi_cmnd *scmd)
53210 *
53211 * Note: potentially run from within an ISR. Must not block.
53212 **/
53213-static int sd_done(struct scsi_cmnd *SCpnt)
53214+static unsigned int sd_done(struct scsi_cmnd *SCpnt)
53215 {
53216 int result = SCpnt->result;
53217 unsigned int good_bytes = result ? 0 : scsi_bufflen(SCpnt);
53218@@ -2997,7 +2997,7 @@ static int sd_probe(struct device *dev)
53219 sdkp->disk = gd;
53220 sdkp->index = index;
53221 atomic_set(&sdkp->openers, 0);
53222- atomic_set(&sdkp->device->ioerr_cnt, 0);
53223+ atomic_set_unchecked(&sdkp->device->ioerr_cnt, 0);
53224
53225 if (!sdp->request_queue->rq_timeout) {
53226 if (sdp->type != TYPE_MOD)
53227diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
53228index 2270bd5..98408a5 100644
53229--- a/drivers/scsi/sg.c
53230+++ b/drivers/scsi/sg.c
53231@@ -1083,7 +1083,7 @@ sg_ioctl(struct file *filp, unsigned int cmd_in, unsigned long arg)
53232 sdp->disk->disk_name,
53233 MKDEV(SCSI_GENERIC_MAJOR, sdp->index),
53234 NULL,
53235- (char *)arg);
53236+ (char __user *)arg);
53237 case BLKTRACESTART:
53238 return blk_trace_startstop(sdp->device->request_queue, 1);
53239 case BLKTRACESTOP:
53240diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
53241index 8bd54a6..dd037a5 100644
53242--- a/drivers/scsi/sr.c
53243+++ b/drivers/scsi/sr.c
53244@@ -80,7 +80,7 @@ static DEFINE_MUTEX(sr_mutex);
53245 static int sr_probe(struct device *);
53246 static int sr_remove(struct device *);
53247 static int sr_init_command(struct scsi_cmnd *SCpnt);
53248-static int sr_done(struct scsi_cmnd *);
53249+static unsigned int sr_done(struct scsi_cmnd *);
53250 static int sr_runtime_suspend(struct device *dev);
53251
53252 static struct dev_pm_ops sr_pm_ops = {
53253@@ -312,11 +312,11 @@ do_tur:
53254 * It will be notified on the end of a SCSI read / write, and will take one
53255 * of several actions based on success or failure.
53256 */
53257-static int sr_done(struct scsi_cmnd *SCpnt)
53258+static unsigned int sr_done(struct scsi_cmnd *SCpnt)
53259 {
53260 int result = SCpnt->result;
53261- int this_count = scsi_bufflen(SCpnt);
53262- int good_bytes = (result == 0 ? this_count : 0);
53263+ unsigned int this_count = scsi_bufflen(SCpnt);
53264+ unsigned int good_bytes = (result == 0 ? this_count : 0);
53265 int block_sectors = 0;
53266 long error_sector;
53267 struct scsi_cd *cd = scsi_cd(SCpnt->request->rq_disk);
53268diff --git a/drivers/soc/tegra/fuse/fuse-tegra.c b/drivers/soc/tegra/fuse/fuse-tegra.c
53269index c0d660f..24a5854 100644
53270--- a/drivers/soc/tegra/fuse/fuse-tegra.c
53271+++ b/drivers/soc/tegra/fuse/fuse-tegra.c
53272@@ -71,7 +71,7 @@ static ssize_t fuse_read(struct file *fd, struct kobject *kobj,
53273 return i;
53274 }
53275
53276-static struct bin_attribute fuse_bin_attr = {
53277+static bin_attribute_no_const fuse_bin_attr = {
53278 .attr = { .name = "fuse", .mode = S_IRUGO, },
53279 .read = fuse_read,
53280 };
53281diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
53282index 57a1950..ae54e21 100644
53283--- a/drivers/spi/spi.c
53284+++ b/drivers/spi/spi.c
53285@@ -2307,7 +2307,7 @@ int spi_bus_unlock(struct spi_master *master)
53286 EXPORT_SYMBOL_GPL(spi_bus_unlock);
53287
53288 /* portable code must never pass more than 32 bytes */
53289-#define SPI_BUFSIZ max(32, SMP_CACHE_BYTES)
53290+#define SPI_BUFSIZ max(32UL, SMP_CACHE_BYTES)
53291
53292 static u8 *buf;
53293
53294diff --git a/drivers/staging/android/timed_output.c b/drivers/staging/android/timed_output.c
53295index b41429f..2de5373 100644
53296--- a/drivers/staging/android/timed_output.c
53297+++ b/drivers/staging/android/timed_output.c
53298@@ -25,7 +25,7 @@
53299 #include "timed_output.h"
53300
53301 static struct class *timed_output_class;
53302-static atomic_t device_count;
53303+static atomic_unchecked_t device_count;
53304
53305 static ssize_t enable_show(struct device *dev, struct device_attribute *attr,
53306 char *buf)
53307@@ -65,7 +65,7 @@ static int create_timed_output_class(void)
53308 timed_output_class = class_create(THIS_MODULE, "timed_output");
53309 if (IS_ERR(timed_output_class))
53310 return PTR_ERR(timed_output_class);
53311- atomic_set(&device_count, 0);
53312+ atomic_set_unchecked(&device_count, 0);
53313 timed_output_class->dev_groups = timed_output_groups;
53314 }
53315
53316@@ -83,7 +83,7 @@ int timed_output_dev_register(struct timed_output_dev *tdev)
53317 if (ret < 0)
53318 return ret;
53319
53320- tdev->index = atomic_inc_return(&device_count);
53321+ tdev->index = atomic_inc_return_unchecked(&device_count);
53322 tdev->dev = device_create(timed_output_class, NULL,
53323 MKDEV(0, tdev->index), NULL, "%s", tdev->name);
53324 if (IS_ERR(tdev->dev))
53325diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c
53326index 727640e..55bf61c 100644
53327--- a/drivers/staging/comedi/comedi_fops.c
53328+++ b/drivers/staging/comedi/comedi_fops.c
53329@@ -297,8 +297,8 @@ static void comedi_file_reset(struct file *file)
53330 }
53331 cfp->last_attached = dev->attached;
53332 cfp->last_detach_count = dev->detach_count;
53333- ACCESS_ONCE(cfp->read_subdev) = read_s;
53334- ACCESS_ONCE(cfp->write_subdev) = write_s;
53335+ ACCESS_ONCE_RW(cfp->read_subdev) = read_s;
53336+ ACCESS_ONCE_RW(cfp->write_subdev) = write_s;
53337 }
53338
53339 static void comedi_file_check(struct file *file)
53340@@ -1924,7 +1924,7 @@ static int do_setrsubd_ioctl(struct comedi_device *dev, unsigned long arg,
53341 !(s_old->async->cmd.flags & CMDF_WRITE))
53342 return -EBUSY;
53343
53344- ACCESS_ONCE(cfp->read_subdev) = s_new;
53345+ ACCESS_ONCE_RW(cfp->read_subdev) = s_new;
53346 return 0;
53347 }
53348
53349@@ -1966,7 +1966,7 @@ static int do_setwsubd_ioctl(struct comedi_device *dev, unsigned long arg,
53350 (s_old->async->cmd.flags & CMDF_WRITE))
53351 return -EBUSY;
53352
53353- ACCESS_ONCE(cfp->write_subdev) = s_new;
53354+ ACCESS_ONCE_RW(cfp->write_subdev) = s_new;
53355 return 0;
53356 }
53357
53358diff --git a/drivers/staging/fbtft/fbtft-core.c b/drivers/staging/fbtft/fbtft-core.c
53359index 37dcf7e..f3c2016 100644
53360--- a/drivers/staging/fbtft/fbtft-core.c
53361+++ b/drivers/staging/fbtft/fbtft-core.c
53362@@ -689,7 +689,7 @@ struct fb_info *fbtft_framebuffer_alloc(struct fbtft_display *display,
53363 {
53364 struct fb_info *info;
53365 struct fbtft_par *par;
53366- struct fb_ops *fbops = NULL;
53367+ fb_ops_no_const *fbops = NULL;
53368 struct fb_deferred_io *fbdefio = NULL;
53369 struct fbtft_platform_data *pdata = dev->platform_data;
53370 u8 *vmem = NULL;
53371diff --git a/drivers/staging/fbtft/fbtft.h b/drivers/staging/fbtft/fbtft.h
53372index 0dbf3f9..fed0063 100644
53373--- a/drivers/staging/fbtft/fbtft.h
53374+++ b/drivers/staging/fbtft/fbtft.h
53375@@ -106,7 +106,7 @@ struct fbtft_ops {
53376
53377 int (*set_var)(struct fbtft_par *par);
53378 int (*set_gamma)(struct fbtft_par *par, unsigned long *curves);
53379-};
53380+} __no_const;
53381
53382 /**
53383 * struct fbtft_display - Describes the display properties
53384diff --git a/drivers/staging/gdm724x/gdm_tty.c b/drivers/staging/gdm724x/gdm_tty.c
53385index 001348c..cfaac8a 100644
53386--- a/drivers/staging/gdm724x/gdm_tty.c
53387+++ b/drivers/staging/gdm724x/gdm_tty.c
53388@@ -44,7 +44,7 @@
53389 #define gdm_tty_send_control(n, r, v, d, l) (\
53390 n->tty_dev->send_control(n->tty_dev->priv_dev, r, v, d, l))
53391
53392-#define GDM_TTY_READY(gdm) (gdm && gdm->tty_dev && gdm->port.count)
53393+#define GDM_TTY_READY(gdm) (gdm && gdm->tty_dev && atomic_read(&gdm->port.count))
53394
53395 static struct tty_driver *gdm_driver[TTY_MAX_COUNT];
53396 static struct gdm *gdm_table[TTY_MAX_COUNT][GDM_TTY_MINOR];
53397diff --git a/drivers/staging/i2o/i2o.h b/drivers/staging/i2o/i2o.h
53398index d23c3c2..eb63c81 100644
53399--- a/drivers/staging/i2o/i2o.h
53400+++ b/drivers/staging/i2o/i2o.h
53401@@ -565,7 +565,7 @@ struct i2o_controller {
53402 struct i2o_device *exec; /* Executive */
53403 #if BITS_PER_LONG == 64
53404 spinlock_t context_list_lock; /* lock for context_list */
53405- atomic_t context_list_counter; /* needed for unique contexts */
53406+ atomic_unchecked_t context_list_counter; /* needed for unique contexts */
53407 struct list_head context_list; /* list of context id's
53408 and pointers */
53409 #endif
53410diff --git a/drivers/staging/i2o/i2o_proc.c b/drivers/staging/i2o/i2o_proc.c
53411index ad84f33..c5bdf65 100644
53412--- a/drivers/staging/i2o/i2o_proc.c
53413+++ b/drivers/staging/i2o/i2o_proc.c
53414@@ -255,12 +255,6 @@ static char *scsi_devices[] = {
53415 "Array Controller Device"
53416 };
53417
53418-static char *chtostr(char *tmp, u8 *chars, int n)
53419-{
53420- tmp[0] = 0;
53421- return strncat(tmp, (char *)chars, n);
53422-}
53423-
53424 static int i2o_report_query_status(struct seq_file *seq, int block_status,
53425 char *group)
53426 {
53427@@ -707,9 +701,9 @@ static int i2o_seq_show_status(struct seq_file *seq, void *v)
53428 static int i2o_seq_show_hw(struct seq_file *seq, void *v)
53429 {
53430 struct i2o_controller *c = (struct i2o_controller *)seq->private;
53431- static u32 work32[5];
53432- static u8 *work8 = (u8 *) work32;
53433- static u16 *work16 = (u16 *) work32;
53434+ u32 work32[5];
53435+ u8 *work8 = (u8 *) work32;
53436+ u16 *work16 = (u16 *) work32;
53437 int token;
53438 u32 hwcap;
53439
53440@@ -790,7 +784,6 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
53441 } *result;
53442
53443 i2o_exec_execute_ddm_table ddm_table;
53444- char tmp[28 + 1];
53445
53446 result = kmalloc(sizeof(*result), GFP_KERNEL);
53447 if (!result)
53448@@ -825,8 +818,7 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
53449
53450 seq_printf(seq, "%-#7x", ddm_table.i2o_vendor_id);
53451 seq_printf(seq, "%-#8x", ddm_table.module_id);
53452- seq_printf(seq, "%-29s",
53453- chtostr(tmp, ddm_table.module_name_version, 28));
53454+ seq_printf(seq, "%-.28s", ddm_table.module_name_version);
53455 seq_printf(seq, "%9d ", ddm_table.data_size);
53456 seq_printf(seq, "%8d", ddm_table.code_size);
53457
53458@@ -893,7 +885,6 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
53459
53460 i2o_driver_result_table *result;
53461 i2o_driver_store_table *dst;
53462- char tmp[28 + 1];
53463
53464 result = kmalloc(sizeof(i2o_driver_result_table), GFP_KERNEL);
53465 if (result == NULL)
53466@@ -928,9 +919,8 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
53467
53468 seq_printf(seq, "%-#7x", dst->i2o_vendor_id);
53469 seq_printf(seq, "%-#8x", dst->module_id);
53470- seq_printf(seq, "%-29s",
53471- chtostr(tmp, dst->module_name_version, 28));
53472- seq_printf(seq, "%-9s", chtostr(tmp, dst->date, 8));
53473+ seq_printf(seq, "%-.28s", dst->module_name_version);
53474+ seq_printf(seq, "%-.8s", dst->date);
53475 seq_printf(seq, "%8d ", dst->module_size);
53476 seq_printf(seq, "%8d ", dst->mpb_size);
53477 seq_printf(seq, "0x%04x", dst->module_flags);
53478@@ -1246,11 +1236,10 @@ static int i2o_seq_show_authorized_users(struct seq_file *seq, void *v)
53479 static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
53480 {
53481 struct i2o_device *d = (struct i2o_device *)seq->private;
53482- static u32 work32[128]; // allow for "stuff" + up to 256 byte (max) serial number
53483+ u32 work32[128]; // allow for "stuff" + up to 256 byte (max) serial number
53484 // == (allow) 512d bytes (max)
53485- static u16 *work16 = (u16 *) work32;
53486+ u16 *work16 = (u16 *) work32;
53487 int token;
53488- char tmp[16 + 1];
53489
53490 token = i2o_parm_field_get(d, 0xF100, -1, &work32, sizeof(work32));
53491
53492@@ -1262,14 +1251,10 @@ static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
53493 seq_printf(seq, "Device Class : %s\n", i2o_get_class_name(work16[0]));
53494 seq_printf(seq, "Owner TID : %0#5x\n", work16[2]);
53495 seq_printf(seq, "Parent TID : %0#5x\n", work16[3]);
53496- seq_printf(seq, "Vendor info : %s\n",
53497- chtostr(tmp, (u8 *) (work32 + 2), 16));
53498- seq_printf(seq, "Product info : %s\n",
53499- chtostr(tmp, (u8 *) (work32 + 6), 16));
53500- seq_printf(seq, "Description : %s\n",
53501- chtostr(tmp, (u8 *) (work32 + 10), 16));
53502- seq_printf(seq, "Product rev. : %s\n",
53503- chtostr(tmp, (u8 *) (work32 + 14), 8));
53504+ seq_printf(seq, "Vendor info : %.16s\n", (u8 *) (work32 + 2));
53505+ seq_printf(seq, "Product info : %.16s\n", (u8 *) (work32 + 6));
53506+ seq_printf(seq, "Description : %.16s\n", (u8 *) (work32 + 10));
53507+ seq_printf(seq, "Product rev. : %.8s\n", (u8 *) (work32 + 14));
53508
53509 seq_printf(seq, "Serial number : ");
53510 print_serial_number(seq, (u8 *) (work32 + 16),
53511@@ -1306,8 +1291,6 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
53512 u8 pad[256]; // allow up to 256 byte (max) serial number
53513 } result;
53514
53515- char tmp[24 + 1];
53516-
53517 token = i2o_parm_field_get(d, 0xF101, -1, &result, sizeof(result));
53518
53519 if (token < 0) {
53520@@ -1316,10 +1299,8 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
53521 }
53522
53523 seq_printf(seq, "Registering DDM TID : 0x%03x\n", result.ddm_tid);
53524- seq_printf(seq, "Module name : %s\n",
53525- chtostr(tmp, result.module_name, 24));
53526- seq_printf(seq, "Module revision : %s\n",
53527- chtostr(tmp, result.module_rev, 8));
53528+ seq_printf(seq, "Module name : %.24s\n", result.module_name);
53529+ seq_printf(seq, "Module revision : %.8s\n", result.module_rev);
53530
53531 seq_printf(seq, "Serial number : ");
53532 print_serial_number(seq, result.serial_number, sizeof(result) - 36);
53533@@ -1343,8 +1324,6 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
53534 u8 instance_number[4];
53535 } result;
53536
53537- char tmp[64 + 1];
53538-
53539 token = i2o_parm_field_get(d, 0xF102, -1, &result, sizeof(result));
53540
53541 if (token < 0) {
53542@@ -1352,14 +1331,10 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
53543 return 0;
53544 }
53545
53546- seq_printf(seq, "Device name : %s\n",
53547- chtostr(tmp, result.device_name, 64));
53548- seq_printf(seq, "Service name : %s\n",
53549- chtostr(tmp, result.service_name, 64));
53550- seq_printf(seq, "Physical name : %s\n",
53551- chtostr(tmp, result.physical_location, 64));
53552- seq_printf(seq, "Instance number : %s\n",
53553- chtostr(tmp, result.instance_number, 4));
53554+ seq_printf(seq, "Device name : %.64s\n", result.device_name);
53555+ seq_printf(seq, "Service name : %.64s\n", result.service_name);
53556+ seq_printf(seq, "Physical name : %.64s\n", result.physical_location);
53557+ seq_printf(seq, "Instance number : %.4s\n", result.instance_number);
53558
53559 return 0;
53560 }
53561@@ -1368,9 +1343,9 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
53562 static int i2o_seq_show_sgl_limits(struct seq_file *seq, void *v)
53563 {
53564 struct i2o_device *d = (struct i2o_device *)seq->private;
53565- static u32 work32[12];
53566- static u16 *work16 = (u16 *) work32;
53567- static u8 *work8 = (u8 *) work32;
53568+ u32 work32[12];
53569+ u16 *work16 = (u16 *) work32;
53570+ u8 *work8 = (u8 *) work32;
53571 int token;
53572
53573 token = i2o_parm_field_get(d, 0xF103, -1, &work32, sizeof(work32));
53574diff --git a/drivers/staging/i2o/iop.c b/drivers/staging/i2o/iop.c
53575index 52334fc..d7f40b3 100644
53576--- a/drivers/staging/i2o/iop.c
53577+++ b/drivers/staging/i2o/iop.c
53578@@ -111,10 +111,10 @@ u32 i2o_cntxt_list_add(struct i2o_controller * c, void *ptr)
53579
53580 spin_lock_irqsave(&c->context_list_lock, flags);
53581
53582- if (unlikely(atomic_inc_and_test(&c->context_list_counter)))
53583- atomic_inc(&c->context_list_counter);
53584+ if (unlikely(atomic_inc_and_test_unchecked(&c->context_list_counter)))
53585+ atomic_inc_unchecked(&c->context_list_counter);
53586
53587- entry->context = atomic_read(&c->context_list_counter);
53588+ entry->context = atomic_read_unchecked(&c->context_list_counter);
53589
53590 list_add(&entry->list, &c->context_list);
53591
53592@@ -1076,7 +1076,7 @@ struct i2o_controller *i2o_iop_alloc(void)
53593
53594 #if BITS_PER_LONG == 64
53595 spin_lock_init(&c->context_list_lock);
53596- atomic_set(&c->context_list_counter, 0);
53597+ atomic_set_unchecked(&c->context_list_counter, 0);
53598 INIT_LIST_HEAD(&c->context_list);
53599 #endif
53600
53601diff --git a/drivers/staging/lustre/lnet/selftest/brw_test.c b/drivers/staging/lustre/lnet/selftest/brw_test.c
53602index 463da07..e791ce9 100644
53603--- a/drivers/staging/lustre/lnet/selftest/brw_test.c
53604+++ b/drivers/staging/lustre/lnet/selftest/brw_test.c
53605@@ -488,13 +488,11 @@ brw_server_handle(struct srpc_server_rpc *rpc)
53606 return 0;
53607 }
53608
53609-sfw_test_client_ops_t brw_test_client;
53610-void brw_init_test_client(void)
53611-{
53612- brw_test_client.tso_init = brw_client_init;
53613- brw_test_client.tso_fini = brw_client_fini;
53614- brw_test_client.tso_prep_rpc = brw_client_prep_rpc;
53615- brw_test_client.tso_done_rpc = brw_client_done_rpc;
53616+sfw_test_client_ops_t brw_test_client = {
53617+ .tso_init = brw_client_init,
53618+ .tso_fini = brw_client_fini,
53619+ .tso_prep_rpc = brw_client_prep_rpc,
53620+ .tso_done_rpc = brw_client_done_rpc,
53621 };
53622
53623 srpc_service_t brw_test_service;
53624diff --git a/drivers/staging/lustre/lnet/selftest/framework.c b/drivers/staging/lustre/lnet/selftest/framework.c
53625index 5709148..ccd9e0d 100644
53626--- a/drivers/staging/lustre/lnet/selftest/framework.c
53627+++ b/drivers/staging/lustre/lnet/selftest/framework.c
53628@@ -1628,12 +1628,10 @@ static srpc_service_t sfw_services[] = {
53629
53630 extern sfw_test_client_ops_t ping_test_client;
53631 extern srpc_service_t ping_test_service;
53632-extern void ping_init_test_client(void);
53633 extern void ping_init_test_service(void);
53634
53635 extern sfw_test_client_ops_t brw_test_client;
53636 extern srpc_service_t brw_test_service;
53637-extern void brw_init_test_client(void);
53638 extern void brw_init_test_service(void);
53639
53640
53641@@ -1675,12 +1673,10 @@ sfw_startup (void)
53642 INIT_LIST_HEAD(&sfw_data.fw_zombie_rpcs);
53643 INIT_LIST_HEAD(&sfw_data.fw_zombie_sessions);
53644
53645- brw_init_test_client();
53646 brw_init_test_service();
53647 rc = sfw_register_test(&brw_test_service, &brw_test_client);
53648 LASSERT (rc == 0);
53649
53650- ping_init_test_client();
53651 ping_init_test_service();
53652 rc = sfw_register_test(&ping_test_service, &ping_test_client);
53653 LASSERT (rc == 0);
53654diff --git a/drivers/staging/lustre/lnet/selftest/ping_test.c b/drivers/staging/lustre/lnet/selftest/ping_test.c
53655index d8c0df6..5041cbb 100644
53656--- a/drivers/staging/lustre/lnet/selftest/ping_test.c
53657+++ b/drivers/staging/lustre/lnet/selftest/ping_test.c
53658@@ -211,14 +211,12 @@ ping_server_handle(struct srpc_server_rpc *rpc)
53659 return 0;
53660 }
53661
53662-sfw_test_client_ops_t ping_test_client;
53663-void ping_init_test_client(void)
53664-{
53665- ping_test_client.tso_init = ping_client_init;
53666- ping_test_client.tso_fini = ping_client_fini;
53667- ping_test_client.tso_prep_rpc = ping_client_prep_rpc;
53668- ping_test_client.tso_done_rpc = ping_client_done_rpc;
53669-}
53670+sfw_test_client_ops_t ping_test_client = {
53671+ .tso_init = ping_client_init,
53672+ .tso_fini = ping_client_fini,
53673+ .tso_prep_rpc = ping_client_prep_rpc,
53674+ .tso_done_rpc = ping_client_done_rpc,
53675+};
53676
53677 srpc_service_t ping_test_service;
53678 void ping_init_test_service(void)
53679diff --git a/drivers/staging/lustre/lustre/include/lustre_dlm.h b/drivers/staging/lustre/lustre/include/lustre_dlm.h
53680index 83bc0a9..12ba00a 100644
53681--- a/drivers/staging/lustre/lustre/include/lustre_dlm.h
53682+++ b/drivers/staging/lustre/lustre/include/lustre_dlm.h
53683@@ -1139,7 +1139,7 @@ struct ldlm_callback_suite {
53684 ldlm_completion_callback lcs_completion;
53685 ldlm_blocking_callback lcs_blocking;
53686 ldlm_glimpse_callback lcs_glimpse;
53687-};
53688+} __no_const;
53689
53690 /* ldlm_lockd.c */
53691 int ldlm_del_waiting_lock(struct ldlm_lock *lock);
53692diff --git a/drivers/staging/lustre/lustre/include/obd.h b/drivers/staging/lustre/lustre/include/obd.h
53693index 2a88b80..62e7e5f 100644
53694--- a/drivers/staging/lustre/lustre/include/obd.h
53695+++ b/drivers/staging/lustre/lustre/include/obd.h
53696@@ -1362,7 +1362,7 @@ struct md_ops {
53697 * lprocfs_alloc_md_stats() in obdclass/lprocfs_status.c. Also, add a
53698 * wrapper function in include/linux/obd_class.h.
53699 */
53700-};
53701+} __no_const;
53702
53703 struct lsm_operations {
53704 void (*lsm_free)(struct lov_stripe_md *);
53705diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c b/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
53706index a4c252f..b21acac 100644
53707--- a/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
53708+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
53709@@ -258,7 +258,7 @@ ldlm_process_flock_lock(struct ldlm_lock *req, __u64 *flags, int first_enq,
53710 int added = (mode == LCK_NL);
53711 int overlaps = 0;
53712 int splitted = 0;
53713- const struct ldlm_callback_suite null_cbs = { NULL };
53714+ const struct ldlm_callback_suite null_cbs = { };
53715
53716 CDEBUG(D_DLMTRACE,
53717 "flags %#llx owner %llu pid %u mode %u start %llu end %llu\n",
53718diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c b/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
53719index c539e37..743b213 100644
53720--- a/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
53721+++ b/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
53722@@ -237,7 +237,7 @@ static int proc_console_max_delay_cs(struct ctl_table *table, int write,
53723 loff_t *ppos)
53724 {
53725 int rc, max_delay_cs;
53726- struct ctl_table dummy = *table;
53727+ ctl_table_no_const dummy = *table;
53728 long d;
53729
53730 dummy.data = &max_delay_cs;
53731@@ -270,7 +270,7 @@ static int proc_console_min_delay_cs(struct ctl_table *table, int write,
53732 loff_t *ppos)
53733 {
53734 int rc, min_delay_cs;
53735- struct ctl_table dummy = *table;
53736+ ctl_table_no_const dummy = *table;
53737 long d;
53738
53739 dummy.data = &min_delay_cs;
53740@@ -302,7 +302,7 @@ static int proc_console_backoff(struct ctl_table *table, int write,
53741 void __user *buffer, size_t *lenp, loff_t *ppos)
53742 {
53743 int rc, backoff;
53744- struct ctl_table dummy = *table;
53745+ ctl_table_no_const dummy = *table;
53746
53747 dummy.data = &backoff;
53748 dummy.proc_handler = &proc_dointvec;
53749diff --git a/drivers/staging/lustre/lustre/libcfs/module.c b/drivers/staging/lustre/lustre/libcfs/module.c
53750index 7dc77dd..289d03e 100644
53751--- a/drivers/staging/lustre/lustre/libcfs/module.c
53752+++ b/drivers/staging/lustre/lustre/libcfs/module.c
53753@@ -313,11 +313,11 @@ out:
53754
53755
53756 struct cfs_psdev_ops libcfs_psdev_ops = {
53757- libcfs_psdev_open,
53758- libcfs_psdev_release,
53759- NULL,
53760- NULL,
53761- libcfs_ioctl
53762+ .p_open = libcfs_psdev_open,
53763+ .p_close = libcfs_psdev_release,
53764+ .p_read = NULL,
53765+ .p_write = NULL,
53766+ .p_ioctl = libcfs_ioctl
53767 };
53768
53769 extern int insert_proc(void);
53770diff --git a/drivers/staging/octeon/ethernet-rx.c b/drivers/staging/octeon/ethernet-rx.c
53771index 22667db..8b703b6 100644
53772--- a/drivers/staging/octeon/ethernet-rx.c
53773+++ b/drivers/staging/octeon/ethernet-rx.c
53774@@ -354,14 +354,14 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
53775 /* Increment RX stats for virtual ports */
53776 if (work->ipprt >= CVMX_PIP_NUM_INPUT_PORTS) {
53777 #ifdef CONFIG_64BIT
53778- atomic64_add(1,
53779+ atomic64_add_unchecked(1,
53780 (atomic64_t *)&priv->stats.rx_packets);
53781- atomic64_add(skb->len,
53782+ atomic64_add_unchecked(skb->len,
53783 (atomic64_t *)&priv->stats.rx_bytes);
53784 #else
53785- atomic_add(1,
53786+ atomic_add_unchecked(1,
53787 (atomic_t *)&priv->stats.rx_packets);
53788- atomic_add(skb->len,
53789+ atomic_add_unchecked(skb->len,
53790 (atomic_t *)&priv->stats.rx_bytes);
53791 #endif
53792 }
53793@@ -373,10 +373,10 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
53794 dev->name);
53795 */
53796 #ifdef CONFIG_64BIT
53797- atomic64_add(1,
53798+ atomic64_add_unchecked(1,
53799 (atomic64_t *)&priv->stats.rx_dropped);
53800 #else
53801- atomic_add(1,
53802+ atomic_add_unchecked(1,
53803 (atomic_t *)&priv->stats.rx_dropped);
53804 #endif
53805 dev_kfree_skb_irq(skb);
53806diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c
53807index 460e854..f926452 100644
53808--- a/drivers/staging/octeon/ethernet.c
53809+++ b/drivers/staging/octeon/ethernet.c
53810@@ -241,11 +241,11 @@ static struct net_device_stats *cvm_oct_common_get_stats(struct net_device *dev)
53811 * since the RX tasklet also increments it.
53812 */
53813 #ifdef CONFIG_64BIT
53814- atomic64_add(rx_status.dropped_packets,
53815- (atomic64_t *)&priv->stats.rx_dropped);
53816+ atomic64_add_unchecked(rx_status.dropped_packets,
53817+ (atomic64_unchecked_t *)&priv->stats.rx_dropped);
53818 #else
53819- atomic_add(rx_status.dropped_packets,
53820- (atomic_t *)&priv->stats.rx_dropped);
53821+ atomic_add_unchecked(rx_status.dropped_packets,
53822+ (atomic_unchecked_t *)&priv->stats.rx_dropped);
53823 #endif
53824 }
53825
53826diff --git a/drivers/staging/rtl8188eu/include/hal_intf.h b/drivers/staging/rtl8188eu/include/hal_intf.h
53827index 3b476d8..f522d68 100644
53828--- a/drivers/staging/rtl8188eu/include/hal_intf.h
53829+++ b/drivers/staging/rtl8188eu/include/hal_intf.h
53830@@ -225,7 +225,7 @@ struct hal_ops {
53831
53832 void (*hal_notch_filter)(struct adapter *adapter, bool enable);
53833 void (*hal_reset_security_engine)(struct adapter *adapter);
53834-};
53835+} __no_const;
53836
53837 enum rt_eeprom_type {
53838 EEPROM_93C46,
53839diff --git a/drivers/staging/rtl8712/rtl871x_io.h b/drivers/staging/rtl8712/rtl871x_io.h
53840index 070cc03..6806e37 100644
53841--- a/drivers/staging/rtl8712/rtl871x_io.h
53842+++ b/drivers/staging/rtl8712/rtl871x_io.h
53843@@ -108,7 +108,7 @@ struct _io_ops {
53844 u8 *pmem);
53845 u32 (*_write_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt,
53846 u8 *pmem);
53847-};
53848+} __no_const;
53849
53850 struct io_req {
53851 struct list_head list;
53852diff --git a/drivers/staging/unisys/visorchipset/visorchipset.h b/drivers/staging/unisys/visorchipset/visorchipset.h
53853index 98f3ba4..c6a7fce 100644
53854--- a/drivers/staging/unisys/visorchipset/visorchipset.h
53855+++ b/drivers/staging/unisys/visorchipset/visorchipset.h
53856@@ -171,7 +171,7 @@ struct visorchipset_busdev_notifiers {
53857 void (*device_resume)(ulong bus_no, ulong dev_no);
53858 int (*get_channel_info)(uuid_le type_uuid, ulong *min_size,
53859 ulong *max_size);
53860-};
53861+} __no_const;
53862
53863 /* These functions live inside visorchipset, and will be called to indicate
53864 * responses to specific events (by code outside of visorchipset).
53865@@ -186,7 +186,7 @@ struct visorchipset_busdev_responders {
53866 void (*device_destroy)(ulong bus_no, ulong dev_no, int response);
53867 void (*device_pause)(ulong bus_no, ulong dev_no, int response);
53868 void (*device_resume)(ulong bus_no, ulong dev_no, int response);
53869-};
53870+} __no_const;
53871
53872 /** Register functions (in the bus driver) to get called by visorchipset
53873 * whenever a bus or device appears for which this service partition is
53874diff --git a/drivers/target/sbp/sbp_target.c b/drivers/target/sbp/sbp_target.c
53875index 9512af6..045bf5a 100644
53876--- a/drivers/target/sbp/sbp_target.c
53877+++ b/drivers/target/sbp/sbp_target.c
53878@@ -62,7 +62,7 @@ static const u32 sbp_unit_directory_template[] = {
53879
53880 #define SESSION_MAINTENANCE_INTERVAL HZ
53881
53882-static atomic_t login_id = ATOMIC_INIT(0);
53883+static atomic_unchecked_t login_id = ATOMIC_INIT(0);
53884
53885 static void session_maintenance_work(struct work_struct *);
53886 static int sbp_run_transaction(struct fw_card *, int, int, int, int,
53887@@ -444,7 +444,7 @@ static void sbp_management_request_login(
53888 login->lun = se_lun;
53889 login->status_fifo_addr = sbp2_pointer_to_addr(&req->orb.status_fifo);
53890 login->exclusive = LOGIN_ORB_EXCLUSIVE(be32_to_cpu(req->orb.misc));
53891- login->login_id = atomic_inc_return(&login_id);
53892+ login->login_id = atomic_inc_return_unchecked(&login_id);
53893
53894 login->tgt_agt = sbp_target_agent_register(login);
53895 if (IS_ERR(login->tgt_agt)) {
53896diff --git a/drivers/target/target_core_device.c b/drivers/target/target_core_device.c
53897index 7faa6ae..ae6c410 100644
53898--- a/drivers/target/target_core_device.c
53899+++ b/drivers/target/target_core_device.c
53900@@ -1495,7 +1495,7 @@ struct se_device *target_alloc_device(struct se_hba *hba, const char *name)
53901 spin_lock_init(&dev->se_tmr_lock);
53902 spin_lock_init(&dev->qf_cmd_lock);
53903 sema_init(&dev->caw_sem, 1);
53904- atomic_set(&dev->dev_ordered_id, 0);
53905+ atomic_set_unchecked(&dev->dev_ordered_id, 0);
53906 INIT_LIST_HEAD(&dev->t10_wwn.t10_vpd_list);
53907 spin_lock_init(&dev->t10_wwn.t10_vpd_lock);
53908 INIT_LIST_HEAD(&dev->t10_pr.registration_list);
53909diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
53910index f786de0..04b643e 100644
53911--- a/drivers/target/target_core_transport.c
53912+++ b/drivers/target/target_core_transport.c
53913@@ -1168,7 +1168,7 @@ transport_check_alloc_task_attr(struct se_cmd *cmd)
53914 * Used to determine when ORDERED commands should go from
53915 * Dormant to Active status.
53916 */
53917- cmd->se_ordered_id = atomic_inc_return(&dev->dev_ordered_id);
53918+ cmd->se_ordered_id = atomic_inc_return_unchecked(&dev->dev_ordered_id);
53919 pr_debug("Allocated se_ordered_id: %u for Task Attr: 0x%02x on %s\n",
53920 cmd->se_ordered_id, cmd->sam_task_attr,
53921 dev->transport->name);
53922diff --git a/drivers/thermal/int340x_thermal/int3400_thermal.c b/drivers/thermal/int340x_thermal/int3400_thermal.c
53923index 031018e..90981a1 100644
53924--- a/drivers/thermal/int340x_thermal/int3400_thermal.c
53925+++ b/drivers/thermal/int340x_thermal/int3400_thermal.c
53926@@ -272,8 +272,10 @@ static int int3400_thermal_probe(struct platform_device *pdev)
53927 platform_set_drvdata(pdev, priv);
53928
53929 if (priv->uuid_bitmap & 1 << INT3400_THERMAL_PASSIVE_1) {
53930- int3400_thermal_ops.get_mode = int3400_thermal_get_mode;
53931- int3400_thermal_ops.set_mode = int3400_thermal_set_mode;
53932+ pax_open_kernel();
53933+ *(void **)&int3400_thermal_ops.get_mode = int3400_thermal_get_mode;
53934+ *(void **)&int3400_thermal_ops.set_mode = int3400_thermal_set_mode;
53935+ pax_close_kernel();
53936 }
53937 priv->thermal = thermal_zone_device_register("INT3400 Thermal", 0, 0,
53938 priv, &int3400_thermal_ops,
53939diff --git a/drivers/thermal/of-thermal.c b/drivers/thermal/of-thermal.c
53940index 668fb1b..2737bbe 100644
53941--- a/drivers/thermal/of-thermal.c
53942+++ b/drivers/thermal/of-thermal.c
53943@@ -31,6 +31,7 @@
53944 #include <linux/export.h>
53945 #include <linux/string.h>
53946 #include <linux/thermal.h>
53947+#include <linux/mm.h>
53948
53949 #include "thermal_core.h"
53950
53951@@ -412,9 +413,11 @@ thermal_zone_of_add_sensor(struct device_node *zone,
53952 tz->ops = ops;
53953 tz->sensor_data = data;
53954
53955- tzd->ops->get_temp = of_thermal_get_temp;
53956- tzd->ops->get_trend = of_thermal_get_trend;
53957- tzd->ops->set_emul_temp = of_thermal_set_emul_temp;
53958+ pax_open_kernel();
53959+ *(void **)&tzd->ops->get_temp = of_thermal_get_temp;
53960+ *(void **)&tzd->ops->get_trend = of_thermal_get_trend;
53961+ *(void **)&tzd->ops->set_emul_temp = of_thermal_set_emul_temp;
53962+ pax_close_kernel();
53963 mutex_unlock(&tzd->lock);
53964
53965 return tzd;
53966@@ -544,9 +547,11 @@ void thermal_zone_of_sensor_unregister(struct device *dev,
53967 return;
53968
53969 mutex_lock(&tzd->lock);
53970- tzd->ops->get_temp = NULL;
53971- tzd->ops->get_trend = NULL;
53972- tzd->ops->set_emul_temp = NULL;
53973+ pax_open_kernel();
53974+ *(void **)&tzd->ops->get_temp = NULL;
53975+ *(void **)&tzd->ops->get_trend = NULL;
53976+ *(void **)&tzd->ops->set_emul_temp = NULL;
53977+ pax_close_kernel();
53978
53979 tz->ops = NULL;
53980 tz->sensor_data = NULL;
53981diff --git a/drivers/thermal/x86_pkg_temp_thermal.c b/drivers/thermal/x86_pkg_temp_thermal.c
53982index 9ea3d9d..53e8792 100644
53983--- a/drivers/thermal/x86_pkg_temp_thermal.c
53984+++ b/drivers/thermal/x86_pkg_temp_thermal.c
53985@@ -567,7 +567,7 @@ static int pkg_temp_thermal_cpu_callback(struct notifier_block *nfb,
53986 return NOTIFY_OK;
53987 }
53988
53989-static struct notifier_block pkg_temp_thermal_notifier __refdata = {
53990+static struct notifier_block pkg_temp_thermal_notifier __refconst = {
53991 .notifier_call = pkg_temp_thermal_cpu_callback,
53992 };
53993
53994diff --git a/drivers/tty/cyclades.c b/drivers/tty/cyclades.c
53995index fd66f57..48e6376 100644
53996--- a/drivers/tty/cyclades.c
53997+++ b/drivers/tty/cyclades.c
53998@@ -1570,10 +1570,10 @@ static int cy_open(struct tty_struct *tty, struct file *filp)
53999 printk(KERN_DEBUG "cyc:cy_open ttyC%d, count = %d\n", info->line,
54000 info->port.count);
54001 #endif
54002- info->port.count++;
54003+ atomic_inc(&info->port.count);
54004 #ifdef CY_DEBUG_COUNT
54005 printk(KERN_DEBUG "cyc:cy_open (%d): incrementing count to %d\n",
54006- current->pid, info->port.count);
54007+ current->pid, atomic_read(&info->port.count));
54008 #endif
54009
54010 /*
54011@@ -3974,7 +3974,7 @@ static int cyclades_proc_show(struct seq_file *m, void *v)
54012 for (j = 0; j < cy_card[i].nports; j++) {
54013 info = &cy_card[i].ports[j];
54014
54015- if (info->port.count) {
54016+ if (atomic_read(&info->port.count)) {
54017 /* XXX is the ldisc num worth this? */
54018 struct tty_struct *tty;
54019 struct tty_ldisc *ld;
54020diff --git a/drivers/tty/hvc/hvc_console.c b/drivers/tty/hvc/hvc_console.c
54021index 4fcec1d..5a036f7 100644
54022--- a/drivers/tty/hvc/hvc_console.c
54023+++ b/drivers/tty/hvc/hvc_console.c
54024@@ -342,7 +342,7 @@ static int hvc_open(struct tty_struct *tty, struct file * filp)
54025
54026 spin_lock_irqsave(&hp->port.lock, flags);
54027 /* Check and then increment for fast path open. */
54028- if (hp->port.count++ > 0) {
54029+ if (atomic_inc_return(&hp->port.count) > 1) {
54030 spin_unlock_irqrestore(&hp->port.lock, flags);
54031 hvc_kick();
54032 return 0;
54033@@ -397,7 +397,7 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
54034
54035 spin_lock_irqsave(&hp->port.lock, flags);
54036
54037- if (--hp->port.count == 0) {
54038+ if (atomic_dec_return(&hp->port.count) == 0) {
54039 spin_unlock_irqrestore(&hp->port.lock, flags);
54040 /* We are done with the tty pointer now. */
54041 tty_port_tty_set(&hp->port, NULL);
54042@@ -419,9 +419,9 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
54043 */
54044 tty_wait_until_sent_from_close(tty, HVC_CLOSE_WAIT);
54045 } else {
54046- if (hp->port.count < 0)
54047+ if (atomic_read(&hp->port.count) < 0)
54048 printk(KERN_ERR "hvc_close %X: oops, count is %d\n",
54049- hp->vtermno, hp->port.count);
54050+ hp->vtermno, atomic_read(&hp->port.count));
54051 spin_unlock_irqrestore(&hp->port.lock, flags);
54052 }
54053 }
54054@@ -451,12 +451,12 @@ static void hvc_hangup(struct tty_struct *tty)
54055 * open->hangup case this can be called after the final close so prevent
54056 * that from happening for now.
54057 */
54058- if (hp->port.count <= 0) {
54059+ if (atomic_read(&hp->port.count) <= 0) {
54060 spin_unlock_irqrestore(&hp->port.lock, flags);
54061 return;
54062 }
54063
54064- hp->port.count = 0;
54065+ atomic_set(&hp->port.count, 0);
54066 spin_unlock_irqrestore(&hp->port.lock, flags);
54067 tty_port_tty_set(&hp->port, NULL);
54068
54069@@ -504,7 +504,7 @@ static int hvc_write(struct tty_struct *tty, const unsigned char *buf, int count
54070 return -EPIPE;
54071
54072 /* FIXME what's this (unprotected) check for? */
54073- if (hp->port.count <= 0)
54074+ if (atomic_read(&hp->port.count) <= 0)
54075 return -EIO;
54076
54077 spin_lock_irqsave(&hp->lock, flags);
54078diff --git a/drivers/tty/hvc/hvcs.c b/drivers/tty/hvc/hvcs.c
54079index 81ff7e1..dfb7b71 100644
54080--- a/drivers/tty/hvc/hvcs.c
54081+++ b/drivers/tty/hvc/hvcs.c
54082@@ -83,6 +83,7 @@
54083 #include <asm/hvcserver.h>
54084 #include <asm/uaccess.h>
54085 #include <asm/vio.h>
54086+#include <asm/local.h>
54087
54088 /*
54089 * 1.3.0 -> 1.3.1 In hvcs_open memset(..,0x00,..) instead of memset(..,0x3F,00).
54090@@ -416,7 +417,7 @@ static ssize_t hvcs_vterm_state_store(struct device *dev, struct device_attribut
54091
54092 spin_lock_irqsave(&hvcsd->lock, flags);
54093
54094- if (hvcsd->port.count > 0) {
54095+ if (atomic_read(&hvcsd->port.count) > 0) {
54096 spin_unlock_irqrestore(&hvcsd->lock, flags);
54097 printk(KERN_INFO "HVCS: vterm state unchanged. "
54098 "The hvcs device node is still in use.\n");
54099@@ -1127,7 +1128,7 @@ static int hvcs_install(struct tty_driver *driver, struct tty_struct *tty)
54100 }
54101 }
54102
54103- hvcsd->port.count = 0;
54104+ atomic_set(&hvcsd->port.count, 0);
54105 hvcsd->port.tty = tty;
54106 tty->driver_data = hvcsd;
54107
54108@@ -1180,7 +1181,7 @@ static int hvcs_open(struct tty_struct *tty, struct file *filp)
54109 unsigned long flags;
54110
54111 spin_lock_irqsave(&hvcsd->lock, flags);
54112- hvcsd->port.count++;
54113+ atomic_inc(&hvcsd->port.count);
54114 hvcsd->todo_mask |= HVCS_SCHED_READ;
54115 spin_unlock_irqrestore(&hvcsd->lock, flags);
54116
54117@@ -1216,7 +1217,7 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
54118 hvcsd = tty->driver_data;
54119
54120 spin_lock_irqsave(&hvcsd->lock, flags);
54121- if (--hvcsd->port.count == 0) {
54122+ if (atomic_dec_and_test(&hvcsd->port.count)) {
54123
54124 vio_disable_interrupts(hvcsd->vdev);
54125
54126@@ -1241,10 +1242,10 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
54127
54128 free_irq(irq, hvcsd);
54129 return;
54130- } else if (hvcsd->port.count < 0) {
54131+ } else if (atomic_read(&hvcsd->port.count) < 0) {
54132 printk(KERN_ERR "HVCS: vty-server@%X open_count: %d"
54133 " is missmanaged.\n",
54134- hvcsd->vdev->unit_address, hvcsd->port.count);
54135+ hvcsd->vdev->unit_address, atomic_read(&hvcsd->port.count));
54136 }
54137
54138 spin_unlock_irqrestore(&hvcsd->lock, flags);
54139@@ -1266,7 +1267,7 @@ static void hvcs_hangup(struct tty_struct * tty)
54140
54141 spin_lock_irqsave(&hvcsd->lock, flags);
54142 /* Preserve this so that we know how many kref refs to put */
54143- temp_open_count = hvcsd->port.count;
54144+ temp_open_count = atomic_read(&hvcsd->port.count);
54145
54146 /*
54147 * Don't kref put inside the spinlock because the destruction
54148@@ -1281,7 +1282,7 @@ static void hvcs_hangup(struct tty_struct * tty)
54149 tty->driver_data = NULL;
54150 hvcsd->port.tty = NULL;
54151
54152- hvcsd->port.count = 0;
54153+ atomic_set(&hvcsd->port.count, 0);
54154
54155 /* This will drop any buffered data on the floor which is OK in a hangup
54156 * scenario. */
54157@@ -1352,7 +1353,7 @@ static int hvcs_write(struct tty_struct *tty,
54158 * the middle of a write operation? This is a crummy place to do this
54159 * but we want to keep it all in the spinlock.
54160 */
54161- if (hvcsd->port.count <= 0) {
54162+ if (atomic_read(&hvcsd->port.count) <= 0) {
54163 spin_unlock_irqrestore(&hvcsd->lock, flags);
54164 return -ENODEV;
54165 }
54166@@ -1426,7 +1427,7 @@ static int hvcs_write_room(struct tty_struct *tty)
54167 {
54168 struct hvcs_struct *hvcsd = tty->driver_data;
54169
54170- if (!hvcsd || hvcsd->port.count <= 0)
54171+ if (!hvcsd || atomic_read(&hvcsd->port.count) <= 0)
54172 return 0;
54173
54174 return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
54175diff --git a/drivers/tty/hvc/hvsi.c b/drivers/tty/hvc/hvsi.c
54176index 4190199..06d5bfa 100644
54177--- a/drivers/tty/hvc/hvsi.c
54178+++ b/drivers/tty/hvc/hvsi.c
54179@@ -85,7 +85,7 @@ struct hvsi_struct {
54180 int n_outbuf;
54181 uint32_t vtermno;
54182 uint32_t virq;
54183- atomic_t seqno; /* HVSI packet sequence number */
54184+ atomic_unchecked_t seqno; /* HVSI packet sequence number */
54185 uint16_t mctrl;
54186 uint8_t state; /* HVSI protocol state */
54187 uint8_t flags;
54188@@ -295,7 +295,7 @@ static int hvsi_version_respond(struct hvsi_struct *hp, uint16_t query_seqno)
54189
54190 packet.hdr.type = VS_QUERY_RESPONSE_PACKET_HEADER;
54191 packet.hdr.len = sizeof(struct hvsi_query_response);
54192- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
54193+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
54194 packet.verb = VSV_SEND_VERSION_NUMBER;
54195 packet.u.version = HVSI_VERSION;
54196 packet.query_seqno = query_seqno+1;
54197@@ -555,7 +555,7 @@ static int hvsi_query(struct hvsi_struct *hp, uint16_t verb)
54198
54199 packet.hdr.type = VS_QUERY_PACKET_HEADER;
54200 packet.hdr.len = sizeof(struct hvsi_query);
54201- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
54202+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
54203 packet.verb = verb;
54204
54205 pr_debug("%s: sending %i bytes\n", __func__, packet.hdr.len);
54206@@ -597,7 +597,7 @@ static int hvsi_set_mctrl(struct hvsi_struct *hp, uint16_t mctrl)
54207 int wrote;
54208
54209 packet.hdr.type = VS_CONTROL_PACKET_HEADER,
54210- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
54211+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
54212 packet.hdr.len = sizeof(struct hvsi_control);
54213 packet.verb = VSV_SET_MODEM_CTL;
54214 packet.mask = HVSI_TSDTR;
54215@@ -680,7 +680,7 @@ static int hvsi_put_chars(struct hvsi_struct *hp, const char *buf, int count)
54216 BUG_ON(count > HVSI_MAX_OUTGOING_DATA);
54217
54218 packet.hdr.type = VS_DATA_PACKET_HEADER;
54219- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
54220+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
54221 packet.hdr.len = count + sizeof(struct hvsi_header);
54222 memcpy(&packet.data, buf, count);
54223
54224@@ -697,7 +697,7 @@ static void hvsi_close_protocol(struct hvsi_struct *hp)
54225 struct hvsi_control packet __ALIGNED__;
54226
54227 packet.hdr.type = VS_CONTROL_PACKET_HEADER;
54228- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
54229+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
54230 packet.hdr.len = 6;
54231 packet.verb = VSV_CLOSE_PROTOCOL;
54232
54233@@ -725,7 +725,7 @@ static int hvsi_open(struct tty_struct *tty, struct file *filp)
54234
54235 tty_port_tty_set(&hp->port, tty);
54236 spin_lock_irqsave(&hp->lock, flags);
54237- hp->port.count++;
54238+ atomic_inc(&hp->port.count);
54239 atomic_set(&hp->seqno, 0);
54240 h_vio_signal(hp->vtermno, VIO_IRQ_ENABLE);
54241 spin_unlock_irqrestore(&hp->lock, flags);
54242@@ -782,7 +782,7 @@ static void hvsi_close(struct tty_struct *tty, struct file *filp)
54243
54244 spin_lock_irqsave(&hp->lock, flags);
54245
54246- if (--hp->port.count == 0) {
54247+ if (atomic_dec_return(&hp->port.count) == 0) {
54248 tty_port_tty_set(&hp->port, NULL);
54249 hp->inbuf_end = hp->inbuf; /* discard remaining partial packets */
54250
54251@@ -815,9 +815,9 @@ static void hvsi_close(struct tty_struct *tty, struct file *filp)
54252
54253 spin_lock_irqsave(&hp->lock, flags);
54254 }
54255- } else if (hp->port.count < 0)
54256+ } else if (atomic_read(&hp->port.count) < 0)
54257 printk(KERN_ERR "hvsi_close %lu: oops, count is %d\n",
54258- hp - hvsi_ports, hp->port.count);
54259+ hp - hvsi_ports, atomic_read(&hp->port.count));
54260
54261 spin_unlock_irqrestore(&hp->lock, flags);
54262 }
54263@@ -832,7 +832,7 @@ static void hvsi_hangup(struct tty_struct *tty)
54264 tty_port_tty_set(&hp->port, NULL);
54265
54266 spin_lock_irqsave(&hp->lock, flags);
54267- hp->port.count = 0;
54268+ atomic_set(&hp->port.count, 0);
54269 hp->n_outbuf = 0;
54270 spin_unlock_irqrestore(&hp->lock, flags);
54271 }
54272diff --git a/drivers/tty/hvc/hvsi_lib.c b/drivers/tty/hvc/hvsi_lib.c
54273index a270f04..7c77b5d 100644
54274--- a/drivers/tty/hvc/hvsi_lib.c
54275+++ b/drivers/tty/hvc/hvsi_lib.c
54276@@ -8,7 +8,7 @@
54277
54278 static int hvsi_send_packet(struct hvsi_priv *pv, struct hvsi_header *packet)
54279 {
54280- packet->seqno = cpu_to_be16(atomic_inc_return(&pv->seqno));
54281+ packet->seqno = cpu_to_be16(atomic_inc_return_unchecked(&pv->seqno));
54282
54283 /* Assumes that always succeeds, works in practice */
54284 return pv->put_chars(pv->termno, (char *)packet, packet->len);
54285@@ -20,7 +20,7 @@ static void hvsi_start_handshake(struct hvsi_priv *pv)
54286
54287 /* Reset state */
54288 pv->established = 0;
54289- atomic_set(&pv->seqno, 0);
54290+ atomic_set_unchecked(&pv->seqno, 0);
54291
54292 pr_devel("HVSI@%x: Handshaking started\n", pv->termno);
54293
54294diff --git a/drivers/tty/ipwireless/tty.c b/drivers/tty/ipwireless/tty.c
54295index 345cebb..d5a1e9e 100644
54296--- a/drivers/tty/ipwireless/tty.c
54297+++ b/drivers/tty/ipwireless/tty.c
54298@@ -28,6 +28,7 @@
54299 #include <linux/tty_driver.h>
54300 #include <linux/tty_flip.h>
54301 #include <linux/uaccess.h>
54302+#include <asm/local.h>
54303
54304 #include "tty.h"
54305 #include "network.h"
54306@@ -93,10 +94,10 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
54307 return -ENODEV;
54308
54309 mutex_lock(&tty->ipw_tty_mutex);
54310- if (tty->port.count == 0)
54311+ if (atomic_read(&tty->port.count) == 0)
54312 tty->tx_bytes_queued = 0;
54313
54314- tty->port.count++;
54315+ atomic_inc(&tty->port.count);
54316
54317 tty->port.tty = linux_tty;
54318 linux_tty->driver_data = tty;
54319@@ -112,9 +113,7 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
54320
54321 static void do_ipw_close(struct ipw_tty *tty)
54322 {
54323- tty->port.count--;
54324-
54325- if (tty->port.count == 0) {
54326+ if (atomic_dec_return(&tty->port.count) == 0) {
54327 struct tty_struct *linux_tty = tty->port.tty;
54328
54329 if (linux_tty != NULL) {
54330@@ -135,7 +134,7 @@ static void ipw_hangup(struct tty_struct *linux_tty)
54331 return;
54332
54333 mutex_lock(&tty->ipw_tty_mutex);
54334- if (tty->port.count == 0) {
54335+ if (atomic_read(&tty->port.count) == 0) {
54336 mutex_unlock(&tty->ipw_tty_mutex);
54337 return;
54338 }
54339@@ -158,7 +157,7 @@ void ipwireless_tty_received(struct ipw_tty *tty, unsigned char *data,
54340
54341 mutex_lock(&tty->ipw_tty_mutex);
54342
54343- if (!tty->port.count) {
54344+ if (!atomic_read(&tty->port.count)) {
54345 mutex_unlock(&tty->ipw_tty_mutex);
54346 return;
54347 }
54348@@ -197,7 +196,7 @@ static int ipw_write(struct tty_struct *linux_tty,
54349 return -ENODEV;
54350
54351 mutex_lock(&tty->ipw_tty_mutex);
54352- if (!tty->port.count) {
54353+ if (!atomic_read(&tty->port.count)) {
54354 mutex_unlock(&tty->ipw_tty_mutex);
54355 return -EINVAL;
54356 }
54357@@ -237,7 +236,7 @@ static int ipw_write_room(struct tty_struct *linux_tty)
54358 if (!tty)
54359 return -ENODEV;
54360
54361- if (!tty->port.count)
54362+ if (!atomic_read(&tty->port.count))
54363 return -EINVAL;
54364
54365 room = IPWIRELESS_TX_QUEUE_SIZE - tty->tx_bytes_queued;
54366@@ -279,7 +278,7 @@ static int ipw_chars_in_buffer(struct tty_struct *linux_tty)
54367 if (!tty)
54368 return 0;
54369
54370- if (!tty->port.count)
54371+ if (!atomic_read(&tty->port.count))
54372 return 0;
54373
54374 return tty->tx_bytes_queued;
54375@@ -360,7 +359,7 @@ static int ipw_tiocmget(struct tty_struct *linux_tty)
54376 if (!tty)
54377 return -ENODEV;
54378
54379- if (!tty->port.count)
54380+ if (!atomic_read(&tty->port.count))
54381 return -EINVAL;
54382
54383 return get_control_lines(tty);
54384@@ -376,7 +375,7 @@ ipw_tiocmset(struct tty_struct *linux_tty,
54385 if (!tty)
54386 return -ENODEV;
54387
54388- if (!tty->port.count)
54389+ if (!atomic_read(&tty->port.count))
54390 return -EINVAL;
54391
54392 return set_control_lines(tty, set, clear);
54393@@ -390,7 +389,7 @@ static int ipw_ioctl(struct tty_struct *linux_tty,
54394 if (!tty)
54395 return -ENODEV;
54396
54397- if (!tty->port.count)
54398+ if (!atomic_read(&tty->port.count))
54399 return -EINVAL;
54400
54401 /* FIXME: Exactly how is the tty object locked here .. */
54402@@ -546,7 +545,7 @@ void ipwireless_tty_free(struct ipw_tty *tty)
54403 * are gone */
54404 mutex_lock(&ttyj->ipw_tty_mutex);
54405 }
54406- while (ttyj->port.count)
54407+ while (atomic_read(&ttyj->port.count))
54408 do_ipw_close(ttyj);
54409 ipwireless_disassociate_network_ttys(network,
54410 ttyj->channel_idx);
54411diff --git a/drivers/tty/moxa.c b/drivers/tty/moxa.c
54412index 14c54e0..1efd4f2 100644
54413--- a/drivers/tty/moxa.c
54414+++ b/drivers/tty/moxa.c
54415@@ -1189,7 +1189,7 @@ static int moxa_open(struct tty_struct *tty, struct file *filp)
54416 }
54417
54418 ch = &brd->ports[port % MAX_PORTS_PER_BOARD];
54419- ch->port.count++;
54420+ atomic_inc(&ch->port.count);
54421 tty->driver_data = ch;
54422 tty_port_tty_set(&ch->port, tty);
54423 mutex_lock(&ch->port.mutex);
54424diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
54425index bce16e4..1120a85 100644
54426--- a/drivers/tty/n_gsm.c
54427+++ b/drivers/tty/n_gsm.c
54428@@ -1644,7 +1644,7 @@ static struct gsm_dlci *gsm_dlci_alloc(struct gsm_mux *gsm, int addr)
54429 spin_lock_init(&dlci->lock);
54430 mutex_init(&dlci->mutex);
54431 dlci->fifo = &dlci->_fifo;
54432- if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL) < 0) {
54433+ if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL)) {
54434 kfree(dlci);
54435 return NULL;
54436 }
54437@@ -2958,7 +2958,7 @@ static int gsmtty_open(struct tty_struct *tty, struct file *filp)
54438 struct gsm_dlci *dlci = tty->driver_data;
54439 struct tty_port *port = &dlci->port;
54440
54441- port->count++;
54442+ atomic_inc(&port->count);
54443 tty_port_tty_set(port, tty);
54444
54445 dlci->modem_rx = 0;
54446diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
54447index eee40b5..796fb03 100644
54448--- a/drivers/tty/n_tty.c
54449+++ b/drivers/tty/n_tty.c
54450@@ -116,7 +116,7 @@ struct n_tty_data {
54451 int minimum_to_wake;
54452
54453 /* consumer-published */
54454- size_t read_tail;
54455+ size_t read_tail __intentional_overflow(-1);
54456 size_t line_start;
54457
54458 /* protected by output lock */
54459@@ -2572,6 +2572,7 @@ void n_tty_inherit_ops(struct tty_ldisc_ops *ops)
54460 {
54461 *ops = tty_ldisc_N_TTY;
54462 ops->owner = NULL;
54463- ops->refcount = ops->flags = 0;
54464+ atomic_set(&ops->refcount, 0);
54465+ ops->flags = 0;
54466 }
54467 EXPORT_SYMBOL_GPL(n_tty_inherit_ops);
54468diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
54469index 4d5e840..a2340a6 100644
54470--- a/drivers/tty/pty.c
54471+++ b/drivers/tty/pty.c
54472@@ -849,8 +849,10 @@ static void __init unix98_pty_init(void)
54473 panic("Couldn't register Unix98 pts driver");
54474
54475 /* Now create the /dev/ptmx special device */
54476+ pax_open_kernel();
54477 tty_default_fops(&ptmx_fops);
54478- ptmx_fops.open = ptmx_open;
54479+ *(void **)&ptmx_fops.open = ptmx_open;
54480+ pax_close_kernel();
54481
54482 cdev_init(&ptmx_cdev, &ptmx_fops);
54483 if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
54484diff --git a/drivers/tty/rocket.c b/drivers/tty/rocket.c
54485index c8dd8dc..dca6cfd 100644
54486--- a/drivers/tty/rocket.c
54487+++ b/drivers/tty/rocket.c
54488@@ -914,7 +914,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
54489 tty->driver_data = info;
54490 tty_port_tty_set(port, tty);
54491
54492- if (port->count++ == 0) {
54493+ if (atomic_inc_return(&port->count) == 1) {
54494 atomic_inc(&rp_num_ports_open);
54495
54496 #ifdef ROCKET_DEBUG_OPEN
54497@@ -923,7 +923,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
54498 #endif
54499 }
54500 #ifdef ROCKET_DEBUG_OPEN
54501- printk(KERN_INFO "rp_open ttyR%d, count=%d\n", info->line, info->port.count);
54502+ printk(KERN_INFO "rp_open ttyR%d, count=%d\n", info->line, atomic-read(&info->port.count));
54503 #endif
54504
54505 /*
54506@@ -1515,7 +1515,7 @@ static void rp_hangup(struct tty_struct *tty)
54507 spin_unlock_irqrestore(&info->port.lock, flags);
54508 return;
54509 }
54510- if (info->port.count)
54511+ if (atomic_read(&info->port.count))
54512 atomic_dec(&rp_num_ports_open);
54513 clear_bit((info->aiop * 8) + info->chan, (void *) &xmit_flags[info->board]);
54514 spin_unlock_irqrestore(&info->port.lock, flags);
54515diff --git a/drivers/tty/serial/ioc4_serial.c b/drivers/tty/serial/ioc4_serial.c
54516index aa28209..e08fb85 100644
54517--- a/drivers/tty/serial/ioc4_serial.c
54518+++ b/drivers/tty/serial/ioc4_serial.c
54519@@ -437,7 +437,7 @@ struct ioc4_soft {
54520 } is_intr_info[MAX_IOC4_INTR_ENTS];
54521
54522 /* Number of entries active in the above array */
54523- atomic_t is_num_intrs;
54524+ atomic_unchecked_t is_num_intrs;
54525 } is_intr_type[IOC4_NUM_INTR_TYPES];
54526
54527 /* is_ir_lock must be held while
54528@@ -974,7 +974,7 @@ intr_connect(struct ioc4_soft *soft, int type,
54529 BUG_ON(!((type == IOC4_SIO_INTR_TYPE)
54530 || (type == IOC4_OTHER_INTR_TYPE)));
54531
54532- i = atomic_inc_return(&soft-> is_intr_type[type].is_num_intrs) - 1;
54533+ i = atomic_inc_return_unchecked(&soft-> is_intr_type[type].is_num_intrs) - 1;
54534 BUG_ON(!(i < MAX_IOC4_INTR_ENTS || (printk("i %d\n", i), 0)));
54535
54536 /* Save off the lower level interrupt handler */
54537@@ -1001,7 +1001,7 @@ static irqreturn_t ioc4_intr(int irq, void *arg)
54538
54539 soft = arg;
54540 for (intr_type = 0; intr_type < IOC4_NUM_INTR_TYPES; intr_type++) {
54541- num_intrs = (int)atomic_read(
54542+ num_intrs = (int)atomic_read_unchecked(
54543 &soft->is_intr_type[intr_type].is_num_intrs);
54544
54545 this_mir = this_ir = pending_intrs(soft, intr_type);
54546diff --git a/drivers/tty/serial/kgdb_nmi.c b/drivers/tty/serial/kgdb_nmi.c
54547index 129dc5b..1da5bb8 100644
54548--- a/drivers/tty/serial/kgdb_nmi.c
54549+++ b/drivers/tty/serial/kgdb_nmi.c
54550@@ -53,7 +53,9 @@ static int kgdb_nmi_console_setup(struct console *co, char *options)
54551 * I/O utilities that messages sent to the console will automatically
54552 * be displayed on the dbg_io.
54553 */
54554- dbg_io_ops->is_console = true;
54555+ pax_open_kernel();
54556+ *(int *)&dbg_io_ops->is_console = true;
54557+ pax_close_kernel();
54558
54559 return 0;
54560 }
54561diff --git a/drivers/tty/serial/kgdboc.c b/drivers/tty/serial/kgdboc.c
54562index a260cde..6b2b5ce 100644
54563--- a/drivers/tty/serial/kgdboc.c
54564+++ b/drivers/tty/serial/kgdboc.c
54565@@ -24,8 +24,9 @@
54566 #define MAX_CONFIG_LEN 40
54567
54568 static struct kgdb_io kgdboc_io_ops;
54569+static struct kgdb_io kgdboc_io_ops_console;
54570
54571-/* -1 = init not run yet, 0 = unconfigured, 1 = configured. */
54572+/* -1 = init not run yet, 0 = unconfigured, 1/2 = configured. */
54573 static int configured = -1;
54574
54575 static char config[MAX_CONFIG_LEN];
54576@@ -151,6 +152,8 @@ static void cleanup_kgdboc(void)
54577 kgdboc_unregister_kbd();
54578 if (configured == 1)
54579 kgdb_unregister_io_module(&kgdboc_io_ops);
54580+ else if (configured == 2)
54581+ kgdb_unregister_io_module(&kgdboc_io_ops_console);
54582 }
54583
54584 static int configure_kgdboc(void)
54585@@ -160,13 +163,13 @@ static int configure_kgdboc(void)
54586 int err;
54587 char *cptr = config;
54588 struct console *cons;
54589+ int is_console = 0;
54590
54591 err = kgdboc_option_setup(config);
54592 if (err || !strlen(config) || isspace(config[0]))
54593 goto noconfig;
54594
54595 err = -ENODEV;
54596- kgdboc_io_ops.is_console = 0;
54597 kgdb_tty_driver = NULL;
54598
54599 kgdboc_use_kms = 0;
54600@@ -187,7 +190,7 @@ static int configure_kgdboc(void)
54601 int idx;
54602 if (cons->device && cons->device(cons, &idx) == p &&
54603 idx == tty_line) {
54604- kgdboc_io_ops.is_console = 1;
54605+ is_console = 1;
54606 break;
54607 }
54608 cons = cons->next;
54609@@ -197,7 +200,13 @@ static int configure_kgdboc(void)
54610 kgdb_tty_line = tty_line;
54611
54612 do_register:
54613- err = kgdb_register_io_module(&kgdboc_io_ops);
54614+ if (is_console) {
54615+ err = kgdb_register_io_module(&kgdboc_io_ops_console);
54616+ configured = 2;
54617+ } else {
54618+ err = kgdb_register_io_module(&kgdboc_io_ops);
54619+ configured = 1;
54620+ }
54621 if (err)
54622 goto noconfig;
54623
54624@@ -205,8 +214,6 @@ do_register:
54625 if (err)
54626 goto nmi_con_failed;
54627
54628- configured = 1;
54629-
54630 return 0;
54631
54632 nmi_con_failed:
54633@@ -223,7 +230,7 @@ noconfig:
54634 static int __init init_kgdboc(void)
54635 {
54636 /* Already configured? */
54637- if (configured == 1)
54638+ if (configured >= 1)
54639 return 0;
54640
54641 return configure_kgdboc();
54642@@ -272,7 +279,7 @@ static int param_set_kgdboc_var(const char *kmessage, struct kernel_param *kp)
54643 if (config[len - 1] == '\n')
54644 config[len - 1] = '\0';
54645
54646- if (configured == 1)
54647+ if (configured >= 1)
54648 cleanup_kgdboc();
54649
54650 /* Go and configure with the new params. */
54651@@ -312,6 +319,15 @@ static struct kgdb_io kgdboc_io_ops = {
54652 .post_exception = kgdboc_post_exp_handler,
54653 };
54654
54655+static struct kgdb_io kgdboc_io_ops_console = {
54656+ .name = "kgdboc",
54657+ .read_char = kgdboc_get_char,
54658+ .write_char = kgdboc_put_char,
54659+ .pre_exception = kgdboc_pre_exp_handler,
54660+ .post_exception = kgdboc_post_exp_handler,
54661+ .is_console = 1
54662+};
54663+
54664 #ifdef CONFIG_KGDB_SERIAL_CONSOLE
54665 /* This is only available if kgdboc is a built in for early debugging */
54666 static int __init kgdboc_early_init(char *opt)
54667diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c
54668index b73889c..9f74f0a 100644
54669--- a/drivers/tty/serial/msm_serial.c
54670+++ b/drivers/tty/serial/msm_serial.c
54671@@ -1012,7 +1012,7 @@ static struct uart_driver msm_uart_driver = {
54672 .cons = MSM_CONSOLE,
54673 };
54674
54675-static atomic_t msm_uart_next_id = ATOMIC_INIT(0);
54676+static atomic_unchecked_t msm_uart_next_id = ATOMIC_INIT(0);
54677
54678 static const struct of_device_id msm_uartdm_table[] = {
54679 { .compatible = "qcom,msm-uartdm-v1.1", .data = (void *)UARTDM_1P1 },
54680@@ -1036,7 +1036,7 @@ static int msm_serial_probe(struct platform_device *pdev)
54681 line = pdev->id;
54682
54683 if (line < 0)
54684- line = atomic_inc_return(&msm_uart_next_id) - 1;
54685+ line = atomic_inc_return_unchecked(&msm_uart_next_id) - 1;
54686
54687 if (unlikely(line < 0 || line >= UART_NR))
54688 return -ENXIO;
54689diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c
54690index cf08876..711e0bf 100644
54691--- a/drivers/tty/serial/samsung.c
54692+++ b/drivers/tty/serial/samsung.c
54693@@ -987,11 +987,16 @@ static void s3c24xx_serial_shutdown(struct uart_port *port)
54694 ourport->tx_in_progress = 0;
54695 }
54696
54697+static int s3c64xx_serial_startup(struct uart_port *port);
54698 static int s3c24xx_serial_startup(struct uart_port *port)
54699 {
54700 struct s3c24xx_uart_port *ourport = to_ourport(port);
54701 int ret;
54702
54703+ /* Startup sequence is different for s3c64xx and higher SoC's */
54704+ if (s3c24xx_serial_has_interrupt_mask(port))
54705+ return s3c64xx_serial_startup(port);
54706+
54707 dbg("s3c24xx_serial_startup: port=%p (%08llx,%p)\n",
54708 port, (unsigned long long)port->mapbase, port->membase);
54709
54710@@ -1697,10 +1702,6 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport,
54711 /* setup info for port */
54712 port->dev = &platdev->dev;
54713
54714- /* Startup sequence is different for s3c64xx and higher SoC's */
54715- if (s3c24xx_serial_has_interrupt_mask(port))
54716- s3c24xx_serial_ops.startup = s3c64xx_serial_startup;
54717-
54718 port->uartclk = 1;
54719
54720 if (cfg->uart_flags & UPF_CONS_FLOW) {
54721diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
54722index 6a1055a..5ca9ad9 100644
54723--- a/drivers/tty/serial/serial_core.c
54724+++ b/drivers/tty/serial/serial_core.c
54725@@ -1377,7 +1377,7 @@ static void uart_close(struct tty_struct *tty, struct file *filp)
54726 state = drv->state + tty->index;
54727 port = &state->port;
54728 spin_lock_irq(&port->lock);
54729- --port->count;
54730+ atomic_dec(&port->count);
54731 spin_unlock_irq(&port->lock);
54732 return;
54733 }
54734@@ -1387,7 +1387,7 @@ static void uart_close(struct tty_struct *tty, struct file *filp)
54735
54736 pr_debug("uart_close(%d) called\n", uport ? uport->line : -1);
54737
54738- if (!port->count || tty_port_close_start(port, tty, filp) == 0)
54739+ if (!atomic_read(&port->count) || tty_port_close_start(port, tty, filp) == 0)
54740 return;
54741
54742 /*
54743@@ -1511,7 +1511,7 @@ static void uart_hangup(struct tty_struct *tty)
54744 uart_flush_buffer(tty);
54745 uart_shutdown(tty, state);
54746 spin_lock_irqsave(&port->lock, flags);
54747- port->count = 0;
54748+ atomic_set(&port->count, 0);
54749 clear_bit(ASYNCB_NORMAL_ACTIVE, &port->flags);
54750 spin_unlock_irqrestore(&port->lock, flags);
54751 tty_port_tty_set(port, NULL);
54752@@ -1598,7 +1598,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
54753 pr_debug("uart_open(%d) called\n", line);
54754
54755 spin_lock_irq(&port->lock);
54756- ++port->count;
54757+ atomic_inc(&port->count);
54758 spin_unlock_irq(&port->lock);
54759
54760 /*
54761diff --git a/drivers/tty/synclink.c b/drivers/tty/synclink.c
54762index b799170..87dafd5 100644
54763--- a/drivers/tty/synclink.c
54764+++ b/drivers/tty/synclink.c
54765@@ -3090,7 +3090,7 @@ static void mgsl_close(struct tty_struct *tty, struct file * filp)
54766
54767 if (debug_level >= DEBUG_LEVEL_INFO)
54768 printk("%s(%d):mgsl_close(%s) entry, count=%d\n",
54769- __FILE__,__LINE__, info->device_name, info->port.count);
54770+ __FILE__,__LINE__, info->device_name, atomic_read(&info->port.count));
54771
54772 if (tty_port_close_start(&info->port, tty, filp) == 0)
54773 goto cleanup;
54774@@ -3108,7 +3108,7 @@ static void mgsl_close(struct tty_struct *tty, struct file * filp)
54775 cleanup:
54776 if (debug_level >= DEBUG_LEVEL_INFO)
54777 printk("%s(%d):mgsl_close(%s) exit, count=%d\n", __FILE__,__LINE__,
54778- tty->driver->name, info->port.count);
54779+ tty->driver->name, atomic_read(&info->port.count));
54780
54781 } /* end of mgsl_close() */
54782
54783@@ -3207,8 +3207,8 @@ static void mgsl_hangup(struct tty_struct *tty)
54784
54785 mgsl_flush_buffer(tty);
54786 shutdown(info);
54787-
54788- info->port.count = 0;
54789+
54790+ atomic_set(&info->port.count, 0);
54791 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
54792 info->port.tty = NULL;
54793
54794@@ -3296,10 +3296,10 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
54795
54796 if (debug_level >= DEBUG_LEVEL_INFO)
54797 printk("%s(%d):block_til_ready before block on %s count=%d\n",
54798- __FILE__,__LINE__, tty->driver->name, port->count );
54799+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
54800
54801 spin_lock_irqsave(&info->irq_spinlock, flags);
54802- port->count--;
54803+ atomic_dec(&port->count);
54804 spin_unlock_irqrestore(&info->irq_spinlock, flags);
54805 port->blocked_open++;
54806
54807@@ -3327,7 +3327,7 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
54808
54809 if (debug_level >= DEBUG_LEVEL_INFO)
54810 printk("%s(%d):block_til_ready blocking on %s count=%d\n",
54811- __FILE__,__LINE__, tty->driver->name, port->count );
54812+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
54813
54814 tty_unlock(tty);
54815 schedule();
54816@@ -3339,12 +3339,12 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
54817
54818 /* FIXME: Racy on hangup during close wait */
54819 if (!tty_hung_up_p(filp))
54820- port->count++;
54821+ atomic_inc(&port->count);
54822 port->blocked_open--;
54823
54824 if (debug_level >= DEBUG_LEVEL_INFO)
54825 printk("%s(%d):block_til_ready after blocking on %s count=%d\n",
54826- __FILE__,__LINE__, tty->driver->name, port->count );
54827+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
54828
54829 if (!retval)
54830 port->flags |= ASYNC_NORMAL_ACTIVE;
54831@@ -3396,7 +3396,7 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp)
54832
54833 if (debug_level >= DEBUG_LEVEL_INFO)
54834 printk("%s(%d):mgsl_open(%s), old ref count = %d\n",
54835- __FILE__,__LINE__,tty->driver->name, info->port.count);
54836+ __FILE__,__LINE__,tty->driver->name, atomic_read(&info->port.count));
54837
54838 /* If port is closing, signal caller to try again */
54839 if (info->port.flags & ASYNC_CLOSING){
54840@@ -3415,10 +3415,10 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp)
54841 spin_unlock_irqrestore(&info->netlock, flags);
54842 goto cleanup;
54843 }
54844- info->port.count++;
54845+ atomic_inc(&info->port.count);
54846 spin_unlock_irqrestore(&info->netlock, flags);
54847
54848- if (info->port.count == 1) {
54849+ if (atomic_read(&info->port.count) == 1) {
54850 /* 1st open on this device, init hardware */
54851 retval = startup(info);
54852 if (retval < 0)
54853@@ -3442,8 +3442,8 @@ cleanup:
54854 if (retval) {
54855 if (tty->count == 1)
54856 info->port.tty = NULL; /* tty layer will release tty struct */
54857- if(info->port.count)
54858- info->port.count--;
54859+ if (atomic_read(&info->port.count))
54860+ atomic_dec(&info->port.count);
54861 }
54862
54863 return retval;
54864@@ -7661,7 +7661,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
54865 unsigned short new_crctype;
54866
54867 /* return error if TTY interface open */
54868- if (info->port.count)
54869+ if (atomic_read(&info->port.count))
54870 return -EBUSY;
54871
54872 switch (encoding)
54873@@ -7756,7 +7756,7 @@ static int hdlcdev_open(struct net_device *dev)
54874
54875 /* arbitrate between network and tty opens */
54876 spin_lock_irqsave(&info->netlock, flags);
54877- if (info->port.count != 0 || info->netcount != 0) {
54878+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
54879 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
54880 spin_unlock_irqrestore(&info->netlock, flags);
54881 return -EBUSY;
54882@@ -7842,7 +7842,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
54883 printk("%s:hdlcdev_ioctl(%s)\n",__FILE__,dev->name);
54884
54885 /* return error if TTY interface open */
54886- if (info->port.count)
54887+ if (atomic_read(&info->port.count))
54888 return -EBUSY;
54889
54890 if (cmd != SIOCWANDEV)
54891diff --git a/drivers/tty/synclink_gt.c b/drivers/tty/synclink_gt.c
54892index 0e8c39b..e0cb171 100644
54893--- a/drivers/tty/synclink_gt.c
54894+++ b/drivers/tty/synclink_gt.c
54895@@ -670,7 +670,7 @@ static int open(struct tty_struct *tty, struct file *filp)
54896 tty->driver_data = info;
54897 info->port.tty = tty;
54898
54899- DBGINFO(("%s open, old ref count = %d\n", info->device_name, info->port.count));
54900+ DBGINFO(("%s open, old ref count = %d\n", info->device_name, atomic_read(&info->port.count)));
54901
54902 /* If port is closing, signal caller to try again */
54903 if (info->port.flags & ASYNC_CLOSING){
54904@@ -691,10 +691,10 @@ static int open(struct tty_struct *tty, struct file *filp)
54905 mutex_unlock(&info->port.mutex);
54906 goto cleanup;
54907 }
54908- info->port.count++;
54909+ atomic_inc(&info->port.count);
54910 spin_unlock_irqrestore(&info->netlock, flags);
54911
54912- if (info->port.count == 1) {
54913+ if (atomic_read(&info->port.count) == 1) {
54914 /* 1st open on this device, init hardware */
54915 retval = startup(info);
54916 if (retval < 0) {
54917@@ -715,8 +715,8 @@ cleanup:
54918 if (retval) {
54919 if (tty->count == 1)
54920 info->port.tty = NULL; /* tty layer will release tty struct */
54921- if(info->port.count)
54922- info->port.count--;
54923+ if(atomic_read(&info->port.count))
54924+ atomic_dec(&info->port.count);
54925 }
54926
54927 DBGINFO(("%s open rc=%d\n", info->device_name, retval));
54928@@ -729,7 +729,7 @@ static void close(struct tty_struct *tty, struct file *filp)
54929
54930 if (sanity_check(info, tty->name, "close"))
54931 return;
54932- DBGINFO(("%s close entry, count=%d\n", info->device_name, info->port.count));
54933+ DBGINFO(("%s close entry, count=%d\n", info->device_name, atomic_read(&info->port.count)));
54934
54935 if (tty_port_close_start(&info->port, tty, filp) == 0)
54936 goto cleanup;
54937@@ -746,7 +746,7 @@ static void close(struct tty_struct *tty, struct file *filp)
54938 tty_port_close_end(&info->port, tty);
54939 info->port.tty = NULL;
54940 cleanup:
54941- DBGINFO(("%s close exit, count=%d\n", tty->driver->name, info->port.count));
54942+ DBGINFO(("%s close exit, count=%d\n", tty->driver->name, atomic_read(&info->port.count)));
54943 }
54944
54945 static void hangup(struct tty_struct *tty)
54946@@ -764,7 +764,7 @@ static void hangup(struct tty_struct *tty)
54947 shutdown(info);
54948
54949 spin_lock_irqsave(&info->port.lock, flags);
54950- info->port.count = 0;
54951+ atomic_set(&info->port.count, 0);
54952 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
54953 info->port.tty = NULL;
54954 spin_unlock_irqrestore(&info->port.lock, flags);
54955@@ -1449,7 +1449,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
54956 unsigned short new_crctype;
54957
54958 /* return error if TTY interface open */
54959- if (info->port.count)
54960+ if (atomic_read(&info->port.count))
54961 return -EBUSY;
54962
54963 DBGINFO(("%s hdlcdev_attach\n", info->device_name));
54964@@ -1544,7 +1544,7 @@ static int hdlcdev_open(struct net_device *dev)
54965
54966 /* arbitrate between network and tty opens */
54967 spin_lock_irqsave(&info->netlock, flags);
54968- if (info->port.count != 0 || info->netcount != 0) {
54969+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
54970 DBGINFO(("%s hdlc_open busy\n", dev->name));
54971 spin_unlock_irqrestore(&info->netlock, flags);
54972 return -EBUSY;
54973@@ -1629,7 +1629,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
54974 DBGINFO(("%s hdlcdev_ioctl\n", dev->name));
54975
54976 /* return error if TTY interface open */
54977- if (info->port.count)
54978+ if (atomic_read(&info->port.count))
54979 return -EBUSY;
54980
54981 if (cmd != SIOCWANDEV)
54982@@ -2413,7 +2413,7 @@ static irqreturn_t slgt_interrupt(int dummy, void *dev_id)
54983 if (port == NULL)
54984 continue;
54985 spin_lock(&port->lock);
54986- if ((port->port.count || port->netcount) &&
54987+ if ((atomic_read(&port->port.count) || port->netcount) &&
54988 port->pending_bh && !port->bh_running &&
54989 !port->bh_requested) {
54990 DBGISR(("%s bh queued\n", port->device_name));
54991@@ -3299,7 +3299,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
54992 add_wait_queue(&port->open_wait, &wait);
54993
54994 spin_lock_irqsave(&info->lock, flags);
54995- port->count--;
54996+ atomic_dec(&port->count);
54997 spin_unlock_irqrestore(&info->lock, flags);
54998 port->blocked_open++;
54999
55000@@ -3335,7 +3335,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
55001 remove_wait_queue(&port->open_wait, &wait);
55002
55003 if (!tty_hung_up_p(filp))
55004- port->count++;
55005+ atomic_inc(&port->count);
55006 port->blocked_open--;
55007
55008 if (!retval)
55009diff --git a/drivers/tty/synclinkmp.c b/drivers/tty/synclinkmp.c
55010index c3f9091..abe4601 100644
55011--- a/drivers/tty/synclinkmp.c
55012+++ b/drivers/tty/synclinkmp.c
55013@@ -750,7 +750,7 @@ static int open(struct tty_struct *tty, struct file *filp)
55014
55015 if (debug_level >= DEBUG_LEVEL_INFO)
55016 printk("%s(%d):%s open(), old ref count = %d\n",
55017- __FILE__,__LINE__,tty->driver->name, info->port.count);
55018+ __FILE__,__LINE__,tty->driver->name, atomic_read(&info->port.count));
55019
55020 /* If port is closing, signal caller to try again */
55021 if (info->port.flags & ASYNC_CLOSING){
55022@@ -769,10 +769,10 @@ static int open(struct tty_struct *tty, struct file *filp)
55023 spin_unlock_irqrestore(&info->netlock, flags);
55024 goto cleanup;
55025 }
55026- info->port.count++;
55027+ atomic_inc(&info->port.count);
55028 spin_unlock_irqrestore(&info->netlock, flags);
55029
55030- if (info->port.count == 1) {
55031+ if (atomic_read(&info->port.count) == 1) {
55032 /* 1st open on this device, init hardware */
55033 retval = startup(info);
55034 if (retval < 0)
55035@@ -796,8 +796,8 @@ cleanup:
55036 if (retval) {
55037 if (tty->count == 1)
55038 info->port.tty = NULL; /* tty layer will release tty struct */
55039- if(info->port.count)
55040- info->port.count--;
55041+ if(atomic_read(&info->port.count))
55042+ atomic_dec(&info->port.count);
55043 }
55044
55045 return retval;
55046@@ -815,7 +815,7 @@ static void close(struct tty_struct *tty, struct file *filp)
55047
55048 if (debug_level >= DEBUG_LEVEL_INFO)
55049 printk("%s(%d):%s close() entry, count=%d\n",
55050- __FILE__,__LINE__, info->device_name, info->port.count);
55051+ __FILE__,__LINE__, info->device_name, atomic_read(&info->port.count));
55052
55053 if (tty_port_close_start(&info->port, tty, filp) == 0)
55054 goto cleanup;
55055@@ -834,7 +834,7 @@ static void close(struct tty_struct *tty, struct file *filp)
55056 cleanup:
55057 if (debug_level >= DEBUG_LEVEL_INFO)
55058 printk("%s(%d):%s close() exit, count=%d\n", __FILE__,__LINE__,
55059- tty->driver->name, info->port.count);
55060+ tty->driver->name, atomic_read(&info->port.count));
55061 }
55062
55063 /* Called by tty_hangup() when a hangup is signaled.
55064@@ -857,7 +857,7 @@ static void hangup(struct tty_struct *tty)
55065 shutdown(info);
55066
55067 spin_lock_irqsave(&info->port.lock, flags);
55068- info->port.count = 0;
55069+ atomic_set(&info->port.count, 0);
55070 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
55071 info->port.tty = NULL;
55072 spin_unlock_irqrestore(&info->port.lock, flags);
55073@@ -1565,7 +1565,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
55074 unsigned short new_crctype;
55075
55076 /* return error if TTY interface open */
55077- if (info->port.count)
55078+ if (atomic_read(&info->port.count))
55079 return -EBUSY;
55080
55081 switch (encoding)
55082@@ -1660,7 +1660,7 @@ static int hdlcdev_open(struct net_device *dev)
55083
55084 /* arbitrate between network and tty opens */
55085 spin_lock_irqsave(&info->netlock, flags);
55086- if (info->port.count != 0 || info->netcount != 0) {
55087+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
55088 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
55089 spin_unlock_irqrestore(&info->netlock, flags);
55090 return -EBUSY;
55091@@ -1746,7 +1746,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
55092 printk("%s:hdlcdev_ioctl(%s)\n",__FILE__,dev->name);
55093
55094 /* return error if TTY interface open */
55095- if (info->port.count)
55096+ if (atomic_read(&info->port.count))
55097 return -EBUSY;
55098
55099 if (cmd != SIOCWANDEV)
55100@@ -2621,7 +2621,7 @@ static irqreturn_t synclinkmp_interrupt(int dummy, void *dev_id)
55101 * do not request bottom half processing if the
55102 * device is not open in a normal mode.
55103 */
55104- if ( port && (port->port.count || port->netcount) &&
55105+ if ( port && (atomic_read(&port->port.count) || port->netcount) &&
55106 port->pending_bh && !port->bh_running &&
55107 !port->bh_requested ) {
55108 if ( debug_level >= DEBUG_LEVEL_ISR )
55109@@ -3318,10 +3318,10 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
55110
55111 if (debug_level >= DEBUG_LEVEL_INFO)
55112 printk("%s(%d):%s block_til_ready() before block, count=%d\n",
55113- __FILE__,__LINE__, tty->driver->name, port->count );
55114+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
55115
55116 spin_lock_irqsave(&info->lock, flags);
55117- port->count--;
55118+ atomic_dec(&port->count);
55119 spin_unlock_irqrestore(&info->lock, flags);
55120 port->blocked_open++;
55121
55122@@ -3349,7 +3349,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
55123
55124 if (debug_level >= DEBUG_LEVEL_INFO)
55125 printk("%s(%d):%s block_til_ready() count=%d\n",
55126- __FILE__,__LINE__, tty->driver->name, port->count );
55127+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
55128
55129 tty_unlock(tty);
55130 schedule();
55131@@ -3359,12 +3359,12 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
55132 set_current_state(TASK_RUNNING);
55133 remove_wait_queue(&port->open_wait, &wait);
55134 if (!tty_hung_up_p(filp))
55135- port->count++;
55136+ atomic_inc(&port->count);
55137 port->blocked_open--;
55138
55139 if (debug_level >= DEBUG_LEVEL_INFO)
55140 printk("%s(%d):%s block_til_ready() after, count=%d\n",
55141- __FILE__,__LINE__, tty->driver->name, port->count );
55142+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
55143
55144 if (!retval)
55145 port->flags |= ASYNC_NORMAL_ACTIVE;
55146diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c
55147index 259a4d5..9b0c9e7 100644
55148--- a/drivers/tty/sysrq.c
55149+++ b/drivers/tty/sysrq.c
55150@@ -1085,7 +1085,7 @@ EXPORT_SYMBOL(unregister_sysrq_key);
55151 static ssize_t write_sysrq_trigger(struct file *file, const char __user *buf,
55152 size_t count, loff_t *ppos)
55153 {
55154- if (count) {
55155+ if (count && capable(CAP_SYS_ADMIN)) {
55156 char c;
55157
55158 if (get_user(c, buf))
55159diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
55160index 2bb4dfc..a7f6e86 100644
55161--- a/drivers/tty/tty_io.c
55162+++ b/drivers/tty/tty_io.c
55163@@ -3503,7 +3503,7 @@ EXPORT_SYMBOL(tty_devnum);
55164
55165 void tty_default_fops(struct file_operations *fops)
55166 {
55167- *fops = tty_fops;
55168+ memcpy((void *)fops, &tty_fops, sizeof(tty_fops));
55169 }
55170
55171 /*
55172diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c
55173index 3737f55..7cef448 100644
55174--- a/drivers/tty/tty_ldisc.c
55175+++ b/drivers/tty/tty_ldisc.c
55176@@ -71,7 +71,7 @@ int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc)
55177 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
55178 tty_ldiscs[disc] = new_ldisc;
55179 new_ldisc->num = disc;
55180- new_ldisc->refcount = 0;
55181+ atomic_set(&new_ldisc->refcount, 0);
55182 raw_spin_unlock_irqrestore(&tty_ldiscs_lock, flags);
55183
55184 return ret;
55185@@ -99,7 +99,7 @@ int tty_unregister_ldisc(int disc)
55186 return -EINVAL;
55187
55188 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
55189- if (tty_ldiscs[disc]->refcount)
55190+ if (atomic_read(&tty_ldiscs[disc]->refcount))
55191 ret = -EBUSY;
55192 else
55193 tty_ldiscs[disc] = NULL;
55194@@ -120,7 +120,7 @@ static struct tty_ldisc_ops *get_ldops(int disc)
55195 if (ldops) {
55196 ret = ERR_PTR(-EAGAIN);
55197 if (try_module_get(ldops->owner)) {
55198- ldops->refcount++;
55199+ atomic_inc(&ldops->refcount);
55200 ret = ldops;
55201 }
55202 }
55203@@ -133,7 +133,7 @@ static void put_ldops(struct tty_ldisc_ops *ldops)
55204 unsigned long flags;
55205
55206 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
55207- ldops->refcount--;
55208+ atomic_dec(&ldops->refcount);
55209 module_put(ldops->owner);
55210 raw_spin_unlock_irqrestore(&tty_ldiscs_lock, flags);
55211 }
55212diff --git a/drivers/tty/tty_port.c b/drivers/tty/tty_port.c
55213index 40b31835..94d92ae 100644
55214--- a/drivers/tty/tty_port.c
55215+++ b/drivers/tty/tty_port.c
55216@@ -236,7 +236,7 @@ void tty_port_hangup(struct tty_port *port)
55217 unsigned long flags;
55218
55219 spin_lock_irqsave(&port->lock, flags);
55220- port->count = 0;
55221+ atomic_set(&port->count, 0);
55222 port->flags &= ~ASYNC_NORMAL_ACTIVE;
55223 tty = port->tty;
55224 if (tty)
55225@@ -398,7 +398,7 @@ int tty_port_block_til_ready(struct tty_port *port,
55226
55227 /* The port lock protects the port counts */
55228 spin_lock_irqsave(&port->lock, flags);
55229- port->count--;
55230+ atomic_dec(&port->count);
55231 port->blocked_open++;
55232 spin_unlock_irqrestore(&port->lock, flags);
55233
55234@@ -440,7 +440,7 @@ int tty_port_block_til_ready(struct tty_port *port,
55235 we must not mess that up further */
55236 spin_lock_irqsave(&port->lock, flags);
55237 if (!tty_hung_up_p(filp))
55238- port->count++;
55239+ atomic_inc(&port->count);
55240 port->blocked_open--;
55241 if (retval == 0)
55242 port->flags |= ASYNC_NORMAL_ACTIVE;
55243@@ -476,19 +476,19 @@ int tty_port_close_start(struct tty_port *port,
55244 return 0;
55245
55246 spin_lock_irqsave(&port->lock, flags);
55247- if (tty->count == 1 && port->count != 1) {
55248+ if (tty->count == 1 && atomic_read(&port->count) != 1) {
55249 printk(KERN_WARNING
55250 "tty_port_close_start: tty->count = 1 port count = %d.\n",
55251- port->count);
55252- port->count = 1;
55253+ atomic_read(&port->count));
55254+ atomic_set(&port->count, 1);
55255 }
55256- if (--port->count < 0) {
55257+ if (atomic_dec_return(&port->count) < 0) {
55258 printk(KERN_WARNING "tty_port_close_start: count = %d\n",
55259- port->count);
55260- port->count = 0;
55261+ atomic_read(&port->count));
55262+ atomic_set(&port->count, 0);
55263 }
55264
55265- if (port->count) {
55266+ if (atomic_read(&port->count)) {
55267 spin_unlock_irqrestore(&port->lock, flags);
55268 return 0;
55269 }
55270@@ -590,7 +590,7 @@ int tty_port_open(struct tty_port *port, struct tty_struct *tty,
55271 struct file *filp)
55272 {
55273 spin_lock_irq(&port->lock);
55274- ++port->count;
55275+ atomic_inc(&port->count);
55276 spin_unlock_irq(&port->lock);
55277 tty_port_tty_set(port, tty);
55278
55279diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
55280index 8a89f6e..50b32af 100644
55281--- a/drivers/tty/vt/keyboard.c
55282+++ b/drivers/tty/vt/keyboard.c
55283@@ -641,6 +641,16 @@ static void k_spec(struct vc_data *vc, unsigned char value, char up_flag)
55284 kbd->kbdmode == VC_OFF) &&
55285 value != KVAL(K_SAK))
55286 return; /* SAK is allowed even in raw mode */
55287+
55288+#if defined(CONFIG_GRKERNSEC_PROC) || defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
55289+ {
55290+ void *func = fn_handler[value];
55291+ if (func == fn_show_state || func == fn_show_ptregs ||
55292+ func == fn_show_mem)
55293+ return;
55294+ }
55295+#endif
55296+
55297 fn_handler[value](vc);
55298 }
55299
55300@@ -1776,9 +1786,6 @@ int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm,
55301 if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
55302 return -EFAULT;
55303
55304- if (!capable(CAP_SYS_TTY_CONFIG))
55305- perm = 0;
55306-
55307 switch (cmd) {
55308 case KDGKBENT:
55309 /* Ensure another thread doesn't free it under us */
55310@@ -1793,6 +1800,9 @@ int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm,
55311 spin_unlock_irqrestore(&kbd_event_lock, flags);
55312 return put_user(val, &user_kbe->kb_value);
55313 case KDSKBENT:
55314+ if (!capable(CAP_SYS_TTY_CONFIG))
55315+ perm = 0;
55316+
55317 if (!perm)
55318 return -EPERM;
55319 if (!i && v == K_NOSUCHMAP) {
55320@@ -1883,9 +1893,6 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
55321 int i, j, k;
55322 int ret;
55323
55324- if (!capable(CAP_SYS_TTY_CONFIG))
55325- perm = 0;
55326-
55327 kbs = kmalloc(sizeof(*kbs), GFP_KERNEL);
55328 if (!kbs) {
55329 ret = -ENOMEM;
55330@@ -1919,6 +1926,9 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
55331 kfree(kbs);
55332 return ((p && *p) ? -EOVERFLOW : 0);
55333 case KDSKBSENT:
55334+ if (!capable(CAP_SYS_TTY_CONFIG))
55335+ perm = 0;
55336+
55337 if (!perm) {
55338 ret = -EPERM;
55339 goto reterr;
55340diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
55341index 6276f13..84f2449 100644
55342--- a/drivers/uio/uio.c
55343+++ b/drivers/uio/uio.c
55344@@ -25,6 +25,7 @@
55345 #include <linux/kobject.h>
55346 #include <linux/cdev.h>
55347 #include <linux/uio_driver.h>
55348+#include <asm/local.h>
55349
55350 #define UIO_MAX_DEVICES (1U << MINORBITS)
55351
55352@@ -231,7 +232,7 @@ static ssize_t event_show(struct device *dev,
55353 struct device_attribute *attr, char *buf)
55354 {
55355 struct uio_device *idev = dev_get_drvdata(dev);
55356- return sprintf(buf, "%u\n", (unsigned int)atomic_read(&idev->event));
55357+ return sprintf(buf, "%u\n", (unsigned int)atomic_read_unchecked(&idev->event));
55358 }
55359 static DEVICE_ATTR_RO(event);
55360
55361@@ -393,7 +394,7 @@ void uio_event_notify(struct uio_info *info)
55362 {
55363 struct uio_device *idev = info->uio_dev;
55364
55365- atomic_inc(&idev->event);
55366+ atomic_inc_unchecked(&idev->event);
55367 wake_up_interruptible(&idev->wait);
55368 kill_fasync(&idev->async_queue, SIGIO, POLL_IN);
55369 }
55370@@ -446,7 +447,7 @@ static int uio_open(struct inode *inode, struct file *filep)
55371 }
55372
55373 listener->dev = idev;
55374- listener->event_count = atomic_read(&idev->event);
55375+ listener->event_count = atomic_read_unchecked(&idev->event);
55376 filep->private_data = listener;
55377
55378 if (idev->info->open) {
55379@@ -497,7 +498,7 @@ static unsigned int uio_poll(struct file *filep, poll_table *wait)
55380 return -EIO;
55381
55382 poll_wait(filep, &idev->wait, wait);
55383- if (listener->event_count != atomic_read(&idev->event))
55384+ if (listener->event_count != atomic_read_unchecked(&idev->event))
55385 return POLLIN | POLLRDNORM;
55386 return 0;
55387 }
55388@@ -522,7 +523,7 @@ static ssize_t uio_read(struct file *filep, char __user *buf,
55389 do {
55390 set_current_state(TASK_INTERRUPTIBLE);
55391
55392- event_count = atomic_read(&idev->event);
55393+ event_count = atomic_read_unchecked(&idev->event);
55394 if (event_count != listener->event_count) {
55395 if (copy_to_user(buf, &event_count, count))
55396 retval = -EFAULT;
55397@@ -579,9 +580,13 @@ static ssize_t uio_write(struct file *filep, const char __user *buf,
55398 static int uio_find_mem_index(struct vm_area_struct *vma)
55399 {
55400 struct uio_device *idev = vma->vm_private_data;
55401+ unsigned long size;
55402
55403 if (vma->vm_pgoff < MAX_UIO_MAPS) {
55404- if (idev->info->mem[vma->vm_pgoff].size == 0)
55405+ size = idev->info->mem[vma->vm_pgoff].size;
55406+ if (size == 0)
55407+ return -1;
55408+ if (vma->vm_end - vma->vm_start > size)
55409 return -1;
55410 return (int)vma->vm_pgoff;
55411 }
55412@@ -813,7 +818,7 @@ int __uio_register_device(struct module *owner,
55413 idev->owner = owner;
55414 idev->info = info;
55415 init_waitqueue_head(&idev->wait);
55416- atomic_set(&idev->event, 0);
55417+ atomic_set_unchecked(&idev->event, 0);
55418
55419 ret = uio_get_minor(idev);
55420 if (ret)
55421diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c
55422index 813d4d3..a71934f 100644
55423--- a/drivers/usb/atm/cxacru.c
55424+++ b/drivers/usb/atm/cxacru.c
55425@@ -472,7 +472,7 @@ static ssize_t cxacru_sysfs_store_adsl_config(struct device *dev,
55426 ret = sscanf(buf + pos, "%x=%x%n", &index, &value, &tmp);
55427 if (ret < 2)
55428 return -EINVAL;
55429- if (index < 0 || index > 0x7f)
55430+ if (index > 0x7f)
55431 return -EINVAL;
55432 pos += tmp;
55433
55434diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c
55435index dada014..1d0d517 100644
55436--- a/drivers/usb/atm/usbatm.c
55437+++ b/drivers/usb/atm/usbatm.c
55438@@ -331,7 +331,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
55439 if (printk_ratelimit())
55440 atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n",
55441 __func__, vpi, vci);
55442- atomic_inc(&vcc->stats->rx_err);
55443+ atomic_inc_unchecked(&vcc->stats->rx_err);
55444 return;
55445 }
55446
55447@@ -358,7 +358,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
55448 if (length > ATM_MAX_AAL5_PDU) {
55449 atm_rldbg(instance, "%s: bogus length %u (vcc: 0x%p)!\n",
55450 __func__, length, vcc);
55451- atomic_inc(&vcc->stats->rx_err);
55452+ atomic_inc_unchecked(&vcc->stats->rx_err);
55453 goto out;
55454 }
55455
55456@@ -367,14 +367,14 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
55457 if (sarb->len < pdu_length) {
55458 atm_rldbg(instance, "%s: bogus pdu_length %u (sarb->len: %u, vcc: 0x%p)!\n",
55459 __func__, pdu_length, sarb->len, vcc);
55460- atomic_inc(&vcc->stats->rx_err);
55461+ atomic_inc_unchecked(&vcc->stats->rx_err);
55462 goto out;
55463 }
55464
55465 if (crc32_be(~0, skb_tail_pointer(sarb) - pdu_length, pdu_length) != 0xc704dd7b) {
55466 atm_rldbg(instance, "%s: packet failed crc check (vcc: 0x%p)!\n",
55467 __func__, vcc);
55468- atomic_inc(&vcc->stats->rx_err);
55469+ atomic_inc_unchecked(&vcc->stats->rx_err);
55470 goto out;
55471 }
55472
55473@@ -386,7 +386,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
55474 if (printk_ratelimit())
55475 atm_err(instance, "%s: no memory for skb (length: %u)!\n",
55476 __func__, length);
55477- atomic_inc(&vcc->stats->rx_drop);
55478+ atomic_inc_unchecked(&vcc->stats->rx_drop);
55479 goto out;
55480 }
55481
55482@@ -414,7 +414,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
55483
55484 vcc->push(vcc, skb);
55485
55486- atomic_inc(&vcc->stats->rx);
55487+ atomic_inc_unchecked(&vcc->stats->rx);
55488 out:
55489 skb_trim(sarb, 0);
55490 }
55491@@ -612,7 +612,7 @@ static void usbatm_tx_process(unsigned long data)
55492 struct atm_vcc *vcc = UDSL_SKB(skb)->atm.vcc;
55493
55494 usbatm_pop(vcc, skb);
55495- atomic_inc(&vcc->stats->tx);
55496+ atomic_inc_unchecked(&vcc->stats->tx);
55497
55498 skb = skb_dequeue(&instance->sndqueue);
55499 }
55500@@ -756,11 +756,11 @@ static int usbatm_atm_proc_read(struct atm_dev *atm_dev, loff_t *pos, char *page
55501 if (!left--)
55502 return sprintf(page,
55503 "AAL5: tx %d ( %d err ), rx %d ( %d err, %d drop )\n",
55504- atomic_read(&atm_dev->stats.aal5.tx),
55505- atomic_read(&atm_dev->stats.aal5.tx_err),
55506- atomic_read(&atm_dev->stats.aal5.rx),
55507- atomic_read(&atm_dev->stats.aal5.rx_err),
55508- atomic_read(&atm_dev->stats.aal5.rx_drop));
55509+ atomic_read_unchecked(&atm_dev->stats.aal5.tx),
55510+ atomic_read_unchecked(&atm_dev->stats.aal5.tx_err),
55511+ atomic_read_unchecked(&atm_dev->stats.aal5.rx),
55512+ atomic_read_unchecked(&atm_dev->stats.aal5.rx_err),
55513+ atomic_read_unchecked(&atm_dev->stats.aal5.rx_drop));
55514
55515 if (!left--) {
55516 if (instance->disconnected)
55517diff --git a/drivers/usb/core/devices.c b/drivers/usb/core/devices.c
55518index 2a3bbdf..91d72cf 100644
55519--- a/drivers/usb/core/devices.c
55520+++ b/drivers/usb/core/devices.c
55521@@ -126,7 +126,7 @@ static const char format_endpt[] =
55522 * time it gets called.
55523 */
55524 static struct device_connect_event {
55525- atomic_t count;
55526+ atomic_unchecked_t count;
55527 wait_queue_head_t wait;
55528 } device_event = {
55529 .count = ATOMIC_INIT(1),
55530@@ -164,7 +164,7 @@ static const struct class_info clas_info[] = {
55531
55532 void usbfs_conn_disc_event(void)
55533 {
55534- atomic_add(2, &device_event.count);
55535+ atomic_add_unchecked(2, &device_event.count);
55536 wake_up(&device_event.wait);
55537 }
55538
55539@@ -652,7 +652,7 @@ static unsigned int usb_device_poll(struct file *file,
55540
55541 poll_wait(file, &device_event.wait, wait);
55542
55543- event_count = atomic_read(&device_event.count);
55544+ event_count = atomic_read_unchecked(&device_event.count);
55545 if (file->f_version != event_count) {
55546 file->f_version = event_count;
55547 return POLLIN | POLLRDNORM;
55548diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
55549index 1163553..f292679 100644
55550--- a/drivers/usb/core/devio.c
55551+++ b/drivers/usb/core/devio.c
55552@@ -187,7 +187,7 @@ static ssize_t usbdev_read(struct file *file, char __user *buf, size_t nbytes,
55553 struct usb_dev_state *ps = file->private_data;
55554 struct usb_device *dev = ps->dev;
55555 ssize_t ret = 0;
55556- unsigned len;
55557+ size_t len;
55558 loff_t pos;
55559 int i;
55560
55561@@ -229,22 +229,22 @@ static ssize_t usbdev_read(struct file *file, char __user *buf, size_t nbytes,
55562 for (i = 0; nbytes && i < dev->descriptor.bNumConfigurations; i++) {
55563 struct usb_config_descriptor *config =
55564 (struct usb_config_descriptor *)dev->rawdescriptors[i];
55565- unsigned int length = le16_to_cpu(config->wTotalLength);
55566+ size_t length = le16_to_cpu(config->wTotalLength);
55567
55568 if (*ppos < pos + length) {
55569
55570 /* The descriptor may claim to be longer than it
55571 * really is. Here is the actual allocated length. */
55572- unsigned alloclen =
55573+ size_t alloclen =
55574 le16_to_cpu(dev->config[i].desc.wTotalLength);
55575
55576- len = length - (*ppos - pos);
55577+ len = length + pos - *ppos;
55578 if (len > nbytes)
55579 len = nbytes;
55580
55581 /* Simply don't write (skip over) unallocated parts */
55582 if (alloclen > (*ppos - pos)) {
55583- alloclen -= (*ppos - pos);
55584+ alloclen = alloclen + pos - *ppos;
55585 if (copy_to_user(buf,
55586 dev->rawdescriptors[i] + (*ppos - pos),
55587 min(len, alloclen))) {
55588diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
55589index 45a915c..09f9735 100644
55590--- a/drivers/usb/core/hcd.c
55591+++ b/drivers/usb/core/hcd.c
55592@@ -1551,7 +1551,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags)
55593 */
55594 usb_get_urb(urb);
55595 atomic_inc(&urb->use_count);
55596- atomic_inc(&urb->dev->urbnum);
55597+ atomic_inc_unchecked(&urb->dev->urbnum);
55598 usbmon_urb_submit(&hcd->self, urb);
55599
55600 /* NOTE requirements on root-hub callers (usbfs and the hub
55601@@ -1578,7 +1578,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags)
55602 urb->hcpriv = NULL;
55603 INIT_LIST_HEAD(&urb->urb_list);
55604 atomic_dec(&urb->use_count);
55605- atomic_dec(&urb->dev->urbnum);
55606+ atomic_dec_unchecked(&urb->dev->urbnum);
55607 if (atomic_read(&urb->reject))
55608 wake_up(&usb_kill_urb_queue);
55609 usb_put_urb(urb);
55610diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
55611index 3b71516..1f26579 100644
55612--- a/drivers/usb/core/hub.c
55613+++ b/drivers/usb/core/hub.c
55614@@ -26,6 +26,7 @@
55615 #include <linux/mutex.h>
55616 #include <linux/random.h>
55617 #include <linux/pm_qos.h>
55618+#include <linux/grsecurity.h>
55619
55620 #include <asm/uaccess.h>
55621 #include <asm/byteorder.h>
55622@@ -4665,6 +4666,10 @@ static void hub_port_connect(struct usb_hub *hub, int port1, u16 portstatus,
55623 goto done;
55624 return;
55625 }
55626+
55627+ if (gr_handle_new_usb())
55628+ goto done;
55629+
55630 if (hub_is_superspeed(hub->hdev))
55631 unit_load = 150;
55632 else
55633diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
55634index f368d20..0c30ac5 100644
55635--- a/drivers/usb/core/message.c
55636+++ b/drivers/usb/core/message.c
55637@@ -128,7 +128,7 @@ static int usb_internal_control_msg(struct usb_device *usb_dev,
55638 * Return: If successful, the number of bytes transferred. Otherwise, a negative
55639 * error number.
55640 */
55641-int usb_control_msg(struct usb_device *dev, unsigned int pipe, __u8 request,
55642+int __intentional_overflow(-1) usb_control_msg(struct usb_device *dev, unsigned int pipe, __u8 request,
55643 __u8 requesttype, __u16 value, __u16 index, void *data,
55644 __u16 size, int timeout)
55645 {
55646@@ -180,7 +180,7 @@ EXPORT_SYMBOL_GPL(usb_control_msg);
55647 * If successful, 0. Otherwise a negative error number. The number of actual
55648 * bytes transferred will be stored in the @actual_length parameter.
55649 */
55650-int usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
55651+int __intentional_overflow(-1) usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
55652 void *data, int len, int *actual_length, int timeout)
55653 {
55654 return usb_bulk_msg(usb_dev, pipe, data, len, actual_length, timeout);
55655@@ -220,7 +220,7 @@ EXPORT_SYMBOL_GPL(usb_interrupt_msg);
55656 * bytes transferred will be stored in the @actual_length parameter.
55657 *
55658 */
55659-int usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
55660+int __intentional_overflow(-1) usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
55661 void *data, int len, int *actual_length, int timeout)
55662 {
55663 struct urb *urb;
55664diff --git a/drivers/usb/core/sysfs.c b/drivers/usb/core/sysfs.c
55665index d269738..7340cd7 100644
55666--- a/drivers/usb/core/sysfs.c
55667+++ b/drivers/usb/core/sysfs.c
55668@@ -244,7 +244,7 @@ static ssize_t urbnum_show(struct device *dev, struct device_attribute *attr,
55669 struct usb_device *udev;
55670
55671 udev = to_usb_device(dev);
55672- return sprintf(buf, "%d\n", atomic_read(&udev->urbnum));
55673+ return sprintf(buf, "%d\n", atomic_read_unchecked(&udev->urbnum));
55674 }
55675 static DEVICE_ATTR_RO(urbnum);
55676
55677diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
55678index b1fb9ae..4224885 100644
55679--- a/drivers/usb/core/usb.c
55680+++ b/drivers/usb/core/usb.c
55681@@ -431,7 +431,7 @@ struct usb_device *usb_alloc_dev(struct usb_device *parent,
55682 set_dev_node(&dev->dev, dev_to_node(bus->controller));
55683 dev->state = USB_STATE_ATTACHED;
55684 dev->lpm_disable_count = 1;
55685- atomic_set(&dev->urbnum, 0);
55686+ atomic_set_unchecked(&dev->urbnum, 0);
55687
55688 INIT_LIST_HEAD(&dev->ep0.urb_list);
55689 dev->ep0.desc.bLength = USB_DT_ENDPOINT_SIZE;
55690diff --git a/drivers/usb/early/ehci-dbgp.c b/drivers/usb/early/ehci-dbgp.c
55691index 8cfc319..4868255 100644
55692--- a/drivers/usb/early/ehci-dbgp.c
55693+++ b/drivers/usb/early/ehci-dbgp.c
55694@@ -98,7 +98,8 @@ static inline u32 dbgp_len_update(u32 x, u32 len)
55695
55696 #ifdef CONFIG_KGDB
55697 static struct kgdb_io kgdbdbgp_io_ops;
55698-#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops)
55699+static struct kgdb_io kgdbdbgp_io_ops_console;
55700+#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops || dbg_io_ops == &kgdbdbgp_io_ops_console)
55701 #else
55702 #define dbgp_kgdb_mode (0)
55703 #endif
55704@@ -1043,6 +1044,13 @@ static struct kgdb_io kgdbdbgp_io_ops = {
55705 .write_char = kgdbdbgp_write_char,
55706 };
55707
55708+static struct kgdb_io kgdbdbgp_io_ops_console = {
55709+ .name = "kgdbdbgp",
55710+ .read_char = kgdbdbgp_read_char,
55711+ .write_char = kgdbdbgp_write_char,
55712+ .is_console = 1
55713+};
55714+
55715 static int kgdbdbgp_wait_time;
55716
55717 static int __init kgdbdbgp_parse_config(char *str)
55718@@ -1058,8 +1066,10 @@ static int __init kgdbdbgp_parse_config(char *str)
55719 ptr++;
55720 kgdbdbgp_wait_time = simple_strtoul(ptr, &ptr, 10);
55721 }
55722- kgdb_register_io_module(&kgdbdbgp_io_ops);
55723- kgdbdbgp_io_ops.is_console = early_dbgp_console.index != -1;
55724+ if (early_dbgp_console.index != -1)
55725+ kgdb_register_io_module(&kgdbdbgp_io_ops_console);
55726+ else
55727+ kgdb_register_io_module(&kgdbdbgp_io_ops);
55728
55729 return 0;
55730 }
55731diff --git a/drivers/usb/gadget/function/f_uac1.c b/drivers/usb/gadget/function/f_uac1.c
55732index 9719abf..789d5d9 100644
55733--- a/drivers/usb/gadget/function/f_uac1.c
55734+++ b/drivers/usb/gadget/function/f_uac1.c
55735@@ -14,6 +14,7 @@
55736 #include <linux/module.h>
55737 #include <linux/device.h>
55738 #include <linux/atomic.h>
55739+#include <linux/module.h>
55740
55741 #include "u_uac1.h"
55742
55743diff --git a/drivers/usb/gadget/function/u_serial.c b/drivers/usb/gadget/function/u_serial.c
55744index 491082a..dfd7d17 100644
55745--- a/drivers/usb/gadget/function/u_serial.c
55746+++ b/drivers/usb/gadget/function/u_serial.c
55747@@ -729,9 +729,9 @@ static int gs_open(struct tty_struct *tty, struct file *file)
55748 spin_lock_irq(&port->port_lock);
55749
55750 /* already open? Great. */
55751- if (port->port.count) {
55752+ if (atomic_read(&port->port.count)) {
55753 status = 0;
55754- port->port.count++;
55755+ atomic_inc(&port->port.count);
55756
55757 /* currently opening/closing? wait ... */
55758 } else if (port->openclose) {
55759@@ -790,7 +790,7 @@ static int gs_open(struct tty_struct *tty, struct file *file)
55760 tty->driver_data = port;
55761 port->port.tty = tty;
55762
55763- port->port.count = 1;
55764+ atomic_set(&port->port.count, 1);
55765 port->openclose = false;
55766
55767 /* if connected, start the I/O stream */
55768@@ -832,11 +832,11 @@ static void gs_close(struct tty_struct *tty, struct file *file)
55769
55770 spin_lock_irq(&port->port_lock);
55771
55772- if (port->port.count != 1) {
55773- if (port->port.count == 0)
55774+ if (atomic_read(&port->port.count) != 1) {
55775+ if (atomic_read(&port->port.count) == 0)
55776 WARN_ON(1);
55777 else
55778- --port->port.count;
55779+ atomic_dec(&port->port.count);
55780 goto exit;
55781 }
55782
55783@@ -846,7 +846,7 @@ static void gs_close(struct tty_struct *tty, struct file *file)
55784 * and sleep if necessary
55785 */
55786 port->openclose = true;
55787- port->port.count = 0;
55788+ atomic_set(&port->port.count, 0);
55789
55790 gser = port->port_usb;
55791 if (gser && gser->disconnect)
55792@@ -1062,7 +1062,7 @@ static int gs_closed(struct gs_port *port)
55793 int cond;
55794
55795 spin_lock_irq(&port->port_lock);
55796- cond = (port->port.count == 0) && !port->openclose;
55797+ cond = (atomic_read(&port->port.count) == 0) && !port->openclose;
55798 spin_unlock_irq(&port->port_lock);
55799 return cond;
55800 }
55801@@ -1205,7 +1205,7 @@ int gserial_connect(struct gserial *gser, u8 port_num)
55802 /* if it's already open, start I/O ... and notify the serial
55803 * protocol about open/close status (connect/disconnect).
55804 */
55805- if (port->port.count) {
55806+ if (atomic_read(&port->port.count)) {
55807 pr_debug("gserial_connect: start ttyGS%d\n", port->port_num);
55808 gs_start_io(port);
55809 if (gser->connect)
55810@@ -1252,7 +1252,7 @@ void gserial_disconnect(struct gserial *gser)
55811
55812 port->port_usb = NULL;
55813 gser->ioport = NULL;
55814- if (port->port.count > 0 || port->openclose) {
55815+ if (atomic_read(&port->port.count) > 0 || port->openclose) {
55816 wake_up_interruptible(&port->drain_wait);
55817 if (port->port.tty)
55818 tty_hangup(port->port.tty);
55819@@ -1268,7 +1268,7 @@ void gserial_disconnect(struct gserial *gser)
55820
55821 /* finally, free any unused/unusable I/O buffers */
55822 spin_lock_irqsave(&port->port_lock, flags);
55823- if (port->port.count == 0 && !port->openclose)
55824+ if (atomic_read(&port->port.count) == 0 && !port->openclose)
55825 gs_buf_free(&port->port_write_buf);
55826 gs_free_requests(gser->out, &port->read_pool, NULL);
55827 gs_free_requests(gser->out, &port->read_queue, NULL);
55828diff --git a/drivers/usb/gadget/function/u_uac1.c b/drivers/usb/gadget/function/u_uac1.c
55829index c78c841..48fd281 100644
55830--- a/drivers/usb/gadget/function/u_uac1.c
55831+++ b/drivers/usb/gadget/function/u_uac1.c
55832@@ -17,6 +17,7 @@
55833 #include <linux/ctype.h>
55834 #include <linux/random.h>
55835 #include <linux/syscalls.h>
55836+#include <linux/module.h>
55837
55838 #include "u_uac1.h"
55839
55840diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
55841index 7354d01..299478e 100644
55842--- a/drivers/usb/host/ehci-hub.c
55843+++ b/drivers/usb/host/ehci-hub.c
55844@@ -772,7 +772,7 @@ static struct urb *request_single_step_set_feature_urb(
55845 urb->transfer_flags = URB_DIR_IN;
55846 usb_get_urb(urb);
55847 atomic_inc(&urb->use_count);
55848- atomic_inc(&urb->dev->urbnum);
55849+ atomic_inc_unchecked(&urb->dev->urbnum);
55850 urb->setup_dma = dma_map_single(
55851 hcd->self.controller,
55852 urb->setup_packet,
55853@@ -839,7 +839,7 @@ static int ehset_single_step_set_feature(struct usb_hcd *hcd, int port)
55854 urb->status = -EINPROGRESS;
55855 usb_get_urb(urb);
55856 atomic_inc(&urb->use_count);
55857- atomic_inc(&urb->dev->urbnum);
55858+ atomic_inc_unchecked(&urb->dev->urbnum);
55859 retval = submit_single_step_set_feature(hcd, urb, 0);
55860 if (!retval && !wait_for_completion_timeout(&done,
55861 msecs_to_jiffies(2000))) {
55862diff --git a/drivers/usb/host/hwa-hc.c b/drivers/usb/host/hwa-hc.c
55863index 1db0626..4948782 100644
55864--- a/drivers/usb/host/hwa-hc.c
55865+++ b/drivers/usb/host/hwa-hc.c
55866@@ -337,7 +337,10 @@ static int __hwahc_op_bwa_set(struct wusbhc *wusbhc, s8 stream_index,
55867 struct hwahc *hwahc = container_of(wusbhc, struct hwahc, wusbhc);
55868 struct wahc *wa = &hwahc->wa;
55869 struct device *dev = &wa->usb_iface->dev;
55870- u8 mas_le[UWB_NUM_MAS/8];
55871+ u8 *mas_le = kmalloc(UWB_NUM_MAS/8, GFP_KERNEL);
55872+
55873+ if (mas_le == NULL)
55874+ return -ENOMEM;
55875
55876 /* Set the stream index */
55877 result = usb_control_msg(wa->usb_dev, usb_sndctrlpipe(wa->usb_dev, 0),
55878@@ -356,10 +359,12 @@ static int __hwahc_op_bwa_set(struct wusbhc *wusbhc, s8 stream_index,
55879 WUSB_REQ_SET_WUSB_MAS,
55880 USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE,
55881 0, wa->usb_iface->cur_altsetting->desc.bInterfaceNumber,
55882- mas_le, 32, USB_CTRL_SET_TIMEOUT);
55883+ mas_le, UWB_NUM_MAS/8, USB_CTRL_SET_TIMEOUT);
55884 if (result < 0)
55885 dev_err(dev, "Cannot set WUSB MAS allocation: %d\n", result);
55886 out:
55887+ kfree(mas_le);
55888+
55889 return result;
55890 }
55891
55892diff --git a/drivers/usb/misc/appledisplay.c b/drivers/usb/misc/appledisplay.c
55893index b3d245e..99549ed 100644
55894--- a/drivers/usb/misc/appledisplay.c
55895+++ b/drivers/usb/misc/appledisplay.c
55896@@ -84,7 +84,7 @@ struct appledisplay {
55897 struct mutex sysfslock; /* concurrent read and write */
55898 };
55899
55900-static atomic_t count_displays = ATOMIC_INIT(0);
55901+static atomic_unchecked_t count_displays = ATOMIC_INIT(0);
55902 static struct workqueue_struct *wq;
55903
55904 static void appledisplay_complete(struct urb *urb)
55905@@ -288,7 +288,7 @@ static int appledisplay_probe(struct usb_interface *iface,
55906
55907 /* Register backlight device */
55908 snprintf(bl_name, sizeof(bl_name), "appledisplay%d",
55909- atomic_inc_return(&count_displays) - 1);
55910+ atomic_inc_return_unchecked(&count_displays) - 1);
55911 memset(&props, 0, sizeof(struct backlight_properties));
55912 props.type = BACKLIGHT_RAW;
55913 props.max_brightness = 0xff;
55914diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c
55915index 3806e70..55c508b 100644
55916--- a/drivers/usb/serial/console.c
55917+++ b/drivers/usb/serial/console.c
55918@@ -126,7 +126,7 @@ static int usb_console_setup(struct console *co, char *options)
55919
55920 info->port = port;
55921
55922- ++port->port.count;
55923+ atomic_inc(&port->port.count);
55924 if (!test_bit(ASYNCB_INITIALIZED, &port->port.flags)) {
55925 if (serial->type->set_termios) {
55926 /*
55927@@ -175,7 +175,7 @@ static int usb_console_setup(struct console *co, char *options)
55928 }
55929 /* Now that any required fake tty operations are completed restore
55930 * the tty port count */
55931- --port->port.count;
55932+ atomic_dec(&port->port.count);
55933 /* The console is special in terms of closing the device so
55934 * indicate this port is now acting as a system console. */
55935 port->port.console = 1;
55936@@ -188,7 +188,7 @@ static int usb_console_setup(struct console *co, char *options)
55937 put_tty:
55938 tty_kref_put(tty);
55939 reset_open_count:
55940- port->port.count = 0;
55941+ atomic_set(&port->port.count, 0);
55942 usb_autopm_put_interface(serial->interface);
55943 error_get_interface:
55944 usb_serial_put(serial);
55945@@ -199,7 +199,7 @@ static int usb_console_setup(struct console *co, char *options)
55946 static void usb_console_write(struct console *co,
55947 const char *buf, unsigned count)
55948 {
55949- static struct usbcons_info *info = &usbcons_info;
55950+ struct usbcons_info *info = &usbcons_info;
55951 struct usb_serial_port *port = info->port;
55952 struct usb_serial *serial;
55953 int retval = -ENODEV;
55954diff --git a/drivers/usb/storage/usb.h b/drivers/usb/storage/usb.h
55955index 307e339..6aa97cb 100644
55956--- a/drivers/usb/storage/usb.h
55957+++ b/drivers/usb/storage/usb.h
55958@@ -63,7 +63,7 @@ struct us_unusual_dev {
55959 __u8 useProtocol;
55960 __u8 useTransport;
55961 int (*initFunction)(struct us_data *);
55962-};
55963+} __do_const;
55964
55965
55966 /* Dynamic bitflag definitions (us->dflags): used in set_bit() etc. */
55967diff --git a/drivers/usb/usbip/vhci.h b/drivers/usb/usbip/vhci.h
55968index a863a98..d272795 100644
55969--- a/drivers/usb/usbip/vhci.h
55970+++ b/drivers/usb/usbip/vhci.h
55971@@ -83,7 +83,7 @@ struct vhci_hcd {
55972 unsigned resuming:1;
55973 unsigned long re_timeout;
55974
55975- atomic_t seqnum;
55976+ atomic_unchecked_t seqnum;
55977
55978 /*
55979 * NOTE:
55980diff --git a/drivers/usb/usbip/vhci_hcd.c b/drivers/usb/usbip/vhci_hcd.c
55981index 11f6f61..1087910 100644
55982--- a/drivers/usb/usbip/vhci_hcd.c
55983+++ b/drivers/usb/usbip/vhci_hcd.c
55984@@ -440,7 +440,7 @@ static void vhci_tx_urb(struct urb *urb)
55985
55986 spin_lock(&vdev->priv_lock);
55987
55988- priv->seqnum = atomic_inc_return(&the_controller->seqnum);
55989+ priv->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
55990 if (priv->seqnum == 0xffff)
55991 dev_info(&urb->dev->dev, "seqnum max\n");
55992
55993@@ -685,7 +685,7 @@ static int vhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
55994 return -ENOMEM;
55995 }
55996
55997- unlink->seqnum = atomic_inc_return(&the_controller->seqnum);
55998+ unlink->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
55999 if (unlink->seqnum == 0xffff)
56000 pr_info("seqnum max\n");
56001
56002@@ -889,7 +889,7 @@ static int vhci_start(struct usb_hcd *hcd)
56003 vdev->rhport = rhport;
56004 }
56005
56006- atomic_set(&vhci->seqnum, 0);
56007+ atomic_set_unchecked(&vhci->seqnum, 0);
56008 spin_lock_init(&vhci->lock);
56009
56010 hcd->power_budget = 0; /* no limit */
56011diff --git a/drivers/usb/usbip/vhci_rx.c b/drivers/usb/usbip/vhci_rx.c
56012index 00e4a54..d676f85 100644
56013--- a/drivers/usb/usbip/vhci_rx.c
56014+++ b/drivers/usb/usbip/vhci_rx.c
56015@@ -80,7 +80,7 @@ static void vhci_recv_ret_submit(struct vhci_device *vdev,
56016 if (!urb) {
56017 pr_err("cannot find a urb of seqnum %u\n", pdu->base.seqnum);
56018 pr_info("max seqnum %d\n",
56019- atomic_read(&the_controller->seqnum));
56020+ atomic_read_unchecked(&the_controller->seqnum));
56021 usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
56022 return;
56023 }
56024diff --git a/drivers/usb/wusbcore/wa-hc.h b/drivers/usb/wusbcore/wa-hc.h
56025index edc7267..9f65ce2 100644
56026--- a/drivers/usb/wusbcore/wa-hc.h
56027+++ b/drivers/usb/wusbcore/wa-hc.h
56028@@ -240,7 +240,7 @@ struct wahc {
56029 spinlock_t xfer_list_lock;
56030 struct work_struct xfer_enqueue_work;
56031 struct work_struct xfer_error_work;
56032- atomic_t xfer_id_count;
56033+ atomic_unchecked_t xfer_id_count;
56034
56035 kernel_ulong_t quirks;
56036 };
56037@@ -305,7 +305,7 @@ static inline void wa_init(struct wahc *wa)
56038 INIT_WORK(&wa->xfer_enqueue_work, wa_urb_enqueue_run);
56039 INIT_WORK(&wa->xfer_error_work, wa_process_errored_transfers_run);
56040 wa->dto_in_use = 0;
56041- atomic_set(&wa->xfer_id_count, 1);
56042+ atomic_set_unchecked(&wa->xfer_id_count, 1);
56043 /* init the buf in URBs */
56044 for (index = 0; index < WA_MAX_BUF_IN_URBS; ++index)
56045 usb_init_urb(&(wa->buf_in_urbs[index]));
56046diff --git a/drivers/usb/wusbcore/wa-xfer.c b/drivers/usb/wusbcore/wa-xfer.c
56047index 69af4fd..da390d7 100644
56048--- a/drivers/usb/wusbcore/wa-xfer.c
56049+++ b/drivers/usb/wusbcore/wa-xfer.c
56050@@ -314,7 +314,7 @@ static void wa_xfer_completion(struct wa_xfer *xfer)
56051 */
56052 static void wa_xfer_id_init(struct wa_xfer *xfer)
56053 {
56054- xfer->id = atomic_add_return(1, &xfer->wa->xfer_id_count);
56055+ xfer->id = atomic_add_return_unchecked(1, &xfer->wa->xfer_id_count);
56056 }
56057
56058 /* Return the xfer's ID. */
56059diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c
56060index 837d177..170724af 100644
56061--- a/drivers/vfio/vfio.c
56062+++ b/drivers/vfio/vfio.c
56063@@ -518,7 +518,7 @@ static int vfio_group_nb_add_dev(struct vfio_group *group, struct device *dev)
56064 return 0;
56065
56066 /* TODO Prevent device auto probing */
56067- WARN("Device %s added to live group %d!\n", dev_name(dev),
56068+ WARN(1, "Device %s added to live group %d!\n", dev_name(dev),
56069 iommu_group_id(group->iommu_group));
56070
56071 return 0;
56072diff --git a/drivers/vhost/vringh.c b/drivers/vhost/vringh.c
56073index 3bb02c6..a01ff38 100644
56074--- a/drivers/vhost/vringh.c
56075+++ b/drivers/vhost/vringh.c
56076@@ -551,7 +551,7 @@ static inline void __vringh_notify_disable(struct vringh *vrh,
56077 static inline int getu16_user(const struct vringh *vrh, u16 *val, const __virtio16 *p)
56078 {
56079 __virtio16 v = 0;
56080- int rc = get_user(v, (__force __virtio16 __user *)p);
56081+ int rc = get_user(v, (__force_user __virtio16 *)p);
56082 *val = vringh16_to_cpu(vrh, v);
56083 return rc;
56084 }
56085@@ -559,12 +559,12 @@ static inline int getu16_user(const struct vringh *vrh, u16 *val, const __virtio
56086 static inline int putu16_user(const struct vringh *vrh, __virtio16 *p, u16 val)
56087 {
56088 __virtio16 v = cpu_to_vringh16(vrh, val);
56089- return put_user(v, (__force __virtio16 __user *)p);
56090+ return put_user(v, (__force_user __virtio16 *)p);
56091 }
56092
56093 static inline int copydesc_user(void *dst, const void *src, size_t len)
56094 {
56095- return copy_from_user(dst, (__force void __user *)src, len) ?
56096+ return copy_from_user(dst, (void __force_user *)src, len) ?
56097 -EFAULT : 0;
56098 }
56099
56100@@ -572,19 +572,19 @@ static inline int putused_user(struct vring_used_elem *dst,
56101 const struct vring_used_elem *src,
56102 unsigned int num)
56103 {
56104- return copy_to_user((__force void __user *)dst, src,
56105+ return copy_to_user((void __force_user *)dst, src,
56106 sizeof(*dst) * num) ? -EFAULT : 0;
56107 }
56108
56109 static inline int xfer_from_user(void *src, void *dst, size_t len)
56110 {
56111- return copy_from_user(dst, (__force void __user *)src, len) ?
56112+ return copy_from_user(dst, (void __force_user *)src, len) ?
56113 -EFAULT : 0;
56114 }
56115
56116 static inline int xfer_to_user(void *dst, void *src, size_t len)
56117 {
56118- return copy_to_user((__force void __user *)dst, src, len) ?
56119+ return copy_to_user((void __force_user *)dst, src, len) ?
56120 -EFAULT : 0;
56121 }
56122
56123@@ -621,9 +621,9 @@ int vringh_init_user(struct vringh *vrh, u64 features,
56124 vrh->last_used_idx = 0;
56125 vrh->vring.num = num;
56126 /* vring expects kernel addresses, but only used via accessors. */
56127- vrh->vring.desc = (__force struct vring_desc *)desc;
56128- vrh->vring.avail = (__force struct vring_avail *)avail;
56129- vrh->vring.used = (__force struct vring_used *)used;
56130+ vrh->vring.desc = (__force_kernel struct vring_desc *)desc;
56131+ vrh->vring.avail = (__force_kernel struct vring_avail *)avail;
56132+ vrh->vring.used = (__force_kernel struct vring_used *)used;
56133 return 0;
56134 }
56135 EXPORT_SYMBOL(vringh_init_user);
56136@@ -826,7 +826,7 @@ static inline int getu16_kern(const struct vringh *vrh,
56137
56138 static inline int putu16_kern(const struct vringh *vrh, __virtio16 *p, u16 val)
56139 {
56140- ACCESS_ONCE(*p) = cpu_to_vringh16(vrh, val);
56141+ ACCESS_ONCE_RW(*p) = cpu_to_vringh16(vrh, val);
56142 return 0;
56143 }
56144
56145diff --git a/drivers/video/backlight/kb3886_bl.c b/drivers/video/backlight/kb3886_bl.c
56146index 84a110a..96312c3 100644
56147--- a/drivers/video/backlight/kb3886_bl.c
56148+++ b/drivers/video/backlight/kb3886_bl.c
56149@@ -78,7 +78,7 @@ static struct kb3886bl_machinfo *bl_machinfo;
56150 static unsigned long kb3886bl_flags;
56151 #define KB3886BL_SUSPENDED 0x01
56152
56153-static struct dmi_system_id kb3886bl_device_table[] __initdata = {
56154+static const struct dmi_system_id kb3886bl_device_table[] __initconst = {
56155 {
56156 .ident = "Sahara Touch-iT",
56157 .matches = {
56158diff --git a/drivers/video/fbdev/arcfb.c b/drivers/video/fbdev/arcfb.c
56159index 1b0b233..6f34c2c 100644
56160--- a/drivers/video/fbdev/arcfb.c
56161+++ b/drivers/video/fbdev/arcfb.c
56162@@ -458,7 +458,7 @@ static ssize_t arcfb_write(struct fb_info *info, const char __user *buf,
56163 return -ENOSPC;
56164
56165 err = 0;
56166- if ((count + p) > fbmemlength) {
56167+ if (count > (fbmemlength - p)) {
56168 count = fbmemlength - p;
56169 err = -ENOSPC;
56170 }
56171diff --git a/drivers/video/fbdev/aty/aty128fb.c b/drivers/video/fbdev/aty/aty128fb.c
56172index aedf2fb..47c9aca 100644
56173--- a/drivers/video/fbdev/aty/aty128fb.c
56174+++ b/drivers/video/fbdev/aty/aty128fb.c
56175@@ -149,7 +149,7 @@ enum {
56176 };
56177
56178 /* Must match above enum */
56179-static char * const r128_family[] = {
56180+static const char * const r128_family[] = {
56181 "AGP",
56182 "PCI",
56183 "PRO AGP",
56184diff --git a/drivers/video/fbdev/aty/atyfb_base.c b/drivers/video/fbdev/aty/atyfb_base.c
56185index 8789e48..698fe4c 100644
56186--- a/drivers/video/fbdev/aty/atyfb_base.c
56187+++ b/drivers/video/fbdev/aty/atyfb_base.c
56188@@ -1326,10 +1326,14 @@ static int atyfb_set_par(struct fb_info *info)
56189 par->accel_flags = var->accel_flags; /* hack */
56190
56191 if (var->accel_flags) {
56192- info->fbops->fb_sync = atyfb_sync;
56193+ pax_open_kernel();
56194+ *(void **)&info->fbops->fb_sync = atyfb_sync;
56195+ pax_close_kernel();
56196 info->flags &= ~FBINFO_HWACCEL_DISABLED;
56197 } else {
56198- info->fbops->fb_sync = NULL;
56199+ pax_open_kernel();
56200+ *(void **)&info->fbops->fb_sync = NULL;
56201+ pax_close_kernel();
56202 info->flags |= FBINFO_HWACCEL_DISABLED;
56203 }
56204
56205diff --git a/drivers/video/fbdev/aty/mach64_cursor.c b/drivers/video/fbdev/aty/mach64_cursor.c
56206index 2fa0317..4983f2a 100644
56207--- a/drivers/video/fbdev/aty/mach64_cursor.c
56208+++ b/drivers/video/fbdev/aty/mach64_cursor.c
56209@@ -8,6 +8,7 @@
56210 #include "../core/fb_draw.h"
56211
56212 #include <asm/io.h>
56213+#include <asm/pgtable.h>
56214
56215 #ifdef __sparc__
56216 #include <asm/fbio.h>
56217@@ -218,7 +219,9 @@ int aty_init_cursor(struct fb_info *info)
56218 info->sprite.buf_align = 16; /* and 64 lines tall. */
56219 info->sprite.flags = FB_PIXMAP_IO;
56220
56221- info->fbops->fb_cursor = atyfb_cursor;
56222+ pax_open_kernel();
56223+ *(void **)&info->fbops->fb_cursor = atyfb_cursor;
56224+ pax_close_kernel();
56225
56226 return 0;
56227 }
56228diff --git a/drivers/video/fbdev/core/fb_defio.c b/drivers/video/fbdev/core/fb_defio.c
56229index d6cab1f..112f680 100644
56230--- a/drivers/video/fbdev/core/fb_defio.c
56231+++ b/drivers/video/fbdev/core/fb_defio.c
56232@@ -207,7 +207,9 @@ void fb_deferred_io_init(struct fb_info *info)
56233
56234 BUG_ON(!fbdefio);
56235 mutex_init(&fbdefio->lock);
56236- info->fbops->fb_mmap = fb_deferred_io_mmap;
56237+ pax_open_kernel();
56238+ *(void **)&info->fbops->fb_mmap = fb_deferred_io_mmap;
56239+ pax_close_kernel();
56240 INIT_DELAYED_WORK(&info->deferred_work, fb_deferred_io_work);
56241 INIT_LIST_HEAD(&fbdefio->pagelist);
56242 if (fbdefio->delay == 0) /* set a default of 1 s */
56243@@ -238,7 +240,7 @@ void fb_deferred_io_cleanup(struct fb_info *info)
56244 page->mapping = NULL;
56245 }
56246
56247- info->fbops->fb_mmap = NULL;
56248+ *(void **)&info->fbops->fb_mmap = NULL;
56249 mutex_destroy(&fbdefio->lock);
56250 }
56251 EXPORT_SYMBOL_GPL(fb_deferred_io_cleanup);
56252diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c
56253index 0705d88..d9429bf 100644
56254--- a/drivers/video/fbdev/core/fbmem.c
56255+++ b/drivers/video/fbdev/core/fbmem.c
56256@@ -1301,7 +1301,7 @@ static int do_fscreeninfo_to_user(struct fb_fix_screeninfo *fix,
56257 __u32 data;
56258 int err;
56259
56260- err = copy_to_user(&fix32->id, &fix->id, sizeof(fix32->id));
56261+ err = copy_to_user(fix32->id, &fix->id, sizeof(fix32->id));
56262
56263 data = (__u32) (unsigned long) fix->smem_start;
56264 err |= put_user(data, &fix32->smem_start);
56265diff --git a/drivers/video/fbdev/hyperv_fb.c b/drivers/video/fbdev/hyperv_fb.c
56266index 4254336..282567e 100644
56267--- a/drivers/video/fbdev/hyperv_fb.c
56268+++ b/drivers/video/fbdev/hyperv_fb.c
56269@@ -240,7 +240,7 @@ static uint screen_fb_size;
56270 static inline int synthvid_send(struct hv_device *hdev,
56271 struct synthvid_msg *msg)
56272 {
56273- static atomic64_t request_id = ATOMIC64_INIT(0);
56274+ static atomic64_unchecked_t request_id = ATOMIC64_INIT(0);
56275 int ret;
56276
56277 msg->pipe_hdr.type = PIPE_MSG_DATA;
56278@@ -248,7 +248,7 @@ static inline int synthvid_send(struct hv_device *hdev,
56279
56280 ret = vmbus_sendpacket(hdev->channel, msg,
56281 msg->vid_hdr.size + sizeof(struct pipe_msg_hdr),
56282- atomic64_inc_return(&request_id),
56283+ atomic64_inc_return_unchecked(&request_id),
56284 VM_PKT_DATA_INBAND, 0);
56285
56286 if (ret)
56287diff --git a/drivers/video/fbdev/i810/i810_accel.c b/drivers/video/fbdev/i810/i810_accel.c
56288index 7672d2e..b56437f 100644
56289--- a/drivers/video/fbdev/i810/i810_accel.c
56290+++ b/drivers/video/fbdev/i810/i810_accel.c
56291@@ -73,6 +73,7 @@ static inline int wait_for_space(struct fb_info *info, u32 space)
56292 }
56293 }
56294 printk("ringbuffer lockup!!!\n");
56295+ printk("head:%u tail:%u iring.size:%u space:%u\n", head, tail, par->iring.size, space);
56296 i810_report_error(mmio);
56297 par->dev_flags |= LOCKUP;
56298 info->pixmap.scan_align = 1;
56299diff --git a/drivers/video/fbdev/matrox/matroxfb_DAC1064.c b/drivers/video/fbdev/matrox/matroxfb_DAC1064.c
56300index a01147f..5d896f8 100644
56301--- a/drivers/video/fbdev/matrox/matroxfb_DAC1064.c
56302+++ b/drivers/video/fbdev/matrox/matroxfb_DAC1064.c
56303@@ -1088,14 +1088,20 @@ static void MGAG100_restore(struct matrox_fb_info *minfo)
56304
56305 #ifdef CONFIG_FB_MATROX_MYSTIQUE
56306 struct matrox_switch matrox_mystique = {
56307- MGA1064_preinit, MGA1064_reset, MGA1064_init, MGA1064_restore,
56308+ .preinit = MGA1064_preinit,
56309+ .reset = MGA1064_reset,
56310+ .init = MGA1064_init,
56311+ .restore = MGA1064_restore,
56312 };
56313 EXPORT_SYMBOL(matrox_mystique);
56314 #endif
56315
56316 #ifdef CONFIG_FB_MATROX_G
56317 struct matrox_switch matrox_G100 = {
56318- MGAG100_preinit, MGAG100_reset, MGAG100_init, MGAG100_restore,
56319+ .preinit = MGAG100_preinit,
56320+ .reset = MGAG100_reset,
56321+ .init = MGAG100_init,
56322+ .restore = MGAG100_restore,
56323 };
56324 EXPORT_SYMBOL(matrox_G100);
56325 #endif
56326diff --git a/drivers/video/fbdev/matrox/matroxfb_Ti3026.c b/drivers/video/fbdev/matrox/matroxfb_Ti3026.c
56327index 195ad7c..09743fc 100644
56328--- a/drivers/video/fbdev/matrox/matroxfb_Ti3026.c
56329+++ b/drivers/video/fbdev/matrox/matroxfb_Ti3026.c
56330@@ -738,7 +738,10 @@ static int Ti3026_preinit(struct matrox_fb_info *minfo)
56331 }
56332
56333 struct matrox_switch matrox_millennium = {
56334- Ti3026_preinit, Ti3026_reset, Ti3026_init, Ti3026_restore
56335+ .preinit = Ti3026_preinit,
56336+ .reset = Ti3026_reset,
56337+ .init = Ti3026_init,
56338+ .restore = Ti3026_restore
56339 };
56340 EXPORT_SYMBOL(matrox_millennium);
56341 #endif
56342diff --git a/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c b/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c
56343index fe92eed..106e085 100644
56344--- a/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c
56345+++ b/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c
56346@@ -312,14 +312,18 @@ void mb862xxfb_init_accel(struct fb_info *info, int xres)
56347 struct mb862xxfb_par *par = info->par;
56348
56349 if (info->var.bits_per_pixel == 32) {
56350- info->fbops->fb_fillrect = cfb_fillrect;
56351- info->fbops->fb_copyarea = cfb_copyarea;
56352- info->fbops->fb_imageblit = cfb_imageblit;
56353+ pax_open_kernel();
56354+ *(void **)&info->fbops->fb_fillrect = cfb_fillrect;
56355+ *(void **)&info->fbops->fb_copyarea = cfb_copyarea;
56356+ *(void **)&info->fbops->fb_imageblit = cfb_imageblit;
56357+ pax_close_kernel();
56358 } else {
56359 outreg(disp, GC_L0EM, 3);
56360- info->fbops->fb_fillrect = mb86290fb_fillrect;
56361- info->fbops->fb_copyarea = mb86290fb_copyarea;
56362- info->fbops->fb_imageblit = mb86290fb_imageblit;
56363+ pax_open_kernel();
56364+ *(void **)&info->fbops->fb_fillrect = mb86290fb_fillrect;
56365+ *(void **)&info->fbops->fb_copyarea = mb86290fb_copyarea;
56366+ *(void **)&info->fbops->fb_imageblit = mb86290fb_imageblit;
56367+ pax_close_kernel();
56368 }
56369 outreg(draw, GDC_REG_DRAW_BASE, 0);
56370 outreg(draw, GDC_REG_MODE_MISC, 0x8000);
56371diff --git a/drivers/video/fbdev/nvidia/nvidia.c b/drivers/video/fbdev/nvidia/nvidia.c
56372index def0412..fed6529 100644
56373--- a/drivers/video/fbdev/nvidia/nvidia.c
56374+++ b/drivers/video/fbdev/nvidia/nvidia.c
56375@@ -669,19 +669,23 @@ static int nvidiafb_set_par(struct fb_info *info)
56376 info->fix.line_length = (info->var.xres_virtual *
56377 info->var.bits_per_pixel) >> 3;
56378 if (info->var.accel_flags) {
56379- info->fbops->fb_imageblit = nvidiafb_imageblit;
56380- info->fbops->fb_fillrect = nvidiafb_fillrect;
56381- info->fbops->fb_copyarea = nvidiafb_copyarea;
56382- info->fbops->fb_sync = nvidiafb_sync;
56383+ pax_open_kernel();
56384+ *(void **)&info->fbops->fb_imageblit = nvidiafb_imageblit;
56385+ *(void **)&info->fbops->fb_fillrect = nvidiafb_fillrect;
56386+ *(void **)&info->fbops->fb_copyarea = nvidiafb_copyarea;
56387+ *(void **)&info->fbops->fb_sync = nvidiafb_sync;
56388+ pax_close_kernel();
56389 info->pixmap.scan_align = 4;
56390 info->flags &= ~FBINFO_HWACCEL_DISABLED;
56391 info->flags |= FBINFO_READS_FAST;
56392 NVResetGraphics(info);
56393 } else {
56394- info->fbops->fb_imageblit = cfb_imageblit;
56395- info->fbops->fb_fillrect = cfb_fillrect;
56396- info->fbops->fb_copyarea = cfb_copyarea;
56397- info->fbops->fb_sync = NULL;
56398+ pax_open_kernel();
56399+ *(void **)&info->fbops->fb_imageblit = cfb_imageblit;
56400+ *(void **)&info->fbops->fb_fillrect = cfb_fillrect;
56401+ *(void **)&info->fbops->fb_copyarea = cfb_copyarea;
56402+ *(void **)&info->fbops->fb_sync = NULL;
56403+ pax_close_kernel();
56404 info->pixmap.scan_align = 1;
56405 info->flags |= FBINFO_HWACCEL_DISABLED;
56406 info->flags &= ~FBINFO_READS_FAST;
56407@@ -1173,8 +1177,11 @@ static int nvidia_set_fbinfo(struct fb_info *info)
56408 info->pixmap.size = 8 * 1024;
56409 info->pixmap.flags = FB_PIXMAP_SYSTEM;
56410
56411- if (!hwcur)
56412- info->fbops->fb_cursor = NULL;
56413+ if (!hwcur) {
56414+ pax_open_kernel();
56415+ *(void **)&info->fbops->fb_cursor = NULL;
56416+ pax_close_kernel();
56417+ }
56418
56419 info->var.accel_flags = (!noaccel);
56420
56421diff --git a/drivers/video/fbdev/omap2/dss/display.c b/drivers/video/fbdev/omap2/dss/display.c
56422index 2412a0d..294215b 100644
56423--- a/drivers/video/fbdev/omap2/dss/display.c
56424+++ b/drivers/video/fbdev/omap2/dss/display.c
56425@@ -161,12 +161,14 @@ int omapdss_register_display(struct omap_dss_device *dssdev)
56426 if (dssdev->name == NULL)
56427 dssdev->name = dssdev->alias;
56428
56429+ pax_open_kernel();
56430 if (drv && drv->get_resolution == NULL)
56431- drv->get_resolution = omapdss_default_get_resolution;
56432+ *(void **)&drv->get_resolution = omapdss_default_get_resolution;
56433 if (drv && drv->get_recommended_bpp == NULL)
56434- drv->get_recommended_bpp = omapdss_default_get_recommended_bpp;
56435+ *(void **)&drv->get_recommended_bpp = omapdss_default_get_recommended_bpp;
56436 if (drv && drv->get_timings == NULL)
56437- drv->get_timings = omapdss_default_get_timings;
56438+ *(void **)&drv->get_timings = omapdss_default_get_timings;
56439+ pax_close_kernel();
56440
56441 mutex_lock(&panel_list_mutex);
56442 list_add_tail(&dssdev->panel_list, &panel_list);
56443diff --git a/drivers/video/fbdev/s1d13xxxfb.c b/drivers/video/fbdev/s1d13xxxfb.c
56444index 83433cb..71e9b98 100644
56445--- a/drivers/video/fbdev/s1d13xxxfb.c
56446+++ b/drivers/video/fbdev/s1d13xxxfb.c
56447@@ -881,8 +881,10 @@ static int s1d13xxxfb_probe(struct platform_device *pdev)
56448
56449 switch(prod_id) {
56450 case S1D13506_PROD_ID: /* activate acceleration */
56451- s1d13xxxfb_fbops.fb_fillrect = s1d13xxxfb_bitblt_solidfill;
56452- s1d13xxxfb_fbops.fb_copyarea = s1d13xxxfb_bitblt_copyarea;
56453+ pax_open_kernel();
56454+ *(void **)&s1d13xxxfb_fbops.fb_fillrect = s1d13xxxfb_bitblt_solidfill;
56455+ *(void **)&s1d13xxxfb_fbops.fb_copyarea = s1d13xxxfb_bitblt_copyarea;
56456+ pax_close_kernel();
56457 info->flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN |
56458 FBINFO_HWACCEL_FILLRECT | FBINFO_HWACCEL_COPYAREA;
56459 break;
56460diff --git a/drivers/video/fbdev/sh_mobile_lcdcfb.c b/drivers/video/fbdev/sh_mobile_lcdcfb.c
56461index d3013cd..95b8285 100644
56462--- a/drivers/video/fbdev/sh_mobile_lcdcfb.c
56463+++ b/drivers/video/fbdev/sh_mobile_lcdcfb.c
56464@@ -439,9 +439,9 @@ static unsigned long lcdc_sys_read_data(void *handle)
56465 }
56466
56467 static struct sh_mobile_lcdc_sys_bus_ops sh_mobile_lcdc_sys_bus_ops = {
56468- lcdc_sys_write_index,
56469- lcdc_sys_write_data,
56470- lcdc_sys_read_data,
56471+ .write_index = lcdc_sys_write_index,
56472+ .write_data = lcdc_sys_write_data,
56473+ .read_data = lcdc_sys_read_data,
56474 };
56475
56476 static int sh_mobile_lcdc_sginit(struct fb_info *info,
56477diff --git a/drivers/video/fbdev/smscufx.c b/drivers/video/fbdev/smscufx.c
56478index 9279e5f..d5f5276 100644
56479--- a/drivers/video/fbdev/smscufx.c
56480+++ b/drivers/video/fbdev/smscufx.c
56481@@ -1174,7 +1174,9 @@ static int ufx_ops_release(struct fb_info *info, int user)
56482 fb_deferred_io_cleanup(info);
56483 kfree(info->fbdefio);
56484 info->fbdefio = NULL;
56485- info->fbops->fb_mmap = ufx_ops_mmap;
56486+ pax_open_kernel();
56487+ *(void **)&info->fbops->fb_mmap = ufx_ops_mmap;
56488+ pax_close_kernel();
56489 }
56490
56491 pr_debug("released /dev/fb%d user=%d count=%d",
56492diff --git a/drivers/video/fbdev/udlfb.c b/drivers/video/fbdev/udlfb.c
56493index ff2b873..626a8d5 100644
56494--- a/drivers/video/fbdev/udlfb.c
56495+++ b/drivers/video/fbdev/udlfb.c
56496@@ -623,11 +623,11 @@ static int dlfb_handle_damage(struct dlfb_data *dev, int x, int y,
56497 dlfb_urb_completion(urb);
56498
56499 error:
56500- atomic_add(bytes_sent, &dev->bytes_sent);
56501- atomic_add(bytes_identical, &dev->bytes_identical);
56502- atomic_add(width*height*2, &dev->bytes_rendered);
56503+ atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
56504+ atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
56505+ atomic_add_unchecked(width*height*2, &dev->bytes_rendered);
56506 end_cycles = get_cycles();
56507- atomic_add(((unsigned int) ((end_cycles - start_cycles)
56508+ atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
56509 >> 10)), /* Kcycles */
56510 &dev->cpu_kcycles_used);
56511
56512@@ -748,11 +748,11 @@ static void dlfb_dpy_deferred_io(struct fb_info *info,
56513 dlfb_urb_completion(urb);
56514
56515 error:
56516- atomic_add(bytes_sent, &dev->bytes_sent);
56517- atomic_add(bytes_identical, &dev->bytes_identical);
56518- atomic_add(bytes_rendered, &dev->bytes_rendered);
56519+ atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
56520+ atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
56521+ atomic_add_unchecked(bytes_rendered, &dev->bytes_rendered);
56522 end_cycles = get_cycles();
56523- atomic_add(((unsigned int) ((end_cycles - start_cycles)
56524+ atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
56525 >> 10)), /* Kcycles */
56526 &dev->cpu_kcycles_used);
56527 }
56528@@ -991,7 +991,9 @@ static int dlfb_ops_release(struct fb_info *info, int user)
56529 fb_deferred_io_cleanup(info);
56530 kfree(info->fbdefio);
56531 info->fbdefio = NULL;
56532- info->fbops->fb_mmap = dlfb_ops_mmap;
56533+ pax_open_kernel();
56534+ *(void **)&info->fbops->fb_mmap = dlfb_ops_mmap;
56535+ pax_close_kernel();
56536 }
56537
56538 pr_warn("released /dev/fb%d user=%d count=%d\n",
56539@@ -1373,7 +1375,7 @@ static ssize_t metrics_bytes_rendered_show(struct device *fbdev,
56540 struct fb_info *fb_info = dev_get_drvdata(fbdev);
56541 struct dlfb_data *dev = fb_info->par;
56542 return snprintf(buf, PAGE_SIZE, "%u\n",
56543- atomic_read(&dev->bytes_rendered));
56544+ atomic_read_unchecked(&dev->bytes_rendered));
56545 }
56546
56547 static ssize_t metrics_bytes_identical_show(struct device *fbdev,
56548@@ -1381,7 +1383,7 @@ static ssize_t metrics_bytes_identical_show(struct device *fbdev,
56549 struct fb_info *fb_info = dev_get_drvdata(fbdev);
56550 struct dlfb_data *dev = fb_info->par;
56551 return snprintf(buf, PAGE_SIZE, "%u\n",
56552- atomic_read(&dev->bytes_identical));
56553+ atomic_read_unchecked(&dev->bytes_identical));
56554 }
56555
56556 static ssize_t metrics_bytes_sent_show(struct device *fbdev,
56557@@ -1389,7 +1391,7 @@ static ssize_t metrics_bytes_sent_show(struct device *fbdev,
56558 struct fb_info *fb_info = dev_get_drvdata(fbdev);
56559 struct dlfb_data *dev = fb_info->par;
56560 return snprintf(buf, PAGE_SIZE, "%u\n",
56561- atomic_read(&dev->bytes_sent));
56562+ atomic_read_unchecked(&dev->bytes_sent));
56563 }
56564
56565 static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
56566@@ -1397,7 +1399,7 @@ static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
56567 struct fb_info *fb_info = dev_get_drvdata(fbdev);
56568 struct dlfb_data *dev = fb_info->par;
56569 return snprintf(buf, PAGE_SIZE, "%u\n",
56570- atomic_read(&dev->cpu_kcycles_used));
56571+ atomic_read_unchecked(&dev->cpu_kcycles_used));
56572 }
56573
56574 static ssize_t edid_show(
56575@@ -1457,10 +1459,10 @@ static ssize_t metrics_reset_store(struct device *fbdev,
56576 struct fb_info *fb_info = dev_get_drvdata(fbdev);
56577 struct dlfb_data *dev = fb_info->par;
56578
56579- atomic_set(&dev->bytes_rendered, 0);
56580- atomic_set(&dev->bytes_identical, 0);
56581- atomic_set(&dev->bytes_sent, 0);
56582- atomic_set(&dev->cpu_kcycles_used, 0);
56583+ atomic_set_unchecked(&dev->bytes_rendered, 0);
56584+ atomic_set_unchecked(&dev->bytes_identical, 0);
56585+ atomic_set_unchecked(&dev->bytes_sent, 0);
56586+ atomic_set_unchecked(&dev->cpu_kcycles_used, 0);
56587
56588 return count;
56589 }
56590diff --git a/drivers/video/fbdev/uvesafb.c b/drivers/video/fbdev/uvesafb.c
56591index d32d1c4..46722e6 100644
56592--- a/drivers/video/fbdev/uvesafb.c
56593+++ b/drivers/video/fbdev/uvesafb.c
56594@@ -19,6 +19,7 @@
56595 #include <linux/io.h>
56596 #include <linux/mutex.h>
56597 #include <linux/slab.h>
56598+#include <linux/moduleloader.h>
56599 #include <video/edid.h>
56600 #include <video/uvesafb.h>
56601 #ifdef CONFIG_X86
56602@@ -565,10 +566,32 @@ static int uvesafb_vbe_getpmi(struct uvesafb_ktask *task,
56603 if ((task->t.regs.eax & 0xffff) != 0x4f || task->t.regs.es < 0xc000) {
56604 par->pmi_setpal = par->ypan = 0;
56605 } else {
56606+
56607+#ifdef CONFIG_PAX_KERNEXEC
56608+#ifdef CONFIG_MODULES
56609+ par->pmi_code = module_alloc_exec((u16)task->t.regs.ecx);
56610+#endif
56611+ if (!par->pmi_code) {
56612+ par->pmi_setpal = par->ypan = 0;
56613+ return 0;
56614+ }
56615+#endif
56616+
56617 par->pmi_base = (u16 *)phys_to_virt(((u32)task->t.regs.es << 4)
56618 + task->t.regs.edi);
56619+
56620+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
56621+ pax_open_kernel();
56622+ memcpy(par->pmi_code, par->pmi_base, (u16)task->t.regs.ecx);
56623+ pax_close_kernel();
56624+
56625+ par->pmi_start = ktva_ktla(par->pmi_code + par->pmi_base[1]);
56626+ par->pmi_pal = ktva_ktla(par->pmi_code + par->pmi_base[2]);
56627+#else
56628 par->pmi_start = (u8 *)par->pmi_base + par->pmi_base[1];
56629 par->pmi_pal = (u8 *)par->pmi_base + par->pmi_base[2];
56630+#endif
56631+
56632 printk(KERN_INFO "uvesafb: protected mode interface info at "
56633 "%04x:%04x\n",
56634 (u16)task->t.regs.es, (u16)task->t.regs.edi);
56635@@ -813,13 +836,14 @@ static int uvesafb_vbe_init(struct fb_info *info)
56636 par->ypan = ypan;
56637
56638 if (par->pmi_setpal || par->ypan) {
56639+#if !defined(CONFIG_MODULES) || !defined(CONFIG_PAX_KERNEXEC)
56640 if (__supported_pte_mask & _PAGE_NX) {
56641 par->pmi_setpal = par->ypan = 0;
56642 printk(KERN_WARNING "uvesafb: NX protection is active, "
56643 "better not use the PMI.\n");
56644- } else {
56645+ } else
56646+#endif
56647 uvesafb_vbe_getpmi(task, par);
56648- }
56649 }
56650 #else
56651 /* The protected mode interface is not available on non-x86. */
56652@@ -1452,8 +1476,11 @@ static void uvesafb_init_info(struct fb_info *info, struct vbe_mode_ib *mode)
56653 info->fix.ywrapstep = (par->ypan > 1) ? 1 : 0;
56654
56655 /* Disable blanking if the user requested so. */
56656- if (!blank)
56657- info->fbops->fb_blank = NULL;
56658+ if (!blank) {
56659+ pax_open_kernel();
56660+ *(void **)&info->fbops->fb_blank = NULL;
56661+ pax_close_kernel();
56662+ }
56663
56664 /*
56665 * Find out how much IO memory is required for the mode with
56666@@ -1524,8 +1551,11 @@ static void uvesafb_init_info(struct fb_info *info, struct vbe_mode_ib *mode)
56667 info->flags = FBINFO_FLAG_DEFAULT |
56668 (par->ypan ? FBINFO_HWACCEL_YPAN : 0);
56669
56670- if (!par->ypan)
56671- info->fbops->fb_pan_display = NULL;
56672+ if (!par->ypan) {
56673+ pax_open_kernel();
56674+ *(void **)&info->fbops->fb_pan_display = NULL;
56675+ pax_close_kernel();
56676+ }
56677 }
56678
56679 static void uvesafb_init_mtrr(struct fb_info *info)
56680@@ -1786,6 +1816,11 @@ out_mode:
56681 out:
56682 kfree(par->vbe_modes);
56683
56684+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
56685+ if (par->pmi_code)
56686+ module_memfree_exec(par->pmi_code);
56687+#endif
56688+
56689 framebuffer_release(info);
56690 return err;
56691 }
56692@@ -1810,6 +1845,11 @@ static int uvesafb_remove(struct platform_device *dev)
56693 kfree(par->vbe_state_orig);
56694 kfree(par->vbe_state_saved);
56695
56696+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
56697+ if (par->pmi_code)
56698+ module_memfree_exec(par->pmi_code);
56699+#endif
56700+
56701 framebuffer_release(info);
56702 }
56703 return 0;
56704diff --git a/drivers/video/fbdev/vesafb.c b/drivers/video/fbdev/vesafb.c
56705index d79a0ac..2d0c3d4 100644
56706--- a/drivers/video/fbdev/vesafb.c
56707+++ b/drivers/video/fbdev/vesafb.c
56708@@ -9,6 +9,7 @@
56709 */
56710
56711 #include <linux/module.h>
56712+#include <linux/moduleloader.h>
56713 #include <linux/kernel.h>
56714 #include <linux/errno.h>
56715 #include <linux/string.h>
56716@@ -52,8 +53,8 @@ static int vram_remap; /* Set amount of memory to be used */
56717 static int vram_total; /* Set total amount of memory */
56718 static int pmi_setpal __read_mostly = 1; /* pmi for palette changes ??? */
56719 static int ypan __read_mostly; /* 0..nothing, 1..ypan, 2..ywrap */
56720-static void (*pmi_start)(void) __read_mostly;
56721-static void (*pmi_pal) (void) __read_mostly;
56722+static void (*pmi_start)(void) __read_only;
56723+static void (*pmi_pal) (void) __read_only;
56724 static int depth __read_mostly;
56725 static int vga_compat __read_mostly;
56726 /* --------------------------------------------------------------------- */
56727@@ -233,6 +234,7 @@ static int vesafb_probe(struct platform_device *dev)
56728 unsigned int size_remap;
56729 unsigned int size_total;
56730 char *option = NULL;
56731+ void *pmi_code = NULL;
56732
56733 /* ignore error return of fb_get_options */
56734 fb_get_options("vesafb", &option);
56735@@ -279,10 +281,6 @@ static int vesafb_probe(struct platform_device *dev)
56736 size_remap = size_total;
56737 vesafb_fix.smem_len = size_remap;
56738
56739-#ifndef __i386__
56740- screen_info.vesapm_seg = 0;
56741-#endif
56742-
56743 if (!request_mem_region(vesafb_fix.smem_start, size_total, "vesafb")) {
56744 printk(KERN_WARNING
56745 "vesafb: cannot reserve video memory at 0x%lx\n",
56746@@ -312,9 +310,21 @@ static int vesafb_probe(struct platform_device *dev)
56747 printk(KERN_INFO "vesafb: mode is %dx%dx%d, linelength=%d, pages=%d\n",
56748 vesafb_defined.xres, vesafb_defined.yres, vesafb_defined.bits_per_pixel, vesafb_fix.line_length, screen_info.pages);
56749
56750+#ifdef __i386__
56751+
56752+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
56753+ pmi_code = module_alloc_exec(screen_info.vesapm_size);
56754+ if (!pmi_code)
56755+#elif !defined(CONFIG_PAX_KERNEXEC)
56756+ if (0)
56757+#endif
56758+
56759+#endif
56760+ screen_info.vesapm_seg = 0;
56761+
56762 if (screen_info.vesapm_seg) {
56763- printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x\n",
56764- screen_info.vesapm_seg,screen_info.vesapm_off);
56765+ printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x %04x bytes\n",
56766+ screen_info.vesapm_seg,screen_info.vesapm_off,screen_info.vesapm_size);
56767 }
56768
56769 if (screen_info.vesapm_seg < 0xc000)
56770@@ -322,9 +332,25 @@ static int vesafb_probe(struct platform_device *dev)
56771
56772 if (ypan || pmi_setpal) {
56773 unsigned short *pmi_base;
56774+
56775 pmi_base = (unsigned short*)phys_to_virt(((unsigned long)screen_info.vesapm_seg << 4) + screen_info.vesapm_off);
56776- pmi_start = (void*)((char*)pmi_base + pmi_base[1]);
56777- pmi_pal = (void*)((char*)pmi_base + pmi_base[2]);
56778+
56779+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
56780+ pax_open_kernel();
56781+ memcpy(pmi_code, pmi_base, screen_info.vesapm_size);
56782+#else
56783+ pmi_code = pmi_base;
56784+#endif
56785+
56786+ pmi_start = (void*)((char*)pmi_code + pmi_base[1]);
56787+ pmi_pal = (void*)((char*)pmi_code + pmi_base[2]);
56788+
56789+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
56790+ pmi_start = ktva_ktla(pmi_start);
56791+ pmi_pal = ktva_ktla(pmi_pal);
56792+ pax_close_kernel();
56793+#endif
56794+
56795 printk(KERN_INFO "vesafb: pmi: set display start = %p, set palette = %p\n",pmi_start,pmi_pal);
56796 if (pmi_base[3]) {
56797 printk(KERN_INFO "vesafb: pmi: ports = ");
56798@@ -477,8 +503,11 @@ static int vesafb_probe(struct platform_device *dev)
56799 info->flags = FBINFO_FLAG_DEFAULT | FBINFO_MISC_FIRMWARE |
56800 (ypan ? FBINFO_HWACCEL_YPAN : 0);
56801
56802- if (!ypan)
56803- info->fbops->fb_pan_display = NULL;
56804+ if (!ypan) {
56805+ pax_open_kernel();
56806+ *(void **)&info->fbops->fb_pan_display = NULL;
56807+ pax_close_kernel();
56808+ }
56809
56810 if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) {
56811 err = -ENOMEM;
56812@@ -492,6 +521,11 @@ static int vesafb_probe(struct platform_device *dev)
56813 fb_info(info, "%s frame buffer device\n", info->fix.id);
56814 return 0;
56815 err:
56816+
56817+#if defined(__i386__) && defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
56818+ module_memfree_exec(pmi_code);
56819+#endif
56820+
56821 if (info->screen_base)
56822 iounmap(info->screen_base);
56823 framebuffer_release(info);
56824diff --git a/drivers/video/fbdev/via/via_clock.h b/drivers/video/fbdev/via/via_clock.h
56825index 88714ae..16c2e11 100644
56826--- a/drivers/video/fbdev/via/via_clock.h
56827+++ b/drivers/video/fbdev/via/via_clock.h
56828@@ -56,7 +56,7 @@ struct via_clock {
56829
56830 void (*set_engine_pll_state)(u8 state);
56831 void (*set_engine_pll)(struct via_pll_config config);
56832-};
56833+} __no_const;
56834
56835
56836 static inline u32 get_pll_internal_frequency(u32 ref_freq,
56837diff --git a/drivers/video/logo/logo_linux_clut224.ppm b/drivers/video/logo/logo_linux_clut224.ppm
56838index 3c14e43..2630570 100644
56839--- a/drivers/video/logo/logo_linux_clut224.ppm
56840+++ b/drivers/video/logo/logo_linux_clut224.ppm
56841@@ -2,1603 +2,1123 @@ P3
56842 # Standard 224-color Linux logo
56843 80 80
56844 255
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 0 0 0 0 0 0 0 0 0 0
56848- 0 0 0 0 0 0 0 0 0 0 0 0
56849- 0 0 0 0 0 0 0 0 0 0 0 0
56850- 0 0 0 0 0 0 0 0 0 0 0 0
56851- 0 0 0 0 0 0 0 0 0 0 0 0
56852- 0 0 0 0 0 0 0 0 0 0 0 0
56853- 0 0 0 0 0 0 0 0 0 0 0 0
56854- 6 6 6 6 6 6 10 10 10 10 10 10
56855- 10 10 10 6 6 6 6 6 6 6 6 6
56856- 0 0 0 0 0 0 0 0 0 0 0 0
56857- 0 0 0 0 0 0 0 0 0 0 0 0
56858- 0 0 0 0 0 0 0 0 0 0 0 0
56859- 0 0 0 0 0 0 0 0 0 0 0 0
56860- 0 0 0 0 0 0 0 0 0 0 0 0
56861- 0 0 0 0 0 0 0 0 0 0 0 0
56862- 0 0 0 0 0 0 0 0 0 0 0 0
56863- 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 0 0 0 0 0 0 0 0 0 0
56868- 0 0 0 0 0 0 0 0 0 0 0 0
56869- 0 0 0 0 0 0 0 0 0 0 0 0
56870- 0 0 0 0 0 0 0 0 0 0 0 0
56871- 0 0 0 0 0 0 0 0 0 0 0 0
56872- 0 0 0 0 0 0 0 0 0 0 0 0
56873- 0 0 0 6 6 6 10 10 10 14 14 14
56874- 22 22 22 26 26 26 30 30 30 34 34 34
56875- 30 30 30 30 30 30 26 26 26 18 18 18
56876- 14 14 14 10 10 10 6 6 6 0 0 0
56877- 0 0 0 0 0 0 0 0 0 0 0 0
56878- 0 0 0 0 0 0 0 0 0 0 0 0
56879- 0 0 0 0 0 0 0 0 0 0 0 0
56880- 0 0 0 0 0 0 0 0 0 0 0 0
56881- 0 0 0 0 0 0 0 0 0 0 0 0
56882- 0 0 0 0 0 0 0 0 0 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 1 0 0 1 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 0 0 0
56893- 6 6 6 14 14 14 26 26 26 42 42 42
56894- 54 54 54 66 66 66 78 78 78 78 78 78
56895- 78 78 78 74 74 74 66 66 66 54 54 54
56896- 42 42 42 26 26 26 18 18 18 10 10 10
56897- 6 6 6 0 0 0 0 0 0 0 0 0
56898- 0 0 0 0 0 0 0 0 0 0 0 0
56899- 0 0 0 0 0 0 0 0 0 0 0 0
56900- 0 0 0 0 0 0 0 0 0 0 0 0
56901- 0 0 0 0 0 0 0 0 0 0 0 0
56902- 0 0 0 0 0 0 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 1 0 0 0 0 0 0 0 0 0
56907- 0 0 0 0 0 0 0 0 0 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 10 10 10
56913- 22 22 22 42 42 42 66 66 66 86 86 86
56914- 66 66 66 38 38 38 38 38 38 22 22 22
56915- 26 26 26 34 34 34 54 54 54 66 66 66
56916- 86 86 86 70 70 70 46 46 46 26 26 26
56917- 14 14 14 6 6 6 0 0 0 0 0 0
56918- 0 0 0 0 0 0 0 0 0 0 0 0
56919- 0 0 0 0 0 0 0 0 0 0 0 0
56920- 0 0 0 0 0 0 0 0 0 0 0 0
56921- 0 0 0 0 0 0 0 0 0 0 0 0
56922- 0 0 0 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 1 0 0 1 0 0 1 0 0 0
56927- 0 0 0 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 10 10 10 26 26 26
56933- 50 50 50 82 82 82 58 58 58 6 6 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- 6 6 6 54 54 54 86 86 86 66 66 66
56937- 38 38 38 18 18 18 6 6 6 0 0 0
56938- 0 0 0 0 0 0 0 0 0 0 0 0
56939- 0 0 0 0 0 0 0 0 0 0 0 0
56940- 0 0 0 0 0 0 0 0 0 0 0 0
56941- 0 0 0 0 0 0 0 0 0 0 0 0
56942- 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 0 0 0 0 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 6 6 6 22 22 22 50 50 50
56953- 78 78 78 34 34 34 2 2 6 2 2 6
56954- 2 2 6 2 2 6 2 2 6 2 2 6
56955- 2 2 6 2 2 6 2 2 6 2 2 6
56956- 2 2 6 2 2 6 6 6 6 70 70 70
56957- 78 78 78 46 46 46 22 22 22 6 6 6
56958- 0 0 0 0 0 0 0 0 0 0 0 0
56959- 0 0 0 0 0 0 0 0 0 0 0 0
56960- 0 0 0 0 0 0 0 0 0 0 0 0
56961- 0 0 0 0 0 0 0 0 0 0 0 0
56962- 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 1 0 0 1 0 0 1 0 0 0
56967- 0 0 0 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- 6 6 6 18 18 18 42 42 42 82 82 82
56973- 26 26 26 2 2 6 2 2 6 2 2 6
56974- 2 2 6 2 2 6 2 2 6 2 2 6
56975- 2 2 6 2 2 6 2 2 6 14 14 14
56976- 46 46 46 34 34 34 6 6 6 2 2 6
56977- 42 42 42 78 78 78 42 42 42 18 18 18
56978- 6 6 6 0 0 0 0 0 0 0 0 0
56979- 0 0 0 0 0 0 0 0 0 0 0 0
56980- 0 0 0 0 0 0 0 0 0 0 0 0
56981- 0 0 0 0 0 0 0 0 0 0 0 0
56982- 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 1 0 0 0 0 0 1 0 0 0
56987- 0 0 0 0 0 0 0 0 0 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- 10 10 10 30 30 30 66 66 66 58 58 58
56993- 2 2 6 2 2 6 2 2 6 2 2 6
56994- 2 2 6 2 2 6 2 2 6 2 2 6
56995- 2 2 6 2 2 6 2 2 6 26 26 26
56996- 86 86 86 101 101 101 46 46 46 10 10 10
56997- 2 2 6 58 58 58 70 70 70 34 34 34
56998- 10 10 10 0 0 0 0 0 0 0 0 0
56999- 0 0 0 0 0 0 0 0 0 0 0 0
57000- 0 0 0 0 0 0 0 0 0 0 0 0
57001- 0 0 0 0 0 0 0 0 0 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 1 0 0 1 0 0 1 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- 14 14 14 42 42 42 86 86 86 10 10 10
57013- 2 2 6 2 2 6 2 2 6 2 2 6
57014- 2 2 6 2 2 6 2 2 6 2 2 6
57015- 2 2 6 2 2 6 2 2 6 30 30 30
57016- 94 94 94 94 94 94 58 58 58 26 26 26
57017- 2 2 6 6 6 6 78 78 78 54 54 54
57018- 22 22 22 6 6 6 0 0 0 0 0 0
57019- 0 0 0 0 0 0 0 0 0 0 0 0
57020- 0 0 0 0 0 0 0 0 0 0 0 0
57021- 0 0 0 0 0 0 0 0 0 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 0 0 0 0
57027- 0 0 0 0 0 0 0 0 0 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 6 6 6
57032- 22 22 22 62 62 62 62 62 62 2 2 6
57033- 2 2 6 2 2 6 2 2 6 2 2 6
57034- 2 2 6 2 2 6 2 2 6 2 2 6
57035- 2 2 6 2 2 6 2 2 6 26 26 26
57036- 54 54 54 38 38 38 18 18 18 10 10 10
57037- 2 2 6 2 2 6 34 34 34 82 82 82
57038- 38 38 38 14 14 14 0 0 0 0 0 0
57039- 0 0 0 0 0 0 0 0 0 0 0 0
57040- 0 0 0 0 0 0 0 0 0 0 0 0
57041- 0 0 0 0 0 0 0 0 0 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 1 0 0 1 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 6 6 6
57052- 30 30 30 78 78 78 30 30 30 2 2 6
57053- 2 2 6 2 2 6 2 2 6 2 2 6
57054- 2 2 6 2 2 6 2 2 6 2 2 6
57055- 2 2 6 2 2 6 2 2 6 10 10 10
57056- 10 10 10 2 2 6 2 2 6 2 2 6
57057- 2 2 6 2 2 6 2 2 6 78 78 78
57058- 50 50 50 18 18 18 6 6 6 0 0 0
57059- 0 0 0 0 0 0 0 0 0 0 0 0
57060- 0 0 0 0 0 0 0 0 0 0 0 0
57061- 0 0 0 0 0 0 0 0 0 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 1 0 0 0 0 0 0 0 0 0
57067- 0 0 0 0 0 0 0 0 0 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 10 10 10
57072- 38 38 38 86 86 86 14 14 14 2 2 6
57073- 2 2 6 2 2 6 2 2 6 2 2 6
57074- 2 2 6 2 2 6 2 2 6 2 2 6
57075- 2 2 6 2 2 6 2 2 6 2 2 6
57076- 2 2 6 2 2 6 2 2 6 2 2 6
57077- 2 2 6 2 2 6 2 2 6 54 54 54
57078- 66 66 66 26 26 26 6 6 6 0 0 0
57079- 0 0 0 0 0 0 0 0 0 0 0 0
57080- 0 0 0 0 0 0 0 0 0 0 0 0
57081- 0 0 0 0 0 0 0 0 0 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 1 0 0 1 0 0 0
57087- 0 0 0 0 0 0 0 0 0 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 14 14 14
57092- 42 42 42 82 82 82 2 2 6 2 2 6
57093- 2 2 6 6 6 6 10 10 10 2 2 6
57094- 2 2 6 2 2 6 2 2 6 2 2 6
57095- 2 2 6 2 2 6 2 2 6 6 6 6
57096- 14 14 14 10 10 10 2 2 6 2 2 6
57097- 2 2 6 2 2 6 2 2 6 18 18 18
57098- 82 82 82 34 34 34 10 10 10 0 0 0
57099- 0 0 0 0 0 0 0 0 0 0 0 0
57100- 0 0 0 0 0 0 0 0 0 0 0 0
57101- 0 0 0 0 0 0 0 0 0 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 1 0 0 0 0 0 0 0 0 0
57107- 0 0 0 0 0 0 0 0 0 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 14 14 14
57112- 46 46 46 86 86 86 2 2 6 2 2 6
57113- 6 6 6 6 6 6 22 22 22 34 34 34
57114- 6 6 6 2 2 6 2 2 6 2 2 6
57115- 2 2 6 2 2 6 18 18 18 34 34 34
57116- 10 10 10 50 50 50 22 22 22 2 2 6
57117- 2 2 6 2 2 6 2 2 6 10 10 10
57118- 86 86 86 42 42 42 14 14 14 0 0 0
57119- 0 0 0 0 0 0 0 0 0 0 0 0
57120- 0 0 0 0 0 0 0 0 0 0 0 0
57121- 0 0 0 0 0 0 0 0 0 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 1 0 0 1 0 0 1 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 14 14 14
57132- 46 46 46 86 86 86 2 2 6 2 2 6
57133- 38 38 38 116 116 116 94 94 94 22 22 22
57134- 22 22 22 2 2 6 2 2 6 2 2 6
57135- 14 14 14 86 86 86 138 138 138 162 162 162
57136-154 154 154 38 38 38 26 26 26 6 6 6
57137- 2 2 6 2 2 6 2 2 6 2 2 6
57138- 86 86 86 46 46 46 14 14 14 0 0 0
57139- 0 0 0 0 0 0 0 0 0 0 0 0
57140- 0 0 0 0 0 0 0 0 0 0 0 0
57141- 0 0 0 0 0 0 0 0 0 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 14 14 14
57152- 46 46 46 86 86 86 2 2 6 14 14 14
57153-134 134 134 198 198 198 195 195 195 116 116 116
57154- 10 10 10 2 2 6 2 2 6 6 6 6
57155-101 98 89 187 187 187 210 210 210 218 218 218
57156-214 214 214 134 134 134 14 14 14 6 6 6
57157- 2 2 6 2 2 6 2 2 6 2 2 6
57158- 86 86 86 50 50 50 18 18 18 6 6 6
57159- 0 0 0 0 0 0 0 0 0 0 0 0
57160- 0 0 0 0 0 0 0 0 0 0 0 0
57161- 0 0 0 0 0 0 0 0 0 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 1 0 0 0
57166- 0 0 1 0 0 1 0 0 1 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 14 14 14
57172- 46 46 46 86 86 86 2 2 6 54 54 54
57173-218 218 218 195 195 195 226 226 226 246 246 246
57174- 58 58 58 2 2 6 2 2 6 30 30 30
57175-210 210 210 253 253 253 174 174 174 123 123 123
57176-221 221 221 234 234 234 74 74 74 2 2 6
57177- 2 2 6 2 2 6 2 2 6 2 2 6
57178- 70 70 70 58 58 58 22 22 22 6 6 6
57179- 0 0 0 0 0 0 0 0 0 0 0 0
57180- 0 0 0 0 0 0 0 0 0 0 0 0
57181- 0 0 0 0 0 0 0 0 0 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 14 14 14
57192- 46 46 46 82 82 82 2 2 6 106 106 106
57193-170 170 170 26 26 26 86 86 86 226 226 226
57194-123 123 123 10 10 10 14 14 14 46 46 46
57195-231 231 231 190 190 190 6 6 6 70 70 70
57196- 90 90 90 238 238 238 158 158 158 2 2 6
57197- 2 2 6 2 2 6 2 2 6 2 2 6
57198- 70 70 70 58 58 58 22 22 22 6 6 6
57199- 0 0 0 0 0 0 0 0 0 0 0 0
57200- 0 0 0 0 0 0 0 0 0 0 0 0
57201- 0 0 0 0 0 0 0 0 0 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 1 0 0 0
57206- 0 0 1 0 0 1 0 0 1 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 14 14 14
57212- 42 42 42 86 86 86 6 6 6 116 116 116
57213-106 106 106 6 6 6 70 70 70 149 149 149
57214-128 128 128 18 18 18 38 38 38 54 54 54
57215-221 221 221 106 106 106 2 2 6 14 14 14
57216- 46 46 46 190 190 190 198 198 198 2 2 6
57217- 2 2 6 2 2 6 2 2 6 2 2 6
57218- 74 74 74 62 62 62 22 22 22 6 6 6
57219- 0 0 0 0 0 0 0 0 0 0 0 0
57220- 0 0 0 0 0 0 0 0 0 0 0 0
57221- 0 0 0 0 0 0 0 0 0 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 1 0 0 0
57226- 0 0 1 0 0 0 0 0 1 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 14 14 14
57232- 42 42 42 94 94 94 14 14 14 101 101 101
57233-128 128 128 2 2 6 18 18 18 116 116 116
57234-118 98 46 121 92 8 121 92 8 98 78 10
57235-162 162 162 106 106 106 2 2 6 2 2 6
57236- 2 2 6 195 195 195 195 195 195 6 6 6
57237- 2 2 6 2 2 6 2 2 6 2 2 6
57238- 74 74 74 62 62 62 22 22 22 6 6 6
57239- 0 0 0 0 0 0 0 0 0 0 0 0
57240- 0 0 0 0 0 0 0 0 0 0 0 0
57241- 0 0 0 0 0 0 0 0 0 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 1 0 0 1
57246- 0 0 1 0 0 0 0 0 1 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 10 10 10
57252- 38 38 38 90 90 90 14 14 14 58 58 58
57253-210 210 210 26 26 26 54 38 6 154 114 10
57254-226 170 11 236 186 11 225 175 15 184 144 12
57255-215 174 15 175 146 61 37 26 9 2 2 6
57256- 70 70 70 246 246 246 138 138 138 2 2 6
57257- 2 2 6 2 2 6 2 2 6 2 2 6
57258- 70 70 70 66 66 66 26 26 26 6 6 6
57259- 0 0 0 0 0 0 0 0 0 0 0 0
57260- 0 0 0 0 0 0 0 0 0 0 0 0
57261- 0 0 0 0 0 0 0 0 0 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 10 10 10
57272- 38 38 38 86 86 86 14 14 14 10 10 10
57273-195 195 195 188 164 115 192 133 9 225 175 15
57274-239 182 13 234 190 10 232 195 16 232 200 30
57275-245 207 45 241 208 19 232 195 16 184 144 12
57276-218 194 134 211 206 186 42 42 42 2 2 6
57277- 2 2 6 2 2 6 2 2 6 2 2 6
57278- 50 50 50 74 74 74 30 30 30 6 6 6
57279- 0 0 0 0 0 0 0 0 0 0 0 0
57280- 0 0 0 0 0 0 0 0 0 0 0 0
57281- 0 0 0 0 0 0 0 0 0 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 10 10 10
57292- 34 34 34 86 86 86 14 14 14 2 2 6
57293-121 87 25 192 133 9 219 162 10 239 182 13
57294-236 186 11 232 195 16 241 208 19 244 214 54
57295-246 218 60 246 218 38 246 215 20 241 208 19
57296-241 208 19 226 184 13 121 87 25 2 2 6
57297- 2 2 6 2 2 6 2 2 6 2 2 6
57298- 50 50 50 82 82 82 34 34 34 10 10 10
57299- 0 0 0 0 0 0 0 0 0 0 0 0
57300- 0 0 0 0 0 0 0 0 0 0 0 0
57301- 0 0 0 0 0 0 0 0 0 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 10 10 10
57312- 34 34 34 82 82 82 30 30 30 61 42 6
57313-180 123 7 206 145 10 230 174 11 239 182 13
57314-234 190 10 238 202 15 241 208 19 246 218 74
57315-246 218 38 246 215 20 246 215 20 246 215 20
57316-226 184 13 215 174 15 184 144 12 6 6 6
57317- 2 2 6 2 2 6 2 2 6 2 2 6
57318- 26 26 26 94 94 94 42 42 42 14 14 14
57319- 0 0 0 0 0 0 0 0 0 0 0 0
57320- 0 0 0 0 0 0 0 0 0 0 0 0
57321- 0 0 0 0 0 0 0 0 0 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 10 10 10
57332- 30 30 30 78 78 78 50 50 50 104 69 6
57333-192 133 9 216 158 10 236 178 12 236 186 11
57334-232 195 16 241 208 19 244 214 54 245 215 43
57335-246 215 20 246 215 20 241 208 19 198 155 10
57336-200 144 11 216 158 10 156 118 10 2 2 6
57337- 2 2 6 2 2 6 2 2 6 2 2 6
57338- 6 6 6 90 90 90 54 54 54 18 18 18
57339- 6 6 6 0 0 0 0 0 0 0 0 0
57340- 0 0 0 0 0 0 0 0 0 0 0 0
57341- 0 0 0 0 0 0 0 0 0 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 10 10 10
57352- 30 30 30 78 78 78 46 46 46 22 22 22
57353-137 92 6 210 162 10 239 182 13 238 190 10
57354-238 202 15 241 208 19 246 215 20 246 215 20
57355-241 208 19 203 166 17 185 133 11 210 150 10
57356-216 158 10 210 150 10 102 78 10 2 2 6
57357- 6 6 6 54 54 54 14 14 14 2 2 6
57358- 2 2 6 62 62 62 74 74 74 30 30 30
57359- 10 10 10 0 0 0 0 0 0 0 0 0
57360- 0 0 0 0 0 0 0 0 0 0 0 0
57361- 0 0 0 0 0 0 0 0 0 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 10 10 10
57372- 34 34 34 78 78 78 50 50 50 6 6 6
57373- 94 70 30 139 102 15 190 146 13 226 184 13
57374-232 200 30 232 195 16 215 174 15 190 146 13
57375-168 122 10 192 133 9 210 150 10 213 154 11
57376-202 150 34 182 157 106 101 98 89 2 2 6
57377- 2 2 6 78 78 78 116 116 116 58 58 58
57378- 2 2 6 22 22 22 90 90 90 46 46 46
57379- 18 18 18 6 6 6 0 0 0 0 0 0
57380- 0 0 0 0 0 0 0 0 0 0 0 0
57381- 0 0 0 0 0 0 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 0 0 0 10 10 10
57392- 38 38 38 86 86 86 50 50 50 6 6 6
57393-128 128 128 174 154 114 156 107 11 168 122 10
57394-198 155 10 184 144 12 197 138 11 200 144 11
57395-206 145 10 206 145 10 197 138 11 188 164 115
57396-195 195 195 198 198 198 174 174 174 14 14 14
57397- 2 2 6 22 22 22 116 116 116 116 116 116
57398- 22 22 22 2 2 6 74 74 74 70 70 70
57399- 30 30 30 10 10 10 0 0 0 0 0 0
57400- 0 0 0 0 0 0 0 0 0 0 0 0
57401- 0 0 0 0 0 0 0 0 0 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 0 0 0 6 6 6 18 18 18
57412- 50 50 50 101 101 101 26 26 26 10 10 10
57413-138 138 138 190 190 190 174 154 114 156 107 11
57414-197 138 11 200 144 11 197 138 11 192 133 9
57415-180 123 7 190 142 34 190 178 144 187 187 187
57416-202 202 202 221 221 221 214 214 214 66 66 66
57417- 2 2 6 2 2 6 50 50 50 62 62 62
57418- 6 6 6 2 2 6 10 10 10 90 90 90
57419- 50 50 50 18 18 18 6 6 6 0 0 0
57420- 0 0 0 0 0 0 0 0 0 0 0 0
57421- 0 0 0 0 0 0 0 0 0 0 0 0
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- 0 0 0 0 0 0 10 10 10 34 34 34
57432- 74 74 74 74 74 74 2 2 6 6 6 6
57433-144 144 144 198 198 198 190 190 190 178 166 146
57434-154 121 60 156 107 11 156 107 11 168 124 44
57435-174 154 114 187 187 187 190 190 190 210 210 210
57436-246 246 246 253 253 253 253 253 253 182 182 182
57437- 6 6 6 2 2 6 2 2 6 2 2 6
57438- 2 2 6 2 2 6 2 2 6 62 62 62
57439- 74 74 74 34 34 34 14 14 14 0 0 0
57440- 0 0 0 0 0 0 0 0 0 0 0 0
57441- 0 0 0 0 0 0 0 0 0 0 0 0
57442- 0 0 0 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- 0 0 0 10 10 10 22 22 22 54 54 54
57452- 94 94 94 18 18 18 2 2 6 46 46 46
57453-234 234 234 221 221 221 190 190 190 190 190 190
57454-190 190 190 187 187 187 187 187 187 190 190 190
57455-190 190 190 195 195 195 214 214 214 242 242 242
57456-253 253 253 253 253 253 253 253 253 253 253 253
57457- 82 82 82 2 2 6 2 2 6 2 2 6
57458- 2 2 6 2 2 6 2 2 6 14 14 14
57459- 86 86 86 54 54 54 22 22 22 6 6 6
57460- 0 0 0 0 0 0 0 0 0 0 0 0
57461- 0 0 0 0 0 0 0 0 0 0 0 0
57462- 0 0 0 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- 6 6 6 18 18 18 46 46 46 90 90 90
57472- 46 46 46 18 18 18 6 6 6 182 182 182
57473-253 253 253 246 246 246 206 206 206 190 190 190
57474-190 190 190 190 190 190 190 190 190 190 190 190
57475-206 206 206 231 231 231 250 250 250 253 253 253
57476-253 253 253 253 253 253 253 253 253 253 253 253
57477-202 202 202 14 14 14 2 2 6 2 2 6
57478- 2 2 6 2 2 6 2 2 6 2 2 6
57479- 42 42 42 86 86 86 42 42 42 18 18 18
57480- 6 6 6 0 0 0 0 0 0 0 0 0
57481- 0 0 0 0 0 0 0 0 0 0 0 0
57482- 0 0 0 0 0 0 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- 14 14 14 38 38 38 74 74 74 66 66 66
57492- 2 2 6 6 6 6 90 90 90 250 250 250
57493-253 253 253 253 253 253 238 238 238 198 198 198
57494-190 190 190 190 190 190 195 195 195 221 221 221
57495-246 246 246 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 82 82 82 2 2 6 2 2 6
57498- 2 2 6 2 2 6 2 2 6 2 2 6
57499- 2 2 6 78 78 78 70 70 70 34 34 34
57500- 14 14 14 6 6 6 0 0 0 0 0 0
57501- 0 0 0 0 0 0 0 0 0 0 0 0
57502- 0 0 0 0 0 0 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 14 14 14
57511- 34 34 34 66 66 66 78 78 78 6 6 6
57512- 2 2 6 18 18 18 218 218 218 253 253 253
57513-253 253 253 253 253 253 253 253 253 246 246 246
57514-226 226 226 231 231 231 246 246 246 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 178 178 178 2 2 6 2 2 6
57518- 2 2 6 2 2 6 2 2 6 2 2 6
57519- 2 2 6 18 18 18 90 90 90 62 62 62
57520- 30 30 30 10 10 10 0 0 0 0 0 0
57521- 0 0 0 0 0 0 0 0 0 0 0 0
57522- 0 0 0 0 0 0 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 10 10 10 26 26 26
57531- 58 58 58 90 90 90 18 18 18 2 2 6
57532- 2 2 6 110 110 110 253 253 253 253 253 253
57533-253 253 253 253 253 253 253 253 253 253 253 253
57534-250 250 250 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 231 231 231 18 18 18 2 2 6
57538- 2 2 6 2 2 6 2 2 6 2 2 6
57539- 2 2 6 2 2 6 18 18 18 94 94 94
57540- 54 54 54 26 26 26 10 10 10 0 0 0
57541- 0 0 0 0 0 0 0 0 0 0 0 0
57542- 0 0 0 0 0 0 0 0 0 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 6 6 6 22 22 22 50 50 50
57551- 90 90 90 26 26 26 2 2 6 2 2 6
57552- 14 14 14 195 195 195 250 250 250 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-250 250 250 242 242 242 54 54 54 2 2 6
57558- 2 2 6 2 2 6 2 2 6 2 2 6
57559- 2 2 6 2 2 6 2 2 6 38 38 38
57560- 86 86 86 50 50 50 22 22 22 6 6 6
57561- 0 0 0 0 0 0 0 0 0 0 0 0
57562- 0 0 0 0 0 0 0 0 0 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- 6 6 6 14 14 14 38 38 38 82 82 82
57571- 34 34 34 2 2 6 2 2 6 2 2 6
57572- 42 42 42 195 195 195 246 246 246 253 253 253
57573-253 253 253 253 253 253 253 253 253 250 250 250
57574-242 242 242 242 242 242 250 250 250 253 253 253
57575-253 253 253 253 253 253 253 253 253 253 253 253
57576-253 253 253 250 250 250 246 246 246 238 238 238
57577-226 226 226 231 231 231 101 101 101 6 6 6
57578- 2 2 6 2 2 6 2 2 6 2 2 6
57579- 2 2 6 2 2 6 2 2 6 2 2 6
57580- 38 38 38 82 82 82 42 42 42 14 14 14
57581- 6 6 6 0 0 0 0 0 0 0 0 0
57582- 0 0 0 0 0 0 0 0 0 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- 10 10 10 26 26 26 62 62 62 66 66 66
57591- 2 2 6 2 2 6 2 2 6 6 6 6
57592- 70 70 70 170 170 170 206 206 206 234 234 234
57593-246 246 246 250 250 250 250 250 250 238 238 238
57594-226 226 226 231 231 231 238 238 238 250 250 250
57595-250 250 250 250 250 250 246 246 246 231 231 231
57596-214 214 214 206 206 206 202 202 202 202 202 202
57597-198 198 198 202 202 202 182 182 182 18 18 18
57598- 2 2 6 2 2 6 2 2 6 2 2 6
57599- 2 2 6 2 2 6 2 2 6 2 2 6
57600- 2 2 6 62 62 62 66 66 66 30 30 30
57601- 10 10 10 0 0 0 0 0 0 0 0 0
57602- 0 0 0 0 0 0 0 0 0 0 0 0
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- 14 14 14 42 42 42 82 82 82 18 18 18
57611- 2 2 6 2 2 6 2 2 6 10 10 10
57612- 94 94 94 182 182 182 218 218 218 242 242 242
57613-250 250 250 253 253 253 253 253 253 250 250 250
57614-234 234 234 253 253 253 253 253 253 253 253 253
57615-253 253 253 253 253 253 253 253 253 246 246 246
57616-238 238 238 226 226 226 210 210 210 202 202 202
57617-195 195 195 195 195 195 210 210 210 158 158 158
57618- 6 6 6 14 14 14 50 50 50 14 14 14
57619- 2 2 6 2 2 6 2 2 6 2 2 6
57620- 2 2 6 6 6 6 86 86 86 46 46 46
57621- 18 18 18 6 6 6 0 0 0 0 0 0
57622- 0 0 0 0 0 0 0 0 0 0 0 0
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 6 6 6
57630- 22 22 22 54 54 54 70 70 70 2 2 6
57631- 2 2 6 10 10 10 2 2 6 22 22 22
57632-166 166 166 231 231 231 250 250 250 253 253 253
57633-253 253 253 253 253 253 253 253 253 250 250 250
57634-242 242 242 253 253 253 253 253 253 253 253 253
57635-253 253 253 253 253 253 253 253 253 253 253 253
57636-253 253 253 253 253 253 253 253 253 246 246 246
57637-231 231 231 206 206 206 198 198 198 226 226 226
57638- 94 94 94 2 2 6 6 6 6 38 38 38
57639- 30 30 30 2 2 6 2 2 6 2 2 6
57640- 2 2 6 2 2 6 62 62 62 66 66 66
57641- 26 26 26 10 10 10 0 0 0 0 0 0
57642- 0 0 0 0 0 0 0 0 0 0 0 0
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 10 10 10
57650- 30 30 30 74 74 74 50 50 50 2 2 6
57651- 26 26 26 26 26 26 2 2 6 106 106 106
57652-238 238 238 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 253 253 253 253 253 253
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 246 246 246 218 218 218 202 202 202
57658-210 210 210 14 14 14 2 2 6 2 2 6
57659- 30 30 30 22 22 22 2 2 6 2 2 6
57660- 2 2 6 2 2 6 18 18 18 86 86 86
57661- 42 42 42 14 14 14 0 0 0 0 0 0
57662- 0 0 0 0 0 0 0 0 0 0 0 0
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 14 14 14
57670- 42 42 42 90 90 90 22 22 22 2 2 6
57671- 42 42 42 2 2 6 18 18 18 218 218 218
57672-253 253 253 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 253 253 253 253 253 253
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 250 250 250 221 221 221
57678-218 218 218 101 101 101 2 2 6 14 14 14
57679- 18 18 18 38 38 38 10 10 10 2 2 6
57680- 2 2 6 2 2 6 2 2 6 78 78 78
57681- 58 58 58 22 22 22 6 6 6 0 0 0
57682- 0 0 0 0 0 0 0 0 0 0 0 0
57683- 0 0 0 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 6 6 6 18 18 18
57690- 54 54 54 82 82 82 2 2 6 26 26 26
57691- 22 22 22 2 2 6 123 123 123 253 253 253
57692-253 253 253 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 253 253 253 253 253 253
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 250 250 250
57698-238 238 238 198 198 198 6 6 6 38 38 38
57699- 58 58 58 26 26 26 38 38 38 2 2 6
57700- 2 2 6 2 2 6 2 2 6 46 46 46
57701- 78 78 78 30 30 30 10 10 10 0 0 0
57702- 0 0 0 0 0 0 0 0 0 0 0 0
57703- 0 0 0 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 10 10 10 30 30 30
57710- 74 74 74 58 58 58 2 2 6 42 42 42
57711- 2 2 6 22 22 22 231 231 231 253 253 253
57712-253 253 253 253 253 253 253 253 253 253 253 253
57713-253 253 253 253 253 253 253 253 253 250 250 250
57714-253 253 253 253 253 253 253 253 253 253 253 253
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 246 246 246 46 46 46 38 38 38
57719- 42 42 42 14 14 14 38 38 38 14 14 14
57720- 2 2 6 2 2 6 2 2 6 6 6 6
57721- 86 86 86 46 46 46 14 14 14 0 0 0
57722- 0 0 0 0 0 0 0 0 0 0 0 0
57723- 0 0 0 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 6 6 6 14 14 14 42 42 42
57730- 90 90 90 18 18 18 18 18 18 26 26 26
57731- 2 2 6 116 116 116 253 253 253 253 253 253
57732-253 253 253 253 253 253 253 253 253 253 253 253
57733-253 253 253 253 253 253 250 250 250 238 238 238
57734-253 253 253 253 253 253 253 253 253 253 253 253
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 94 94 94 6 6 6
57739- 2 2 6 2 2 6 10 10 10 34 34 34
57740- 2 2 6 2 2 6 2 2 6 2 2 6
57741- 74 74 74 58 58 58 22 22 22 6 6 6
57742- 0 0 0 0 0 0 0 0 0 0 0 0
57743- 0 0 0 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 10 10 10 26 26 26 66 66 66
57750- 82 82 82 2 2 6 38 38 38 6 6 6
57751- 14 14 14 210 210 210 253 253 253 253 253 253
57752-253 253 253 253 253 253 253 253 253 253 253 253
57753-253 253 253 253 253 253 246 246 246 242 242 242
57754-253 253 253 253 253 253 253 253 253 253 253 253
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 144 144 144 2 2 6
57759- 2 2 6 2 2 6 2 2 6 46 46 46
57760- 2 2 6 2 2 6 2 2 6 2 2 6
57761- 42 42 42 74 74 74 30 30 30 10 10 10
57762- 0 0 0 0 0 0 0 0 0 0 0 0
57763- 0 0 0 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- 6 6 6 14 14 14 42 42 42 90 90 90
57770- 26 26 26 6 6 6 42 42 42 2 2 6
57771- 74 74 74 250 250 250 253 253 253 253 253 253
57772-253 253 253 253 253 253 253 253 253 253 253 253
57773-253 253 253 253 253 253 242 242 242 242 242 242
57774-253 253 253 253 253 253 253 253 253 253 253 253
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 182 182 182 2 2 6
57779- 2 2 6 2 2 6 2 2 6 46 46 46
57780- 2 2 6 2 2 6 2 2 6 2 2 6
57781- 10 10 10 86 86 86 38 38 38 10 10 10
57782- 0 0 0 0 0 0 0 0 0 0 0 0
57783- 0 0 0 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- 10 10 10 26 26 26 66 66 66 82 82 82
57790- 2 2 6 22 22 22 18 18 18 2 2 6
57791-149 149 149 253 253 253 253 253 253 253 253 253
57792-253 253 253 253 253 253 253 253 253 253 253 253
57793-253 253 253 253 253 253 234 234 234 242 242 242
57794-253 253 253 253 253 253 253 253 253 253 253 253
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 206 206 206 2 2 6
57799- 2 2 6 2 2 6 2 2 6 38 38 38
57800- 2 2 6 2 2 6 2 2 6 2 2 6
57801- 6 6 6 86 86 86 46 46 46 14 14 14
57802- 0 0 0 0 0 0 0 0 0 0 0 0
57803- 0 0 0 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- 18 18 18 46 46 46 86 86 86 18 18 18
57810- 2 2 6 34 34 34 10 10 10 6 6 6
57811-210 210 210 253 253 253 253 253 253 253 253 253
57812-253 253 253 253 253 253 253 253 253 253 253 253
57813-253 253 253 253 253 253 234 234 234 242 242 242
57814-253 253 253 253 253 253 253 253 253 253 253 253
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 221 221 221 6 6 6
57819- 2 2 6 2 2 6 6 6 6 30 30 30
57820- 2 2 6 2 2 6 2 2 6 2 2 6
57821- 2 2 6 82 82 82 54 54 54 18 18 18
57822- 6 6 6 0 0 0 0 0 0 0 0 0
57823- 0 0 0 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 0 0 0 0 0 0 10 10 10
57829- 26 26 26 66 66 66 62 62 62 2 2 6
57830- 2 2 6 38 38 38 10 10 10 26 26 26
57831-238 238 238 253 253 253 253 253 253 253 253 253
57832-253 253 253 253 253 253 253 253 253 253 253 253
57833-253 253 253 253 253 253 231 231 231 238 238 238
57834-253 253 253 253 253 253 253 253 253 253 253 253
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 231 231 231 6 6 6
57839- 2 2 6 2 2 6 10 10 10 30 30 30
57840- 2 2 6 2 2 6 2 2 6 2 2 6
57841- 2 2 6 66 66 66 58 58 58 22 22 22
57842- 6 6 6 0 0 0 0 0 0 0 0 0
57843- 0 0 0 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- 0 0 0 0 0 0 0 0 0 10 10 10
57849- 38 38 38 78 78 78 6 6 6 2 2 6
57850- 2 2 6 46 46 46 14 14 14 42 42 42
57851-246 246 246 253 253 253 253 253 253 253 253 253
57852-253 253 253 253 253 253 253 253 253 253 253 253
57853-253 253 253 253 253 253 231 231 231 242 242 242
57854-253 253 253 253 253 253 253 253 253 253 253 253
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 234 234 234 10 10 10
57859- 2 2 6 2 2 6 22 22 22 14 14 14
57860- 2 2 6 2 2 6 2 2 6 2 2 6
57861- 2 2 6 66 66 66 62 62 62 22 22 22
57862- 6 6 6 0 0 0 0 0 0 0 0 0
57863- 0 0 0 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- 0 0 0 0 0 0 6 6 6 18 18 18
57869- 50 50 50 74 74 74 2 2 6 2 2 6
57870- 14 14 14 70 70 70 34 34 34 62 62 62
57871-250 250 250 253 253 253 253 253 253 253 253 253
57872-253 253 253 253 253 253 253 253 253 253 253 253
57873-253 253 253 253 253 253 231 231 231 246 246 246
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 253 253 253 234 234 234 14 14 14
57879- 2 2 6 2 2 6 30 30 30 2 2 6
57880- 2 2 6 2 2 6 2 2 6 2 2 6
57881- 2 2 6 66 66 66 62 62 62 22 22 22
57882- 6 6 6 0 0 0 0 0 0 0 0 0
57883- 0 0 0 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 0 0 0
57888- 0 0 0 0 0 0 6 6 6 18 18 18
57889- 54 54 54 62 62 62 2 2 6 2 2 6
57890- 2 2 6 30 30 30 46 46 46 70 70 70
57891-250 250 250 253 253 253 253 253 253 253 253 253
57892-253 253 253 253 253 253 253 253 253 253 253 253
57893-253 253 253 253 253 253 231 231 231 246 246 246
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 253 253 253 226 226 226 10 10 10
57899- 2 2 6 6 6 6 30 30 30 2 2 6
57900- 2 2 6 2 2 6 2 2 6 2 2 6
57901- 2 2 6 66 66 66 58 58 58 22 22 22
57902- 6 6 6 0 0 0 0 0 0 0 0 0
57903- 0 0 0 0 0 0 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 0 0 0
57908- 0 0 0 0 0 0 6 6 6 22 22 22
57909- 58 58 58 62 62 62 2 2 6 2 2 6
57910- 2 2 6 2 2 6 30 30 30 78 78 78
57911-250 250 250 253 253 253 253 253 253 253 253 253
57912-253 253 253 253 253 253 253 253 253 253 253 253
57913-253 253 253 253 253 253 231 231 231 246 246 246
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 253 253 253 206 206 206 2 2 6
57919- 22 22 22 34 34 34 18 14 6 22 22 22
57920- 26 26 26 18 18 18 6 6 6 2 2 6
57921- 2 2 6 82 82 82 54 54 54 18 18 18
57922- 6 6 6 0 0 0 0 0 0 0 0 0
57923- 0 0 0 0 0 0 0 0 0 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 0 0 0
57928- 0 0 0 0 0 0 6 6 6 26 26 26
57929- 62 62 62 106 106 106 74 54 14 185 133 11
57930-210 162 10 121 92 8 6 6 6 62 62 62
57931-238 238 238 253 253 253 253 253 253 253 253 253
57932-253 253 253 253 253 253 253 253 253 253 253 253
57933-253 253 253 253 253 253 231 231 231 246 246 246
57934-253 253 253 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-253 253 253 253 253 253 158 158 158 18 18 18
57939- 14 14 14 2 2 6 2 2 6 2 2 6
57940- 6 6 6 18 18 18 66 66 66 38 38 38
57941- 6 6 6 94 94 94 50 50 50 18 18 18
57942- 6 6 6 0 0 0 0 0 0 0 0 0
57943- 0 0 0 0 0 0 0 0 0 0 0 0
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 6 6 6
57948- 10 10 10 10 10 10 18 18 18 38 38 38
57949- 78 78 78 142 134 106 216 158 10 242 186 14
57950-246 190 14 246 190 14 156 118 10 10 10 10
57951- 90 90 90 238 238 238 253 253 253 253 253 253
57952-253 253 253 253 253 253 253 253 253 253 253 253
57953-253 253 253 253 253 253 231 231 231 250 250 250
57954-253 253 253 253 253 253 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 246 230 190
57958-238 204 91 238 204 91 181 142 44 37 26 9
57959- 2 2 6 2 2 6 2 2 6 2 2 6
57960- 2 2 6 2 2 6 38 38 38 46 46 46
57961- 26 26 26 106 106 106 54 54 54 18 18 18
57962- 6 6 6 0 0 0 0 0 0 0 0 0
57963- 0 0 0 0 0 0 0 0 0 0 0 0
57964- 0 0 0 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 6 6 6 14 14 14 22 22 22
57968- 30 30 30 38 38 38 50 50 50 70 70 70
57969-106 106 106 190 142 34 226 170 11 242 186 14
57970-246 190 14 246 190 14 246 190 14 154 114 10
57971- 6 6 6 74 74 74 226 226 226 253 253 253
57972-253 253 253 253 253 253 253 253 253 253 253 253
57973-253 253 253 253 253 253 231 231 231 250 250 250
57974-253 253 253 253 253 253 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 228 184 62
57978-241 196 14 241 208 19 232 195 16 38 30 10
57979- 2 2 6 2 2 6 2 2 6 2 2 6
57980- 2 2 6 6 6 6 30 30 30 26 26 26
57981-203 166 17 154 142 90 66 66 66 26 26 26
57982- 6 6 6 0 0 0 0 0 0 0 0 0
57983- 0 0 0 0 0 0 0 0 0 0 0 0
57984- 0 0 0 0 0 0 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- 6 6 6 18 18 18 38 38 38 58 58 58
57988- 78 78 78 86 86 86 101 101 101 123 123 123
57989-175 146 61 210 150 10 234 174 13 246 186 14
57990-246 190 14 246 190 14 246 190 14 238 190 10
57991-102 78 10 2 2 6 46 46 46 198 198 198
57992-253 253 253 253 253 253 253 253 253 253 253 253
57993-253 253 253 253 253 253 234 234 234 242 242 242
57994-253 253 253 253 253 253 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 224 178 62
57998-242 186 14 241 196 14 210 166 10 22 18 6
57999- 2 2 6 2 2 6 2 2 6 2 2 6
58000- 2 2 6 2 2 6 6 6 6 121 92 8
58001-238 202 15 232 195 16 82 82 82 34 34 34
58002- 10 10 10 0 0 0 0 0 0 0 0 0
58003- 0 0 0 0 0 0 0 0 0 0 0 0
58004- 0 0 0 0 0 0 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- 14 14 14 38 38 38 70 70 70 154 122 46
58008-190 142 34 200 144 11 197 138 11 197 138 11
58009-213 154 11 226 170 11 242 186 14 246 190 14
58010-246 190 14 246 190 14 246 190 14 246 190 14
58011-225 175 15 46 32 6 2 2 6 22 22 22
58012-158 158 158 250 250 250 253 253 253 253 253 253
58013-253 253 253 253 253 253 253 253 253 253 253 253
58014-253 253 253 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 250 250 250 242 242 242 224 178 62
58018-239 182 13 236 186 11 213 154 11 46 32 6
58019- 2 2 6 2 2 6 2 2 6 2 2 6
58020- 2 2 6 2 2 6 61 42 6 225 175 15
58021-238 190 10 236 186 11 112 100 78 42 42 42
58022- 14 14 14 0 0 0 0 0 0 0 0 0
58023- 0 0 0 0 0 0 0 0 0 0 0 0
58024- 0 0 0 0 0 0 0 0 0 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 6 6 6
58027- 22 22 22 54 54 54 154 122 46 213 154 11
58028-226 170 11 230 174 11 226 170 11 226 170 11
58029-236 178 12 242 186 14 246 190 14 246 190 14
58030-246 190 14 246 190 14 246 190 14 246 190 14
58031-241 196 14 184 144 12 10 10 10 2 2 6
58032- 6 6 6 116 116 116 242 242 242 253 253 253
58033-253 253 253 253 253 253 253 253 253 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 231 231 231 198 198 198 214 170 54
58038-236 178 12 236 178 12 210 150 10 137 92 6
58039- 18 14 6 2 2 6 2 2 6 2 2 6
58040- 6 6 6 70 47 6 200 144 11 236 178 12
58041-239 182 13 239 182 13 124 112 88 58 58 58
58042- 22 22 22 6 6 6 0 0 0 0 0 0
58043- 0 0 0 0 0 0 0 0 0 0 0 0
58044- 0 0 0 0 0 0 0 0 0 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 10 10 10
58047- 30 30 30 70 70 70 180 133 36 226 170 11
58048-239 182 13 242 186 14 242 186 14 246 186 14
58049-246 190 14 246 190 14 246 190 14 246 190 14
58050-246 190 14 246 190 14 246 190 14 246 190 14
58051-246 190 14 232 195 16 98 70 6 2 2 6
58052- 2 2 6 2 2 6 66 66 66 221 221 221
58053-253 253 253 253 253 253 253 253 253 253 253 253
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 206 206 206 198 198 198 214 166 58
58058-230 174 11 230 174 11 216 158 10 192 133 9
58059-163 110 8 116 81 8 102 78 10 116 81 8
58060-167 114 7 197 138 11 226 170 11 239 182 13
58061-242 186 14 242 186 14 162 146 94 78 78 78
58062- 34 34 34 14 14 14 6 6 6 0 0 0
58063- 0 0 0 0 0 0 0 0 0 0 0 0
58064- 0 0 0 0 0 0 0 0 0 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 6 6 6
58067- 30 30 30 78 78 78 190 142 34 226 170 11
58068-239 182 13 246 190 14 246 190 14 246 190 14
58069-246 190 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 241 196 14 203 166 17 22 18 6
58072- 2 2 6 2 2 6 2 2 6 38 38 38
58073-218 218 218 253 253 253 253 253 253 253 253 253
58074-253 253 253 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-250 250 250 206 206 206 198 198 198 202 162 69
58078-226 170 11 236 178 12 224 166 10 210 150 10
58079-200 144 11 197 138 11 192 133 9 197 138 11
58080-210 150 10 226 170 11 242 186 14 246 190 14
58081-246 190 14 246 186 14 225 175 15 124 112 88
58082- 62 62 62 30 30 30 14 14 14 6 6 6
58083- 0 0 0 0 0 0 0 0 0 0 0 0
58084- 0 0 0 0 0 0 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 10 10 10
58087- 30 30 30 78 78 78 174 135 50 224 166 10
58088-239 182 13 246 190 14 246 190 14 246 190 14
58089-246 190 14 246 190 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 241 196 14 139 102 15
58092- 2 2 6 2 2 6 2 2 6 2 2 6
58093- 78 78 78 250 250 250 253 253 253 253 253 253
58094-253 253 253 253 253 253 253 253 253 253 253 253
58095-253 253 253 253 253 253 253 253 253 253 253 253
58096-253 253 253 253 253 253 253 253 253 253 253 253
58097-250 250 250 214 214 214 198 198 198 190 150 46
58098-219 162 10 236 178 12 234 174 13 224 166 10
58099-216 158 10 213 154 11 213 154 11 216 158 10
58100-226 170 11 239 182 13 246 190 14 246 190 14
58101-246 190 14 246 190 14 242 186 14 206 162 42
58102-101 101 101 58 58 58 30 30 30 14 14 14
58103- 6 6 6 0 0 0 0 0 0 0 0 0
58104- 0 0 0 0 0 0 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 10 10 10
58107- 30 30 30 74 74 74 174 135 50 216 158 10
58108-236 178 12 246 190 14 246 190 14 246 190 14
58109-246 190 14 246 190 14 246 190 14 246 190 14
58110-246 190 14 246 190 14 246 190 14 246 190 14
58111-246 190 14 246 190 14 241 196 14 226 184 13
58112- 61 42 6 2 2 6 2 2 6 2 2 6
58113- 22 22 22 238 238 238 253 253 253 253 253 253
58114-253 253 253 253 253 253 253 253 253 253 253 253
58115-253 253 253 253 253 253 253 253 253 253 253 253
58116-253 253 253 253 253 253 253 253 253 253 253 253
58117-253 253 253 226 226 226 187 187 187 180 133 36
58118-216 158 10 236 178 12 239 182 13 236 178 12
58119-230 174 11 226 170 11 226 170 11 230 174 11
58120-236 178 12 242 186 14 246 190 14 246 190 14
58121-246 190 14 246 190 14 246 186 14 239 182 13
58122-206 162 42 106 106 106 66 66 66 34 34 34
58123- 14 14 14 6 6 6 0 0 0 0 0 0
58124- 0 0 0 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 6 6 6
58127- 26 26 26 70 70 70 163 133 67 213 154 11
58128-236 178 12 246 190 14 246 190 14 246 190 14
58129-246 190 14 246 190 14 246 190 14 246 190 14
58130-246 190 14 246 190 14 246 190 14 246 190 14
58131-246 190 14 246 190 14 246 190 14 241 196 14
58132-190 146 13 18 14 6 2 2 6 2 2 6
58133- 46 46 46 246 246 246 253 253 253 253 253 253
58134-253 253 253 253 253 253 253 253 253 253 253 253
58135-253 253 253 253 253 253 253 253 253 253 253 253
58136-253 253 253 253 253 253 253 253 253 253 253 253
58137-253 253 253 221 221 221 86 86 86 156 107 11
58138-216 158 10 236 178 12 242 186 14 246 186 14
58139-242 186 14 239 182 13 239 182 13 242 186 14
58140-242 186 14 246 186 14 246 190 14 246 190 14
58141-246 190 14 246 190 14 246 190 14 246 190 14
58142-242 186 14 225 175 15 142 122 72 66 66 66
58143- 30 30 30 10 10 10 0 0 0 0 0 0
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 6 6 6
58147- 26 26 26 70 70 70 163 133 67 210 150 10
58148-236 178 12 246 190 14 246 190 14 246 190 14
58149-246 190 14 246 190 14 246 190 14 246 190 14
58150-246 190 14 246 190 14 246 190 14 246 190 14
58151-246 190 14 246 190 14 246 190 14 246 190 14
58152-232 195 16 121 92 8 34 34 34 106 106 106
58153-221 221 221 253 253 253 253 253 253 253 253 253
58154-253 253 253 253 253 253 253 253 253 253 253 253
58155-253 253 253 253 253 253 253 253 253 253 253 253
58156-253 253 253 253 253 253 253 253 253 253 253 253
58157-242 242 242 82 82 82 18 14 6 163 110 8
58158-216 158 10 236 178 12 242 186 14 246 190 14
58159-246 190 14 246 190 14 246 190 14 246 190 14
58160-246 190 14 246 190 14 246 190 14 246 190 14
58161-246 190 14 246 190 14 246 190 14 246 190 14
58162-246 190 14 246 190 14 242 186 14 163 133 67
58163- 46 46 46 18 18 18 6 6 6 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 10 10 10
58167- 30 30 30 78 78 78 163 133 67 210 150 10
58168-236 178 12 246 186 14 246 190 14 246 190 14
58169-246 190 14 246 190 14 246 190 14 246 190 14
58170-246 190 14 246 190 14 246 190 14 246 190 14
58171-246 190 14 246 190 14 246 190 14 246 190 14
58172-241 196 14 215 174 15 190 178 144 253 253 253
58173-253 253 253 253 253 253 253 253 253 253 253 253
58174-253 253 253 253 253 253 253 253 253 253 253 253
58175-253 253 253 253 253 253 253 253 253 253 253 253
58176-253 253 253 253 253 253 253 253 253 218 218 218
58177- 58 58 58 2 2 6 22 18 6 167 114 7
58178-216 158 10 236 178 12 246 186 14 246 190 14
58179-246 190 14 246 190 14 246 190 14 246 190 14
58180-246 190 14 246 190 14 246 190 14 246 190 14
58181-246 190 14 246 190 14 246 190 14 246 190 14
58182-246 190 14 246 186 14 242 186 14 190 150 46
58183- 54 54 54 22 22 22 6 6 6 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 14 14 14
58187- 38 38 38 86 86 86 180 133 36 213 154 11
58188-236 178 12 246 186 14 246 190 14 246 190 14
58189-246 190 14 246 190 14 246 190 14 246 190 14
58190-246 190 14 246 190 14 246 190 14 246 190 14
58191-246 190 14 246 190 14 246 190 14 246 190 14
58192-246 190 14 232 195 16 190 146 13 214 214 214
58193-253 253 253 253 253 253 253 253 253 253 253 253
58194-253 253 253 253 253 253 253 253 253 253 253 253
58195-253 253 253 253 253 253 253 253 253 253 253 253
58196-253 253 253 250 250 250 170 170 170 26 26 26
58197- 2 2 6 2 2 6 37 26 9 163 110 8
58198-219 162 10 239 182 13 246 186 14 246 190 14
58199-246 190 14 246 190 14 246 190 14 246 190 14
58200-246 190 14 246 190 14 246 190 14 246 190 14
58201-246 190 14 246 190 14 246 190 14 246 190 14
58202-246 186 14 236 178 12 224 166 10 142 122 72
58203- 46 46 46 18 18 18 6 6 6 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 6 6 6 18 18 18
58207- 50 50 50 109 106 95 192 133 9 224 166 10
58208-242 186 14 246 190 14 246 190 14 246 190 14
58209-246 190 14 246 190 14 246 190 14 246 190 14
58210-246 190 14 246 190 14 246 190 14 246 190 14
58211-246 190 14 246 190 14 246 190 14 246 190 14
58212-242 186 14 226 184 13 210 162 10 142 110 46
58213-226 226 226 253 253 253 253 253 253 253 253 253
58214-253 253 253 253 253 253 253 253 253 253 253 253
58215-253 253 253 253 253 253 253 253 253 253 253 253
58216-198 198 198 66 66 66 2 2 6 2 2 6
58217- 2 2 6 2 2 6 50 34 6 156 107 11
58218-219 162 10 239 182 13 246 186 14 246 190 14
58219-246 190 14 246 190 14 246 190 14 246 190 14
58220-246 190 14 246 190 14 246 190 14 246 190 14
58221-246 190 14 246 190 14 246 190 14 242 186 14
58222-234 174 13 213 154 11 154 122 46 66 66 66
58223- 30 30 30 10 10 10 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 6 6 6 22 22 22
58227- 58 58 58 154 121 60 206 145 10 234 174 13
58228-242 186 14 246 186 14 246 190 14 246 190 14
58229-246 190 14 246 190 14 246 190 14 246 190 14
58230-246 190 14 246 190 14 246 190 14 246 190 14
58231-246 190 14 246 190 14 246 190 14 246 190 14
58232-246 186 14 236 178 12 210 162 10 163 110 8
58233- 61 42 6 138 138 138 218 218 218 250 250 250
58234-253 253 253 253 253 253 253 253 253 250 250 250
58235-242 242 242 210 210 210 144 144 144 66 66 66
58236- 6 6 6 2 2 6 2 2 6 2 2 6
58237- 2 2 6 2 2 6 61 42 6 163 110 8
58238-216 158 10 236 178 12 246 190 14 246 190 14
58239-246 190 14 246 190 14 246 190 14 246 190 14
58240-246 190 14 246 190 14 246 190 14 246 190 14
58241-246 190 14 239 182 13 230 174 11 216 158 10
58242-190 142 34 124 112 88 70 70 70 38 38 38
58243- 18 18 18 6 6 6 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 6 6 6 22 22 22
58247- 62 62 62 168 124 44 206 145 10 224 166 10
58248-236 178 12 239 182 13 242 186 14 242 186 14
58249-246 186 14 246 190 14 246 190 14 246 190 14
58250-246 190 14 246 190 14 246 190 14 246 190 14
58251-246 190 14 246 190 14 246 190 14 246 190 14
58252-246 190 14 236 178 12 216 158 10 175 118 6
58253- 80 54 7 2 2 6 6 6 6 30 30 30
58254- 54 54 54 62 62 62 50 50 50 38 38 38
58255- 14 14 14 2 2 6 2 2 6 2 2 6
58256- 2 2 6 2 2 6 2 2 6 2 2 6
58257- 2 2 6 6 6 6 80 54 7 167 114 7
58258-213 154 11 236 178 12 246 190 14 246 190 14
58259-246 190 14 246 190 14 246 190 14 246 190 14
58260-246 190 14 242 186 14 239 182 13 239 182 13
58261-230 174 11 210 150 10 174 135 50 124 112 88
58262- 82 82 82 54 54 54 34 34 34 18 18 18
58263- 6 6 6 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 6 6 6 18 18 18
58267- 50 50 50 158 118 36 192 133 9 200 144 11
58268-216 158 10 219 162 10 224 166 10 226 170 11
58269-230 174 11 236 178 12 239 182 13 239 182 13
58270-242 186 14 246 186 14 246 190 14 246 190 14
58271-246 190 14 246 190 14 246 190 14 246 190 14
58272-246 186 14 230 174 11 210 150 10 163 110 8
58273-104 69 6 10 10 10 2 2 6 2 2 6
58274- 2 2 6 2 2 6 2 2 6 2 2 6
58275- 2 2 6 2 2 6 2 2 6 2 2 6
58276- 2 2 6 2 2 6 2 2 6 2 2 6
58277- 2 2 6 6 6 6 91 60 6 167 114 7
58278-206 145 10 230 174 11 242 186 14 246 190 14
58279-246 190 14 246 190 14 246 186 14 242 186 14
58280-239 182 13 230 174 11 224 166 10 213 154 11
58281-180 133 36 124 112 88 86 86 86 58 58 58
58282- 38 38 38 22 22 22 10 10 10 6 6 6
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 14 14 14
58287- 34 34 34 70 70 70 138 110 50 158 118 36
58288-167 114 7 180 123 7 192 133 9 197 138 11
58289-200 144 11 206 145 10 213 154 11 219 162 10
58290-224 166 10 230 174 11 239 182 13 242 186 14
58291-246 186 14 246 186 14 246 186 14 246 186 14
58292-239 182 13 216 158 10 185 133 11 152 99 6
58293-104 69 6 18 14 6 2 2 6 2 2 6
58294- 2 2 6 2 2 6 2 2 6 2 2 6
58295- 2 2 6 2 2 6 2 2 6 2 2 6
58296- 2 2 6 2 2 6 2 2 6 2 2 6
58297- 2 2 6 6 6 6 80 54 7 152 99 6
58298-192 133 9 219 162 10 236 178 12 239 182 13
58299-246 186 14 242 186 14 239 182 13 236 178 12
58300-224 166 10 206 145 10 192 133 9 154 121 60
58301- 94 94 94 62 62 62 42 42 42 22 22 22
58302- 14 14 14 6 6 6 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- 0 0 0 0 0 0 0 0 0 6 6 6
58307- 18 18 18 34 34 34 58 58 58 78 78 78
58308-101 98 89 124 112 88 142 110 46 156 107 11
58309-163 110 8 167 114 7 175 118 6 180 123 7
58310-185 133 11 197 138 11 210 150 10 219 162 10
58311-226 170 11 236 178 12 236 178 12 234 174 13
58312-219 162 10 197 138 11 163 110 8 130 83 6
58313- 91 60 6 10 10 10 2 2 6 2 2 6
58314- 18 18 18 38 38 38 38 38 38 38 38 38
58315- 38 38 38 38 38 38 38 38 38 38 38 38
58316- 38 38 38 38 38 38 26 26 26 2 2 6
58317- 2 2 6 6 6 6 70 47 6 137 92 6
58318-175 118 6 200 144 11 219 162 10 230 174 11
58319-234 174 13 230 174 11 219 162 10 210 150 10
58320-192 133 9 163 110 8 124 112 88 82 82 82
58321- 50 50 50 30 30 30 14 14 14 6 6 6
58322- 0 0 0 0 0 0 0 0 0 0 0 0
58323- 0 0 0 0 0 0 0 0 0 0 0 0
58324- 0 0 0 0 0 0 0 0 0 0 0 0
58325- 0 0 0 0 0 0 0 0 0 0 0 0
58326- 0 0 0 0 0 0 0 0 0 0 0 0
58327- 6 6 6 14 14 14 22 22 22 34 34 34
58328- 42 42 42 58 58 58 74 74 74 86 86 86
58329-101 98 89 122 102 70 130 98 46 121 87 25
58330-137 92 6 152 99 6 163 110 8 180 123 7
58331-185 133 11 197 138 11 206 145 10 200 144 11
58332-180 123 7 156 107 11 130 83 6 104 69 6
58333- 50 34 6 54 54 54 110 110 110 101 98 89
58334- 86 86 86 82 82 82 78 78 78 78 78 78
58335- 78 78 78 78 78 78 78 78 78 78 78 78
58336- 78 78 78 82 82 82 86 86 86 94 94 94
58337-106 106 106 101 101 101 86 66 34 124 80 6
58338-156 107 11 180 123 7 192 133 9 200 144 11
58339-206 145 10 200 144 11 192 133 9 175 118 6
58340-139 102 15 109 106 95 70 70 70 42 42 42
58341- 22 22 22 10 10 10 0 0 0 0 0 0
58342- 0 0 0 0 0 0 0 0 0 0 0 0
58343- 0 0 0 0 0 0 0 0 0 0 0 0
58344- 0 0 0 0 0 0 0 0 0 0 0 0
58345- 0 0 0 0 0 0 0 0 0 0 0 0
58346- 0 0 0 0 0 0 0 0 0 0 0 0
58347- 0 0 0 0 0 0 6 6 6 10 10 10
58348- 14 14 14 22 22 22 30 30 30 38 38 38
58349- 50 50 50 62 62 62 74 74 74 90 90 90
58350-101 98 89 112 100 78 121 87 25 124 80 6
58351-137 92 6 152 99 6 152 99 6 152 99 6
58352-138 86 6 124 80 6 98 70 6 86 66 30
58353-101 98 89 82 82 82 58 58 58 46 46 46
58354- 38 38 38 34 34 34 34 34 34 34 34 34
58355- 34 34 34 34 34 34 34 34 34 34 34 34
58356- 34 34 34 34 34 34 38 38 38 42 42 42
58357- 54 54 54 82 82 82 94 86 76 91 60 6
58358-134 86 6 156 107 11 167 114 7 175 118 6
58359-175 118 6 167 114 7 152 99 6 121 87 25
58360-101 98 89 62 62 62 34 34 34 18 18 18
58361- 6 6 6 0 0 0 0 0 0 0 0 0
58362- 0 0 0 0 0 0 0 0 0 0 0 0
58363- 0 0 0 0 0 0 0 0 0 0 0 0
58364- 0 0 0 0 0 0 0 0 0 0 0 0
58365- 0 0 0 0 0 0 0 0 0 0 0 0
58366- 0 0 0 0 0 0 0 0 0 0 0 0
58367- 0 0 0 0 0 0 0 0 0 0 0 0
58368- 0 0 0 6 6 6 6 6 6 10 10 10
58369- 18 18 18 22 22 22 30 30 30 42 42 42
58370- 50 50 50 66 66 66 86 86 86 101 98 89
58371-106 86 58 98 70 6 104 69 6 104 69 6
58372-104 69 6 91 60 6 82 62 34 90 90 90
58373- 62 62 62 38 38 38 22 22 22 14 14 14
58374- 10 10 10 10 10 10 10 10 10 10 10 10
58375- 10 10 10 10 10 10 6 6 6 10 10 10
58376- 10 10 10 10 10 10 10 10 10 14 14 14
58377- 22 22 22 42 42 42 70 70 70 89 81 66
58378- 80 54 7 104 69 6 124 80 6 137 92 6
58379-134 86 6 116 81 8 100 82 52 86 86 86
58380- 58 58 58 30 30 30 14 14 14 6 6 6
58381- 0 0 0 0 0 0 0 0 0 0 0 0
58382- 0 0 0 0 0 0 0 0 0 0 0 0
58383- 0 0 0 0 0 0 0 0 0 0 0 0
58384- 0 0 0 0 0 0 0 0 0 0 0 0
58385- 0 0 0 0 0 0 0 0 0 0 0 0
58386- 0 0 0 0 0 0 0 0 0 0 0 0
58387- 0 0 0 0 0 0 0 0 0 0 0 0
58388- 0 0 0 0 0 0 0 0 0 0 0 0
58389- 0 0 0 6 6 6 10 10 10 14 14 14
58390- 18 18 18 26 26 26 38 38 38 54 54 54
58391- 70 70 70 86 86 86 94 86 76 89 81 66
58392- 89 81 66 86 86 86 74 74 74 50 50 50
58393- 30 30 30 14 14 14 6 6 6 0 0 0
58394- 0 0 0 0 0 0 0 0 0 0 0 0
58395- 0 0 0 0 0 0 0 0 0 0 0 0
58396- 0 0 0 0 0 0 0 0 0 0 0 0
58397- 6 6 6 18 18 18 34 34 34 58 58 58
58398- 82 82 82 89 81 66 89 81 66 89 81 66
58399- 94 86 66 94 86 76 74 74 74 50 50 50
58400- 26 26 26 14 14 14 6 6 6 0 0 0
58401- 0 0 0 0 0 0 0 0 0 0 0 0
58402- 0 0 0 0 0 0 0 0 0 0 0 0
58403- 0 0 0 0 0 0 0 0 0 0 0 0
58404- 0 0 0 0 0 0 0 0 0 0 0 0
58405- 0 0 0 0 0 0 0 0 0 0 0 0
58406- 0 0 0 0 0 0 0 0 0 0 0 0
58407- 0 0 0 0 0 0 0 0 0 0 0 0
58408- 0 0 0 0 0 0 0 0 0 0 0 0
58409- 0 0 0 0 0 0 0 0 0 0 0 0
58410- 6 6 6 6 6 6 14 14 14 18 18 18
58411- 30 30 30 38 38 38 46 46 46 54 54 54
58412- 50 50 50 42 42 42 30 30 30 18 18 18
58413- 10 10 10 0 0 0 0 0 0 0 0 0
58414- 0 0 0 0 0 0 0 0 0 0 0 0
58415- 0 0 0 0 0 0 0 0 0 0 0 0
58416- 0 0 0 0 0 0 0 0 0 0 0 0
58417- 0 0 0 6 6 6 14 14 14 26 26 26
58418- 38 38 38 50 50 50 58 58 58 58 58 58
58419- 54 54 54 42 42 42 30 30 30 18 18 18
58420- 10 10 10 0 0 0 0 0 0 0 0 0
58421- 0 0 0 0 0 0 0 0 0 0 0 0
58422- 0 0 0 0 0 0 0 0 0 0 0 0
58423- 0 0 0 0 0 0 0 0 0 0 0 0
58424- 0 0 0 0 0 0 0 0 0 0 0 0
58425- 0 0 0 0 0 0 0 0 0 0 0 0
58426- 0 0 0 0 0 0 0 0 0 0 0 0
58427- 0 0 0 0 0 0 0 0 0 0 0 0
58428- 0 0 0 0 0 0 0 0 0 0 0 0
58429- 0 0 0 0 0 0 0 0 0 0 0 0
58430- 0 0 0 0 0 0 0 0 0 6 6 6
58431- 6 6 6 10 10 10 14 14 14 18 18 18
58432- 18 18 18 14 14 14 10 10 10 6 6 6
58433- 0 0 0 0 0 0 0 0 0 0 0 0
58434- 0 0 0 0 0 0 0 0 0 0 0 0
58435- 0 0 0 0 0 0 0 0 0 0 0 0
58436- 0 0 0 0 0 0 0 0 0 0 0 0
58437- 0 0 0 0 0 0 0 0 0 6 6 6
58438- 14 14 14 18 18 18 22 22 22 22 22 22
58439- 18 18 18 14 14 14 10 10 10 6 6 6
58440- 0 0 0 0 0 0 0 0 0 0 0 0
58441- 0 0 0 0 0 0 0 0 0 0 0 0
58442- 0 0 0 0 0 0 0 0 0 0 0 0
58443- 0 0 0 0 0 0 0 0 0 0 0 0
58444- 0 0 0 0 0 0 0 0 0 0 0 0
58445+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58446+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58447+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58448+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58449+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58450+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58451+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58452+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58453+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58454+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58455+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58456+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58457+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58458+4 4 4 4 4 4
58459+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58460+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58461+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58462+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58463+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58464+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58465+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58466+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58467+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58468+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58469+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58470+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58471+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58472+4 4 4 4 4 4
58473+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58474+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58475+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58476+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58477+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58478+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58479+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58480+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58481+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58482+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58483+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58484+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58485+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58486+4 4 4 4 4 4
58487+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58488+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58489+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58490+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58491+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58492+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58493+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58494+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58495+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58496+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58497+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58498+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58499+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58500+4 4 4 4 4 4
58501+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58502+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58503+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58504+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58505+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58506+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58507+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58508+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58509+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58510+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58511+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58512+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58513+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58514+4 4 4 4 4 4
58515+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58516+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58517+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58518+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58519+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58520+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58521+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58522+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58523+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58524+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58525+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58526+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58527+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58528+4 4 4 4 4 4
58529+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58530+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58531+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58532+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58533+4 4 4 4 4 4 4 4 4 3 3 3 0 0 0 0 0 0
58534+0 0 0 0 0 0 0 0 0 0 0 0 3 3 3 4 4 4
58535+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58536+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58537+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58538+4 4 4 4 4 4 4 4 4 4 4 4 1 1 1 0 0 0
58539+0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
58540+4 4 4 4 4 4 4 4 4 2 1 0 2 1 0 3 2 2
58541+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58542+4 4 4 4 4 4
58543+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58544+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58545+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58546+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58547+4 4 4 4 4 4 2 2 2 0 0 0 3 4 3 26 28 28
58548+37 38 37 37 38 37 14 17 19 2 2 2 0 0 0 2 2 2
58549+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58550+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58551+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58552+4 4 4 4 4 4 3 3 3 0 0 0 1 1 1 6 6 6
58553+2 2 2 0 0 0 3 3 3 4 4 4 4 4 4 4 4 4
58554+4 4 5 3 3 3 1 0 0 0 0 0 1 0 0 0 0 0
58555+1 1 1 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58556+4 4 4 4 4 4
58557+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58558+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58559+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58560+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58561+2 2 2 0 0 0 0 0 0 14 17 19 60 74 84 137 136 137
58562+153 152 153 137 136 137 125 124 125 60 73 81 6 6 6 3 1 0
58563+0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
58564+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58565+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58566+4 4 4 4 4 4 0 0 0 4 4 4 41 54 63 125 124 125
58567+60 73 81 6 6 6 4 0 0 3 3 3 4 4 4 4 4 4
58568+4 4 4 0 0 0 6 9 11 41 54 63 41 65 82 22 30 35
58569+2 2 2 2 1 0 4 4 4 4 4 4 4 4 4 4 4 4
58570+4 4 4 4 4 4
58571+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58572+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58573+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58574+4 4 4 4 4 4 5 5 5 5 5 5 2 2 2 0 0 0
58575+4 0 0 6 6 6 41 54 63 137 136 137 174 174 174 167 166 167
58576+165 164 165 165 164 165 163 162 163 163 162 163 125 124 125 41 54 63
58577+1 1 1 0 0 0 0 0 0 3 3 3 5 5 5 4 4 4
58578+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58579+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5
58580+3 3 3 2 0 0 4 0 0 60 73 81 156 155 156 167 166 167
58581+163 162 163 85 115 134 5 7 8 0 0 0 4 4 4 5 5 5
58582+0 0 0 2 5 5 55 98 126 90 154 193 90 154 193 72 125 159
58583+37 51 59 2 0 0 1 1 1 4 5 5 4 4 4 4 4 4
58584+4 4 4 4 4 4
58585+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58586+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58587+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58588+4 4 4 5 5 5 4 4 4 1 1 1 0 0 0 3 3 3
58589+37 38 37 125 124 125 163 162 163 174 174 174 158 157 158 158 157 158
58590+156 155 156 156 155 156 158 157 158 165 164 165 174 174 174 166 165 166
58591+125 124 125 16 19 21 1 0 0 0 0 0 0 0 0 4 4 4
58592+5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
58593+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 1 1 1
58594+0 0 0 0 0 0 37 38 37 153 152 153 174 174 174 158 157 158
58595+174 174 174 163 162 163 37 38 37 4 3 3 4 0 0 1 1 1
58596+0 0 0 22 40 52 101 161 196 101 161 196 90 154 193 101 161 196
58597+64 123 161 14 17 19 0 0 0 4 4 4 4 4 4 4 4 4
58598+4 4 4 4 4 4
58599+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58600+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58601+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
58602+5 5 5 2 2 2 0 0 0 4 0 0 24 26 27 85 115 134
58603+156 155 156 174 174 174 167 166 167 156 155 156 154 153 154 157 156 157
58604+156 155 156 156 155 156 155 154 155 153 152 153 158 157 158 167 166 167
58605+174 174 174 156 155 156 60 74 84 16 19 21 0 0 0 0 0 0
58606+1 1 1 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
58607+4 4 4 5 5 5 6 6 6 3 3 3 0 0 0 4 0 0
58608+13 16 17 60 73 81 137 136 137 165 164 165 156 155 156 153 152 153
58609+174 174 174 177 184 187 60 73 81 3 1 0 0 0 0 1 1 2
58610+22 30 35 64 123 161 136 185 209 90 154 193 90 154 193 90 154 193
58611+90 154 193 21 29 34 0 0 0 3 2 2 4 4 5 4 4 4
58612+4 4 4 4 4 4
58613+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58614+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58615+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 3 3 3
58616+0 0 0 0 0 0 10 13 16 60 74 84 157 156 157 174 174 174
58617+174 174 174 158 157 158 153 152 153 154 153 154 156 155 156 155 154 155
58618+156 155 156 155 154 155 154 153 154 157 156 157 154 153 154 153 152 153
58619+163 162 163 174 174 174 177 184 187 137 136 137 60 73 81 13 16 17
58620+4 0 0 0 0 0 3 3 3 5 5 5 4 4 4 4 4 4
58621+5 5 5 4 4 4 1 1 1 0 0 0 3 3 3 41 54 63
58622+131 129 131 174 174 174 174 174 174 174 174 174 167 166 167 174 174 174
58623+190 197 201 137 136 137 24 26 27 4 0 0 16 21 25 50 82 103
58624+90 154 193 136 185 209 90 154 193 101 161 196 101 161 196 101 161 196
58625+31 91 132 3 6 7 0 0 0 4 4 4 4 4 4 4 4 4
58626+4 4 4 4 4 4
58627+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58628+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58629+4 4 4 4 4 4 4 4 4 2 2 2 0 0 0 4 0 0
58630+4 0 0 43 57 68 137 136 137 177 184 187 174 174 174 163 162 163
58631+155 154 155 155 154 155 156 155 156 155 154 155 158 157 158 165 164 165
58632+167 166 167 166 165 166 163 162 163 157 156 157 155 154 155 155 154 155
58633+153 152 153 156 155 156 167 166 167 174 174 174 174 174 174 131 129 131
58634+41 54 63 5 5 5 0 0 0 0 0 0 3 3 3 4 4 4
58635+1 1 1 0 0 0 1 0 0 26 28 28 125 124 125 174 174 174
58636+177 184 187 174 174 174 174 174 174 156 155 156 131 129 131 137 136 137
58637+125 124 125 24 26 27 4 0 0 41 65 82 90 154 193 136 185 209
58638+136 185 209 101 161 196 53 118 160 37 112 160 90 154 193 34 86 122
58639+7 12 15 0 0 0 4 4 4 4 4 4 4 4 4 4 4 4
58640+4 4 4 4 4 4
58641+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58642+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58643+4 4 4 3 3 3 0 0 0 0 0 0 5 5 5 37 38 37
58644+125 124 125 167 166 167 174 174 174 167 166 167 158 157 158 155 154 155
58645+156 155 156 156 155 156 156 155 156 163 162 163 167 166 167 155 154 155
58646+137 136 137 153 152 153 156 155 156 165 164 165 163 162 163 156 155 156
58647+156 155 156 156 155 156 155 154 155 158 157 158 166 165 166 174 174 174
58648+167 166 167 125 124 125 37 38 37 1 0 0 0 0 0 0 0 0
58649+0 0 0 24 26 27 60 74 84 158 157 158 174 174 174 174 174 174
58650+166 165 166 158 157 158 125 124 125 41 54 63 13 16 17 6 6 6
58651+6 6 6 37 38 37 80 127 157 136 185 209 101 161 196 101 161 196
58652+90 154 193 28 67 93 6 10 14 13 20 25 13 20 25 6 10 14
58653+1 1 2 4 3 3 4 4 4 4 4 4 4 4 4 4 4 4
58654+4 4 4 4 4 4
58655+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58656+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58657+1 1 1 1 0 0 4 3 3 37 38 37 60 74 84 153 152 153
58658+167 166 167 167 166 167 158 157 158 154 153 154 155 154 155 156 155 156
58659+157 156 157 158 157 158 167 166 167 167 166 167 131 129 131 43 57 68
58660+26 28 28 37 38 37 60 73 81 131 129 131 165 164 165 166 165 166
58661+158 157 158 155 154 155 156 155 156 156 155 156 156 155 156 158 157 158
58662+165 164 165 174 174 174 163 162 163 60 74 84 16 19 21 13 16 17
58663+60 73 81 131 129 131 174 174 174 174 174 174 167 166 167 165 164 165
58664+137 136 137 60 73 81 24 26 27 4 0 0 4 0 0 16 19 21
58665+52 104 138 101 161 196 136 185 209 136 185 209 90 154 193 27 99 146
58666+13 20 25 4 5 7 2 5 5 4 5 7 1 1 2 0 0 0
58667+4 4 4 4 4 4 3 3 3 2 2 2 2 2 2 4 4 4
58668+4 4 4 4 4 4
58669+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58670+4 4 4 4 4 4 4 4 4 4 4 4 3 3 3 0 0 0
58671+0 0 0 13 16 17 60 73 81 137 136 137 174 174 174 166 165 166
58672+158 157 158 156 155 156 157 156 157 156 155 156 155 154 155 158 157 158
58673+167 166 167 174 174 174 153 152 153 60 73 81 16 19 21 4 0 0
58674+4 0 0 4 0 0 6 6 6 26 28 28 60 74 84 158 157 158
58675+174 174 174 166 165 166 157 156 157 155 154 155 156 155 156 156 155 156
58676+155 154 155 158 157 158 167 166 167 167 166 167 131 129 131 125 124 125
58677+137 136 137 167 166 167 167 166 167 174 174 174 158 157 158 125 124 125
58678+16 19 21 4 0 0 4 0 0 10 13 16 49 76 92 107 159 188
58679+136 185 209 136 185 209 90 154 193 26 108 161 22 40 52 6 10 14
58680+2 3 3 1 1 2 1 1 2 4 4 5 4 4 5 4 4 5
58681+4 4 5 2 2 1 0 0 0 0 0 0 0 0 0 2 2 2
58682+4 4 4 4 4 4
58683+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58684+4 4 4 5 5 5 3 3 3 0 0 0 1 0 0 4 0 0
58685+37 51 59 131 129 131 167 166 167 167 166 167 163 162 163 157 156 157
58686+157 156 157 155 154 155 153 152 153 157 156 157 167 166 167 174 174 174
58687+153 152 153 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
58688+4 3 3 4 3 3 4 0 0 6 6 6 4 0 0 37 38 37
58689+125 124 125 174 174 174 174 174 174 165 164 165 156 155 156 154 153 154
58690+156 155 156 156 155 156 155 154 155 163 162 163 158 157 158 163 162 163
58691+174 174 174 174 174 174 174 174 174 125 124 125 37 38 37 0 0 0
58692+4 0 0 6 9 11 41 54 63 90 154 193 136 185 209 146 190 211
58693+136 185 209 37 112 160 22 40 52 6 10 14 3 6 7 1 1 2
58694+1 1 2 3 3 3 1 1 2 3 3 3 4 4 4 4 4 4
58695+2 2 2 2 0 0 16 19 21 37 38 37 24 26 27 0 0 0
58696+0 0 0 4 4 4
58697+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5
58698+4 4 4 0 0 0 0 0 0 0 0 0 26 28 28 120 125 127
58699+158 157 158 174 174 174 165 164 165 157 156 157 155 154 155 156 155 156
58700+153 152 153 153 152 153 167 166 167 174 174 174 174 174 174 125 124 125
58701+37 38 37 4 0 0 0 0 0 4 0 0 4 3 3 4 4 4
58702+4 4 4 4 4 4 5 5 5 4 0 0 4 0 0 4 0 0
58703+4 3 3 43 57 68 137 136 137 174 174 174 174 174 174 165 164 165
58704+154 153 154 153 152 153 153 152 153 153 152 153 163 162 163 174 174 174
58705+174 174 174 153 152 153 60 73 81 6 6 6 4 0 0 4 3 3
58706+32 43 50 80 127 157 136 185 209 146 190 211 146 190 211 90 154 193
58707+28 67 93 28 67 93 40 71 93 3 6 7 1 1 2 2 5 5
58708+50 82 103 79 117 143 26 37 45 0 0 0 3 3 3 1 1 1
58709+0 0 0 41 54 63 137 136 137 174 174 174 153 152 153 60 73 81
58710+2 0 0 0 0 0
58711+4 4 4 4 4 4 4 4 4 4 4 4 6 6 6 2 2 2
58712+0 0 0 2 0 0 24 26 27 60 74 84 153 152 153 174 174 174
58713+174 174 174 157 156 157 154 153 154 156 155 156 154 153 154 153 152 153
58714+165 164 165 174 174 174 177 184 187 137 136 137 43 57 68 6 6 6
58715+4 0 0 2 0 0 3 3 3 5 5 5 5 5 5 4 4 4
58716+4 4 4 4 4 4 4 4 4 5 5 5 6 6 6 4 3 3
58717+4 0 0 4 0 0 24 26 27 60 73 81 153 152 153 174 174 174
58718+174 174 174 158 157 158 158 157 158 174 174 174 174 174 174 158 157 158
58719+60 74 84 24 26 27 4 0 0 4 0 0 17 23 27 59 113 148
58720+136 185 209 191 222 234 146 190 211 136 185 209 31 91 132 7 11 13
58721+22 40 52 101 161 196 90 154 193 6 9 11 3 4 4 43 95 132
58722+136 185 209 172 205 220 55 98 126 0 0 0 0 0 0 2 0 0
58723+26 28 28 153 152 153 177 184 187 167 166 167 177 184 187 165 164 165
58724+37 38 37 0 0 0
58725+4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
58726+13 16 17 60 73 81 137 136 137 174 174 174 174 174 174 165 164 165
58727+153 152 153 153 152 153 155 154 155 154 153 154 158 157 158 174 174 174
58728+177 184 187 163 162 163 60 73 81 16 19 21 4 0 0 4 0 0
58729+4 3 3 4 4 4 5 5 5 5 5 5 4 4 4 5 5 5
58730+5 5 5 5 5 5 5 5 5 4 4 4 4 4 4 5 5 5
58731+6 6 6 4 0 0 4 0 0 4 0 0 24 26 27 60 74 84
58732+166 165 166 174 174 174 177 184 187 165 164 165 125 124 125 24 26 27
58733+4 0 0 4 0 0 5 5 5 50 82 103 136 185 209 172 205 220
58734+146 190 211 136 185 209 26 108 161 22 40 52 7 12 15 44 81 103
58735+71 116 144 28 67 93 37 51 59 41 65 82 100 139 164 101 161 196
58736+90 154 193 90 154 193 28 67 93 0 0 0 0 0 0 26 28 28
58737+125 124 125 167 166 167 163 162 163 153 152 153 163 162 163 174 174 174
58738+85 115 134 4 0 0
58739+4 4 4 5 5 5 4 4 4 1 0 0 4 0 0 34 47 55
58740+125 124 125 174 174 174 174 174 174 167 166 167 157 156 157 153 152 153
58741+155 154 155 155 154 155 158 157 158 166 165 166 167 166 167 154 153 154
58742+125 124 125 26 28 28 4 0 0 4 0 0 4 0 0 5 5 5
58743+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 1 1 1
58744+0 0 0 0 0 0 1 1 1 4 4 4 4 4 4 4 4 4
58745+5 5 5 5 5 5 4 3 3 4 0 0 4 0 0 6 6 6
58746+37 38 37 131 129 131 137 136 137 37 38 37 0 0 0 4 0 0
58747+4 5 5 43 61 72 90 154 193 172 205 220 146 190 211 136 185 209
58748+90 154 193 28 67 93 13 20 25 43 61 72 71 116 144 44 81 103
58749+2 5 5 7 11 13 59 113 148 101 161 196 90 154 193 28 67 93
58750+13 20 25 6 10 14 0 0 0 13 16 17 60 73 81 137 136 137
58751+166 165 166 158 157 158 156 155 156 154 153 154 167 166 167 174 174 174
58752+60 73 81 4 0 0
58753+4 4 4 4 4 4 0 0 0 3 3 3 60 74 84 174 174 174
58754+174 174 174 167 166 167 163 162 163 155 154 155 157 156 157 155 154 155
58755+156 155 156 163 162 163 167 166 167 158 157 158 125 124 125 37 38 37
58756+4 3 3 4 0 0 4 0 0 6 6 6 6 6 6 5 5 5
58757+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 2 3 3
58758+10 13 16 7 11 13 1 0 0 0 0 0 2 2 1 4 4 4
58759+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 4 0 0
58760+4 0 0 7 11 13 13 16 17 4 0 0 3 3 3 34 47 55
58761+80 127 157 146 190 211 172 205 220 136 185 209 136 185 209 136 185 209
58762+28 67 93 22 40 52 55 98 126 55 98 126 21 29 34 7 11 13
58763+50 82 103 101 161 196 101 161 196 35 83 115 13 20 25 2 2 1
58764+1 1 2 1 1 2 37 51 59 131 129 131 174 174 174 174 174 174
58765+167 166 167 163 162 163 163 162 163 167 166 167 174 174 174 125 124 125
58766+16 19 21 4 0 0
58767+4 4 4 4 0 0 4 0 0 60 74 84 174 174 174 174 174 174
58768+158 157 158 155 154 155 155 154 155 156 155 156 155 154 155 158 157 158
58769+167 166 167 165 164 165 131 129 131 60 73 81 13 16 17 4 0 0
58770+4 0 0 4 3 3 6 6 6 4 3 3 5 5 5 4 4 4
58771+4 4 4 3 2 2 0 0 0 0 0 0 7 11 13 45 69 86
58772+80 127 157 71 116 144 43 61 72 7 11 13 0 0 0 1 1 1
58773+4 3 3 4 4 4 4 4 4 4 4 4 6 6 6 5 5 5
58774+3 2 2 4 0 0 1 0 0 21 29 34 59 113 148 136 185 209
58775+146 190 211 136 185 209 136 185 209 136 185 209 136 185 209 136 185 209
58776+68 124 159 44 81 103 22 40 52 13 16 17 43 61 72 90 154 193
58777+136 185 209 59 113 148 21 29 34 3 4 3 1 1 1 0 0 0
58778+24 26 27 125 124 125 163 162 163 174 174 174 166 165 166 165 164 165
58779+163 162 163 125 124 125 125 124 125 125 124 125 125 124 125 26 28 28
58780+4 0 0 4 3 3
58781+3 3 3 0 0 0 24 26 27 153 152 153 177 184 187 158 157 158
58782+156 155 156 156 155 156 155 154 155 155 154 155 165 164 165 174 174 174
58783+155 154 155 60 74 84 26 28 28 4 0 0 4 0 0 3 1 0
58784+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 3 3
58785+2 0 0 0 0 0 0 0 0 32 43 50 72 125 159 101 161 196
58786+136 185 209 101 161 196 101 161 196 79 117 143 32 43 50 0 0 0
58787+0 0 0 2 2 2 4 4 4 4 4 4 3 3 3 1 0 0
58788+0 0 0 4 5 5 49 76 92 101 161 196 146 190 211 146 190 211
58789+136 185 209 136 185 209 136 185 209 136 185 209 136 185 209 90 154 193
58790+28 67 93 13 16 17 37 51 59 80 127 157 136 185 209 90 154 193
58791+22 40 52 6 9 11 3 4 3 2 2 1 16 19 21 60 73 81
58792+137 136 137 163 162 163 158 157 158 166 165 166 167 166 167 153 152 153
58793+60 74 84 37 38 37 6 6 6 13 16 17 4 0 0 1 0 0
58794+3 2 2 4 4 4
58795+3 2 2 4 0 0 37 38 37 137 136 137 167 166 167 158 157 158
58796+157 156 157 154 153 154 157 156 157 167 166 167 174 174 174 125 124 125
58797+37 38 37 4 0 0 4 0 0 4 0 0 4 3 3 4 4 4
58798+4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
58799+0 0 0 16 21 25 55 98 126 90 154 193 136 185 209 101 161 196
58800+101 161 196 101 161 196 136 185 209 136 185 209 101 161 196 55 98 126
58801+14 17 19 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
58802+22 40 52 90 154 193 146 190 211 146 190 211 136 185 209 136 185 209
58803+136 185 209 136 185 209 136 185 209 101 161 196 35 83 115 7 11 13
58804+17 23 27 59 113 148 136 185 209 101 161 196 34 86 122 7 12 15
58805+2 5 5 3 4 3 6 6 6 60 73 81 131 129 131 163 162 163
58806+166 165 166 174 174 174 174 174 174 163 162 163 125 124 125 41 54 63
58807+13 16 17 4 0 0 4 0 0 4 0 0 1 0 0 2 2 2
58808+4 4 4 4 4 4
58809+1 1 1 2 1 0 43 57 68 137 136 137 153 152 153 153 152 153
58810+163 162 163 156 155 156 165 164 165 167 166 167 60 74 84 6 6 6
58811+4 0 0 4 0 0 5 5 5 4 4 4 4 4 4 4 4 4
58812+4 5 5 6 6 6 4 3 3 0 0 0 0 0 0 11 15 18
58813+40 71 93 100 139 164 101 161 196 101 161 196 101 161 196 101 161 196
58814+101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 136 185 209
58815+101 161 196 45 69 86 6 6 6 0 0 0 17 23 27 55 98 126
58816+136 185 209 146 190 211 136 185 209 136 185 209 136 185 209 136 185 209
58817+136 185 209 136 185 209 90 154 193 22 40 52 7 11 13 50 82 103
58818+136 185 209 136 185 209 53 118 160 22 40 52 7 11 13 2 5 5
58819+3 4 3 37 38 37 125 124 125 157 156 157 166 165 166 167 166 167
58820+174 174 174 174 174 174 137 136 137 60 73 81 4 0 0 4 0 0
58821+4 0 0 4 0 0 5 5 5 3 3 3 3 3 3 4 4 4
58822+4 4 4 4 4 4
58823+4 0 0 4 0 0 41 54 63 137 136 137 125 124 125 131 129 131
58824+155 154 155 167 166 167 174 174 174 60 74 84 6 6 6 4 0 0
58825+4 3 3 6 6 6 4 4 4 4 4 4 4 4 4 5 5 5
58826+4 4 4 1 1 1 0 0 0 3 6 7 41 65 82 72 125 159
58827+101 161 196 101 161 196 101 161 196 90 154 193 90 154 193 101 161 196
58828+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
58829+136 185 209 136 185 209 80 127 157 55 98 126 101 161 196 146 190 211
58830+136 185 209 136 185 209 136 185 209 101 161 196 136 185 209 101 161 196
58831+136 185 209 101 161 196 35 83 115 22 30 35 101 161 196 172 205 220
58832+90 154 193 28 67 93 7 11 13 2 5 5 3 4 3 13 16 17
58833+85 115 134 167 166 167 174 174 174 174 174 174 174 174 174 174 174 174
58834+167 166 167 60 74 84 13 16 17 4 0 0 4 0 0 4 3 3
58835+6 6 6 5 5 5 4 4 4 5 5 5 4 4 4 5 5 5
58836+5 5 5 5 5 5
58837+1 1 1 4 0 0 41 54 63 137 136 137 137 136 137 125 124 125
58838+131 129 131 167 166 167 157 156 157 37 38 37 6 6 6 4 0 0
58839+6 6 6 5 5 5 4 4 4 4 4 4 4 5 5 2 2 1
58840+0 0 0 0 0 0 26 37 45 58 111 146 101 161 196 101 161 196
58841+101 161 196 90 154 193 90 154 193 90 154 193 101 161 196 101 161 196
58842+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
58843+101 161 196 136 185 209 136 185 209 136 185 209 146 190 211 136 185 209
58844+136 185 209 101 161 196 136 185 209 136 185 209 101 161 196 136 185 209
58845+101 161 196 136 185 209 136 185 209 136 185 209 136 185 209 16 89 141
58846+7 11 13 2 5 5 2 5 5 13 16 17 60 73 81 154 154 154
58847+174 174 174 174 174 174 174 174 174 174 174 174 163 162 163 125 124 125
58848+24 26 27 4 0 0 4 0 0 4 0 0 5 5 5 5 5 5
58849+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5
58850+5 5 5 4 4 4
58851+4 0 0 6 6 6 37 38 37 137 136 137 137 136 137 131 129 131
58852+131 129 131 153 152 153 131 129 131 26 28 28 4 0 0 4 3 3
58853+6 6 6 4 4 4 4 4 4 4 4 4 0 0 0 0 0 0
58854+13 20 25 51 88 114 90 154 193 101 161 196 101 161 196 90 154 193
58855+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
58856+101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 101 161 196
58857+101 161 196 136 185 209 101 161 196 136 185 209 136 185 209 101 161 196
58858+136 185 209 101 161 196 136 185 209 101 161 196 101 161 196 101 161 196
58859+136 185 209 136 185 209 136 185 209 37 112 160 21 29 34 5 7 8
58860+2 5 5 13 16 17 43 57 68 131 129 131 174 174 174 174 174 174
58861+174 174 174 167 166 167 157 156 157 125 124 125 37 38 37 4 0 0
58862+4 0 0 4 0 0 5 5 5 5 5 5 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
58865+1 1 1 4 0 0 41 54 63 153 152 153 137 136 137 137 136 137
58866+137 136 137 153 152 153 125 124 125 24 26 27 4 0 0 3 2 2
58867+4 4 4 4 4 4 4 3 3 4 0 0 3 6 7 43 61 72
58868+64 123 161 101 161 196 90 154 193 90 154 193 90 154 193 90 154 193
58869+90 154 193 90 154 193 90 154 193 90 154 193 101 161 196 90 154 193
58870+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
58871+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
58872+136 185 209 101 161 196 101 161 196 136 185 209 136 185 209 101 161 196
58873+101 161 196 90 154 193 28 67 93 13 16 17 7 11 13 3 6 7
58874+37 51 59 125 124 125 163 162 163 174 174 174 167 166 167 166 165 166
58875+167 166 167 131 129 131 60 73 81 4 0 0 4 0 0 4 0 0
58876+3 3 3 5 5 5 6 6 6 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
58879+4 0 0 4 0 0 41 54 63 137 136 137 153 152 153 137 136 137
58880+153 152 153 157 156 157 125 124 125 24 26 27 0 0 0 2 2 2
58881+4 4 4 4 4 4 2 0 0 0 0 0 28 67 93 90 154 193
58882+90 154 193 90 154 193 90 154 193 90 154 193 64 123 161 90 154 193
58883+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
58884+90 154 193 101 161 196 101 161 196 101 161 196 90 154 193 136 185 209
58885+101 161 196 101 161 196 136 185 209 101 161 196 136 185 209 101 161 196
58886+101 161 196 101 161 196 136 185 209 101 161 196 101 161 196 90 154 193
58887+35 83 115 13 16 17 3 6 7 2 5 5 13 16 17 60 74 84
58888+154 154 154 166 165 166 165 164 165 158 157 158 163 162 163 157 156 157
58889+60 74 84 13 16 17 4 0 0 4 0 0 3 2 2 4 4 4
58890+4 4 4 4 4 4 4 4 4 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
58893+1 1 1 4 0 0 41 54 63 157 156 157 155 154 155 137 136 137
58894+153 152 153 158 157 158 137 136 137 26 28 28 2 0 0 2 2 2
58895+4 4 4 4 4 4 1 0 0 6 10 14 34 86 122 90 154 193
58896+64 123 161 90 154 193 64 123 161 90 154 193 90 154 193 90 154 193
58897+64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
58898+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
58899+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
58900+136 185 209 101 161 196 136 185 209 90 154 193 26 108 161 22 40 52
58901+13 16 17 5 7 8 2 5 5 2 5 5 37 38 37 165 164 165
58902+174 174 174 163 162 163 154 154 154 165 164 165 167 166 167 60 73 81
58903+6 6 6 4 0 0 4 0 0 4 4 4 4 4 4 4 4 4
58904+4 4 4 4 4 4 4 4 4 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
58907+4 0 0 6 6 6 41 54 63 156 155 156 158 157 158 153 152 153
58908+156 155 156 165 164 165 137 136 137 26 28 28 0 0 0 2 2 2
58909+4 4 5 4 4 4 2 0 0 7 12 15 31 96 139 64 123 161
58910+90 154 193 64 123 161 90 154 193 90 154 193 64 123 161 90 154 193
58911+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
58912+90 154 193 90 154 193 90 154 193 101 161 196 101 161 196 101 161 196
58913+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
58914+101 161 196 136 185 209 26 108 161 22 40 52 7 11 13 5 7 8
58915+2 5 5 2 5 5 2 5 5 2 2 1 37 38 37 158 157 158
58916+174 174 174 154 154 154 156 155 156 167 166 167 165 164 165 37 38 37
58917+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58918+4 4 4 4 4 4 4 4 4 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
58921+3 1 0 4 0 0 60 73 81 157 156 157 163 162 163 153 152 153
58922+158 157 158 167 166 167 137 136 137 26 28 28 2 0 0 2 2 2
58923+4 5 5 4 4 4 4 0 0 7 12 15 24 86 132 26 108 161
58924+37 112 160 64 123 161 90 154 193 64 123 161 90 154 193 90 154 193
58925+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
58926+90 154 193 101 161 196 90 154 193 101 161 196 101 161 196 101 161 196
58927+101 161 196 101 161 196 101 161 196 136 185 209 101 161 196 136 185 209
58928+90 154 193 35 83 115 13 16 17 13 16 17 7 11 13 3 6 7
58929+5 7 8 6 6 6 3 4 3 2 2 1 30 32 34 154 154 154
58930+167 166 167 154 154 154 154 154 154 174 174 174 165 164 165 37 38 37
58931+6 6 6 4 0 0 6 6 6 4 4 4 4 4 4 4 4 4
58932+4 4 4 4 4 4 4 4 4 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
58935+4 0 0 4 0 0 41 54 63 163 162 163 166 165 166 154 154 154
58936+163 162 163 174 174 174 137 136 137 26 28 28 0 0 0 2 2 2
58937+4 5 5 4 4 5 1 1 2 6 10 14 28 67 93 18 97 151
58938+18 97 151 18 97 151 26 108 161 37 112 160 37 112 160 90 154 193
58939+64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
58940+90 154 193 101 161 196 101 161 196 90 154 193 101 161 196 101 161 196
58941+101 161 196 101 161 196 101 161 196 136 185 209 90 154 193 16 89 141
58942+13 20 25 7 11 13 5 7 8 5 7 8 2 5 5 4 5 5
58943+3 4 3 4 5 5 3 4 3 0 0 0 37 38 37 158 157 158
58944+174 174 174 158 157 158 158 157 158 167 166 167 174 174 174 41 54 63
58945+4 0 0 3 2 2 5 5 5 4 4 4 4 4 4 4 4 4
58946+4 4 4 4 4 4 4 4 4 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
58949+1 1 1 4 0 0 60 73 81 165 164 165 174 174 174 158 157 158
58950+167 166 167 174 174 174 153 152 153 26 28 28 2 0 0 2 2 2
58951+4 5 5 4 4 4 4 0 0 7 12 15 10 87 144 10 87 144
58952+18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
58953+26 108 161 37 112 160 53 118 160 90 154 193 90 154 193 90 154 193
58954+90 154 193 90 154 193 101 161 196 101 161 196 101 161 196 101 161 196
58955+101 161 196 136 185 209 90 154 193 26 108 161 22 40 52 13 16 17
58956+7 11 13 3 6 7 5 7 8 5 7 8 2 5 5 4 5 5
58957+4 5 5 6 6 6 3 4 3 0 0 0 30 32 34 158 157 158
58958+174 174 174 156 155 156 155 154 155 165 164 165 154 153 154 37 38 37
58959+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58960+4 4 4 4 4 4 4 4 4 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
58963+4 0 0 4 0 0 60 73 81 167 166 167 174 174 174 163 162 163
58964+174 174 174 174 174 174 153 152 153 26 28 28 0 0 0 3 3 3
58965+5 5 5 4 4 4 1 1 2 7 12 15 28 67 93 18 97 151
58966+18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
58967+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
58968+90 154 193 26 108 161 90 154 193 90 154 193 90 154 193 101 161 196
58969+101 161 196 26 108 161 22 40 52 13 16 17 7 11 13 2 5 5
58970+2 5 5 6 6 6 2 5 5 4 5 5 4 5 5 4 5 5
58971+3 4 3 5 5 5 3 4 3 2 0 0 30 32 34 137 136 137
58972+153 152 153 137 136 137 131 129 131 137 136 137 131 129 131 37 38 37
58973+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58974+4 4 4 4 4 4 4 4 4 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
58977+1 1 1 4 0 0 60 73 81 167 166 167 174 174 174 166 165 166
58978+174 174 174 177 184 187 153 152 153 30 32 34 1 0 0 3 3 3
58979+5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
58980+18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
58981+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
58982+26 108 161 26 108 161 26 108 161 90 154 193 90 154 193 26 108 161
58983+35 83 115 13 16 17 7 11 13 5 7 8 3 6 7 5 7 8
58984+2 5 5 6 6 6 4 5 5 4 5 5 3 4 3 4 5 5
58985+3 4 3 6 6 6 3 4 3 0 0 0 26 28 28 125 124 125
58986+131 129 131 125 124 125 125 124 125 131 129 131 131 129 131 37 38 37
58987+4 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58988+4 4 4 4 4 4 4 4 4 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
58991+3 1 0 4 0 0 60 73 81 174 174 174 177 184 187 167 166 167
58992+174 174 174 177 184 187 153 152 153 30 32 34 0 0 0 3 3 3
58993+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
58994+18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
58995+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
58996+26 108 161 90 154 193 26 108 161 26 108 161 24 86 132 13 20 25
58997+7 11 13 13 20 25 22 40 52 5 7 8 3 4 3 3 4 3
58998+4 5 5 3 4 3 4 5 5 3 4 3 4 5 5 3 4 3
58999+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
59000+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59001+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59002+4 4 4 4 4 4 4 4 4 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
59005+1 1 1 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
59006+174 174 174 190 197 201 157 156 157 30 32 34 1 0 0 3 3 3
59007+5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
59008+18 97 151 19 95 150 19 95 150 18 97 151 18 97 151 26 108 161
59009+18 97 151 26 108 161 26 108 161 26 108 161 26 108 161 90 154 193
59010+26 108 161 26 108 161 26 108 161 22 40 52 2 5 5 3 4 3
59011+28 67 93 37 112 160 34 86 122 2 5 5 3 4 3 3 4 3
59012+3 4 3 3 4 3 3 4 3 2 2 1 3 4 3 4 4 4
59013+4 5 5 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
59014+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59015+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59016+4 4 4 4 4 4 4 4 4 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
59019+4 0 0 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
59020+174 174 174 190 197 201 158 157 158 30 32 34 0 0 0 2 2 2
59021+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
59022+10 87 144 19 95 150 19 95 150 18 97 151 18 97 151 18 97 151
59023+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
59024+18 97 151 22 40 52 2 5 5 2 2 1 22 40 52 26 108 161
59025+90 154 193 37 112 160 22 40 52 3 4 3 13 20 25 22 30 35
59026+3 6 7 1 1 1 2 2 2 6 9 11 5 5 5 4 3 3
59027+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
59028+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59029+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59030+4 4 4 4 4 4 4 4 4 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
59033+1 1 1 4 0 0 60 73 81 177 184 187 193 200 203 174 174 174
59034+177 184 187 193 200 203 163 162 163 30 32 34 4 0 0 2 2 2
59035+5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
59036+10 87 144 10 87 144 19 95 150 19 95 150 19 95 150 18 97 151
59037+26 108 161 26 108 161 26 108 161 90 154 193 26 108 161 28 67 93
59038+6 10 14 2 5 5 13 20 25 24 86 132 37 112 160 90 154 193
59039+10 87 144 7 12 15 2 5 5 28 67 93 37 112 160 28 67 93
59040+2 2 1 7 12 15 35 83 115 28 67 93 3 6 7 1 0 0
59041+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
59042+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59043+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59044+4 4 4 4 4 4 4 4 4 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
59047+4 0 0 4 0 0 60 73 81 174 174 174 190 197 201 174 174 174
59048+177 184 187 193 200 203 163 162 163 30 32 34 0 0 0 2 2 2
59049+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
59050+10 87 144 16 89 141 19 95 150 10 87 144 26 108 161 26 108 161
59051+26 108 161 26 108 161 26 108 161 28 67 93 6 10 14 1 1 2
59052+7 12 15 28 67 93 26 108 161 16 89 141 24 86 132 21 29 34
59053+3 4 3 21 29 34 37 112 160 37 112 160 27 99 146 21 29 34
59054+21 29 34 26 108 161 90 154 193 35 83 115 1 1 2 2 0 0
59055+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
59056+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59057+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59058+4 4 4 4 4 4 4 4 4 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
59061+3 1 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
59062+190 197 201 193 200 203 165 164 165 37 38 37 4 0 0 2 2 2
59063+5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
59064+10 87 144 10 87 144 16 89 141 18 97 151 18 97 151 10 87 144
59065+24 86 132 24 86 132 13 20 25 4 5 7 4 5 7 22 40 52
59066+18 97 151 37 112 160 26 108 161 7 12 15 1 1 1 0 0 0
59067+28 67 93 37 112 160 26 108 161 28 67 93 22 40 52 28 67 93
59068+26 108 161 90 154 193 26 108 161 10 87 144 0 0 0 2 0 0
59069+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
59070+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59071+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59072+4 4 4 4 4 4 4 4 4 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
59075+4 0 0 6 6 6 60 73 81 174 174 174 193 200 203 174 174 174
59076+190 197 201 193 200 203 165 164 165 30 32 34 0 0 0 2 2 2
59077+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
59078+10 87 144 10 87 144 10 87 144 18 97 151 28 67 93 6 10 14
59079+0 0 0 1 1 2 4 5 7 13 20 25 16 89 141 26 108 161
59080+26 108 161 26 108 161 24 86 132 6 9 11 2 3 3 22 40 52
59081+37 112 160 16 89 141 22 40 52 28 67 93 26 108 161 26 108 161
59082+90 154 193 26 108 161 26 108 161 28 67 93 1 1 1 4 0 0
59083+4 4 4 5 5 5 3 3 3 4 0 0 26 28 28 124 126 130
59084+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59085+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59086+4 4 4 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
59089+4 0 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
59090+193 200 203 193 200 203 167 166 167 37 38 37 4 0 0 2 2 2
59091+5 5 5 4 4 4 4 0 0 6 10 14 28 67 93 10 87 144
59092+10 87 144 10 87 144 18 97 151 10 87 144 13 20 25 4 5 7
59093+1 1 2 1 1 1 22 40 52 26 108 161 26 108 161 26 108 161
59094+26 108 161 26 108 161 26 108 161 24 86 132 22 40 52 22 40 52
59095+22 40 52 22 40 52 10 87 144 26 108 161 26 108 161 26 108 161
59096+26 108 161 26 108 161 90 154 193 10 87 144 0 0 0 4 0 0
59097+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
59098+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59099+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59100+4 4 4 4 4 4 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
59103+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
59104+190 197 201 205 212 215 167 166 167 30 32 34 0 0 0 2 2 2
59105+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
59106+10 87 144 10 87 144 10 87 144 10 87 144 22 40 52 1 1 2
59107+2 0 0 1 1 2 24 86 132 26 108 161 26 108 161 26 108 161
59108+26 108 161 19 95 150 16 89 141 10 87 144 22 40 52 22 40 52
59109+10 87 144 26 108 161 37 112 160 26 108 161 26 108 161 26 108 161
59110+26 108 161 26 108 161 26 108 161 28 67 93 2 0 0 3 1 0
59111+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
59112+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59113+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59114+4 4 4 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
59117+4 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
59118+193 200 203 193 200 203 174 174 174 37 38 37 4 0 0 2 2 2
59119+5 5 5 4 4 4 3 2 2 1 1 2 13 20 25 10 87 144
59120+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 13 20 25
59121+13 20 25 22 40 52 10 87 144 18 97 151 18 97 151 26 108 161
59122+10 87 144 13 20 25 6 10 14 21 29 34 24 86 132 18 97 151
59123+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
59124+26 108 161 90 154 193 18 97 151 13 20 25 0 0 0 4 3 3
59125+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
59126+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59127+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
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
59131+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
59132+190 197 201 220 221 221 167 166 167 30 32 34 1 0 0 2 2 2
59133+5 5 5 4 4 4 4 4 5 2 5 5 4 5 7 13 20 25
59134+28 67 93 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
59135+10 87 144 10 87 144 18 97 151 10 87 144 18 97 151 18 97 151
59136+28 67 93 2 3 3 0 0 0 28 67 93 26 108 161 26 108 161
59137+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
59138+26 108 161 10 87 144 13 20 25 1 1 2 3 2 2 4 4 4
59139+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
59140+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59141+0 0 0 3 3 3 5 5 5 4 4 4 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
59145+4 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
59146+193 200 203 193 200 203 174 174 174 26 28 28 4 0 0 4 3 3
59147+5 5 5 4 4 4 4 4 4 4 4 5 1 1 2 2 5 5
59148+4 5 7 22 40 52 10 87 144 10 87 144 18 97 151 10 87 144
59149+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 18 97 151
59150+10 87 144 28 67 93 22 40 52 10 87 144 26 108 161 18 97 151
59151+18 97 151 18 97 151 26 108 161 26 108 161 26 108 161 26 108 161
59152+22 40 52 1 1 2 0 0 0 2 3 3 4 4 4 4 4 4
59153+4 4 4 5 5 5 4 4 4 0 0 0 26 28 28 131 129 131
59154+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59155+0 0 0 3 3 3 5 5 5 4 4 4 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
59159+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
59160+190 197 201 220 221 221 190 197 201 41 54 63 4 0 0 2 2 2
59161+6 6 6 4 4 4 4 4 4 4 4 5 4 4 5 3 3 3
59162+1 1 2 1 1 2 6 10 14 22 40 52 10 87 144 18 97 151
59163+18 97 151 10 87 144 10 87 144 10 87 144 18 97 151 10 87 144
59164+10 87 144 18 97 151 26 108 161 18 97 151 18 97 151 10 87 144
59165+26 108 161 26 108 161 26 108 161 10 87 144 28 67 93 6 10 14
59166+1 1 2 1 1 2 4 3 3 4 4 5 4 4 4 4 4 4
59167+5 5 5 5 5 5 1 1 1 4 0 0 37 51 59 137 136 137
59168+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59169+0 0 0 3 3 3 5 5 5 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
59173+4 0 0 4 0 0 60 73 81 220 221 221 193 200 203 174 174 174
59174+193 200 203 193 200 203 220 221 221 137 136 137 13 16 17 4 0 0
59175+2 2 2 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5
59176+4 4 5 4 3 3 1 1 2 4 5 7 13 20 25 28 67 93
59177+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
59178+10 87 144 18 97 151 18 97 151 10 87 144 18 97 151 26 108 161
59179+26 108 161 18 97 151 28 67 93 6 10 14 0 0 0 0 0 0
59180+2 3 3 4 5 5 4 4 5 4 4 4 4 4 4 5 5 5
59181+3 3 3 1 1 1 0 0 0 16 19 21 125 124 125 137 136 137
59182+131 129 131 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59183+0 0 0 3 3 3 5 5 5 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
59187+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
59188+193 200 203 190 197 201 220 221 221 220 221 221 153 152 153 30 32 34
59189+0 0 0 0 0 0 2 2 2 4 4 4 4 4 4 4 4 4
59190+4 4 4 4 5 5 4 5 7 1 1 2 1 1 2 4 5 7
59191+13 20 25 28 67 93 10 87 144 18 97 151 10 87 144 10 87 144
59192+10 87 144 10 87 144 10 87 144 18 97 151 26 108 161 18 97 151
59193+28 67 93 7 12 15 0 0 0 0 0 0 2 2 1 4 4 4
59194+4 5 5 4 5 5 4 4 4 4 4 4 3 3 3 0 0 0
59195+0 0 0 0 0 0 37 38 37 125 124 125 158 157 158 131 129 131
59196+125 124 125 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59197+0 0 0 3 3 3 5 5 5 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
59201+4 3 3 4 0 0 41 54 63 193 200 203 220 221 221 174 174 174
59202+193 200 203 193 200 203 193 200 203 220 221 221 244 246 246 193 200 203
59203+120 125 127 5 5 5 1 0 0 0 0 0 1 1 1 4 4 4
59204+4 4 4 4 4 4 4 5 5 4 5 5 4 4 5 1 1 2
59205+4 5 7 4 5 7 22 40 52 10 87 144 10 87 144 10 87 144
59206+10 87 144 10 87 144 18 97 151 10 87 144 10 87 144 13 20 25
59207+4 5 7 2 3 3 1 1 2 4 4 4 4 5 5 4 4 4
59208+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 1 2
59209+24 26 27 60 74 84 153 152 153 163 162 163 137 136 137 125 124 125
59210+125 124 125 125 124 125 125 124 125 137 136 137 125 124 125 26 28 28
59211+0 0 0 3 3 3 5 5 5 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
59215+4 0 0 6 6 6 26 28 28 156 155 156 220 221 221 220 221 221
59216+174 174 174 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
59217+220 221 221 167 166 167 60 73 81 7 11 13 0 0 0 0 0 0
59218+3 3 3 4 4 4 4 4 4 4 4 4 4 4 5 4 4 5
59219+4 4 5 1 1 2 1 1 2 4 5 7 22 40 52 10 87 144
59220+10 87 144 10 87 144 10 87 144 22 40 52 4 5 7 1 1 2
59221+1 1 2 4 4 5 4 4 4 4 4 4 4 4 4 4 4 4
59222+5 5 5 2 2 2 0 0 0 4 0 0 16 19 21 60 73 81
59223+137 136 137 167 166 167 158 157 158 137 136 137 131 129 131 131 129 131
59224+125 124 125 125 124 125 131 129 131 155 154 155 60 74 84 5 7 8
59225+0 0 0 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
59229+5 5 5 4 0 0 4 0 0 60 73 81 193 200 203 220 221 221
59230+193 200 203 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
59231+220 221 221 220 221 221 220 221 221 137 136 137 43 57 68 6 6 6
59232+4 0 0 1 1 1 4 4 4 4 4 4 4 4 4 4 4 4
59233+4 4 5 4 4 5 3 2 2 1 1 2 2 5 5 13 20 25
59234+22 40 52 22 40 52 13 20 25 2 3 3 1 1 2 3 3 3
59235+4 5 7 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59236+1 1 1 0 0 0 2 3 3 41 54 63 131 129 131 166 165 166
59237+166 165 166 155 154 155 153 152 153 137 136 137 137 136 137 125 124 125
59238+125 124 125 137 136 137 137 136 137 125 124 125 37 38 37 4 3 3
59239+4 3 3 5 5 5 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
59243+4 3 3 6 6 6 6 6 6 13 16 17 60 73 81 167 166 167
59244+220 221 221 220 221 221 220 221 221 193 200 203 193 200 203 193 200 203
59245+205 212 215 220 221 221 220 221 221 244 246 246 205 212 215 125 124 125
59246+24 26 27 0 0 0 0 0 0 2 2 2 5 5 5 5 5 5
59247+4 4 4 4 4 4 4 4 4 4 4 5 1 1 2 4 5 7
59248+4 5 7 4 5 7 1 1 2 3 2 2 4 4 5 4 4 4
59249+4 4 4 4 4 4 5 5 5 4 4 4 0 0 0 0 0 0
59250+2 0 0 26 28 28 125 124 125 174 174 174 174 174 174 166 165 166
59251+156 155 156 153 152 153 137 136 137 137 136 137 131 129 131 137 136 137
59252+137 136 137 137 136 137 60 74 84 30 32 34 4 0 0 4 0 0
59253+5 5 5 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
59257+5 5 5 6 6 6 4 0 0 4 0 0 6 6 6 26 28 28
59258+125 124 125 174 174 174 220 221 221 220 221 221 220 221 221 193 200 203
59259+205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
59260+193 200 203 60 74 84 13 16 17 4 0 0 0 0 0 3 3 3
59261+5 5 5 5 5 5 4 4 4 4 4 4 4 4 5 3 3 3
59262+1 1 2 3 3 3 4 4 5 4 4 5 4 4 4 4 4 4
59263+5 5 5 5 5 5 2 2 2 0 0 0 0 0 0 13 16 17
59264+60 74 84 174 174 174 193 200 203 174 174 174 167 166 167 163 162 163
59265+153 152 153 153 152 153 137 136 137 137 136 137 153 152 153 137 136 137
59266+125 124 125 41 54 63 24 26 27 4 0 0 4 0 0 5 5 5
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
59271+4 3 3 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
59272+6 6 6 37 38 37 131 129 131 220 221 221 220 221 221 220 221 221
59273+193 200 203 193 200 203 220 221 221 205 212 215 220 221 221 244 246 246
59274+244 246 246 244 246 246 174 174 174 41 54 63 0 0 0 0 0 0
59275+0 0 0 4 4 4 5 5 5 5 5 5 4 4 4 4 4 5
59276+4 4 5 4 4 5 4 4 4 4 4 4 6 6 6 6 6 6
59277+3 3 3 0 0 0 2 0 0 13 16 17 60 73 81 156 155 156
59278+220 221 221 193 200 203 174 174 174 165 164 165 163 162 163 154 153 154
59279+153 152 153 153 152 153 158 157 158 163 162 163 137 136 137 60 73 81
59280+13 16 17 4 0 0 4 0 0 4 3 3 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
59285+5 5 5 4 3 3 4 3 3 6 6 6 6 6 6 6 6 6
59286+6 6 6 6 6 6 6 6 6 37 38 37 167 166 167 244 246 246
59287+244 246 246 220 221 221 205 212 215 205 212 215 220 221 221 193 200 203
59288+220 221 221 244 246 246 244 246 246 244 246 246 137 136 137 37 38 37
59289+3 2 2 0 0 0 1 1 1 5 5 5 5 5 5 4 4 4
59290+4 4 4 4 4 4 4 4 4 5 5 5 4 4 4 1 1 1
59291+0 0 0 5 5 5 43 57 68 153 152 153 193 200 203 220 221 221
59292+177 184 187 174 174 174 167 166 167 166 165 166 158 157 158 157 156 157
59293+158 157 158 166 165 166 156 155 156 85 115 134 13 16 17 4 0 0
59294+4 0 0 4 0 0 5 5 5 5 5 5 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
59299+5 5 5 4 3 3 6 6 6 6 6 6 4 0 0 6 6 6
59300+6 6 6 6 6 6 6 6 6 6 6 6 13 16 17 60 73 81
59301+177 184 187 220 221 221 220 221 221 220 221 221 205 212 215 220 221 221
59302+220 221 221 205 212 215 220 221 221 244 246 246 244 246 246 205 212 215
59303+125 124 125 30 32 34 0 0 0 0 0 0 2 2 2 5 5 5
59304+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 0 0
59305+37 38 37 131 129 131 205 212 215 220 221 221 193 200 203 174 174 174
59306+174 174 174 174 174 174 167 166 167 165 164 165 166 165 166 167 166 167
59307+158 157 158 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
59308+4 3 3 5 5 5 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
59313+4 4 4 5 5 5 4 3 3 4 3 3 6 6 6 6 6 6
59314+4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
59315+26 28 28 125 124 125 205 212 215 220 221 221 220 221 221 220 221 221
59316+205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
59317+244 246 246 190 197 201 60 74 84 16 19 21 4 0 0 0 0 0
59318+0 0 0 0 0 0 0 0 0 0 0 0 16 19 21 120 125 127
59319+177 184 187 220 221 221 205 212 215 177 184 187 174 174 174 177 184 187
59320+174 174 174 174 174 174 167 166 167 174 174 174 166 165 166 137 136 137
59321+60 73 81 13 16 17 4 0 0 4 0 0 4 3 3 6 6 6
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
59327+5 5 5 4 3 3 5 5 5 4 3 3 6 6 6 4 0 0
59328+6 6 6 6 6 6 4 0 0 6 6 6 4 0 0 6 6 6
59329+6 6 6 6 6 6 37 38 37 137 136 137 193 200 203 220 221 221
59330+220 221 221 205 212 215 220 221 221 205 212 215 205 212 215 220 221 221
59331+220 221 221 220 221 221 244 246 246 166 165 166 43 57 68 2 2 2
59332+0 0 0 4 0 0 16 19 21 60 73 81 157 156 157 202 210 214
59333+220 221 221 193 200 203 177 184 187 177 184 187 177 184 187 174 174 174
59334+174 174 174 174 174 174 174 174 174 157 156 157 60 74 84 24 26 27
59335+4 0 0 4 0 0 4 0 0 6 6 6 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
59341+4 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
59342+6 6 6 4 0 0 6 6 6 6 6 6 6 6 6 4 0 0
59343+4 0 0 4 0 0 6 6 6 24 26 27 60 73 81 167 166 167
59344+220 221 221 220 221 221 220 221 221 205 212 215 205 212 215 205 212 215
59345+205 212 215 220 221 221 220 221 221 220 221 221 205 212 215 137 136 137
59346+60 74 84 125 124 125 137 136 137 190 197 201 220 221 221 193 200 203
59347+177 184 187 177 184 187 177 184 187 174 174 174 174 174 174 177 184 187
59348+190 197 201 174 174 174 125 124 125 37 38 37 6 6 6 4 0 0
59349+4 0 0 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
59355+4 4 4 4 4 4 5 5 5 5 5 5 4 3 3 6 6 6
59356+4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 6 6 6
59357+6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
59358+125 124 125 193 200 203 244 246 246 220 221 221 205 212 215 205 212 215
59359+205 212 215 193 200 203 205 212 215 205 212 215 220 221 221 220 221 221
59360+193 200 203 193 200 203 205 212 215 193 200 203 193 200 203 177 184 187
59361+190 197 201 190 197 201 174 174 174 190 197 201 193 200 203 190 197 201
59362+153 152 153 60 73 81 4 0 0 4 0 0 4 0 0 3 2 2
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
59369+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
59370+6 6 6 4 3 3 4 3 3 4 3 3 6 6 6 6 6 6
59371+4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 4 0 0
59372+4 0 0 26 28 28 131 129 131 220 221 221 244 246 246 220 221 221
59373+205 212 215 193 200 203 205 212 215 193 200 203 193 200 203 205 212 215
59374+220 221 221 193 200 203 193 200 203 193 200 203 190 197 201 174 174 174
59375+174 174 174 190 197 201 193 200 203 193 200 203 167 166 167 125 124 125
59376+6 6 6 4 0 0 4 0 0 4 3 3 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
59383+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
59384+5 5 5 4 3 3 5 5 5 6 6 6 4 3 3 5 5 5
59385+6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
59386+4 0 0 4 0 0 6 6 6 41 54 63 158 157 158 220 221 221
59387+220 221 221 220 221 221 193 200 203 193 200 203 193 200 203 190 197 201
59388+190 197 201 190 197 201 190 197 201 190 197 201 174 174 174 193 200 203
59389+193 200 203 220 221 221 174 174 174 125 124 125 37 38 37 4 0 0
59390+4 0 0 4 3 3 6 6 6 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
59397+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59398+4 4 4 5 5 5 4 3 3 4 3 3 4 3 3 5 5 5
59399+4 3 3 6 6 6 5 5 5 4 3 3 6 6 6 6 6 6
59400+6 6 6 6 6 6 4 0 0 4 0 0 13 16 17 60 73 81
59401+174 174 174 220 221 221 220 221 221 205 212 215 190 197 201 174 174 174
59402+193 200 203 174 174 174 190 197 201 174 174 174 193 200 203 220 221 221
59403+193 200 203 131 129 131 37 38 37 6 6 6 4 0 0 4 0 0
59404+6 6 6 6 6 6 4 3 3 5 5 5 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
59411+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59412+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5
59413+5 5 5 4 3 3 4 3 3 5 5 5 4 3 3 4 3 3
59414+5 5 5 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
59415+6 6 6 125 124 125 174 174 174 220 221 221 220 221 221 193 200 203
59416+193 200 203 193 200 203 193 200 203 193 200 203 220 221 221 158 157 158
59417+60 73 81 6 6 6 4 0 0 4 0 0 5 5 5 6 6 6
59418+5 5 5 5 5 5 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
59425+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59426+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59427+4 4 4 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
59428+5 5 5 5 5 5 6 6 6 6 6 6 4 0 0 4 0 0
59429+4 0 0 4 0 0 26 28 28 125 124 125 174 174 174 193 200 203
59430+193 200 203 174 174 174 193 200 203 167 166 167 125 124 125 6 6 6
59431+6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 5 5 5
59432+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
59433+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59434+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59435+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59436+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59437+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59438+4 4 4 4 4 4
59439+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59440+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59441+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
59442+4 3 3 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
59443+6 6 6 4 0 0 4 0 0 6 6 6 37 38 37 125 124 125
59444+153 152 153 131 129 131 125 124 125 37 38 37 6 6 6 6 6 6
59445+6 6 6 4 0 0 6 6 6 6 6 6 4 3 3 5 5 5
59446+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59447+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59448+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59449+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59450+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59451+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59452+4 4 4 4 4 4
59453+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59454+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59455+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59456+4 4 4 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
59457+6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
59458+24 26 27 24 26 27 6 6 6 6 6 6 6 6 6 4 0 0
59459+6 6 6 6 6 6 4 0 0 6 6 6 5 5 5 4 3 3
59460+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59461+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59462+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59463+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59464+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59465+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59466+4 4 4 4 4 4
59467+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59468+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59469+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59470+4 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
59471+4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
59472+6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
59473+4 0 0 6 6 6 6 6 6 4 3 3 5 5 5 4 4 4
59474+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59475+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59476+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59477+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59478+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59479+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59480+4 4 4 4 4 4
59481+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59482+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59483+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59484+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 5 5 5
59485+5 5 5 5 5 5 4 0 0 6 6 6 4 0 0 6 6 6
59486+6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 4 0 0
59487+6 6 6 4 3 3 5 5 5 4 3 3 5 5 5 4 4 4
59488+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59489+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59490+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59491+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59492+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59493+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59494+4 4 4 4 4 4
59495+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59496+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59497+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59498+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
59499+4 3 3 6 6 6 4 3 3 6 6 6 6 6 6 6 6 6
59500+4 0 0 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
59501+6 6 6 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59502+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59503+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59504+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59505+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59506+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59507+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59508+4 4 4 4 4 4
59509+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59510+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59511+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59512+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59513+4 4 4 5 5 5 4 3 3 5 5 5 4 0 0 6 6 6
59514+6 6 6 4 0 0 6 6 6 6 6 6 4 0 0 6 6 6
59515+4 3 3 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
59516+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59517+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59518+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59519+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59520+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59521+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59522+4 4 4 4 4 4
59523+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59524+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59525+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59526+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59527+4 4 4 5 5 5 4 3 3 5 5 5 6 6 6 4 3 3
59528+4 3 3 6 6 6 6 6 6 4 3 3 6 6 6 4 3 3
59529+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59530+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59531+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59532+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59533+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59534+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59535+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59536+4 4 4 4 4 4
59537+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59538+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59539+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59540+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59541+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 6 6 6
59542+5 5 5 4 3 3 4 3 3 4 3 3 5 5 5 5 5 5
59543+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59544+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59545+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59546+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59547+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59548+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59549+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59550+4 4 4 4 4 4
59551+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59552+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59553+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59554+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59555+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
59556+5 5 5 4 3 3 5 5 5 5 5 5 4 4 4 4 4 4
59557+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59558+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59559+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59560+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59561+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59562+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59563+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59564+4 4 4 4 4 4
59565diff --git a/drivers/xen/events/events_base.c b/drivers/xen/events/events_base.c
59566index 3838795..0d48d61 100644
59567--- a/drivers/xen/events/events_base.c
59568+++ b/drivers/xen/events/events_base.c
59569@@ -1568,7 +1568,7 @@ void xen_irq_resume(void)
59570 restore_pirqs();
59571 }
59572
59573-static struct irq_chip xen_dynamic_chip __read_mostly = {
59574+static struct irq_chip xen_dynamic_chip = {
59575 .name = "xen-dyn",
59576
59577 .irq_disable = disable_dynirq,
59578@@ -1582,7 +1582,7 @@ static struct irq_chip xen_dynamic_chip __read_mostly = {
59579 .irq_retrigger = retrigger_dynirq,
59580 };
59581
59582-static struct irq_chip xen_pirq_chip __read_mostly = {
59583+static struct irq_chip xen_pirq_chip = {
59584 .name = "xen-pirq",
59585
59586 .irq_startup = startup_pirq,
59587@@ -1602,7 +1602,7 @@ static struct irq_chip xen_pirq_chip __read_mostly = {
59588 .irq_retrigger = retrigger_dynirq,
59589 };
59590
59591-static struct irq_chip xen_percpu_chip __read_mostly = {
59592+static struct irq_chip xen_percpu_chip = {
59593 .name = "xen-percpu",
59594
59595 .irq_disable = disable_dynirq,
59596diff --git a/drivers/xen/xenfs/xenstored.c b/drivers/xen/xenfs/xenstored.c
59597index fef20db..d28b1ab 100644
59598--- a/drivers/xen/xenfs/xenstored.c
59599+++ b/drivers/xen/xenfs/xenstored.c
59600@@ -24,7 +24,12 @@ static int xsd_release(struct inode *inode, struct file *file)
59601 static int xsd_kva_open(struct inode *inode, struct file *file)
59602 {
59603 file->private_data = (void *)kasprintf(GFP_KERNEL, "0x%p",
59604+#ifdef CONFIG_GRKERNSEC_HIDESYM
59605+ NULL);
59606+#else
59607 xen_store_interface);
59608+#endif
59609+
59610 if (!file->private_data)
59611 return -ENOMEM;
59612 return 0;
59613diff --git a/firmware/Makefile b/firmware/Makefile
59614index e297e1b..6900c31 100644
59615--- a/firmware/Makefile
59616+++ b/firmware/Makefile
59617@@ -35,6 +35,7 @@ fw-shipped-$(CONFIG_BNX2X) += bnx2x/bnx2x-e1-6.2.9.0.fw \
59618 bnx2x/bnx2x-e1h-6.2.9.0.fw \
59619 bnx2x/bnx2x-e2-6.2.9.0.fw
59620 fw-shipped-$(CONFIG_BNX2) += bnx2/bnx2-mips-09-6.2.1a.fw \
59621+ bnx2/bnx2-mips-09-6.2.1b.fw \
59622 bnx2/bnx2-rv2p-09-6.0.17.fw \
59623 bnx2/bnx2-rv2p-09ax-6.0.17.fw \
59624 bnx2/bnx2-mips-06-6.2.1.fw \
59625diff --git a/firmware/WHENCE b/firmware/WHENCE
59626index 0c4d96d..7563083 100644
59627--- a/firmware/WHENCE
59628+++ b/firmware/WHENCE
59629@@ -655,19 +655,20 @@ Driver: BNX2 - Broadcom NetXtremeII
59630 File: bnx2/bnx2-mips-06-6.2.1.fw
59631 File: bnx2/bnx2-rv2p-06-6.0.15.fw
59632 File: bnx2/bnx2-mips-09-6.2.1a.fw
59633+File: bnx2/bnx2-mips-09-6.2.1b.fw
59634 File: bnx2/bnx2-rv2p-09-6.0.17.fw
59635 File: bnx2/bnx2-rv2p-09ax-6.0.17.fw
59636
59637 Licence:
59638-
59639- This file contains firmware data derived from proprietary unpublished
59640- source code, Copyright (c) 2004 - 2010 Broadcom Corporation.
59641-
59642- Permission is hereby granted for the distribution of this firmware data
59643- in hexadecimal or equivalent format, provided this copyright notice is
59644- accompanying it.
59645-
59646-Found in hex form in kernel source.
59647+
59648+ This file contains firmware data derived from proprietary unpublished
59649+ source code, Copyright (c) 2004 - 2010 Broadcom Corporation.
59650+
59651+ Permission is hereby granted for the distribution of this firmware data
59652+ in hexadecimal or equivalent format, provided this copyright notice is
59653+ accompanying it.
59654+
59655+Found in hex form in kernel source.
59656
59657 --------------------------------------------------------------------------
59658
59659diff --git a/firmware/bnx2/bnx2-mips-09-6.2.1b.fw.ihex b/firmware/bnx2/bnx2-mips-09-6.2.1b.fw.ihex
59660new file mode 100644
59661index 0000000..43d7c4f
59662--- /dev/null
59663+++ b/firmware/bnx2/bnx2-mips-09-6.2.1b.fw.ihex
59664@@ -0,0 +1,6496 @@
59665+:10000000080001180800000000005594000000C816
59666+:1000100000000000000000000000000008005594EF
59667+:10002000000000380000565C080000A00800000036
59668+:100030000000574400005694080059200000008436
59669+:100040000000ADD808005744000001C00000AE5CBD
59670+:100050000800321008000000000092580000B01C98
59671+:10006000000000000000000000000000080092589E
59672+:100070000000033C000142740800049008000400E2
59673+:10008000000012FC000145B000000000000000006C
59674+:1000900000000000080016FC00000004000158AC3D
59675+:1000A000080000A80800000000003D00000158B052
59676+:1000B00000000000000000000000000008003D00FB
59677+:1000C00000000030000195B00A000046000000006A
59678+:1000D000000000000000000D636F6D362E322E31DF
59679+:1000E00062000000060201020000000000000003A0
59680+:1000F000000000C800000032000000030000000003
59681+:1001000000000000000000000000000000000000EF
59682+:1001100000000010000001360000EA600000000549
59683+:1001200000000000000000000000000000000008C7
59684+:1001300000000000000000000000000000000000BF
59685+:1001400000000000000000000000000000000000AF
59686+:10015000000000000000000000000000000000009F
59687+:10016000000000020000000000000000000000008D
59688+:10017000000000000000000000000000000000007F
59689+:10018000000000000000000000000010000000005F
59690+:10019000000000000000000000000000000000005F
59691+:1001A000000000000000000000000000000000004F
59692+:1001B000000000000000000000000000000000003F
59693+:1001C000000000000000000000000000000000002F
59694+:1001D000000000000000000000000000000000001F
59695+:1001E0000000000010000003000000000000000DEF
59696+:1001F0000000000D3C020800244256083C030800A1
59697+:1002000024635754AC4000000043202B1480FFFDB2
59698+:10021000244200043C1D080037BD9FFC03A0F021D0
59699+:100220003C100800261001183C1C0800279C5608AA
59700+:100230000E000256000000000000000D27BDFFB4B4
59701+:10024000AFA10000AFA20004AFA30008AFA4000C50
59702+:10025000AFA50010AFA60014AFA70018AFA8001CF0
59703+:10026000AFA90020AFAA0024AFAB0028AFAC002C90
59704+:10027000AFAD0030AFAE0034AFAF0038AFB8003C28
59705+:10028000AFB90040AFBC0044AFBF00480E001544FA
59706+:10029000000000008FBF00488FBC00448FB90040B1
59707+:1002A0008FB8003C8FAF00388FAE00348FAD003078
59708+:1002B0008FAC002C8FAB00288FAA00248FA90020C0
59709+:1002C0008FA8001C8FA700188FA600148FA5001000
59710+:1002D0008FA4000C8FA300088FA200048FA1000040
59711+:1002E00027BD004C3C1B60108F7A5030377B502864
59712+:1002F00003400008AF7A00008F82002427BDFFE092
59713+:10030000AFB00010AFBF0018AFB100148C42000CAA
59714+:100310003C1080008E110100104000348FBF001887
59715+:100320000E000D84000000008F85002024047FFF54
59716+:100330000091202BACB100008E030104960201084D
59717+:1003400000031C003042FFFF00621825ACA300042C
59718+:100350009202010A96030114304200FF3063FFFF4E
59719+:100360000002140000431025ACA200089603010C03
59720+:100370009602010E00031C003042FFFF00621825A8
59721+:10038000ACA3000C960301109602011200031C009E
59722+:100390003042FFFF00621825ACA300108E02011846
59723+:1003A000ACA200148E02011CACA20018148000083C
59724+:1003B0008F820024978200003C0420050044182509
59725+:1003C00024420001ACA3001C0A0000C6A782000062
59726+:1003D0003C0340189442001E00431025ACA2001CB0
59727+:1003E0000E000DB8240400018FBF00188FB1001457
59728+:1003F0008FB000100000102103E0000827BD00208E
59729+:100400003C0780008CE202B834E50100044100089A
59730+:10041000240300013C0208008C42006024420001D9
59731+:100420003C010800AC22006003E0000800601021DD
59732+:100430003C0208008C42005C8CA4002094A30016AF
59733+:100440008CA6000494A5000E24420001ACE40280B6
59734+:100450002463FFFC3C010800AC22005C3C0210005D
59735+:10046000A4E30284A4E5028600001821ACE6028819
59736+:10047000ACE202B803E000080060102127BDFFE0F5
59737+:100480003C028000AFB0001034420100AFBF001C3E
59738+:10049000AFB20018AFB100148C43000094450008BF
59739+:1004A0002462FE002C42038110400003000381C23D
59740+:1004B0000A00010226100004240201001462000553
59741+:1004C0003C1180003C02800890420004305000FF44
59742+:1004D0003C11800036320100964300143202000FB6
59743+:1004E00000021500004310253C0308008C63004403
59744+:1004F00030A40004AE220080246300013C01080007
59745+:10050000AC2300441080000730A200028FBF001C03
59746+:100510008FB200188FB100148FB000100A0000CE07
59747+:1005200027BD00201040002D0000182130A20080BF
59748+:1005300010400005362200708E44001C0E000C672F
59749+:10054000240500A0362200708C4400008F82000C2D
59750+:10055000008210232C43012C10600004AF82001095
59751+:10056000240300010A000145AF84000C8E42000400
59752+:100570003C036020AF84000CAC6200143C02080015
59753+:100580008C42005850400015000018218C62000475
59754+:10059000240301FE304203FF144300100000182121
59755+:1005A0002E020004104000032E0200080A00014041
59756+:1005B0000000802114400003000000000A000140F8
59757+:1005C0002610FFF90000000D2402000202021004B0
59758+:1005D0003C036000AC626914000018218FBF001C4E
59759+:1005E0008FB200188FB100148FB00010006010217E
59760+:1005F00003E0000827BD00203C0480008C8301003C
59761+:1006000024020100506200033C0280080000000D3B
59762+:100610003C02800890430004000010213063000F6A
59763+:1006200000031D0003E00008AC8300800004188074
59764+:100630002782FF9C00621821000410C00044102390
59765+:100640008C640000000210C03C030800246356E4E0
59766+:10065000004310213C038000AC64009003E00008DC
59767+:10066000AF8200243C0208008C42011410400019A3
59768+:100670003084400030A2007F000231C03C02020002
59769+:100680001080001400A218253C026020AC43001426
59770+:100690003C0408008C8456B83C0308008C630110AD
59771+:1006A0003C02800024050900AC4500200086202182
59772+:1006B000246300013C028008AC4400643C01080053
59773+:1006C000AC2301103C010800AC2456B803E000083C
59774+:1006D000000000003C02602003E00008AC4500146C
59775+:1006E00003E000080000102103E0000800001021D2
59776+:1006F00030A2000810400008240201003C0208005B
59777+:100700008C42010C244200013C010800AC22010C87
59778+:1007100003E0000800000000148200080000000050
59779+:100720003C0208008C4200FC244200013C0108000D
59780+:10073000AC2200FC0A0001A330A200203C02080009
59781+:100740008C420084244200013C010800AC22008459
59782+:1007500030A200201040000830A200103C02080027
59783+:100760008C420108244200013C010800AC2201082F
59784+:1007700003E0000800000000104000080000000036
59785+:100780003C0208008C420104244200013C010800A4
59786+:10079000AC22010403E00008000000003C02080055
59787+:1007A0008C420100244200013C010800AC220100FF
59788+:1007B00003E000080000000027BDFFE0AFB1001417
59789+:1007C0003C118000AFB20018AFBF001CAFB00010EA
59790+:1007D0003632010096500008320200041040000733
59791+:1007E000320300028FBF001C8FB200188FB10014BB
59792+:1007F0008FB000100A0000CE27BD00201060000B53
59793+:10080000020028218E2401000E00018A0000000051
59794+:100810003202008010400003240500A10E000C6786
59795+:100820008E44001C0A0001E3240200018E2301040F
59796+:100830008F82000810430006020028218E24010048
59797+:100840000E00018A000000008E220104AF82000821
59798+:10085000000010218FBF001C8FB200188FB1001450
59799+:100860008FB0001003E0000827BD00202C82000498
59800+:1008700014400002000018212483FFFD240200021E
59801+:10088000006210043C03600003E00008AC626914DD
59802+:1008900027BDFFE0AFBF001CAFB20018AFB100141E
59803+:1008A000AFB000103C048000948201083043700017
59804+:1008B000240220001062000A2862200154400052E5
59805+:1008C0008FBF001C24024000106200482402600018
59806+:1008D0001062004A8FBF001C0A0002518FB200183C
59807+:1008E00034820100904300098C5000189451000C90
59808+:1008F000240200091062001C0000902128620009F7
59809+:10090000144000218F8200242402000A5062001249
59810+:10091000323100FF2402000B1062000F00000000C3
59811+:100920002402000C146200188F8200243C0208008C
59812+:100930008C4256B824030900AC83002000501021DB
59813+:100940003C038008AC6200643C010800AC2256B84D
59814+:100950000A0002508FBF001C0E0001E900102602A1
59815+:100960000A0002308F8200240E0001E900102602E6
59816+:100970003C0380089462001A8C72000C3042FFFF26
59817+:10098000020280258F8200248C42000C5040001E01
59818+:100990008FBF001C0E000D84000000003C02800090
59819+:1009A00034420100944300088F82002400031C009D
59820+:1009B0009444001E8F82002000641825AC50000073
59821+:1009C00024040001AC510004AC520008AC40000CFF
59822+:1009D000AC400010AC400014AC4000180E000DB844
59823+:1009E000AC43001C0A0002508FBF001C0E000440E4
59824+:1009F000000000000A0002508FBF001C0E000C9F78
59825+:100A0000000000008FBF001C8FB200188FB10014CF
59826+:100A10008FB000100000102103E0000827BD002067
59827+:100A200027BDFFD8AFB400203C036010AFBF002447
59828+:100A3000AFB3001CAFB20018AFB10014AFB00010DC
59829+:100A40008C6450002402FF7F3C1408002694563822
59830+:100A5000008220243484380CAC6450003C028000B6
59831+:100A6000240300370E0014B0AC4300083C07080014
59832+:100A700024E70618028010212404001D2484FFFFAF
59833+:100A8000AC4700000481FFFD244200043C02080042
59834+:100A9000244207C83C010800AC2256403C02080032
59835+:100AA000244202303C030800246306203C04080072
59836+:100AB000248403B43C05080024A506F03C06080085
59837+:100AC00024C62C9C3C010800AC2256803C02080045
59838+:100AD000244205303C010800AC2756843C01080044
59839+:100AE000AC2656943C010800AC23569C3C010800FF
59840+:100AF000AC2456A03C010800AC2556A43C010800DB
59841+:100B0000AC2256A83C010800AC23563C3C0108002E
59842+:100B1000AC2456443C010800AC2056603C0108005F
59843+:100B2000AC2556643C010800AC2056703C0108001E
59844+:100B3000AC27567C3C010800AC2656903C010800CE
59845+:100B4000AC2356980E00056E00000000AF80000C2C
59846+:100B50003C0280008C5300008F8300043C0208009C
59847+:100B60008C420020106200213262000700008821C0
59848+:100B70002792FF9C3C100800261056E43C02080017
59849+:100B80008C42002024050001022518040043202483
59850+:100B90008F820004004310245044000C26310001D1
59851+:100BA00010800008AF9000248E4300003C028000BB
59852+:100BB000AC4300900E000D4BAE05000C0A0002C1C4
59853+:100BC00026310001AE00000C263100012E22000269
59854+:100BD000261000381440FFE9265200043C020800A9
59855+:100BE0008C420020AF820004326200071040FFD91F
59856+:100BF0003C028000326200011040002D326200028F
59857+:100C00003C0580008CA2010000002021ACA2002045
59858+:100C10008CA301042C42078110400008ACA300A85B
59859+:100C200094A2010824032000304270001443000302
59860+:100C30003C02800890420005304400FF0E0001593C
59861+:100C4000000000003C0280009042010B304300FF96
59862+:100C50002C62001E54400004000310800E00018628
59863+:100C60000A0002EC00000000005410218C42000039
59864+:100C70000040F80900000000104000043C02800021
59865+:100C80008C4301043C026020AC4300143C02080089
59866+:100C90008C4200343C0440003C03800024420001AC
59867+:100CA000AC6401383C010800AC220034326200021E
59868+:100CB00010400010326200043C1080008E0201409F
59869+:100CC000000020210E000159AE0200200E00038317
59870+:100CD000000000003C024000AE0201783C02080027
59871+:100CE0008C420038244200013C010800AC2200384C
59872+:100CF000326200041040FF973C0280003C108000EC
59873+:100D00008E020180000020210E000159AE02002059
59874+:100D10008E03018024020F00546200073C02800809
59875+:100D20008E0201883C0300E03042FFFF00431025A3
59876+:100D30000A000328AE020080344200809042000086
59877+:100D400024030050304200FF14430007000000005D
59878+:100D50000E000362000000001440000300000000C9
59879+:100D60000E000971000000003C0208008C42003CAB
59880+:100D70003C0440003C03800024420001AC6401B804
59881+:100D80003C010800AC22003C0A0002A33C028000A7
59882+:100D90003C02900034420001008220253C02800089
59883+:100DA000AC4400203C0380008C6200200440FFFE25
59884+:100DB0000000000003E00008000000003C0280008A
59885+:100DC000344300010083202503E00008AC440020E8
59886+:100DD00027BDFFE0AFB10014AFB000100080882144
59887+:100DE000AFBF00180E00033230B000FF8F83FF94B6
59888+:100DF000022020219062002502028025A07000259B
59889+:100E00008C7000183C0280000E00033D020280241A
59890+:100E10001600000B8FBF00183C0480008C8201F884
59891+:100E20000440FFFE348201C024030002AC510000E4
59892+:100E3000A04300043C021000AC8201F88FBF0018F0
59893+:100E40008FB100148FB0001003E0000827BD002010
59894+:100E500027BDFFE83C028000AFBF00103442018094
59895+:100E6000944300048C4400083063020010600005C5
59896+:100E7000000028210E00100C000000000A0003787A
59897+:100E8000240500013C02FF000480000700821824B2
59898+:100E90003C02040014620004240500018F82FF94C8
59899+:100EA00090420008240500018FBF001000A010210F
59900+:100EB00003E0000827BD00188F82FF982405000179
59901+:100EC000A040001A3C028000344201400A00034264
59902+:100ED0008C4400008F85FF9427BDFFE0AFBF001C4E
59903+:100EE000AFB20018AFB10014AFB0001090A2000074
59904+:100EF000304400FF38830020388200300003182B74
59905+:100F00000002102B0062182410600003240200501D
59906+:100F1000148200A88FBF001C90A20005304200017F
59907+:100F2000104000A48FBF001C3C02800034420140EE
59908+:100F3000904200082443FFFF2C6200051040009EF1
59909+:100F40008FB20018000310803C030800246355ACE6
59910+:100F5000004310218C420000004000080000000007
59911+:100F60003C028000345101400E0003328E24000008
59912+:100F70008F92FF948E2200048E50000C1602000205
59913+:100F800024020001AE42000C0E00033D8E2400003E
59914+:100F90008E220004145000068FBF001C8FB2001870
59915+:100FA0008FB100148FB000100A000F7827BD002009
59916+:100FB0008E42000C0A000419000000003C0480006E
59917+:100FC0003482014094A300108C4200043063FFFF80
59918+:100FD0001443001C0000000024020001A4A2001021
59919+:100FE0008C8202380441000F3C0380003C02003F29
59920+:100FF0003448F0003C0760003C06FFC08CE22BBC8C
59921+:1010000000461824004810240002130200031D8229
59922+:10101000106200583C0280008C8202380440FFF7C6
59923+:101020003C038000346201408C44000034620200C2
59924+:10103000AC4400003C021000AC6202380A00043BE1
59925+:101040008FBF001C94A200100A00041900000000C9
59926+:10105000240200201482000F3C0280003C03800028
59927+:1010600094A20012346301408C6300043042FFFFFD
59928+:10107000146200050000000024020001A4A2001276
59929+:101080000A0004028FBF001C94A200120A00041977
59930+:1010900000000000345101400E0003328E24000095
59931+:1010A0008F92FF948E230004964200123050FFFF6F
59932+:1010B0001603000224020001A64200120E00033DA6
59933+:1010C0008E2400008E220004160200068FBF001C32
59934+:1010D0008FB200188FB100148FB000100A00037C8B
59935+:1010E00027BD0020964200120A00041900000000EB
59936+:1010F0003C03800094A20014346301408C6300041C
59937+:101100003042FFFF14620008240200018FBF001C60
59938+:101110008FB200188FB100148FB00010A4A2001479
59939+:101120000A00146327BD002094A20014144000217B
59940+:101130008FBF001C0A000435000000003C03800043
59941+:1011400094A20016346301408C6300043042FFFF18
59942+:101150001462000D240200018FBF001C8FB2001822
59943+:101160008FB100148FB00010A4A200160A000B1457
59944+:1011700027BD00209442007824420004A4A200105D
59945+:101180000A00043B8FBF001C94A200162403000138
59946+:101190003042FFFF144300078FBF001C3C020800D1
59947+:1011A0008C420070244200013C010800AC22007017
59948+:1011B0008FBF001C8FB200188FB100148FB00010C9
59949+:1011C00003E0000827BD002027BDFFD8AFB20018FC
59950+:1011D0008F92FF94AFB10014AFBF0020AFB3001CDB
59951+:1011E000AFB000103C028000345101008C5001006F
59952+:1011F0009242000092230009304400FF2402001FA5
59953+:10120000106200AB28620020104000192402003850
59954+:101210002862000A1040000D2402000B286200081A
59955+:101220001040002E8F820024046001042862000216
59956+:101230001440002A8F820024240200061062002637
59957+:101240008FBF00200A00055F8FB3001C1062006092
59958+:101250002862000B144000FA8FBF00202402000E09
59959+:10126000106200788F8200240A00055F8FB3001C93
59960+:10127000106200D2286200391040000A2402008067
59961+:1012800024020036106200E528620037104000C3D7
59962+:1012900024020035106200D98FBF00200A00055FCC
59963+:1012A0008FB3001C1062002D2862008110400006E0
59964+:1012B000240200C824020039106200C98FBF002038
59965+:1012C0000A00055F8FB3001C106200A28FBF0020D0
59966+:1012D0000A00055F8FB3001C8F8200248C42000C33
59967+:1012E000104000D78FBF00200E000D8400000000CA
59968+:1012F0003C038000346301008C6200008F85002075
59969+:10130000946700089466000CACA200008C64000492
59970+:101310008F82002400063400ACA400049448001E10
59971+:101320008C62001800073C0000E83825ACA20008D9
59972+:101330008C62001C24040001ACA2000C9062000A24
59973+:1013400000C23025ACA60010ACA00014ACA0001860
59974+:10135000ACA7001C0A00051D8FBF00208F8200244F
59975+:101360008C42000C104000B68FBF00200E000D8490
59976+:10137000000000008F820024962400089625000CAF
59977+:101380009443001E000422029626000E8F82002045
59978+:10139000000426000083202500052C003C0300806B
59979+:1013A00000A6282500832025AC400000AC400004A6
59980+:1013B000AC400008AC40000CAC450010AC40001440
59981+:1013C000AC400018AC44001C0A00051C24040001B9
59982+:1013D0009622000C14400018000000009242000504
59983+:1013E0003042001014400014000000000E000332D0
59984+:1013F0000200202192420005020020213442001008
59985+:101400000E00033DA242000592420000240300208A
59986+:10141000304200FF10430089020020218FBF0020CE
59987+:101420008FB3001C8FB200188FB100148FB0001062
59988+:101430000A00107527BD00280000000D0A00055E97
59989+:101440008FBF00208C42000C1040007D8FBF002019
59990+:101450000E000D84000000008E2200048F84002006
59991+:101460009623000CAC8200003C0280089445002CBE
59992+:101470008F82002400031C0030A5FFFF9446001E4D
59993+:101480003C02400E0065182500C23025AC830004E4
59994+:10149000AC800008AC80000CAC800010AC80001464
59995+:1014A000AC800018AC86001C0A00051C2404000156
59996+:1014B0000E000332020020218F93FF9802002021AA
59997+:1014C0000E00033DA660000C020020210E00034226
59998+:1014D000240500018F8200248C42000C104000582B
59999+:1014E0008FBF00200E000D84000000009622000C2B
60000+:1014F0008F83002000021400AC700000AC62000476
60001+:10150000AC6000088E4400388F820024AC64000C6C
60002+:101510008E46003C9445001E3C02401FAC66001005
60003+:1015200000A228258E62000424040001AC6200148D
60004+:10153000AC600018AC65001C8FBF00208FB3001C8E
60005+:101540008FB200188FB100148FB000100A000DB8D0
60006+:1015500027BD0028240200201082003A8FB3001C0F
60007+:101560000E000F5E00000000104000358FBF00200D
60008+:101570003C0480008C8201F80440FFFE348201C0EC
60009+:1015800024030002AC500000A04300043C02100001
60010+:10159000AC8201F80A00055E8FBF00200200202106
60011+:1015A0008FBF00208FB3001C8FB200188FB10014C2
60012+:1015B0008FB000100A000EA727BD00289625000C4A
60013+:1015C000020020218FBF00208FB3001C8FB20018B3
60014+:1015D0008FB100148FB000100A000ECC27BD002878
60015+:1015E000020020218FB3001C8FB200188FB10014AD
60016+:1015F0008FB000100A000EF727BD00289225000DBD
60017+:10160000020020218FB3001C8FB200188FB100148C
60018+:101610008FB000100A000F4827BD002802002021CB
60019+:101620008FBF00208FB3001C8FB200188FB1001441
60020+:101630008FB000100A000F1F27BD00288FBF0020A9
60021+:101640008FB3001C8FB200188FB100148FB0001040
60022+:1016500003E0000827BD00283C0580008CA202782A
60023+:101660000440FFFE34A2024024030002AC44000008
60024+:10167000A04300043C02100003E00008ACA2027882
60025+:10168000A380001803E00008A38000193C03800039
60026+:101690008C6202780440FFFE8F82001CAC62024024
60027+:1016A00024020002A06202443C02100003E0000891
60028+:1016B000AC6202783C02600003E000088C425404F3
60029+:1016C0009083003024020005008040213063003FF9
60030+:1016D0000000482114620005000050219082004C57
60031+:1016E0009483004E304900FF306AFFFFAD00000CCC
60032+:1016F000AD000010AD000024950200148D05001C03
60033+:101700008D0400183042FFFF004910230002110031
60034+:10171000000237C3004038210086202300A2102B8E
60035+:101720000082202300A72823AD05001CAD0400186B
60036+:10173000A5090014A5090020A50A001603E0000869
60037+:10174000A50A002203E000080000000027BDFFD822
60038+:10175000AFB200183C128008AFB40020AFB3001C39
60039+:10176000AFB10014AFBF0024AFB00010365101007C
60040+:101770003C0260008C4254049222000C3C1408008D
60041+:10178000929400F7304300FF2402000110620032FF
60042+:101790000080982124020002146200353650008037
60043+:1017A0000E00143D000000009202004C2403FF8054
60044+:1017B0003C0480003042007F000211C024420240FD
60045+:1017C0000262102100431824AC8300949245000863
60046+:1017D0009204004C3042007F3C03800614850007D1
60047+:1017E000004380212402FFFFA22200112402FFFFF8
60048+:1017F000A62200120A0005D22402FFFF9602002052
60049+:10180000A222001196020022A62200128E020024BB
60050+:101810003C048008AE2200143485008090A2004C65
60051+:1018200034830100A06200108CA2003CAC6200185E
60052+:101830008C820068AC6200F48C820064AC6200F0C0
60053+:101840008C82006CAC6200F824020001A0A2006847
60054+:101850000A0005EE3C0480080E001456000000004B
60055+:1018600036420080A04000680A0005EE3C04800873
60056+:10187000A2000068A20000690A0006293C02800854
60057+:10188000348300808C62003834850100AC62006CC7
60058+:1018900024020001A062006990A200D59083000894
60059+:1018A000305100FF3072007F12320019001111C058
60060+:1018B00024420240026210212403FF8000431824C6
60061+:1018C0003C048000AC8300943042007F3C038006DF
60062+:1018D000004380218E02000C1040000D02002021E8
60063+:1018E0000E00057E0000000026220001305100FF9E
60064+:1018F0009203003C023410260002102B0002102339
60065+:101900003063007F022288240A0005F8A203003C0D
60066+:101910003C088008350401008C8200E03507008017
60067+:10192000ACE2003C8C8200E0AD02000090E5004C8F
60068+:10193000908600D590E3004C908400D52402FF806F
60069+:1019400000A228243063007F308400FF00A62825F1
60070+:101950000064182A1060000230A500FF38A500803E
60071+:10196000A0E5004CA10500093C0280089043000E50
60072+:10197000344400803C058000A043000A8C8300189A
60073+:101980003C027FFF3442FFFF00621824AC83001842
60074+:101990008CA201F80440FFFE00000000ACB301C0BF
60075+:1019A0008FBF00248FB400208FB3001C8FB20018AB
60076+:1019B0008FB100148FB0001024020002A0A201C455
60077+:1019C00027BD00283C02100003E00008ACA201F88B
60078+:1019D00090A2000024420001A0A200003C030800E5
60079+:1019E0008C6300F4304200FF144300020080302179
60080+:1019F000A0A0000090A200008F84001C000211C073
60081+:101A00002442024024830040008220212402FF80DF
60082+:101A1000008220243063007F3C02800A006218218B
60083+:101A20003C028000AC44002403E00008ACC300008A
60084+:101A300094820006908300058C85000C8C86001033
60085+:101A40008C8700188C88001C8C8400203C010800C6
60086+:101A5000A42256C63C010800A02356C53C0108003C
60087+:101A6000AC2556CC3C010800AC2656D03C01080001
60088+:101A7000AC2756D83C010800AC2856DC3C010800D5
60089+:101A8000AC2456E003E00008000000003C0280089F
60090+:101A9000344201008C4400343C038000346504006F
60091+:101AA000AC6400388C420038AF850028AC62003C42
60092+:101AB0003C020005AC6200300000000000000000A5
60093+:101AC00003E00008000000003C020006308400FF34
60094+:101AD000008220253C028000AC4400300000000061
60095+:101AE00000000000000000003C0380008C62000049
60096+:101AF000304200101040FFFD3462040003E0000893
60097+:101B0000AF82002894C200003C080800950800CA73
60098+:101B100030E7FFFF0080482101021021A4C200002D
60099+:101B200094C200003042FFFF00E2102B544000013D
60100+:101B3000A4C7000094A200003C0308008C6300CC02
60101+:101B400024420001A4A2000094A200003042FFFF42
60102+:101B5000144300073C0280080107102BA4A00000DA
60103+:101B60005440000101003821A4C700003C02800855
60104+:101B7000344601008CC3002894A200003C0480007D
60105+:101B80003042FFFE000210C000621021AC82003C17
60106+:101B90008C82003C006218231860000400000000E2
60107+:101BA0008CC200240A0006BA244200018CC2002420
60108+:101BB000AC8200383C020050344200103C038000EC
60109+:101BC000AC620030000000000000000000000000D7
60110+:101BD0008C620000304200201040FFFD0000000039
60111+:101BE00094A200003C04800030420001000210C0BA
60112+:101BF000004410218C430400AD2300008C420404F7
60113+:101C0000AD2200043C02002003E00008AC8200305A
60114+:101C100027BDFFE0AFB20018AFB10014AFB00010A5
60115+:101C2000AFBF001C94C2000000C080213C1208001D
60116+:101C3000965200C624420001A6020000960300004E
60117+:101C400094E2000000E03021144300058FB1003021
60118+:101C50000E00068F024038210A0006F10000000045
60119+:101C60008C8300048C82000424420040046100073D
60120+:101C7000AC8200048C8200040440000400000000D8
60121+:101C80008C82000024420001AC8200009602000019
60122+:101C90003042FFFF50520001A600000096220000D3
60123+:101CA00024420001A62200003C02800834420100C8
60124+:101CB000962300009442003C144300048FBF001C94
60125+:101CC00024020001A62200008FBF001C8FB2001862
60126+:101CD0008FB100148FB0001003E0000827BD002072
60127+:101CE00027BDFFE03C028008AFBF0018344201006E
60128+:101CF0008C4800343C03800034690400AC68003830
60129+:101D00008C42003830E700FFAF890028AC62003C0D
60130+:101D10003C020005AC620030000000000000000042
60131+:101D200000000000000000000000000000000000B3
60132+:101D30008C82000C8C82000C97830016AD22000070
60133+:101D40008C82001000604021AD2200048C820018BB
60134+:101D5000AD2200088C82001CAD22000C8CA2001465
60135+:101D6000AD2200108C820020AD220014908200056C
60136+:101D7000304200FF00021200AD2200188CA20018B1
60137+:101D8000AD22001C8CA2000CAD2200208CA2001001
60138+:101D9000AD2200248CA2001CAD2200288CA20020C1
60139+:101DA000AD22002C3402FFFFAD260030AD20003400
60140+:101DB000506200013408FFFFAD28003850E00011E8
60141+:101DC0003C0280083C048008348401009482005066
60142+:101DD0003042FFFFAD22003C9483004494850044D0
60143+:101DE000240200013063FFFF000318C200641821C1
60144+:101DF0009064006430A5000700A210040A00075C8C
60145+:101E00000044102534420100AD20003C94430044BE
60146+:101E1000944400443063FFFF000318C2006218219D
60147+:101E200030840007906500642402000100821004E1
60148+:101E30000002102700451024A0620064000000008A
60149+:101E400000000000000000003C0200063442004098
60150+:101E50003C038000AC620030000000000000000085
60151+:101E6000000000008C620000304200101040FFFDB6
60152+:101E70003C06800834C201503463040034C7014A70
60153+:101E800034C4013434C5014034C60144AFA200104B
60154+:101E90000E0006D2AF8300288FBF001803E00008B1
60155+:101EA00027BD00208F8300143C0608008CC600E884
60156+:101EB0008F82001C30633FFF000319800046102111
60157+:101EC000004310212403FF80004318243C068000B7
60158+:101ED000ACC300283042007F3C03800C004330211B
60159+:101EE00090C2000D30A500FF0000382134420010E0
60160+:101EF000A0C2000D8F8900143C028008344201000A
60161+:101F00009443004400091382304800032402000176
60162+:101F1000A4C3000E1102000B2902000210400005AC
60163+:101F2000240200021100000C240300010A0007A48F
60164+:101F30000000182111020006000000000A0007A49A
60165+:101F4000000018218CC2002C0A0007A424430001C1
60166+:101F50008CC20014244300018CC200180043102BD3
60167+:101F60005040000A240700012402002714A20003A5
60168+:101F70003C0380080A0007B1240700013463010014
60169+:101F80009462004C24420001A462004C00091382B8
60170+:101F9000304300032C620002104000090080282119
60171+:101FA000146000040000000094C200340A0007C15D
60172+:101FB0003046FFFF8CC600380A0007C10080282188
60173+:101FC000000030213C040800248456C00A000706A3
60174+:101FD0000000000027BDFF90AFB60068AFB50064F9
60175+:101FE000AFB40060AFB3005CAFB20058AFB1005403
60176+:101FF000AFBF006CAFB000508C9000000080B021EB
60177+:102000003C0208008C4200E8960400328F83001CDA
60178+:102010002414FF8030843FFF0062182100042180D7
60179+:1020200000641821007410243C13800000A090214B
60180+:1020300090A50000AE620028920400323C02800CA1
60181+:102040003063007F00628821308400C02402004099
60182+:10205000148200320000A8218E3500388E2200182C
60183+:102060001440000224020001AE2200189202003C3B
60184+:10207000304200201440000E8F83001C000511C068
60185+:102080002442024000621821306400783C02008043
60186+:102090000082202500741824AE630800AE64081086
60187+:1020A0008E2200188E03000800431021AE22001873
60188+:1020B0008E22002C8E230018244200010062182B6F
60189+:1020C0001060004300000000924200002442000122
60190+:1020D000A24200003C0308008C6300F4304200FF81
60191+:1020E00050430001A2400000924200008F84001C77
60192+:1020F000000211C024420240248300403063007F6C
60193+:10210000008220213C02800A0094202400621821D1
60194+:10211000AE6400240A0008D2AEC30000920300326D
60195+:102120002402FFC000431024304200FF1440000589
60196+:1021300024020001AE220018962200340A00084250
60197+:102140003055FFFF8E22001424420001AE220018F9
60198+:102150009202003000021600000216030441001C27
60199+:10216000000000009602003227A400100080282101
60200+:10217000A7A20016960200320000302124070001B9
60201+:102180003042FFFFAF8200140E000706AFA0001C14
60202+:10219000960200328F83001C3C0408008C8400E807
60203+:1021A00030423FFF000211800064182100621821B4
60204+:1021B00000741024AE62002C3063007F3C02800E5D
60205+:1021C000006218219062000D3042007FA062000D75
60206+:1021D0009222000D304200105040007892420000E0
60207+:1021E0003C028008344401009482004C8EC30000FD
60208+:1021F0003C130800967300C62442FFFFA482004CE3
60209+:10220000946200329623000E3054FFFF3070FFFFBF
60210+:102210003C0308008C6300D000701807A7A30038A7
60211+:102220009482003E3063FFFF3042FFFF14620007DC
60212+:10223000000000008C8200303C038000244200300B
60213+:10224000AC62003C0A00086A8C82002C9482004038
60214+:102250003042FFFF5462000927A400408C820038FE
60215+:102260003C03800024420030AC62003C8C8200348D
60216+:10227000AC6200380A0008793C03800027A50038CA
60217+:1022800027A60048026038210E00068FA7A000484C
60218+:102290008FA300403C02800024630030AC43003830
60219+:1022A0008FA30044AC43003C3C0380003C0200058B
60220+:1022B000AC6200303C028008344401009482004249
60221+:1022C000346304003042FFFF0202102B1440000769
60222+:1022D000AF8300289482004E9483004202021021B2
60223+:1022E000004310230A00088F3043FFFF9483004E01
60224+:1022F00094820042026318210050102300621823C8
60225+:102300003063FFFF3C028008344401009482003CAB
60226+:102310003042FFFF14430003000000000A00089F42
60227+:10232000240300019482003C3042FFFF0062102B26
60228+:10233000144000058F8200289482003C0062102324
60229+:102340003043FFFF8F820028AC550000AC400004F2
60230+:10235000AC540008AC43000C3C02000634420010B0
60231+:102360003C038000AC620030000000000000000070
60232+:10237000000000008C620000304200101040FFFDA1
60233+:102380003C04800834840100001018C20064182145
60234+:102390009065006432020007240600010046100424
60235+:1023A00000451025A0620064948300429622000E2E
60236+:1023B00050430001A386001892420000244200010D
60237+:1023C000A24200003C0308008C6300F4304200FF8E
60238+:1023D00050430001A2400000924200008F84001C84
60239+:1023E000000211C0244202402483004000822021C8
60240+:1023F0002402FF80008220243063007F3C02800A98
60241+:10240000006218213C028000AC440024AEC30000EE
60242+:102410008FBF006C8FB600688FB500648FB400600A
60243+:102420008FB3005C8FB200588FB100548FB0005052
60244+:1024300003E0000827BD007027BDFFD8AFB3001C24
60245+:10244000AFB20018AFB10014AFB00010AFBF0020A2
60246+:102450000080982100E0802130B1FFFF0E000D8444
60247+:1024600030D200FF0000000000000000000000006B
60248+:102470008F8200208F830024AC510000AC520004F6
60249+:10248000AC530008AC40000CAC400010AC40001451
60250+:10249000AC4000189463001E02038025AC50001C61
60251+:1024A0000000000000000000000000002404000103
60252+:1024B0008FBF00208FB3001C8FB200188FB10014A3
60253+:1024C0008FB000100A000DB827BD002830A5FFFF0F
60254+:1024D0000A0008DC30C600FF3C02800834430100DB
60255+:1024E0009462000E3C080800950800C63046FFFFC5
60256+:1024F00014C000043402FFFF946500EA0A000929B1
60257+:102500008F84001C10C20027000000009462004E5F
60258+:102510009464003C3045FFFF00A6102300A6182B52
60259+:102520003087FFFF106000043044FFFF00C5102318
60260+:1025300000E210233044FFFF0088102B1040000EF3
60261+:1025400000E810233C028008344401002403000109
60262+:1025500034420080A44300162402FFFFA482000E30
60263+:10256000948500EA8F84001C0000302130A5FFFF15
60264+:102570000A0009013C0760200044102A10400009AD
60265+:102580003C0280083443008094620016304200010F
60266+:10259000104000043C0280009442007E244200145B
60267+:1025A000A462001603E000080000000027BDFFE061
60268+:1025B0003C028008AFBF001CAFB0001834420100DD
60269+:1025C000944300429442004C104000193068FFFFD1
60270+:1025D0009383001824020001146200298FBF001C9D
60271+:1025E0003C06800834D00100000810C200501021C1
60272+:1025F000904200643103000734C70148304200FFB5
60273+:10260000006210073042000134C9014E34C4012C6D
60274+:1026100034C5013E1040001634C601420E0006D2F9
60275+:10262000AFA90010960200420A0009463048FFFF99
60276+:102630003C028008344401009483004494820042A8
60277+:102640001043000F8FBF001C94820044A4820042FC
60278+:1026500094820050A482004E8C820038AC820030FC
60279+:1026600094820040A482003E9482004AA4820048E2
60280+:102670008FBF001C8FB000180A00090427BD00207E
60281+:102680008FB0001803E0000827BD002027BDFFA081
60282+:10269000AFB1004C3C118000AFBF0058AFB3005445
60283+:1026A000AFB20050AFB000483626018890C2000398
60284+:1026B0003044007FA3A400108E32018090C200003D
60285+:1026C0003043007F240200031062003BAF92001CE5
60286+:1026D00028620004104000062402000424020002C4
60287+:1026E000106200098FBF00580A000B0F8FB300540F
60288+:1026F0001062004D240200051062014E8FBF005889
60289+:102700000A000B0F8FB30054000411C002421021C5
60290+:102710002404FF8024420240004410242643004049
60291+:10272000AE2200243063007F3C02800A0062182140
60292+:102730009062003CAFA3003C00441025A062003C26
60293+:102740008FA3003C9062003C304200401040016C7E
60294+:102750008FBF00583C108008A3800018361001007D
60295+:102760008E0200E08C63003427A4003C27A50010F3
60296+:10277000004310210E0007C3AE0200E093A2001038
60297+:102780003C038000A20200D58C6202780440FFFE68
60298+:102790008F82001CAC62024024020002A06202444C
60299+:1027A0003C021000AC6202780E0009390000000003
60300+:1027B0000A000B0E8FBF00583C05800890C3000133
60301+:1027C00090A2000B1443014E8FBF005834A4008028
60302+:1027D0008C8200189082004C90A200083C0260009D
60303+:1027E0008C4254048C8300183C027FFF3442FFFF6C
60304+:1027F000006218243C0208008C4200B4AC8300182C
60305+:102800003C038000244200013C010800AC2200B4DB
60306+:102810008C6201F80440FFFE8F82001CAC6201C094
60307+:102820000A000AD6240200023C10800890C300016E
60308+:102830009202000B144301328FBF005827A40018E6
60309+:1028400036050110240600033C0260008C4254044B
60310+:102850000E000E470000000027A40028360501F0F6
60311+:102860000E000E47240600038FA200283603010045
60312+:10287000AE0200648FA2002CAE0200688FA200306E
60313+:10288000AE02006C93A40018906300D52402FF8070
60314+:102890000082102400431025304900FF3084007F5F
60315+:1028A0003122007F0082102A544000013929008023
60316+:1028B000000411C0244202402403FF800242102180
60317+:1028C00000431024AE220094264200403042007F94
60318+:1028D0003C038006004340218FA3001C2402FFFF1D
60319+:1028E000AFA800403C130800927300F71062003359
60320+:1028F00093A2001995030014304400FF3063FFFFDA
60321+:102900000064182B106000100000000095040014F3
60322+:102910008D07001C8D0600183084FFFF0044202323
60323+:102920000004210000E438210000102100E4202BE5
60324+:1029300000C2302100C43021AD07001CAD060018D4
60325+:102940000A000A2F93A20019950400148D07001C99
60326+:102950008D0600183084FFFF008220230004210030
60327+:10296000000010210080182100C2302300E4202B39
60328+:1029700000C4302300E33823AD07001CAD06001867
60329+:1029800093A200198FA30040A462001497A2001A1A
60330+:10299000A46200168FA2001CAC6200108FA2001C63
60331+:1029A000AC62000C93A20019A462002097A2001A46
60332+:1029B000A46200228FA2001CAC6200243C048008A8
60333+:1029C000348300808C6200388FA20020012088218F
60334+:1029D000AC62003C8FA20020AC82000093A20018E1
60335+:1029E000A062004C93A20018A0820009A0600068B9
60336+:1029F00093A20018105100512407FF803229007F54
60337+:102A0000000911C024420240024210213046007FDA
60338+:102A10003C03800000471024AC6200943C02800616
60339+:102A200000C2302190C2003CAFA60040000020212F
60340+:102A300000471025A0C2003C8FA80040950200026C
60341+:102A4000950300148D07001C3042FFFF3063FFFF29
60342+:102A50008D060018004310230002110000E2382107
60343+:102A600000E2102B00C4302100C23021AD07001C51
60344+:102A7000AD06001895020002A5020014A50000167C
60345+:102A80008D020008AD0200108D020008AD02000C9E
60346+:102A900095020002A5020020A50000228D02000878
60347+:102AA000AD0200249102003C304200401040001A68
60348+:102AB000262200013C108008A3A90038A38000183A
60349+:102AC000361001008E0200E08D03003427A4004080
60350+:102AD00027A50038004310210E0007C3AE0200E016
60351+:102AE00093A200383C038000A20200D58C620278D9
60352+:102AF0000440FFFE8F82001CAC62024024020002F0
60353+:102B0000A06202443C021000AC6202780E00093957
60354+:102B100000000000262200013043007F14730004EF
60355+:102B2000004020212403FF8002231024004320269C
60356+:102B300093A200180A000A4B309100FF93A40018DA
60357+:102B40008FA3001C2402FFFF1062000A308900FFDF
60358+:102B500024820001248300013042007F14530005C9
60359+:102B6000306900FF2403FF800083102400431026F7
60360+:102B7000304900FF3C028008904200080120882173
60361+:102B8000305000FF123000193222007F000211C0C5
60362+:102B900002421021244202402403FF8000431824F3
60363+:102BA0003C048000AC8300943042007F3C038006EC
60364+:102BB000004310218C43000C004020211060000BCA
60365+:102BC000AFA200400E00057E000000002623000199
60366+:102BD0002405FF803062007F145300020225202468
60367+:102BE000008518260A000AAF307100FF3C048008F7
60368+:102BF000348400808C8300183C027FFF3442FFFF46
60369+:102C000000621824AC8300183C0380008C6201F839
60370+:102C10000440FFFE00000000AC7201C0240200026C
60371+:102C2000A06201C43C021000AC6201F80A000B0E65
60372+:102C30008FBF00583C04800890C300019082000BB5
60373+:102C40001443002F8FBF0058349000809202000878
60374+:102C500030420040104000200000000092020008B6
60375+:102C60000002160000021603044100050240202164
60376+:102C70000E000ECC240500930A000B0E8FBF0058E7
60377+:102C80009202000924030018304200FF1443000D93
60378+:102C900002402021240500390E000E64000030217E
60379+:102CA0000E0003328F84001C8F82FF9424030012D5
60380+:102CB000A04300090E00033D8F84001C0A000B0E88
60381+:102CC0008FBF0058240500360E000E64000030212E
60382+:102CD0000A000B0E8FBF00580E0003320240202165
60383+:102CE000920200058F84001C344200200E00033D38
60384+:102CF000A20200050E0010758F84001C8FBF0058C3
60385+:102D00008FB300548FB200508FB1004C8FB0004889
60386+:102D100003E0000827BD00603C0280083445010044
60387+:102D20003C0280008C42014094A3000E0000302140
60388+:102D300000402021AF82001C3063FFFF3402FFFF00
60389+:102D4000106200063C0760202402FFFFA4A2000ED0
60390+:102D500094A500EA0A00090130A5FFFF03E000087E
60391+:102D60000000000027BDFFC83C0280003C06800830
60392+:102D7000AFB5002CAFB1001CAFBF0030AFB400281E
60393+:102D8000AFB30024AFB20020AFB00018345101003F
60394+:102D900034C501008C4301008E2200148CA400E491
60395+:102DA0000000A821AF83001C0044102318400052EB
60396+:102DB000A38000188E22001400005021ACA200E471
60397+:102DC00090C3000890A200D53073007FA3A200102A
60398+:102DD0008CB200E08CB400E4304200FF1053003BA2
60399+:102DE00093A200108F83001C2407FF80000211C0F3
60400+:102DF0000062102124420240246300400047102456
60401+:102E00003063007F3C0980003C08800A006818217C
60402+:102E1000AD2200248C62003427A4001427A50010E2
60403+:102E2000024280210290102304400028AFA3001426
60404+:102E30009062003C00E21024304200FF1440001970
60405+:102E4000020090219062003C34420040A062003CAD
60406+:102E50008F86001C93A3001024C200403042007FE4
60407+:102E6000004828213C0208008C4200F42463000141
60408+:102E7000306400FF14820002A3A30010A3A000107E
60409+:102E800093A20010AFA50014000211C0244202401A
60410+:102E900000C2102100471024AD2200240A000B4577
60411+:102EA00093A200100E0007C3000000003C0280083F
60412+:102EB00034420100AC5000E093A30010240A00014A
60413+:102EC000A04300D50A000B4593A200102402000184
60414+:102ED000154200093C0380008C6202780440FFFE2A
60415+:102EE0008F82001CAC62024024020002A0620244F5
60416+:102EF0003C021000AC6202789222000B2403000214
60417+:102F0000304200FF144300720000000096220008C7
60418+:102F1000304300FF24020082146200402402008437
60419+:102F20003C028000344901008D22000C95230006EC
60420+:102F3000000216023063FFFF3045003F24020027E5
60421+:102F400010A2000FAF83001428A200281040000830
60422+:102F5000240200312402002110A2000924020025CD
60423+:102F600010A20007938200190A000BBD00000000A8
60424+:102F700010A20007938200190A000BBD0000000098
60425+:102F80000E000777012020210A000C3D0000000000
60426+:102F90003C0380008C6202780440FFFE8F82001C9C
60427+:102FA000AC62024024020002A06202443C02100013
60428+:102FB000AC6202780A000C3D000000009523000678
60429+:102FC000912400058D25000C8D2600108D270018FA
60430+:102FD0008D28001C8D290020244200013C0108009E
60431+:102FE000A42356C63C010800A02456C53C01080095
60432+:102FF000AC2556CC3C010800AC2656D03C0108005C
60433+:10300000AC2756D83C010800AC2856DC3C0108002F
60434+:10301000AC2956E00A000C3DA38200191462000A94
60435+:10302000240200813C02800834420100944500EAF9
60436+:10303000922600058F84001C30A5FFFF30C600FFDC
60437+:103040000A000BFE3C0760211462005C00000000D7
60438+:103050009222000A304300FF306200201040000737
60439+:10306000306200403C02800834420100944500EA8E
60440+:103070008F84001C0A000BFC24060040104000074F
60441+:10308000000316003C02800834420100944500EA27
60442+:103090008F84001C0A000BFC24060041000216036A
60443+:1030A000044100463C02800834420100944500EA95
60444+:1030B0008F84001C2406004230A5FFFF3C076019E6
60445+:1030C0000E000901000000000A000C3D0000000095
60446+:1030D0009222000B24040016304200FF1044000628
60447+:1030E0003C0680009222000B24030017304200FFB0
60448+:1030F000144300320000000034C5010090A2000B10
60449+:10310000304200FF1444000B000080218CA20020FC
60450+:103110008CA400202403FF800043102400021140EF
60451+:103120003084007F004410253C032000004310251C
60452+:10313000ACC2083094A2000800021400000214037C
60453+:10314000044200012410000194A2000830420080D3
60454+:103150005040001A0200A82194A20008304220002A
60455+:10316000504000160200A8218CA300183C021C2D20
60456+:10317000344219ED106200110200A8213C0208003F
60457+:103180008C4200D4104000053C0280082403000457
60458+:1031900034420100A04300FC3C028008344201009C
60459+:1031A000944500EA8F84001C2406000630A5FFFF2A
60460+:1031B0000E0009013C0760210200A8210E00093918
60461+:1031C000000000009222000A304200081040000473
60462+:1031D00002A010210E0013790000000002A01021AF
60463+:1031E0008FBF00308FB5002C8FB400288FB3002420
60464+:1031F0008FB200208FB1001C8FB0001803E00008D0
60465+:1032000027BD00382402FF80008220243C02900069
60466+:1032100034420007008220253C028000AC4400209C
60467+:103220003C0380008C6200200440FFFE0000000090
60468+:1032300003E00008000000003C0380002402FF803F
60469+:10324000008220243462000700822025AC64002024
60470+:103250008C6200200440FFFE0000000003E0000834
60471+:103260000000000027BDFFD8AFB3001CAFB10014B1
60472+:10327000AFB00010AFBF0020AFB200183C1180000B
60473+:103280003C0280088E32002034530100AE2400201E
60474+:10329000966300EA000514003C074000004738250B
60475+:1032A00000A08021000030210E0009013065FFFFE1
60476+:1032B000240200A1160200022402FFFFA2620009FC
60477+:1032C000AE3200208FBF00208FB3001C8FB20018D9
60478+:1032D0008FB100148FB0001003E0000827BD002854
60479+:1032E0003C0280082403000527BDFFE834420100AA
60480+:1032F000A04300FCAFBF00103C0280008C420100E4
60481+:10330000240500A1004020210E000C67AF82001CA4
60482+:103310003C0380008C6202780440FFFE8F82001C18
60483+:103320008FBF001027BD0018AC62024024020002CB
60484+:10333000A06202443C021000AC62027803E0000884
60485+:103340000000000027BDFFE83C068000AFBF001072
60486+:1033500034C7010094E20008304400FF3883008243
60487+:10336000388200842C6300012C4200010062182581
60488+:103370001060002D24020083938200195040003B0E
60489+:103380008FBF00103C020800904256CC8CC4010054
60490+:103390003C06080094C656C63045003F38A30032AC
60491+:1033A00038A2003F2C6300012C4200010062182566
60492+:1033B000AF84001CAF860014A380001914600007BE
60493+:1033C00000E020212402002014A2001200000000CE
60494+:1033D0003402FFFF14C2000F00000000240200208E
60495+:1033E00014A2000500E028218CE300142402FFFF52
60496+:1033F0005062000B8FBF00103C040800248456C0AC
60497+:10340000000030210E000706240700010A000CD638
60498+:103410008FBF00100E000777000000008FBF001064
60499+:103420000A00093927BD001814820004240200850F
60500+:103430008CC501040A000CE1000020211482000662
60501+:103440002482FF808CC50104240440008FBF00103B
60502+:103450000A00016727BD0018304200FF2C4200021D
60503+:1034600010400004240200228FBF00100A000B2726
60504+:1034700027BD0018148200048F8200248FBF001023
60505+:103480000A000C8627BD00188C42000C1040001E5C
60506+:1034900000E0282190E300092402001814620003D0
60507+:1034A000240200160A000CFC240300081462000722
60508+:1034B00024020017240300123C02800834420080DA
60509+:1034C000A04300090A000D0994A7000854620007F0
60510+:1034D00094A700088F82FF942404FFFE9043000508
60511+:1034E00000641824A043000594A7000890A6001BC0
60512+:1034F0008CA4000094A500068FBF001000073C00BC
60513+:103500000A0008DC27BD00188FBF001003E0000888
60514+:1035100027BD00188F8500243C04800094A2002A57
60515+:103520008CA30034000230C02402FFF000C210243B
60516+:1035300000621821AC83003C8CA200303C03800068
60517+:10354000AC8200383C02005034420010AC620030C3
60518+:103550000000000000000000000000008C6200007D
60519+:10356000304200201040FFFD30C20008104000062D
60520+:103570003C0280008C620408ACA200208C62040C27
60521+:103580000A000D34ACA200248C430400ACA300203C
60522+:103590008C420404ACA200243C0300203C028000C6
60523+:1035A000AC4300303C0480008C8200300043102487
60524+:1035B0001440FFFD8F8600243C020040AC820030A6
60525+:1035C00094C3002A94C2002894C4002C94C5002EF1
60526+:1035D00024630001004410213064FFFFA4C20028CE
60527+:1035E00014850002A4C3002AA4C0002A03E0000836
60528+:1035F000000000008F84002427BDFFE83C05800404
60529+:1036000024840010AFBF00100E000E472406000AED
60530+:103610008F840024948200129483002E3042000F85
60531+:10362000244200030043180424027FFF0043102BB0
60532+:1036300010400002AC8300000000000D0E000D13CE
60533+:10364000000000008F8300248FBF001027BD0018EA
60534+:10365000946200149463001A3042000F00021500B7
60535+:10366000006218253C02800003E00008AC4300A083
60536+:103670008F8300243C028004944400069462001A64
60537+:103680008C650000A4640016004410233042FFFF44
60538+:103690000045102B03E00008384200018F8400240D
60539+:1036A0003C0780049486001A8C85000094E2000692
60540+:1036B000A482001694E3000600C310233042FFFFEB
60541+:1036C0000045102B384200011440FFF8A483001677
60542+:1036D00003E00008000000008F8400243C02800406
60543+:1036E000944200069483001A8C850000A482001680
60544+:1036F000006210233042FFFF0045102B38420001CA
60545+:103700005040000D8F850024006030213C0780046C
60546+:1037100094E20006A482001694E3000600C310237E
60547+:103720003042FFFF0045102B384200011440FFF8E3
60548+:10373000A48300168F8500243C03800034620400BB
60549+:103740008CA40020AF820020AC6400388CA200243E
60550+:10375000AC62003C3C020005AC62003003E00008B3
60551+:10376000ACA000048F8400243C0300068C8200047B
60552+:1037700000021140004310253C038000AC62003081
60553+:103780000000000000000000000000008C6200004B
60554+:10379000304200101040FFFD34620400AC80000491
60555+:1037A00003E00008AF8200208F86002427BDFFE0E1
60556+:1037B000AFB10014AFB00010AFBF00188CC300044D
60557+:1037C0008CC500248F820020309000FF94C4001A22
60558+:1037D00024630001244200202484000124A7002047
60559+:1037E000ACC30004AF820020A4C4001AACC70024FC
60560+:1037F00004A100060000882104E2000594C2001A1A
60561+:103800008CC2002024420001ACC2002094C2001AE5
60562+:1038100094C300282E040001004310262C4200010E
60563+:10382000004410245040000594C2001A24020001F4
60564+:10383000ACC2000894C2001A94C300280010202BC8
60565+:10384000004310262C4200010044102514400007BC
60566+:10385000000000008CC20008144000042402001084
60567+:103860008CC300041462000F8F8500240E000DA786
60568+:10387000241100018F820024944300289442001AEE
60569+:1038800014430003000000000E000D1300000000B0
60570+:10389000160000048F8500240E000D840000000037
60571+:1038A0008F85002494A2001E94A4001C24420001D1
60572+:1038B0003043FFFF14640002A4A2001EA4A0001E57
60573+:1038C0001200000A3C02800494A2001494A3001A7F
60574+:1038D0003042000F00021500006218253C028000F3
60575+:1038E000AC4300A00A000E1EACA0000894420006E3
60576+:1038F00094A3001A8CA40000A4A200160062102356
60577+:103900003042FFFF0044102B384200011040000DF0
60578+:1039100002201021006030213C07800494E2000660
60579+:10392000A4A2001694E3000600C310233042FFFF58
60580+:103930000044102B384200011440FFF8A4A30016E5
60581+:10394000022010218FBF00188FB100148FB000101B
60582+:1039500003E0000827BD002003E00008000000008D
60583+:103960008F82002C3C03000600021140004310250A
60584+:103970003C038000AC62003000000000000000004A
60585+:10398000000000008C620000304200101040FFFD7B
60586+:1039900034620400AF82002803E00008AF80002CEE
60587+:1039A00003E000080000102103E000080000000010
60588+:1039B0003084FFFF30A5FFFF0000182110800007B2
60589+:1039C000000000003082000110400002000420428C
60590+:1039D000006518210A000E3D0005284003E000089C
60591+:1039E0000060102110C0000624C6FFFF8CA200005A
60592+:1039F00024A50004AC8200000A000E4724840004C1
60593+:103A000003E000080000000010A0000824A3FFFF4E
60594+:103A1000AC86000000000000000000002402FFFF50
60595+:103A20002463FFFF1462FFFA2484000403E000080B
60596+:103A3000000000003C0280083442008024030001A2
60597+:103A4000AC43000CA4430010A4430012A443001490
60598+:103A500003E00008A44300168F82002427BDFFD88E
60599+:103A6000AFB3001CAFB20018AFB10014AFB000107C
60600+:103A7000AFBF00208C47000C248200802409FF8007
60601+:103A80003C08800E3043007F008080213C0A80008B
60602+:103A9000004920240068182130B100FF30D200FF17
60603+:103AA00010E000290000982126020100AD44002CFE
60604+:103AB000004928243042007F004820219062000005
60605+:103AC00024030050304200FF1443000400000000B3
60606+:103AD000AD45002C948200EA3053FFFF0E000D84A8
60607+:103AE000000000008F8200248F83002000112C0032
60608+:103AF0009442001E001224003484000100A22825F4
60609+:103B00003C02400000A22825AC7000008FBF0020BE
60610+:103B1000AC6000048FB20018AC7300088FB10014C1
60611+:103B2000AC60000C8FB3001CAC6400108FB00010B0
60612+:103B3000AC60001424040001AC60001827BD00280C
60613+:103B40000A000DB8AC65001C8FBF00208FB3001CAD
60614+:103B50008FB200188FB100148FB0001003E000087E
60615+:103B600027BD00283C06800034C201009043000FAE
60616+:103B7000240200101062000E2865001110A000073A
60617+:103B800024020012240200082405003A10620006F4
60618+:103B90000000302103E0000800000000240500358B
60619+:103BA0001462FFFC000030210A000E6400000000D7
60620+:103BB0008CC200748F83FF9424420FA003E000089E
60621+:103BC000AC62000C27BDFFE8AFBF00100E0003423F
60622+:103BD000240500013C0480088FBF0010240200016E
60623+:103BE00034830080A462001227BD00182402000163
60624+:103BF00003E00008A080001A27BDFFE0AFB2001864
60625+:103C0000AFB10014AFB00010AFBF001C30B2FFFF67
60626+:103C10000E000332008088213C028008345000806E
60627+:103C20009202000924030004304200FF1443000CF8
60628+:103C30003C028008124000082402000A0E000E5BBD
60629+:103C400000000000920200052403FFFE0043102440
60630+:103C5000A202000524020012A20200093C02800810
60631+:103C600034420080022020210E00033DA0400027A6
60632+:103C700016400003022020210E000EBF00000000AD
60633+:103C800002202021324600FF8FBF001C8FB2001897
60634+:103C90008FB100148FB00010240500380A000E64A4
60635+:103CA00027BD002027BDFFE0AFBF001CAFB200184A
60636+:103CB000AFB10014AFB000100E00033200808021BD
60637+:103CC0000E000E5B000000003C02800834450080BE
60638+:103CD00090A2000924120018305100FF1232000394
60639+:103CE0000200202124020012A0A2000990A20005D7
60640+:103CF0002403FFFE004310240E00033DA0A2000594
60641+:103D00000200202124050020163200070000302187
60642+:103D10008FBF001C8FB200188FB100148FB000103D
60643+:103D20000A00034227BD00208FBF001C8FB200187D
60644+:103D30008FB100148FB00010240500390A000E6402
60645+:103D400027BD002027BDFFE83C028000AFB0001077
60646+:103D5000AFBF0014344201009442000C2405003629
60647+:103D60000080802114400012304600FF0E00033214
60648+:103D7000000000003C02800834420080240300124E
60649+:103D8000A043000990430005346300100E000E5B51
60650+:103D9000A04300050E00033D020020210200202167
60651+:103DA0000E000342240500200A000F3C0000000022
60652+:103DB0000E000E64000000000E00033202002021FD
60653+:103DC0003C0280089043001B2405FF9F0200202135
60654+:103DD000006518248FBF00148FB00010A043001B93
60655+:103DE0000A00033D27BD001827BDFFE0AFBF001844
60656+:103DF000AFB10014AFB0001030B100FF0E000332BD
60657+:103E0000008080213C02800824030012344200809C
60658+:103E10000E000E5BA04300090E00033D02002021AE
60659+:103E200002002021022030218FBF00188FB1001422
60660+:103E30008FB00010240500350A000E6427BD002055
60661+:103E40003C0480089083000E9082000A1443000B0B
60662+:103E5000000028218F82FF942403005024050001D4
60663+:103E600090420000304200FF1443000400000000B4
60664+:103E70009082000E24420001A082000E03E00008A0
60665+:103E800000A010213C0380008C6201F80440FFFE7A
60666+:103E900024020002AC6401C0A06201C43C02100014
60667+:103EA00003E00008AC6201F827BDFFE0AFB20018E4
60668+:103EB0003C128008AFB10014AFBF001CAFB00010BF
60669+:103EC00036510080922200092403000A304200FF8C
60670+:103ED0001443003E000000008E4300048E22003890
60671+:103EE000506200808FBF001C92220000240300500B
60672+:103EF000304200FF144300253C0280008C42014008
60673+:103F00008E4300043642010002202821AC43001CED
60674+:103F10009622005C8E2300383042FFFF00021040E2
60675+:103F200000621821AE23001C8E4300048E2400384A
60676+:103F30009622005C006418233042FFFF0003184300
60677+:103F4000000210400043102A10400006000000004C
60678+:103F50008E4200048E230038004310230A000FAA6B
60679+:103F6000000220439622005C3042FFFF0002204006
60680+:103F70003C0280083443010034420080ACA4002C91
60681+:103F8000A040002424020001A062000C0E000F5E7D
60682+:103F900000000000104000538FBF001C3C02800056
60683+:103FA0008C4401403C0380008C6201F80440FFFE19
60684+:103FB00024020002AC6401C0A06201C43C021000F3
60685+:103FC000AC6201F80A0010078FBF001C92220009A2
60686+:103FD00024030010304200FF144300043C02800020
60687+:103FE0008C4401400A000FEE0000282192220009B3
60688+:103FF00024030016304200FF14430006240200147C
60689+:10400000A22200093C0280008C4401400A001001F9
60690+:104010008FBF001C8E2200388E23003C00431023EB
60691+:10402000044100308FBF001C92220027244200016F
60692+:10403000A2220027922200272C42000414400016DE
60693+:104040003C1080009222000924030004304200FF4B
60694+:10405000144300093C0280008C4401408FBF001CC7
60695+:104060008FB200188FB100148FB000102405009398
60696+:104070000A000ECC27BD00208C440140240500938B
60697+:104080008FBF001C8FB200188FB100148FB00010CA
60698+:104090000A000F4827BD00208E0401400E000332A5
60699+:1040A000000000008E4200042442FFFFAE420004E4
60700+:1040B0008E22003C2442FFFFAE22003C0E00033D56
60701+:1040C0008E0401408E0401408FBF001C8FB2001887
60702+:1040D0008FB100148FB00010240500040A000342C1
60703+:1040E00027BD00208FB200188FB100148FB00010D0
60704+:1040F00003E0000827BD00203C0680008CC2018838
60705+:104100003C038008346500809063000E00021402B6
60706+:10411000304400FF306300FF1464000E3C0280084E
60707+:1041200090A20026304200FF104400098F82FF94C5
60708+:10413000A0A400262403005090420000304200FF5B
60709+:1041400014430006000000000A0005A18CC4018091
60710+:104150003C02800834420080A044002603E00008AE
60711+:104160000000000027BDFFE030E700FFAFB20018FD
60712+:10417000AFBF001CAFB10014AFB0001000809021A1
60713+:1041800014E0000630C600FF000000000000000D33
60714+:10419000000000000A001060240001163C038008A3
60715+:1041A0009062000E304200FF14460023346200800B
60716+:1041B00090420026304200FF1446001F000000001D
60717+:1041C0009062000F304200FF1446001B0000000008
60718+:1041D0009062000A304200FF144600038F90FF9463
60719+:1041E0000000000D8F90FF948F82FF983C1180009B
60720+:1041F000AE05003CAC450000A066000A0E0003328C
60721+:104200008E240100A20000240E00033D8E24010034
60722+:104210003C0380008C6201F80440FFFE240200028F
60723+:10422000AC7201C0A06201C43C021000AC6201F893
60724+:104230000A0010618FBF001C000000000000000D8C
60725+:10424000000000002400013F8FBF001C8FB2001847
60726+:104250008FB100148FB0001003E0000827BD0020CC
60727+:104260008F83FF943C0280008C44010034420100A3
60728+:104270008C65003C9046001B0A00102724070001B3
60729+:104280003C0280089043000E9042000A0043102632
60730+:10429000304200FF03E000080002102B27BDFFE0C2
60731+:1042A0003C028008AFB10014AFB00010AFBF0018DF
60732+:1042B0003450008092020005240300303042003068
60733+:1042C00014430085008088218F8200248C42000CDA
60734+:1042D000104000828FBF00180E000D840000000007
60735+:1042E0008F860020ACD100009202000892030009E2
60736+:1042F000304200FF00021200306300FF004310252F
60737+:10430000ACC200049202004D000216000002160327
60738+:1043100004410005000000003C0308008C630048D5
60739+:104320000A00109F3C1080089202000830420040B2
60740+:10433000144000030000182192020027304300FFC0
60741+:104340003C108008361100809222004D00031E00B0
60742+:10435000304200FF0002140000621825ACC30008C0
60743+:104360008E2400308F820024ACC4000C8E250034D3
60744+:104370009443001E3C02C00BACC50010006218251F
60745+:104380008E22003800002021ACC200148E22003C96
60746+:10439000ACC200180E000DB8ACC3001C8E020004A5
60747+:1043A0008F8400203C058000AC8200008E2200201B
60748+:1043B000AC8200048E22001CAC8200088E220058C1
60749+:1043C0008CA3007400431021AC82000C8E22002CC0
60750+:1043D000AC8200108E2200408E23004400021400A4
60751+:1043E00000431025AC8200149222004D240300806B
60752+:1043F000304200FF1443000400000000AC800018AD
60753+:104400000A0010E38F8200248E23000C2402000196
60754+:104410001062000E2402FFFF92220008304200408A
60755+:104420001440000A2402FFFF8E23000C8CA20074AB
60756+:10443000006218233C0208000062102414400002AD
60757+:10444000000028210060282100051043AC820018DC
60758+:104450008F820024000020219443001E3C02C00CE7
60759+:10446000006218258F8200200E000DB8AC43001C9E
60760+:104470003C038008346201008C4200008F850020DC
60761+:10448000346300808FBF0018ACA20000ACA0000411
60762+:104490008C6400488F8200248FB10014ACA4000803
60763+:1044A000ACA0000CACA00010906300059446001E68
60764+:1044B0003C02400D00031E0000C23025ACA30014D6
60765+:1044C0008FB00010ACA0001824040001ACA6001CA2
60766+:1044D0000A000DB827BD00208FBF00188FB100144F
60767+:1044E0008FB0001003E0000827BD00203C028000D0
60768+:1044F0009443007C3C02800834460100308400FF75
60769+:104500003065FFFF2402000524A34650A0C4000C20
60770+:104510005482000C3065FFFF90C2000D2C42000752
60771+:104520001040000724A30A0090C3000D24020014C9
60772+:104530000062100400A210210A00111F3045FFFF85
60773+:104540003065FFFF3C0280083442008003E0000831
60774+:10455000A44500143C03800834680080AD05003891
60775+:10456000346701008CE2001C308400FF00A210239D
60776+:104570001840000330C600FF24A2FFFCACE2001C80
60777+:1045800030820001504000083C0380088D02003C4E
60778+:1045900000A2102304410012240400058C620004D0
60779+:1045A00010A2000F3C0380088C62000414A2001EBD
60780+:1045B000000000003C0208008C4200D8304200207D
60781+:1045C000104000093C0280083462008090630008BB
60782+:1045D0009042004C144300043C0280082404000470
60783+:1045E0000A00110900000000344300803442010039
60784+:1045F000A040000C24020001A462001410C0000AB4
60785+:104600003C0280008C4401003C0380008C6201F875
60786+:104610000440FFFE24020002AC6401C0A06201C499
60787+:104620003C021000AC6201F803E00008000000004A
60788+:1046300027BDFFE800A61823AFBF00101860008058
60789+:10464000308800FF3C02800834470080A0E000244E
60790+:1046500034440100A0E000278C82001C00A210233B
60791+:1046600004400056000000008CE2003C94E3005C33
60792+:104670008CE4002C004530233063FFFF00C3182179
60793+:104680000083202B1080000400E018218CE2002C15
60794+:104690000A00117800A2102194E2005C3042FFFF72
60795+:1046A00000C2102100A21021AC62001C3C02800854
60796+:1046B000344400809482005C8C83001C3042FFFFF5
60797+:1046C0000002104000A210210043102B10400004F3
60798+:1046D000000000008C82001C0A00118B3C06800840
60799+:1046E0009482005C3042FFFF0002104000A21021C3
60800+:1046F0003C06800834C3010034C70080AC82001C33
60801+:10470000A060000CACE500388C62001C00A21023F5
60802+:104710001840000224A2FFFCAC62001C3102000120
60803+:10472000104000083C0380088CE2003C00A21023EB
60804+:1047300004410012240400058CC2000410A20010E1
60805+:104740008FBF00108C62000414A2004F8FBF0010B6
60806+:104750003C0208008C4200D8304200201040000A81
60807+:104760003C02800834620080906300089042004C54
60808+:10477000144300053C028008240400048FBF00108D
60809+:104780000A00110927BD001834430080344201009B
60810+:10479000A040000C24020001A46200143C0280002E
60811+:1047A0008C4401003C0380008C6201F80440FFFE51
60812+:1047B000240200020A0011D8000000008CE2001C54
60813+:1047C000004610230043102B54400001ACE5001CB0
60814+:1047D00094E2005C3042FFFF0062102B144000079F
60815+:1047E0002402000294E2005C8CE3001C3042FFFFD4
60816+:1047F00000621821ACE3001C24020002ACE5003882
60817+:104800000E000F5EA082000C1040001F8FBF001032
60818+:104810003C0280008C4401003C0380008C6201F863
60819+:104820000440FFFE24020002AC6401C0A06201C487
60820+:104830003C021000AC6201F80A0011F08FBF0010BA
60821+:1048400031020010104000108FBF00103C028008A1
60822+:10485000344500808CA3001C94A2005C00661823E1
60823+:104860003042FFFF006218213C023FFF3444FFFF4B
60824+:104870000083102B544000010080182100C3102138
60825+:10488000ACA2001C8FBF001003E0000827BD001879
60826+:1048900027BDFFE800C0402100A63023AFBF0010B5
60827+:1048A00018C00026308A00FF3C028008344900808E
60828+:1048B0008D24001C8D23002C008820230064182BDD
60829+:1048C0001060000F344701008CE2002000461021E8
60830+:1048D000ACE200208CE200200044102B1440000BBE
60831+:1048E0003C023FFF8CE2002000441023ACE2002099
60832+:1048F0009522005C3042FFFF0A0012100082202146
60833+:10490000ACE00020008620213C023FFF3443FFFF43
60834+:104910000064102B54400001006020213C028008FC
60835+:104920003442008000851821AC43001CA0400024C4
60836+:10493000A04000270A0012623C03800831420010A8
60837+:10494000104000433C0380083C06800834C40080CB
60838+:104950008C82003C004810235840003E34660080A2
60839+:104960009082002424420001A0820024908200242E
60840+:104970003C0308008C630024304200FF0043102BEE
60841+:10498000144000688FBF001034C201008C42001C2C
60842+:1049900000A2102318400063000000008CC3000434
60843+:1049A0009482005C006818233042FFFF0003184324
60844+:1049B000000210400043102A1040000500000000D3
60845+:1049C0008CC20004004810230A0012450002104364
60846+:1049D0009482005C3042FFFF000210403C068008D9
60847+:1049E000AC82002C34C5008094A2005C8CA4002C06
60848+:1049F00094A3005C3042FFFF00021040008220219F
60849+:104A00003063FFFF0083202101041021ACA2001CB1
60850+:104A10008CC2000434C60100ACC2001C2402000297
60851+:104A20000E000F5EA0C2000C1040003E8FBF0010B1
60852+:104A30003C0280008C4401003C0380008C6201F841
60853+:104A40000440FFFE240200020A001292000000004F
60854+:104A500034660080ACC50038346401008C82001CD0
60855+:104A600000A210231840000224A2FFFCAC82001C0C
60856+:104A7000314200015040000A3C0380088CC2003CD7
60857+:104A800000A2102304430014240400058C620004D7
60858+:104A900014A200033C0380080A00128424040005C9
60859+:104AA0008C62000414A2001F8FBF00103C0208009B
60860+:104AB0008C4200D8304200201040000A3C0280089E
60861+:104AC00034620080906300089042004C144300055B
60862+:104AD0003C028008240400048FBF00100A00110962
60863+:104AE00027BD00183443008034420100A040000C70
60864+:104AF00024020001A46200143C0280008C440100E6
60865+:104B00003C0380008C6201F80440FFFE2402000296
60866+:104B1000AC6401C0A06201C43C021000AC6201F8A8
60867+:104B20008FBF001003E0000827BD001827BDFFE875
60868+:104B30003C0A8008AFBF0010354900808D22003C40
60869+:104B400000C04021308400FF004610231840009D23
60870+:104B500030E700FF354701002402000100A63023A2
60871+:104B6000A0E0000CA0E0000DA522001418C0002455
60872+:104B7000308200108D23001C8D22002C0068182329
60873+:104B80000043102B1040000F000000008CE20020BA
60874+:104B900000461021ACE200208CE200200043102BE4
60875+:104BA0001440000B3C023FFF8CE200200043102326
60876+:104BB000ACE200209522005C3042FFFF0A0012C1E7
60877+:104BC00000621821ACE00020006618213C023FFF83
60878+:104BD0003446FFFF00C3102B5440000100C01821D1
60879+:104BE0003C0280083442008000651821AC43001C60
60880+:104BF000A0400024A04000270A00130F3C038008B7
60881+:104C0000104000403C0380088D22003C00481023E7
60882+:104C10005840003D34670080912200242442000166
60883+:104C2000A1220024912200243C0308008C6300246C
60884+:104C3000304200FF0043102B1440009A8FBF001039
60885+:104C40008CE2001C00A21023184000960000000017
60886+:104C50008D4300049522005C006818233042FFFF5A
60887+:104C600000031843000210400043102A10400005C2
60888+:104C7000012020218D420004004810230A0012F276
60889+:104C8000000210439522005C3042FFFF00021040FA
60890+:104C90003C068008AC82002C34C5008094A2005CE5
60891+:104CA0008CA4002C94A3005C3042FFFF0002104053
60892+:104CB000008220213063FFFF0083182101031021AF
60893+:104CC000ACA2001C8CC2000434C60100ACC2001CA3
60894+:104CD000240200020E000F5EA0C2000C1040007102
60895+:104CE0008FBF00103C0280008C4401003C03800018
60896+:104CF0008C6201F80440FFFE240200020A0013390E
60897+:104D00000000000034670080ACE500383466010024
60898+:104D10008CC2001C00A210231840000224A2FFFC39
60899+:104D2000ACC2001C30820001504000083C038008E7
60900+:104D30008CE2003C00A2102304430051240400052F
60901+:104D40008C62000410A2003E3C0380088C620004C8
60902+:104D500054A200548FBF00103C0208008C4200D8BF
60903+:104D600030420020104000063C028008346200807F
60904+:104D7000906300089042004C104300403C028008C1
60905+:104D80003443008034420100A040000C24020001A2
60906+:104D9000A46200143C0280008C4401003C038000AB
60907+:104DA0008C6201F80440FFFE24020002AC6401C0E2
60908+:104DB000A06201C43C021000AC6201F80A00137743
60909+:104DC0008FBF001024020005A120002714E2000A72
60910+:104DD0003C038008354301009062000D2C42000620
60911+:104DE000504000053C0380089062000D2442000101
60912+:104DF000A062000D3C03800834670080ACE50038F9
60913+:104E0000346601008CC2001C00A21023184000026E
60914+:104E100024A2FFFCACC2001C308200015040000AFA
60915+:104E20003C0380088CE2003C00A2102304410014E3
60916+:104E3000240400058C62000414A200033C038008D3
60917+:104E40000A00136E240400058C62000414A20015ED
60918+:104E50008FBF00103C0208008C4200D83042002076
60919+:104E60001040000A3C028008346200809063000811
60920+:104E70009042004C144300053C02800824040004C6
60921+:104E80008FBF00100A00110927BD001834430080AD
60922+:104E900034420100A040000C24020001A46200146E
60923+:104EA0008FBF001003E0000827BD00183C0B8008EE
60924+:104EB00027BDFFE83C028000AFBF00103442010074
60925+:104EC000356A00809044000A356901008C45001461
60926+:104ED0008D4800389123000C308400FF0105102319
60927+:104EE0001C4000B3306700FF2CE20006504000B1C8
60928+:104EF0008FBF00102402000100E2300430C2000322
60929+:104F00005440000800A8302330C2000C144000A117
60930+:104F100030C20030144000A38FBF00100A00143BC1
60931+:104F20000000000018C00024308200108D43001CD7
60932+:104F30008D42002C006818230043102B1040000FF6
60933+:104F4000000000008D22002000461021AD2200202C
60934+:104F50008D2200200043102B1440000B3C023FFF29
60935+:104F60008D22002000431023AD2200209542005CDA
60936+:104F70003042FFFF0A0013AF00621821AD2000206D
60937+:104F8000006618213C023FFF3446FFFF00C3102B90
60938+:104F90005440000100C018213C02800834420080C7
60939+:104FA00000651821AC43001CA0400024A04000274D
60940+:104FB0000A0013FD3C038008104000403C038008B9
60941+:104FC0008D42003C004810231840003D34670080AB
60942+:104FD0009142002424420001A14200249142002475
60943+:104FE0003C0308008C630024304200FF0043102B78
60944+:104FF000144000708FBF00108D22001C00A21023EF
60945+:105000001840006C000000008D6300049542005CB5
60946+:10501000006818233042FFFF0003184300021040CD
60947+:105020000043102A10400005014020218D62000439
60948+:10503000004810230A0013E0000210439542005C70
60949+:105040003042FFFF000210403C068008AC82002C7A
60950+:1050500034C5008094A2005C8CA4002C94A3005C56
60951+:105060003042FFFF00021040008220213063FFFF2A
60952+:105070000083182101031021ACA2001C8CC2000483
60953+:1050800034C60100ACC2001C240200020E000F5EF8
60954+:10509000A0C2000C104000478FBF00103C028000EF
60955+:1050A0008C4401003C0380008C6201F80440FFFE48
60956+:1050B000240200020A00142D000000003467008062
60957+:1050C000ACE50038346601008CC2001C00A210233D
60958+:1050D0001840000224A2FFFCACC2001C3082000178
60959+:1050E0005040000A3C0380088CE2003C00A21023E0
60960+:1050F00004430014240400058C62000414A200037D
60961+:105100003C0380080A00141F240400058C6200047C
60962+:1051100014A200288FBF00103C0208008C4200D867
60963+:10512000304200201040000A3C02800834620080B7
60964+:10513000906300089042004C144300053C02800834
60965+:10514000240400048FBF00100A00110927BD0018B5
60966+:105150003443008034420100A040000C24020001CE
60967+:10516000A46200143C0280008C4401003C038000D7
60968+:105170008C6201F80440FFFE24020002AC6401C00E
60969+:10518000A06201C43C021000AC6201F80A00143BAA
60970+:105190008FBF00108FBF0010010030210A00115A8C
60971+:1051A00027BD0018010030210A00129927BD001800
60972+:1051B0008FBF001003E0000827BD00183C038008E3
60973+:1051C0003464010024020003A082000C8C620004FD
60974+:1051D00003E00008AC82001C3C05800834A300807A
60975+:1051E0009062002734A501002406004324420001F8
60976+:1051F000A0620027906300273C0208008C42004810
60977+:10520000306300FF146200043C07602194A500EAAB
60978+:105210000A00090130A5FFFF03E0000800000000BC
60979+:1052200027BDFFE8AFBF00103C0280000E00144411
60980+:105230008C4401803C02800834430100A060000CD3
60981+:105240008C4200048FBF001027BD001803E0000847
60982+:10525000AC62001C27BDFFE03C028008AFBF001815
60983+:10526000AFB10014AFB000103445008034460100E7
60984+:105270003C0880008D09014090C3000C8CA4003CC8
60985+:105280008CA200381482003B306700FF9502007C3E
60986+:1052900090A30027146000093045FFFF2402000599
60987+:1052A00054E200083C04800890C2000D2442000132
60988+:1052B000A0C2000D0A00147F3C048008A0C0000DAD
60989+:1052C0003C048008348201009042000C2403000555
60990+:1052D000304200FF1443000A24A205DC348300801E
60991+:1052E000906200272C4200075040000524A20A00CB
60992+:1052F00090630027240200140062100400A2102111
60993+:105300003C108008361000803045FFFF012020212E
60994+:105310000E001444A60500149602005C8E030038AB
60995+:105320003C1180003042FFFF000210400062182153
60996+:10533000AE03001C0E0003328E24014092020025B1
60997+:1053400034420040A20200250E00033D8E2401409D
60998+:105350008E2401403C0380008C6201F80440FFFE73
60999+:1053600024020002AC6401C0A06201C43C0210002F
61000+:10537000AC6201F88FBF00188FB100148FB000101D
61001+:1053800003E0000827BD00203C0360103C02080039
61002+:1053900024420174AC62502C8C6250003C048000AA
61003+:1053A00034420080AC6250003C0208002442547C2D
61004+:1053B0003C010800AC2256003C020800244254384C
61005+:1053C0003C010800AC2256043C020002AC840008F8
61006+:1053D000AC82000C03E000082402000100A0302190
61007+:1053E0003C1C0800279C56083C0200023C050400B7
61008+:1053F00000852826008220260004102B2CA5000101
61009+:105400002C840001000210803C0308002463560035
61010+:105410000085202500431821108000030000102182
61011+:10542000AC6600002402000103E000080000000058
61012+:105430003C1C0800279C56083C0200023C05040066
61013+:1054400000852826008220260004102B2CA50001B0
61014+:105450002C840001000210803C03080024635600E5
61015+:105460000085202500431821108000050000102130
61016+:105470003C02080024425438AC62000024020001BF
61017+:1054800003E00008000000003C0200023C030400AE
61018+:1054900000821026008318262C4200012C63000194
61019+:1054A000004310251040000B000028213C1C080080
61020+:1054B000279C56083C0380008C62000824050001EC
61021+:1054C00000431025AC6200088C62000C00441025DB
61022+:1054D000AC62000C03E0000800A010213C1C080096
61023+:1054E000279C56083C0580008CA3000C0004202754
61024+:1054F000240200010064182403E00008ACA3000C9F
61025+:105500003C020002148200063C0560008CA208D018
61026+:105510002403FFFE0043102403E00008ACA208D0DF
61027+:105520003C02040014820005000000008CA208D098
61028+:105530002403FFFD00431024ACA208D003E00008C0
61029+:10554000000000003C02601A344200108C430080CE
61030+:1055500027BDFFF88C440084AFA3000093A3000094
61031+:10556000240200041462001AAFA4000493A20001F4
61032+:105570001040000797A300023062FFFC3C0380004C
61033+:10558000004310218C4200000A001536AFA200042F
61034+:105590003062FFFC3C03800000431021AC4400005B
61035+:1055A000A3A000003C0560008CA208D02403FFFEED
61036+:1055B0003C04601A00431024ACA208D08FA300045E
61037+:1055C0008FA2000034840010AC830084AC82008081
61038+:1055D00003E0000827BD000827BDFFE8AFBF0010AB
61039+:1055E0003C1C0800279C56083C0280008C43000CA1
61040+:1055F0008C420004004318243C0200021060001496
61041+:10560000006228243C0204003C04000210A00005B3
61042+:10561000006210243C0208008C4256000A00155B10
61043+:1056200000000000104000073C0404003C02080099
61044+:105630008C4256040040F809000000000A00156082
61045+:10564000000000000000000D3C1C0800279C5608CC
61046+:105650008FBF001003E0000827BD0018800802403B
61047+:1056600080080100800800808008000000000C8095
61048+:105670000000320008000E9808000EF408000F88A1
61049+:1056800008001028080010748008010080080080BD
61050+:10569000800800000A000028000000000000000050
61051+:1056A0000000000D6370362E322E316200000000C3
61052+:1056B00006020104000000000000000000000000DD
61053+:1056C000000000000000000038003C000000000066
61054+:1056D00000000000000000000000000000000020AA
61055+:1056E00000000000000000000000000000000000BA
61056+:1056F00000000000000000000000000000000000AA
61057+:10570000000000000000000021003800000000013F
61058+:105710000000002B000000000000000400030D400A
61059+:105720000000000000000000000000000000000079
61060+:105730000000000000000000100000030000000056
61061+:105740000000000D0000000D3C020800244259AC8E
61062+:105750003C03080024635BF4AC4000000043202BB2
61063+:105760001480FFFD244200043C1D080037BD9FFC4F
61064+:1057700003A0F0213C100800261000A03C1C0800EB
61065+:10578000279C59AC0E0002F6000000000000000D3E
61066+:1057900027BDFFB4AFA10000AFA20004AFA3000873
61067+:1057A000AFA4000CAFA50010AFA60014AFA700185F
61068+:1057B000AFA8001CAFA90020AFAA0024AFAB0028FF
61069+:1057C000AFAC002CAFAD0030AFAE0034AFAF00389F
61070+:1057D000AFB8003CAFB90040AFBC0044AFBF004819
61071+:1057E0000E000820000000008FBF00488FBC00445E
61072+:1057F0008FB900408FB8003C8FAF00388FAE0034B7
61073+:105800008FAD00308FAC002C8FAB00288FAA002406
61074+:105810008FA900208FA8001C8FA700188FA6001446
61075+:105820008FA500108FA4000C8FA300088FA2000486
61076+:105830008FA1000027BD004C3C1B60188F7A5030B0
61077+:10584000377B502803400008AF7A000000A01821E1
61078+:1058500000801021008028213C0460003C0760008B
61079+:105860002406000810600006348420788C42000072
61080+:10587000ACE220088C63000003E00008ACE3200CDD
61081+:105880000A000F8100000000240300403C02600079
61082+:1058900003E00008AC4320003C0760008F86000452
61083+:1058A0008CE520740086102100A2182B14600007DC
61084+:1058B000000028218F8AFDA024050001A1440013C7
61085+:1058C0008F89000401244021AF88000403E0000810
61086+:1058D00000A010218F84FDA08F8500049086001306
61087+:1058E00030C300FF00A31023AF82000403E00008D0
61088+:1058F000A08000138F84FDA027BDFFE8AFB000108B
61089+:10590000AFBF001490890011908700112402002875
61090+:10591000312800FF3906002830E300FF2485002CE1
61091+:105920002CD00001106200162484001C0E00006EB2
61092+:10593000000000008F8FFDA03C05600024020204DF
61093+:1059400095EE003E95ED003C000E5C0031ACFFFF93
61094+:10595000016C5025ACAA2010520000012402000462
61095+:10596000ACA22000000000000000000000000000C9
61096+:105970008FBF00148FB0001003E0000827BD00188F
61097+:105980000A0000A6000028218F85FDA027BDFFD8B2
61098+:10599000AFBF0020AFB3001CAFB20018AFB100140E
61099+:1059A000AFB000100080982190A4001124B0001C1A
61100+:1059B00024B1002C308300FF386200280E000090D4
61101+:1059C0002C5200010E00009800000000020020216F
61102+:1059D0001240000202202821000028210E00006E43
61103+:1059E000000000008F8DFDA03C0880003C05600099
61104+:1059F00095AC003E95AB003C02683025000C4C0095
61105+:105A0000316AFFFF012A3825ACA7201024020202C8
61106+:105A1000ACA6201452400001240200028FBF0020D7
61107+:105A20008FB3001C8FB200188FB100148FB000101C
61108+:105A300027BD002803E00008ACA2200027BDFFE03E
61109+:105A4000AFB20018AFB10014AFB00010AFBF001C70
61110+:105A50003C1160008E2320748F82000430D0FFFF41
61111+:105A600030F2FFFF1062000C2406008F0E00006E63
61112+:105A7000000000003C06801F0010440034C5FF00F9
61113+:105A80000112382524040002AE2720100000302126
61114+:105A9000AE252014AE2420008FBF001C8FB200184A
61115+:105AA0008FB100148FB0001000C0102103E0000877
61116+:105AB00027BD002027BDFFE0AFB0001030D0FFFFB2
61117+:105AC000AFBF0018AFB100140E00006E30F1FFFF41
61118+:105AD00000102400009180253C036000AC70201071
61119+:105AE0008FBF00188FB100148FB000102402000483
61120+:105AF000AC62200027BD002003E000080000102158
61121+:105B000027BDFFE03C046018AFBF0018AFB1001420
61122+:105B1000AFB000108C8850002403FF7F34028071E6
61123+:105B20000103382434E5380C241F00313C1980006F
61124+:105B3000AC8550003C11800AAC8253BCAF3F0008DA
61125+:105B40000E00054CAF9100400E00050A3C116000AC
61126+:105B50000E00007D000000008E3008083C0F570941
61127+:105B60002418FFF00218602435EEE00035EDF00057
61128+:105B7000018E5026018D58262D4600012D69000109
61129+:105B8000AF86004C0E000D09AF8900503C06601630
61130+:105B90008CC700003C0860148D0500A03C03FFFF8B
61131+:105BA00000E320243C02535300052FC2108200550D
61132+:105BB00034D07C00960201F2A780006C10400003F4
61133+:105BC000A780007C384B1E1EA78B006C960201F844
61134+:105BD000104000048F8D0050384C1E1EA78C007C96
61135+:105BE0008F8D005011A000058F83004C240E0020E3
61136+:105BF000A78E007CA78E006C8F83004C1060000580
61137+:105C00009785007C240F0020A78F007CA78F006C55
61138+:105C10009785007C2CB8008153000001240500808A
61139+:105C20009784006C2C91040152200001240404008C
61140+:105C30001060000B3C0260008FBF00188FB1001491
61141+:105C40008FB0001027BD0020A784006CA785007CC2
61142+:105C5000A380007EA780007403E00008A780009264
61143+:105C60008C4704382419103C30FFFFFF13F9000360
61144+:105C700030A8FFFF1100004624030050A380007EDF
61145+:105C80009386007E50C00024A785007CA780007CFE
61146+:105C90009798007CA780006CA7800074A780009272
61147+:105CA0003C010800AC3800800E00078700000000AF
61148+:105CB0003C0F60008DED0808240EFFF03C0B600ED9
61149+:105CC000260C0388356A00100000482100002821B6
61150+:105CD00001AE20243C105709AF8C0010AF8A004859
61151+:105CE000AF89001810900023AF8500148FBF0018F3
61152+:105CF0008FB100148FB0001027BD002003E0000812
61153+:105D0000AF80005400055080014648218D260004D4
61154+:105D10000A00014800D180219798007CA784006C7C
61155+:105D2000A7800074A78000923C010800AC38008076
61156+:105D30000E000787000000003C0F60008DED080892
61157+:105D4000240EFFF03C0B600E260C0388356A001011
61158+:105D5000000048210000282101AE20243C105709F2
61159+:105D6000AF8C0010AF8A0048AF8900181490FFDF95
61160+:105D7000AF85001424110001AF9100548FBF0018AB
61161+:105D80008FB100148FB0001003E0000827BD002081
61162+:105D90000A00017BA383007E3083FFFF8F880040D1
61163+:105DA0008F87003C000321403C0580003C020050EE
61164+:105DB000008248253C0660003C0A010034AC040027
61165+:105DC0008CCD08E001AA58241160000500000000F5
61166+:105DD0008CCF08E024E7000101EA7025ACCE08E092
61167+:105DE0008D19001001805821ACB900388D180014AD
61168+:105DF000ACB8003CACA9003000000000000000007E
61169+:105E00000000000000000000000000000000000092
61170+:105E100000000000000000003C0380008C640000D3
61171+:105E2000308200201040FFFD3C0F60008DED08E047
61172+:105E30003C0E010001AE18241460FFE100000000D8
61173+:105E4000AF87003C03E00008AF8B00588F8500400F
61174+:105E5000240BFFF03C06800094A7001A8CA90024B4
61175+:105E600030ECFFFF000C38C000EB5024012A402129
61176+:105E7000ACC8003C8CA400248CC3003C00831023DD
61177+:105E800018400033000000008CAD002025A2000166
61178+:105E90003C0F0050ACC2003835EE00103C068000CC
61179+:105EA000ACCE003000000000000000000000000048
61180+:105EB00000000000000000000000000000000000E2
61181+:105EC000000000003C0480008C9900003338002062
61182+:105ED0001300FFFD30E20008104000173C0980006D
61183+:105EE0008C880408ACA800108C83040CACA30014AC
61184+:105EF0003C1900203C188000AF19003094AE001807
61185+:105F000094AF001C01CF3021A4A6001894AD001A54
61186+:105F100025A70001A4A7001A94AB001A94AC001E98
61187+:105F2000118B00030000000003E0000800000000E7
61188+:105F300003E00008A4A0001A8D2A0400ACAA0010F7
61189+:105F40008D240404ACA400140A0002183C1900209B
61190+:105F50008CA200200A0002003C0F00500A0001EE53
61191+:105F60000000000027BDFFE8AFBF00100E000232A6
61192+:105F7000000000008F8900408FBF00103C038000AC
61193+:105F8000A520000A9528000A9527000427BD0018BF
61194+:105F90003105FFFF30E6000F0006150000A22025A6
61195+:105FA00003E00008AC6400803C0508008CA50020DC
61196+:105FB0008F83000C27BDFFE8AFB00010AFBF001407
61197+:105FC00010A300100000802124040001020430040A
61198+:105FD00000A6202400C3102450440006261000010F
61199+:105FE000001018802787FDA41480000A006718217C
61200+:105FF000261000012E0900025520FFF38F83000CAC
61201+:10600000AF85000C8FBF00148FB0001003E00008B4
61202+:1060100027BD00188C6800003C058000ACA8002457
61203+:106020000E000234261000013C0508008CA500205B
61204+:106030000A0002592E0900022405000100851804F7
61205+:106040003C0408008C84002027BDFFC8AFBF00348B
61206+:1060500000831024AFBE0030AFB7002CAFB60028CD
61207+:10606000AFB50024AFB40020AFB3001CAFB200182E
61208+:10607000AFB1001410400051AFB000108F84004049
61209+:10608000948700069488000A00E8302330D5FFFF8B
61210+:1060900012A0004B8FBF0034948B0018948C000A20
61211+:1060A000016C50233142FFFF02A2482B1520000251
61212+:1060B00002A02021004020212C8F000515E00002C5
61213+:1060C00000809821241300040E0001C102602021E9
61214+:1060D0008F87004002609021AF80004494F4000A52
61215+:1060E000026080211260004E3291FFFF3C1670006A
61216+:1060F0003C1440003C1E20003C1760008F99005863
61217+:106100008F380000031618241074004F0283F82BF8
61218+:1061100017E0003600000000107E00478F86004424
61219+:1061200014C0003A2403000102031023022320219B
61220+:106130003050FFFF1600FFF13091FFFF8F870040C6
61221+:106140003C1100203C108000AE11003094EB000A9E
61222+:106150003C178000024B5021A4EA000A94E9000A8F
61223+:1061600094E800043123FFFF3106000F00062D00E4
61224+:106170000065F025AEFE008094F3000A94F6001846
61225+:1061800012D30036001221408CFF00148CF4001052
61226+:1061900003E468210000C02101A4782B029870213B
61227+:1061A00001CF6021ACED0014ACEC001002B238233A
61228+:1061B00030F5FFFF16A0FFB88F8400408FBF00347A
61229+:1061C0008FBE00308FB7002C8FB600288FB500240B
61230+:1061D0008FB400208FB3001C8FB200188FB1001451
61231+:1061E0008FB0001003E0000827BD00381477FFCC03
61232+:1061F0008F8600440E000EE202002021004018218C
61233+:106200008F86004410C0FFC9020310230270702360
61234+:106210008F87004001C368210A0002E431B2FFFF0A
61235+:106220008F86004414C0FFC93C1100203C10800040
61236+:106230000A0002AEAE1100300E00046602002021FA
61237+:106240000A0002DB00401821020020210E0009395B
61238+:10625000022028210A0002DB004018210E0001EE76
61239+:10626000000000000A0002C702B2382327BDFFC8A1
61240+:10627000AFB7002CAFB60028AFB50024AFB40020F4
61241+:10628000AFB3001CAFB20018AFB10014AFB0001034
61242+:10629000AFBF00300E00011B241300013C047FFF40
61243+:1062A0003C0380083C0220003C010800AC20007048
61244+:1062B0003496FFFF34770080345200033C1512C03F
61245+:1062C000241400013C1080002411FF800E000245C0
61246+:1062D000000000008F8700488F8B00188F89001402
61247+:1062E0008CEA00EC8CE800E8014B302B01092823F4
61248+:1062F00000A6102314400006014B18231440000E82
61249+:106300003C05800002A3602B1180000B0000000000
61250+:106310003C0560008CEE00EC8CED00E88CA4180CC1
61251+:10632000AF8E001804800053AF8D00148F8F0010C3
61252+:10633000ADF400003C0580008CBF00003BF900017B
61253+:10634000333800011700FFE13C0380008C6201003C
61254+:1063500024060C0010460009000000008C680100B3
61255+:106360002D043080548000103C0480008C690100B2
61256+:106370002D2331811060000C3C0480008CAA0100A8
61257+:1063800011460004000020218CA6010024C5FF81D5
61258+:1063900030A400FF8E0B01000E000269AE0B00243A
61259+:1063A0000A00034F3C0480008C8D01002DAC3300AB
61260+:1063B00011800022000000003C0708008CE70098D4
61261+:1063C00024EE00013C010800AC2E00983C04800043
61262+:1063D0008C8201001440000300000000566000148D
61263+:1063E0003C0440008C9F01008C9801000000982123
61264+:1063F00003F1C82400193940330F007F00EF7025E6
61265+:1064000001D26825AC8D08308C8C01008C85010090
61266+:10641000258B0100017130240006514030A3007F1C
61267+:106420000143482501324025AC8808303C04400037
61268+:10643000AE0401380A00030E000000008C99010030
61269+:10644000240F0020AC99002092F80000330300FFD5
61270+:10645000106F000C241F0050547FFFDD3C048000AF
61271+:106460008C8401000E00154E000000000A00034F4E
61272+:106470003C04800000963824ACA7180C0A000327BF
61273+:106480008F8F00108C8501000E0008F72404008017
61274+:106490000A00034F3C04800000A4102B24030001D9
61275+:1064A00010400009000030210005284000A4102BF6
61276+:1064B00004A00003000318405440FFFC00052840DE
61277+:1064C0005060000A0004182B0085382B54E00004AB
61278+:1064D0000003184200C33025008520230003184222
61279+:1064E0001460FFF9000528420004182B03E000089F
61280+:1064F00000C310213084FFFF30C600FF3C0780003E
61281+:106500008CE201B80440FFFE00064C000124302557
61282+:106510003C08200000C820253C031000ACE00180AE
61283+:10652000ACE50184ACE4018803E00008ACE301B809
61284+:106530003C0660008CC5201C2402FFF03083020062
61285+:10654000308601001060000E00A2282434A500014E
61286+:106550003087300010E0000530830C0034A50004C3
61287+:106560003C04600003E00008AC85201C1060FFFDC7
61288+:106570003C04600034A5000803E00008AC85201C42
61289+:1065800054C0FFF334A500020A0003B03087300086
61290+:1065900027BDFFE8AFB00010AFBF00143C0760009C
61291+:1065A000240600021080001100A080218F83005873
61292+:1065B0000E0003A78C6400188F8200580000202171
61293+:1065C000240600018C45000C0E000398000000001A
61294+:1065D0001600000224020003000010218FBF0014E7
61295+:1065E0008FB0001003E0000827BD00188CE8201CC5
61296+:1065F0002409FFF001092824ACE5201C8F870058EE
61297+:106600000A0003CD8CE5000C3C02600E00804021A6
61298+:1066100034460100240900180000000000000000BA
61299+:10662000000000003C0A00503C0380003547020097
61300+:10663000AC68003834640400AC65003CAC670030E2
61301+:106640008C6C0000318B00201160FFFD2407FFFFE0
61302+:106650002403007F8C8D00002463FFFF248400044A
61303+:10666000ACCD00001467FFFB24C60004000000004E
61304+:10667000000000000000000024A402000085282B78
61305+:106680003C0300203C0E80002529FFFF010540212E
61306+:10669000ADC300301520FFE00080282103E0000892
61307+:1066A000000000008F82005827BDFFD8AFB3001C48
61308+:1066B000AFBF0020AFB20018AFB10014AFB00010F0
61309+:1066C00094460002008098218C5200182CC300814F
61310+:1066D0008C4800048C4700088C51000C8C49001039
61311+:1066E000106000078C4A00142CC4000414800013AE
61312+:1066F00030EB000730C5000310A0001000000000C0
61313+:106700002410008B02002021022028210E00039873
61314+:10671000240600031660000224020003000010217A
61315+:106720008FBF00208FB3001C8FB200188FB10014F0
61316+:106730008FB0001003E0000827BD00281560FFF1AE
61317+:106740002410008B3C0C80003C030020241F00011F
61318+:10675000AD830030AF9F0044000000000000000047
61319+:10676000000000002419FFF024D8000F031978243A
61320+:106770003C1000D0AD88003801F0702524CD000316
61321+:106780003C08600EAD87003C35850400AD8E0030BE
61322+:10679000000D38823504003C3C0380008C6B000007
61323+:1067A000316200201040FFFD0000000010E00008F2
61324+:1067B00024E3FFFF2407FFFF8CA800002463FFFFF2
61325+:1067C00024A50004AC8800001467FFFB24840004A7
61326+:1067D0003C05600EACA60038000000000000000080
61327+:1067E000000000008F8600543C0400203C0780001D
61328+:1067F000ACE4003054C000060120202102402021DA
61329+:106800000E0003A7000080210A00041D02002021C1
61330+:106810000E0003DD01402821024020210E0003A7C5
61331+:10682000000080210A00041D0200202127BDFFE096
61332+:10683000AFB200183092FFFFAFB10014AFBF001C21
61333+:10684000AFB000101640000D000088210A0004932C
61334+:106850000220102124050003508500278CE5000C40
61335+:106860000000000D262800013111FFFF24E2002066
61336+:106870000232802B12000019AF8200588F82004430
61337+:10688000144000168F8700583C0670003C0320001F
61338+:106890008CE5000000A62024148300108F84006083
61339+:1068A000000544023C09800000A980241480FFE90F
61340+:1068B000310600FF2CCA000B5140FFEB26280001D7
61341+:1068C000000668803C0E080025CE575801AE6021B6
61342+:1068D0008D8B0000016000080000000002201021E4
61343+:1068E0008FBF001C8FB200188FB100148FB0001042
61344+:1068F00003E0000827BD00200E0003982404008454
61345+:106900001600FFD88F8700580A000474AF8000601B
61346+:10691000020028210E0003BF240400018F870058C5
61347+:106920000A000474AF820060020028210E0003BF39
61348+:10693000000020210A0004A38F8700580E000404E1
61349+:10694000020020218F8700580A000474AF82006083
61350+:1069500030AFFFFF000F19C03C0480008C9001B8DD
61351+:106960000600FFFE3C1920043C181000AC83018097
61352+:10697000AC800184AC990188AC9801B80A00047518
61353+:106980002628000190E2000390E30002000020218D
61354+:106990000002FE0000033A0000FF2825240600083C
61355+:1069A0000E000398000000001600FFDC2402000324
61356+:1069B0008F870058000010210A000474AF82006025
61357+:1069C00090E8000200002021240600090A0004C308
61358+:1069D00000082E0090E4000C240900FF308500FF21
61359+:1069E00010A900150000302190F9000290F8000372
61360+:1069F000308F00FF94EB000400196E000018740043
61361+:106A0000000F62000186202501AE5025014B28258C
61362+:106A10003084FF8B0A0004C32406000A90E30002BE
61363+:106A200090FF0004000020210003360000DF28252D
61364+:106A30000A0004C32406000B0A0004D52406008BB8
61365+:106A4000000449C23127003F000443423C02800059
61366+:106A500000082040240316802CE60020AC43002CC4
61367+:106A600024EAFFE02482000114C0000330A900FFE3
61368+:106A700000801021314700FF000260803C0D800043
61369+:106A8000240A0001018D20213C0B000E00EA28049D
61370+:106A9000008B302111200005000538278CCE000026
61371+:106AA00001C5382503E00008ACC700008CD8000001
61372+:106AB0000307782403E00008ACCF000027BDFFE007
61373+:106AC000AFB10014AFB00010AFBF00183C076000BA
61374+:106AD0008CE408083402F0003C1160003083F000C0
61375+:106AE000240501C03C04800E000030211062000625
61376+:106AF000241000018CEA08083149F0003928E00030
61377+:106B00000008382B000780403C0D0200AE2D081411
61378+:106B1000240C16803C0B80008E2744000E000F8B47
61379+:106B2000AD6C002C120000043C02169124050001FB
61380+:106B3000120500103C023D2C345800E0AE384408E9
61381+:106B40003C1108008E31007C8FBF00183C066000AD
61382+:106B500000118540360F16808FB100148FB00010E1
61383+:106B60003C0E020027BD0020ACCF442003E000080B
61384+:106B7000ACCE08103C0218DA345800E0AE384408B5
61385+:106B80003C1108008E31007C8FBF00183C0660006D
61386+:106B900000118540360F16808FB100148FB00010A1
61387+:106BA0003C0E020027BD0020ACCF442003E00008CB
61388+:106BB000ACCE08100A0004EB240500010A0004EB27
61389+:106BC0000000282124020400A7820024A780001CC2
61390+:106BD000000020213C06080024C65A582405FFFF67
61391+:106BE00024890001000440803124FFFF01061821A0
61392+:106BF0002C87002014E0FFFAAC6500002404040098
61393+:106C0000A7840026A780001E000020213C06080063
61394+:106C100024C65AD82405FFFF248D0001000460809B
61395+:106C200031A4FFFF018658212C8A00201540FFFA6D
61396+:106C3000AD650000A7800028A7800020A780002263
61397+:106C4000000020213C06080024C65B582405FFFFF5
61398+:106C5000249900010004C0803324FFFF030678213B
61399+:106C60002C8E000415C0FFFAADE500003C05600065
61400+:106C70008CA73D002403E08F00E31024344601403C
61401+:106C800003E00008ACA63D002487007F000731C266
61402+:106C900024C5FFFF000518C2246400013082FFFFF5
61403+:106CA000000238C0A78400303C010800AC27003047
61404+:106CB000AF80002C0000282100002021000030219E
61405+:106CC0002489000100A728213124FFFF2CA81701E7
61406+:106CD000110000032C8300801460FFF924C600011A
61407+:106CE00000C02821AF86002C10C0001DA786002AF6
61408+:106CF00024CAFFFF000A11423C08080025085B581F
61409+:106D00001040000A00002021004030212407FFFF2E
61410+:106D1000248E00010004688031C4FFFF01A86021B7
61411+:106D20000086582B1560FFFAAD87000030A2001FC7
61412+:106D30005040000800043080240300010043C804D0
61413+:106D400000041080004878212738FFFF03E0000886
61414+:106D5000ADF8000000C820212405FFFFAC8500002D
61415+:106D600003E000080000000030A5FFFF30C6FFFF71
61416+:106D700030A8001F0080602130E700FF0005294295
61417+:106D80000000502110C0001D24090001240B000147
61418+:106D900025180001010B2004330800FF0126782686
61419+:106DA000390E00202DED00012DC2000101A2182591
61420+:106DB0001060000D014450250005C880032C4021BF
61421+:106DC0000100182110E0000F000A20278D040000A8
61422+:106DD000008A1825AD03000024AD00010000402109
61423+:106DE0000000502131A5FFFF252E000131C9FFFF12
61424+:106DF00000C9102B1040FFE72518000103E0000830
61425+:106E0000000000008D0A0000014440240A0005D162
61426+:106E1000AC68000027BDFFE830A5FFFF30C6FFFFCC
61427+:106E2000AFB00010AFBF001430E7FFFF00005021EB
61428+:106E30003410FFFF0000602124AF001F00C0482174
61429+:106E4000241800012419002005E0001601E010219B
61430+:106E50000002F943019F682A0009702B01AE40240B
61431+:106E600011000017000C18800064102110E00005CC
61432+:106E70008C4B000000F840040008382301675824B8
61433+:106E800000003821154000410000402155600016E7
61434+:106E90003169FFFF258B0001316CFFFF05E1FFEC3D
61435+:106EA00001E0102124A2003E0002F943019F682A5C
61436+:106EB0000009702B01AE40241500FFEB000C188078
61437+:106EC000154600053402FFFF020028210E0005B51B
61438+:106ED00000003821020010218FBF00148FB0001075
61439+:106EE00003E0000827BD00181520000301601821E9
61440+:106EF000000B1C0224080010306A00FF154000053A
61441+:106F0000306E000F250D000800031A0231A800FFA3
61442+:106F1000306E000F15C00005307F000325100004FF
61443+:106F200000031902320800FF307F000317E000055C
61444+:106F3000386900012502000200031882304800FF72
61445+:106F4000386900013123000110600004310300FFA3
61446+:106F5000250A0001314800FF310300FF000C6940A1
61447+:106F600001A34021240A000110CAFFD53110FFFF00
61448+:106F7000246E000131C800FF1119FFC638C9000195
61449+:106F80002D1F002053E0001C258B0001240D000163
61450+:106F90000A000648240E002051460017258B0001E8
61451+:106FA00025090001312800FF2D0900205120001281
61452+:106FB000258B000125430001010D5004014B1024D5
61453+:106FC000250900011440FFF4306AFFFF3127FFFF5D
61454+:106FD00010EE000C2582FFFF304CFFFF0000502117
61455+:106FE0003410FFFF312800FF2D0900205520FFF24B
61456+:106FF00025430001258B0001014648260A000602B0
61457+:10700000316CFFFF00003821000050210A000654B7
61458+:107010003410FFFF27BDFFD8AFB0001030F0FFFFE6
61459+:10702000AFB10014001039423211FFE000071080A8
61460+:10703000AFB3001C00B1282330D3FFFFAFB200185C
61461+:1070400030A5FFFF00809021026030210044202104
61462+:10705000AFBF00200E0005E03207001F022288218A
61463+:107060003403FFFF0240202102002821026030216A
61464+:1070700000003821104300093231FFFF02201021A7
61465+:107080008FBF00208FB3001C8FB200188FB1001487
61466+:107090008FB0001003E0000827BD00280E0005E0B7
61467+:1070A0000000000000408821022010218FBF002036
61468+:1070B0008FB3001C8FB200188FB100148FB0001076
61469+:1070C00003E0000827BD0028000424003C03600002
61470+:1070D000AC603D0810A00002348210063482101605
61471+:1070E00003E00008AC623D0427BDFFE0AFB0001034
61472+:1070F000309000FF2E020006AFBF001810400008BD
61473+:10710000AFB10014001030803C03080024635784A2
61474+:1071100000C328218CA400000080000800000000AB
61475+:10712000000020218FBF00188FB100148FB0001015
61476+:107130000080102103E0000827BD00209791002A5D
61477+:1071400016200051000020213C020800904200332C
61478+:107150000A0006BB00000000978D002615A0003134
61479+:10716000000020210A0006BB2402000897870024A3
61480+:1071700014E0001A00001821006020212402000100
61481+:107180001080FFE98FBF0018000429C2004530219C
61482+:1071900000A6582B1160FFE43C0880003C0720004B
61483+:1071A000000569C001A76025AD0C00203C038008E4
61484+:1071B0002402001F2442FFFFAC6000000441FFFDD9
61485+:1071C0002463000424A5000100A6702B15C0FFF560
61486+:1071D000000569C00A0006A58FBF00189787001C2C
61487+:1071E0003C04080024845A58240504000E0006605C
61488+:1071F00024060001978B002424440001308AFFFFFD
61489+:107200002569FFFF2D48040000402821150000409B
61490+:10721000A789002424AC3800000C19C00A0006B964
61491+:10722000A780001C9787001E3C04080024845AD8BD
61492+:10723000240504000E00066024060001979900262C
61493+:10724000244400013098FFFF272FFFFF2F0E04007A
61494+:107250000040882115C0002CA78F0026A780001EA3
61495+:107260003A020003262401003084FFFF0E00068D41
61496+:107270002C4500010011F8C027F00100001021C0CA
61497+:107280000A0006BB240200089785002E978700227B
61498+:107290003C04080024845B580E00066024060001AC
61499+:1072A0009787002A8F89002C2445000130A8FFFF12
61500+:1072B00024E3FFFF0109302B0040802114C0001897
61501+:1072C000A783002AA7800022978500300E000F7543
61502+:1072D00002002021244A05003144FFFF0E00068DE4
61503+:1072E000240500013C05080094A500320E000F752E
61504+:1072F00002002021244521003C0208009042003376
61505+:107300000A0006BB000521C00A0006F3A784001E80
61506+:1073100024AC3800000C19C00A0006B9A784001C70
61507+:107320000A00070DA7850022308400FF27BDFFE873
61508+:107330002C820006AFBF0014AFB000101040001543
61509+:1073400000A03821000440803C0308002463579CBF
61510+:10735000010328218CA40000008000080000000028
61511+:1073600024CC007F000751C2000C59C23170FFFFCE
61512+:107370002547C40030E5FFFF2784001C02003021B0
61513+:107380000E0005B52407000197860028020620217B
61514+:10739000A78400288FBF00148FB0001003E00008FE
61515+:1073A00027BD00183C0508008CA50030000779C2F5
61516+:1073B0000E00038125E4DF003045FFFF3C04080098
61517+:1073C00024845B58240600010E0005B52407000143
61518+:1073D000978E002A8FBF00148FB0001025CD0001BA
61519+:1073E00027BD001803E00008A78D002A0007C9C2C6
61520+:1073F0002738FF00001878C231F0FFFF3C04080076
61521+:1074000024845AD802002821240600010E0005B564
61522+:1074100024070001978D0026260E0100000E84002F
61523+:1074200025AC00013C0B6000A78C0026AD603D0838
61524+:1074300036040006000030213C0760008CE23D0469
61525+:10744000305F000617E0FFFD24C9000100061B00A5
61526+:10745000312600FF006440252CC50004ACE83D0443
61527+:1074600014A0FFF68FBF00148FB0001003E00008D7
61528+:1074700027BD0018000751C22549C8002406000195
61529+:10748000240700013C04080024845A580E0005B566
61530+:107490003125FFFF978700248FBF00148FB00010A5
61531+:1074A00024E6000127BD001803E00008A786002499
61532+:1074B0003C0660183C090800252900FCACC9502C8A
61533+:1074C0008CC850003C0580003C020002350700805B
61534+:1074D000ACC750003C04080024841FE03C030800B3
61535+:1074E00024631F98ACA50008ACA2000C3C01080066
61536+:1074F000AC2459A43C010800AC2359A803E00008BF
61537+:107500002402000100A030213C1C0800279C59AC3B
61538+:107510003C0C04003C0B0002008B3826008C4026FB
61539+:107520002CE200010007502B2D050001000A4880C5
61540+:107530003C030800246359A4004520250123182199
61541+:107540001080000300001021AC660000240200013E
61542+:1075500003E00008000000003C1C0800279C59AC18
61543+:107560003C0B04003C0A0002008A3026008B3826BF
61544+:107570002CC200010006482B2CE5000100094080C8
61545+:107580003C030800246359A4004520250103182169
61546+:1075900010800005000010213C0C0800258C1F986D
61547+:1075A000AC6C00002402000103E0000800000000B1
61548+:1075B0003C0900023C080400008830260089382677
61549+:1075C0002CC30001008028212CE400010083102539
61550+:1075D0001040000B000030213C1C0800279C59ACD7
61551+:1075E0003C0A80008D4E00082406000101CA68256F
61552+:1075F000AD4D00088D4C000C01855825AD4B000C9D
61553+:1076000003E0000800C010213C1C0800279C59AC76
61554+:107610003C0580008CA6000C0004202724020001F9
61555+:1076200000C4182403E00008ACA3000C3C020002D4
61556+:107630001082000B3C0560003C070400108700032B
61557+:107640000000000003E00008000000008CA908D042
61558+:10765000240AFFFD012A402403E00008ACA808D05A
61559+:107660008CA408D02406FFFE0086182403E000083E
61560+:10767000ACA308D03C05601A34A600108CC300806F
61561+:1076800027BDFFF88CC50084AFA3000093A40000C1
61562+:107690002402001010820003AFA5000403E00008DC
61563+:1076A00027BD000893A7000114E0001497AC000266
61564+:1076B00097B800023C0F8000330EFFFC01CF682119
61565+:1076C000ADA50000A3A000003C0660008CC708D058
61566+:1076D0002408FFFE3C04601A00E82824ACC508D04A
61567+:1076E0008FA300048FA200003499001027BD00086A
61568+:1076F000AF22008003E00008AF2300843C0B800031
61569+:10770000318AFFFC014B48218D2800000A00080C3B
61570+:10771000AFA8000427BDFFE8AFBF00103C1C080065
61571+:10772000279C59AC3C0580008CA4000C8CA2000462
61572+:107730003C0300020044282410A0000A00A31824DF
61573+:107740003C0604003C0400021460000900A610245A
61574+:107750001440000F3C0404000000000D3C1C080015
61575+:10776000279C59AC8FBF001003E0000827BD00180C
61576+:107770003C0208008C4259A40040F80900000000B7
61577+:107780003C1C0800279C59AC0A0008358FBF00102C
61578+:107790003C0208008C4259A80040F8090000000093
61579+:1077A0000A00083B000000003C0880008D0201B880
61580+:1077B0000440FFFE35090180AD2400003C031000A9
61581+:1077C00024040040AD250004A1240008A1260009DE
61582+:1077D000A527000A03E00008AD0301B83084FFFFCD
61583+:1077E0000080382130A5FFFF000020210A00084555
61584+:1077F000240600803087FFFF8CA400002406003898
61585+:107800000A000845000028218F8300788F860070C9
61586+:107810001066000B008040213C07080024E75B68ED
61587+:10782000000328C000A710218C440000246300013D
61588+:10783000108800053063000F5466FFFA000328C06B
61589+:1078400003E00008000010213C07080024E75B6CFF
61590+:1078500000A7302103E000088CC200003C03900028
61591+:1078600034620001008220253C038000AC640020CB
61592+:107870008C65002004A0FFFE0000000003E000086B
61593+:10788000000000003C0280003443000100832025FA
61594+:1078900003E00008AC44002027BDFFE0AFB10014B6
61595+:1078A0003091FFFFAFB00010AFBF001812200013DF
61596+:1078B00000A080218CA20000240400022406020003
61597+:1078C0001040000F004028210E0007250000000096
61598+:1078D00000001021AE000000022038218FBF0018E8
61599+:1078E0008FB100148FB0001000402021000028212B
61600+:1078F000000030210A00084527BD00208CA20000AE
61601+:10790000022038218FBF00188FB100148FB00010F3
61602+:107910000040202100002821000030210A000845F5
61603+:1079200027BD002000A010213087FFFF8CA5000498
61604+:107930008C4400000A000845240600068F83FD9C45
61605+:1079400027BDFFE8AFBF0014AFB00010906700087C
61606+:10795000008010210080282130E600400000202116
61607+:1079600010C000088C5000000E0000BD0200202155
61608+:10797000020020218FBF00148FB000100A000548BC
61609+:1079800027BD00180E0008A4000000000E0000BD76
61610+:1079900002002021020020218FBF00148FB00010B0
61611+:1079A0000A00054827BD001827BDFFE0AFB0001052
61612+:1079B0008F90FD9CAFBF001CAFB20018AFB1001498
61613+:1079C00092060001008088210E00087230D2000467
61614+:1079D00092040005001129C2A6050000348300406E
61615+:1079E000A20300050E00087C022020210E00054A9B
61616+:1079F0000220202124020001AE02000C02202821D6
61617+:107A0000A602001024040002A602001224060200AE
61618+:107A1000A60200140E000725A60200161640000F4D
61619+:107A20008FBF001C978C00743C0B08008D6B007896
61620+:107A30002588FFFF3109FFFF256A0001012A382B45
61621+:107A400010E00006A78800743C0F6006240E0016A4
61622+:107A500035ED0010ADAE00508FBF001C8FB2001886
61623+:107A60008FB100148FB0001003E0000827BD002084
61624+:107A700027BDFFE0AFB10014AFBF0018AFB00010DA
61625+:107A80001080000400A088212402008010820007DA
61626+:107A9000000000000000000D8FBF00188FB100141F
61627+:107AA0008FB0001003E0000827BD00200E00087210
61628+:107AB00000A020218F86FD9C0220202190C500057A
61629+:107AC0000E00087C30B000FF2403003E1603FFF1D7
61630+:107AD0003C0680008CC401780480FFFE34C801405D
61631+:107AE000240900073C071000AD11000002202021EE
61632+:107AF000A10900048FBF00188FB100148FB00010CF
61633+:107B0000ACC701780A0008C527BD002027BDFFE0EB
61634+:107B1000AFB00010AFBF0018AFB100143C10800030
61635+:107B20008E110020000000000E00054AAE04002067
61636+:107B3000AE1100208FBF00188FB100148FB000105D
61637+:107B400003E0000827BD00203084FFFF00803821BB
61638+:107B50002406003500A020210A0008450000282145
61639+:107B60003084FFFF008038212406003600A0202149
61640+:107B70000A0008450000282127BDFFD0AFB500242A
61641+:107B80003095FFFFAFB60028AFB40020AFBF002C88
61642+:107B9000AFB3001CAFB20018AFB10014AFB000100B
61643+:107BA00030B6FFFF12A000270000A0218F920058DE
61644+:107BB0008E4300003C0680002402004000033E0289
61645+:107BC00000032C0230E4007F006698241482001D1C
61646+:107BD00030A500FF8F8300682C68000A1100001098
61647+:107BE0008F8D0044000358803C0C0800258C57B84A
61648+:107BF000016C50218D4900000120000800000000A8
61649+:107C000002D4302130C5FFFF0E0008522404008446
61650+:107C1000166000028F920058AF8000688F8D00447C
61651+:107C20002659002026980001032090213314FFFFDD
61652+:107C300015A00004AF9900580295202B1480FFDC9A
61653+:107C400000000000028010218FBF002C8FB600289A
61654+:107C50008FB500248FB400208FB3001C8FB20018A2
61655+:107C60008FB100148FB0001003E0000827BD003072
61656+:107C70002407003414A70149000000009247000EB9
61657+:107C80008F9FFDA08F90FD9C24181600A3E700197C
61658+:107C90009242000D3C0880003C07800CA3E20018D3
61659+:107CA000964A00123C0D60003C117FFFA60A005C62
61660+:107CB000964400103623FFFF240200053099FFFF91
61661+:107CC000AE1900548E46001CAD1800288CEF000041
61662+:107CD0008DAE444801E6482601C93021AE06003881
61663+:107CE0008E05003824CB00013C0E7F00AE05003C21
61664+:107CF0008E0C003CAFEC0004AE0B00208E13002075
61665+:107D0000AE13001CA3E0001BAE03002CA3E2001284
61666+:107D10008E4A001424130050AE0A00348E0400343E
61667+:107D2000AFE400148E590018AE1900489258000CA8
61668+:107D3000A218004E920D000835AF0020A20F0008D7
61669+:107D40008E090018012E282434AC4000AE0C001817
61670+:107D5000920B0000317200FF1253027F2403FF8058
61671+:107D60003C04080024845BE80E0008AA0000000020
61672+:107D70003C1108008E315BE80E00087202202021C1
61673+:107D80002405000424080001A2050025022020216A
61674+:107D90000E00087CA20800053C0580008CB001782C
61675+:107DA0000600FFFE8F92005834AE0140240F0002FF
61676+:107DB0003C091000ADD10000A1CF0004ACA90178AE
61677+:107DC0000A000962AF8000682CAD003751A0FF9413
61678+:107DD0008F8D0044000580803C110800263157E05B
61679+:107DE000021178218DEE000001C0000800000000A3
61680+:107DF0002411000414B1008C3C0780003C080800EA
61681+:107E00008D085BE88F86FD9CACE800208E4500085D
61682+:107E10008F99FDA0240D0050ACC500308E4C000899
61683+:107E2000ACCC00508E4B000CACCB00348E43001019
61684+:107E3000ACC300388E4A0010ACCA00548E42001405
61685+:107E4000ACC2003C8E5F0018AF3F00048E50001C97
61686+:107E5000ACD0002090C40000309800FF130D024AFF
61687+:107E6000000000008CC400348CD00030009030231F
61688+:107E700004C000F12404008C126000EE2402000310
61689+:107E80000A000962AF8200682419000514B900666F
61690+:107E90003C0580003C0808008D085BE88F86FD9C4F
61691+:107EA000ACA800208E4C00048F8AFDA0240720007F
61692+:107EB000ACCC001C924B000824120008A14B001906
61693+:107EC0008F82005890430009A14300188F85005805
61694+:107ED00090BF000A33E400FF1092001028890009C7
61695+:107EE000152000BA240E0002240D0020108D000B76
61696+:107EF000340780002898002117000008240740005C
61697+:107F000024100040109000053C0700012419008057
61698+:107F1000109900023C070002240740008CC20018A0
61699+:107F20003C03FF00004350240147F825ACDF001854
61700+:107F300090B2000BA0D200278F8300589464000CED
61701+:107F4000108001FE000000009467000C3C1F8000C0
61702+:107F50002405FFBFA4C7005C9063000E2407000443
61703+:107F6000A0C300088F820058904A000FA0CA0009E1
61704+:107F70008F8900588D3200108FE400740244C823AA
61705+:107F8000ACD900588D300014ACD0002C95380018B6
61706+:107F9000330DFFFFACCD00409531001A322FFFFFAB
61707+:107FA000ACCF00448D2E001CACCE00489128000EB2
61708+:107FB000A0C8000890CC000801855824126001B6C2
61709+:107FC000A0CB00088F9200580A000962AF870068B2
61710+:107FD0002406000614A600143C0E80003C0F080086
61711+:107FE0008DEF5BE88F85FD98ADCF00208E4900189E
61712+:107FF0008F86FD9C8F8BFDA0ACA900008CC800383B
61713+:1080000024040005ACA800048CCC003C1260008164
61714+:10801000AD6C00000A000962AF84006824110007FB
61715+:1080200010B1004B240400063C05080024A55BE8C1
61716+:108030000E000881240400818F9200580013102B39
61717+:108040000A000962AF820068241F002314BFFFF6F4
61718+:108050003C0C80003C0508008CA55BE88F8BFDA0E4
61719+:10806000AD8500208F91FD9C8E4600042564002084
61720+:1080700026450014AE260028240600030E000F81BA
61721+:10808000257000308F87005802002021240600034D
61722+:108090000E000F8124E500083C04080024845BE8FE
61723+:1080A0000E0008AA0000000092230000240A0050DD
61724+:1080B000306200FF544AFFE18F9200580E000F6CAF
61725+:1080C000000000000A000A6A8F920058240800335A
61726+:1080D00014A800323C0380003C1108008E315BE89C
61727+:1080E0008F8FFDA0AC7100208E420008240D002867
61728+:1080F0008F89FD9CADE200308E4A000C24060009F9
61729+:10810000ADEA00348E5F0010ADFF00388E440014DD
61730+:10811000ADE400208E590018ADF900248E58001CE3
61731+:10812000ADF80028A1ED00118E4E00041260003160
61732+:10813000AD2E00288F9200580A000962AF860068B1
61733+:10814000240D002214ADFFB8000000002404000735
61734+:108150003C1008008E105BE83C188000AF10002037
61735+:108160005660FEAEAF8400683C04080024845BE8DF
61736+:108170000E0008AA241300508F84FD9C90920000EA
61737+:10818000325900FF1333014B000000008F9200585A
61738+:10819000000020210A000962AF8400683C05080045
61739+:1081A00024A55BE80E000858240400810A000A6A2E
61740+:1081B0008F92005802D498213265FFFF0E000852BA
61741+:1081C000240400840A0009628F920058108EFF5325
61742+:1081D000240704002887000310E00179241100041B
61743+:1081E000240F0001548FFF4D240740000A000A228B
61744+:1081F000240701003C05080024A55BE80E0008A444
61745+:10820000240400828F920058000030210A00096285
61746+:10821000AF8600683C04080024845BE88CC2003808
61747+:108220000E0008AA8CC3003C8F9200580A000AC0B6
61748+:1082300000002021240400823C05080024A55BE8FE
61749+:108240000E0008A4000000008F92005800001021CA
61750+:108250000A000962AF8200688E5000048F91FD9C75
61751+:108260003C078000ACF00020922C00050200282181
61752+:10827000318B0002156001562404008A8F92FDA004
61753+:108280002404008D9245001B30A6002014C001502C
61754+:1082900002002821922E00092408001231C900FF93
61755+:1082A0001128014B240400810E00087202002021D5
61756+:1082B0009258001B240F000402002021370D0042B9
61757+:1082C000A24D001B0E00087CA22F00253C0580005B
61758+:1082D0008CA401780480FFFE34B90140241F000201
61759+:1082E000AF300000A33F00048F9200583C101000F4
61760+:1082F000ACB001780A000A6B0013102B8E500004FA
61761+:108300008F91FD9C3C038000AC700020922A0005F8
61762+:108310000200282131420002144000172404008A80
61763+:10832000922C00092412000402002821318B00FF46
61764+:1083300011720011240400810E0008720200202135
61765+:108340008F89FDA0240800122405FFFE912F001B39
61766+:108350000200202135EE0020A12E001BA2280009DA
61767+:108360009226000500C538240E00087CA2270005CF
61768+:1083700002002821000020210E0009330000000027
61769+:108380000A000A6A8F9200588E4C00043C07800055
61770+:108390003C10080026105BE8ACEC00203C01080013
61771+:1083A000AC2C5BE8924B0003317100041220013BBE
61772+:1083B0008F84FD9C24020006A0820009924F001BBE
61773+:1083C000240EFFC031E9003F012E4025A08800089F
61774+:1083D0009245000330A6000114C0013200000000E5
61775+:1083E0008E420008AE0200083C0208008C425BF09E
61776+:1083F000104001318F90FDA0000219C28F8DFD9CAD
61777+:10840000A603000C8E4A000C24180001240400145A
61778+:10841000AE0A002C8E420010AE02001C965F0016C1
61779+:10842000A61F003C96590014A619003EADB8000CDA
61780+:10843000A5B80010A5B80012A5B80014A5B800167C
61781+:1084400012600144A2040011925100033232000272
61782+:108450002E5300018F920058266200080A0009621C
61783+:10846000AF8200688E4400043C1980003C068008FE
61784+:10847000AF2400208E45000890D80000240D005045
61785+:10848000331100FF122D009C2407008824060009E8
61786+:108490000E000845000000000A000A6A8F9200588A
61787+:1084A0008E5000043C0980003C118008AD30002053
61788+:1084B0009228000024050050310400FF10850110AF
61789+:1084C0002407008802002021000028210E00084512
61790+:1084D0002406000E922D00002418FF80020028219F
61791+:1084E00001B8802524040004240600300E0007256E
61792+:1084F000A23000000A000A6A8F9200588E500004D1
61793+:108500008F91FDA03C028000AC500020923F001BE8
61794+:1085100033F900101320006C240700810200202191
61795+:10852000000028212406001F0E000845000000005E
61796+:108530000A000A6A8F9200588E44001C0E00085DE3
61797+:1085400000000000104000E3004048218F880058E0
61798+:1085500024070089012020218D05001C240600012C
61799+:108560000E000845000000000A000A6A8F920058B9
61800+:10857000964900023C10080026105BE831280004F0
61801+:10858000110000973C0460008E4E001C3C0F8000E0
61802+:10859000ADEE00203C010800AC2E5BE896470002DF
61803+:1085A00030E40001148000E6000000008E42000468
61804+:1085B000AE0200083C1008008E105BF0120000ECC8
61805+:1085C0003C0F80008F92FD9C241000018E4E0018FD
61806+:1085D0008F8DFDA08F9FFD9801CF4825AE490018D3
61807+:1085E000A2400005AE50000C3C0808008D085BF06E
61808+:1085F0008F840058A6500010000839C2A6500012FF
61809+:10860000A6500014A6500016A5A7000C8C8C0008DC
61810+:108610008F8B00588F8A0058ADAC002C8D63000CF6
61811+:1086200024070002ADA3001C91460010A1A6001172
61812+:108630008F82005890450011A3E500088F990058DB
61813+:1086400093380012A258004E8F910058922F0013B9
61814+:10865000A1AF00128F920058964E0014A5AE003CB8
61815+:1086600096490016A5A9003E8E480018ADA8001432
61816+:108670005660FD6AAF8700683C05080024A55BE8EA
61817+:108680000E000881000020218F9200580000382140
61818+:108690000A000962AF8700683C05080024A55BE872
61819+:1086A0000E0008A4240400828F9200580A000A4D8C
61820+:1086B000000038210E000F6C000000008F9200585F
61821+:1086C0000A000AC0000020210E00087202002021CA
61822+:1086D0009223001B02002021346A00100E00087C47
61823+:1086E000A22A001B000038210200202100002821BE
61824+:1086F0000A000BA52406001F9242000C305F000107
61825+:1087000013E0000300000000964A000EA4CA002CEB
61826+:10871000924B000C316300025060000600003821CB
61827+:108720008E470014964C0012ACC7001CA4CC001A53
61828+:10873000000038210A000B7F240600093C050800D0
61829+:1087400024A55BE80E0008A42404008B8F92005837
61830+:108750000A000A4D0013382B3C0C08008D8C5BE896
61831+:1087600024DFFFFE25930100326B007F016790211B
61832+:1087700002638824AD110028AE4600E0AE4000E45C
61833+:108780000A0009B3AE5F001CACC000543C0D0800E9
61834+:108790008DAD5BE83C18800C37090100ACED00287A
61835+:1087A0008E510014AD3100E08E4F0014AD2F00E467
61836+:1087B0008E4E001025C7FFFE0A0009F4AD27001CED
61837+:1087C0005491FDD6240740000A000A222407100015
61838+:1087D0000E00092D000000000A000A6A8F9200585E
61839+:1087E0008C83442C3C12DEAD3651BEEF3C010800B8
61840+:1087F000AC205BE810710062000000003C196C6264
61841+:1088000037387970147800082404000297850074C2
61842+:108810009782006C2404009200A2F82B13E0001948
61843+:1088200002002821240400020E00069524050200FF
61844+:108830003C068000ACC200203C010800AC225BE892
61845+:108840001040000D8F8C0058240A002824040003D7
61846+:10885000918B0010316300FF546A00012404000171
61847+:108860000E0000810000000010400004240400837A
61848+:108870000A000BC28F920058240400833C050800B4
61849+:1088800024A55BE80E000881000000008F920058CC
61850+:108890000013382B0A000962AF8700680A000B49F1
61851+:1088A000240200128E4400080E00085D0000000043
61852+:1088B0000A000B55AE0200083C05080024A55BE841
61853+:1088C0000E000858240400878F9200580A000B728B
61854+:1088D0000013102B240400040E000695240500301C
61855+:1088E0001440002A004048218F8800582407008344
61856+:1088F000012020218D05001C0A000BB32406000175
61857+:108900008F8300788F8600701066FEEE000038219D
61858+:108910003C07080024E75B6C000320C00087282187
61859+:108920008CAE000011D0005D246F000131E3000F18
61860+:108930005466FFFA000320C00A000B8C00003821A7
61861+:108940008E4400040E00085D000000000A000BC801
61862+:10895000AE0200083C05080024A55BE80E0008A450
61863+:10896000240400828F9200580A000B72000010212C
61864+:108970003C05080024A55BE80A000C7C2404008761
61865+:108980008C83442C0A000C5B3C196C628F88005865
61866+:108990003C0780083C0C8000240B0050240A000196
61867+:1089A000AD820020A0EB0000A0EA000191030004CA
61868+:1089B000A0E3001891040005A0E400199106000648
61869+:1089C0003C04080024845B6CA0E6001A91020007B6
61870+:1089D0003C06080024C65B68A0E2001B9105000865
61871+:1089E000A0E5001C911F0009A0FF001D9119000ABD
61872+:1089F000A0F9001E9118000BA0F8001F9112000CA6
61873+:108A0000A0F200209111000DA0F100219110000EA4
61874+:108A1000A0F00022910F000FA0EF0023910E001094
61875+:108A2000A0EE0024910D0011A0ED0025950C00147E
61876+:108A3000A4EC0028950B00168F8A00708F920078A6
61877+:108A4000A4EB002A95030018000A10C02545000178
61878+:108A5000A4E3002C8D1F001C0044C0210046C82147
61879+:108A600030A5000FAF3F0000AF09000010B20006B4
61880+:108A7000AF850070000038218D05001C01202021E9
61881+:108A80000A000BB32406000124AD000131A7000F3A
61882+:108A9000AF8700780A000CF9000038213C06080076
61883+:108AA00024C65B680086902100003821ACA000003D
61884+:108AB0000A000B8CAE4000003C0482013C036000C5
61885+:108AC00034820E02AC603D68AF80009803E000087D
61886+:108AD000AC623D6C27BDFFE8AFB000103090FFFFE7
61887+:108AE000001018422C620041AFBF00141440000275
61888+:108AF00024040080240300403C010800AC300060E6
61889+:108B00003C010800AC2300640E000F7500602821B2
61890+:108B1000244802BF2409FF8001092824001039805D
61891+:108B2000001030408FBF00148FB0001000A720212C
61892+:108B300000861821AF8300803C010800AC25005856
61893+:108B40003C010800AC24005C03E0000827BD0018CD
61894+:108B5000308300FF30C6FFFF30E400FF3C08800098
61895+:108B60008D0201B80440FFFE000354000144382583
61896+:108B70003C09600000E920253C031000AD050180A0
61897+:108B8000AD060184AD04018803E00008AD0301B81F
61898+:108B90008F8500583C0A6012354800108CAC0004E8
61899+:108BA0003C0D600E35A60010318B00062D690001CA
61900+:108BB000AD0900C48CA70004ACC731808CA20008AA
61901+:108BC00094A40002ACC231848CA3001C0460000396
61902+:108BD000A784009003E00008000000008CAF00189C
61903+:108BE000ACCF31D08CAE001C03E00008ACCE31D449
61904+:108BF0008F8500588F87FF288F86FF308CAE00044A
61905+:108C00003C0F601235E80010ACEE00788CAD000827
61906+:108C1000ACED007C8CAC0010ACCC004C8CAB000CF0
61907+:108C2000ACCB004894CA00543C0208008C4200447B
61908+:108C300025490001A4C9005494C400543083FFFFA7
61909+:108C400010620017000000003C0208008C42004047
61910+:108C5000A4C200528CA30018ACE300308CA2001414
61911+:108C6000ACE2002C8CB90018ACF900388CB80014B8
61912+:108C700024050001ACF800348D0600BC50C5001975
61913+:108C80008D0200B48D0200B8A4E2004894E40048CC
61914+:108C9000A4E4004A94E800EA03E000083102FFFF80
61915+:108CA0003C0208008C420024A4C00054A4C200521C
61916+:108CB0008CA30018ACE300308CA20014ACE2002CB2
61917+:108CC0008CB90018ACF900388CB8001424050001E8
61918+:108CD000ACF800348D0600BC54C5FFEB8D0200B823
61919+:108CE0008D0200B4A4E2004894E40048A4E4004AE1
61920+:108CF00094E800EA03E000083102FFFF8F86005885
61921+:108D00003C0480008CC900088CC80008000929C0F8
61922+:108D1000000839C0AC87002090C30007306200040F
61923+:108D20001040003EAF85009490CB0007316A0008E8
61924+:108D30001140003D8F87FF2C8CCD000C8CCE001491
61925+:108D400001AE602B11800036000000008CC2000CC8
61926+:108D5000ACE200708CCB00188F85FF288F88FF3025
61927+:108D6000ACEB00748CCA00102402FFF8ACAA00D847
61928+:108D70008CC9000CAD0900608CC4001CACA400D0F0
61929+:108D800090E3007C0062C824A0F9007C90D8000722
61930+:108D9000330F000811E000040000000090ED007C9B
61931+:108DA00035AC0001A0EC007C90CF000731EE000153
61932+:108DB00011C000060000000090E3007C241800347D
61933+:108DC00034790002A0F9007CACB800DC90C2000746
61934+:108DD0003046000210C000040000000090E8007C53
61935+:108DE00035040004A0E4007C90ED007D3C0B600E97
61936+:108DF000356A001031AC003FA0EC007D8D4931D4C4
61937+:108E00003127000110E00002240E0001A0AE00098D
61938+:108E100094AF00EA03E0000831E2FFFF8F87FF2CE8
61939+:108E20000A000DAF8CC200140A000DB0ACE0007057
61940+:108E30008F8C005827BDFFD8AFB3001CAFB200180D
61941+:108E4000AFB00010AFBF0020AFB10014918F00157C
61942+:108E50003C13600E3673001031EB000FA38B009CA7
61943+:108E60008D8F00048D8B0008959F0012959900103E
61944+:108E70009584001A9598001E958E001C33EDFFFF17
61945+:108E8000332AFFFF3089FFFF3308FFFF31C7FFFFA1
61946+:108E90003C010800AC2D00243C010800AC29004432
61947+:108EA0003C010800AC2A0040AE683178AE67317CE6
61948+:108EB00091850015959100163C12601236520010F3
61949+:108EC00030A200FF3230FFFFAE623188AE5000B4F6
61950+:108ED00091830014959F0018240600010066C804C1
61951+:108EE00033F8FFFFAE5900B8AE5800BC918E0014A5
61952+:108EF000AF8F00843C08600631CD00FFAE4D00C04E
61953+:108F0000918A00159584000E3C07600A314900FFE4
61954+:108F1000AF8B00883084FFFFAE4900C835110010C8
61955+:108F20000E000D1034F004103C0208008C4200606A
61956+:108F30003C0308008C6300643C0608008CC60058A3
61957+:108F40003C0508008CA5005C8F8400808FBF00204A
61958+:108F5000AE23004CAE65319CAE030054AE4500DC40
61959+:108F6000AE6231A0AE6331A4AE663198AE22004845
61960+:108F70008FB3001CAE0200508FB10014AE4200E06F
61961+:108F8000AE4300E4AE4600D88FB000108FB2001898
61962+:108F90000A00057D27BD0028978500929783007CF5
61963+:108FA00027BDFFE8AFB0001000A3102BAFBF001427
61964+:108FB000240400058F900058104000552409000239
61965+:108FC0000E0006958F850080AF8200942404000374
61966+:108FD0001040004F240900023C0680000E00008172
61967+:108FE000ACC2002024070001240820001040004DDE
61968+:108FF00024040005978E00928F8AFF2C24090050CC
61969+:1090000025C50001A7850092A14900003C0D08007C
61970+:109010008DAD0064240380008F84FF28000D66005E
61971+:10902000AD4C0018A5400006954B000A8F85FF3017
61972+:109030002402FF8001633024A546000A915F000AE4
61973+:109040000000482103E2C825A159000AA0A0000899
61974+:10905000A140004CA08000D5961800029783009094
61975+:109060003C020004A49800EA960F00022418FFBFF7
61976+:1090700025EE2401A48E00BE8E0D0004ACAD00448C
61977+:109080008E0C0008ACAC0040A4A00050A4A000547A
61978+:109090008E0B000C240C0030AC8B00288E060010C8
61979+:1090A000AC860024A480003EA487004EA487005014
61980+:1090B000A483003CAD420074AC8800D8ACA800602A
61981+:1090C000A08700FC909F00D433F9007FA09900D4C2
61982+:1090D000909000D402187824A08F00D4914E007C88
61983+:1090E00035CD0001A14D007C938B009CAD480070F4
61984+:1090F000AC8C00DCA08B00D68F8800888F87008422
61985+:10910000AC8800C4AC8700C8A5400078A540007AB0
61986+:109110008FBF00148FB000100120102103E0000861
61987+:1091200027BD00188F8500940E0007258F860080CC
61988+:109130000A000E9F2409000227BDFFE0AFB0001017
61989+:109140008F900058AFB10014AFBF00188E09000413
61990+:109150000E00054A000921C08E0800048F84FF28F4
61991+:109160008F82FF30000839C03C068000ACC7002069
61992+:10917000948500EA904300131460001C30B1FFFF97
61993+:109180008F8CFF2C918B0008316A00401540000B3A
61994+:10919000000000008E0D0004022030218FBF001857
61995+:1091A0008FB100148FB00010240400220000382179
61996+:1091B000000D29C00A000D2F27BD00200E000098C9
61997+:1091C000000000008E0D0004022030218FBF001827
61998+:1091D0008FB100148FB00010240400220000382149
61999+:1091E000000D29C00A000D2F27BD00200E000090A1
62000+:1091F000000000008E0D0004022030218FBF0018F7
62001+:109200008FB100148FB00010240400220000382118
62002+:10921000000D29C00A000D2F27BD002027BDFFE04B
62003+:10922000AFB200183092FFFFAFB00010AFBF001C0C
62004+:10923000AFB100141240001E000080218F8600583C
62005+:109240008CC500002403000600053F02000514023F
62006+:1092500030E4000714830016304500FF2CA80006F8
62007+:1092600011000040000558803C0C0800258C58BCBB
62008+:10927000016C50218D490000012000080000000011
62009+:109280008F8E0098240D000111CD005024020002A1
62010+:10929000AF820098260900013130FFFF24C800206A
62011+:1092A0000212202B010030211480FFE5AF88005806
62012+:1092B000020010218FBF001C8FB200188FB1001464
62013+:1092C0008FB0001003E0000827BD00209387007EC8
62014+:1092D00054E00034000030210E000DE700000000D3
62015+:1092E0008F8600580A000EFF240200018F87009825
62016+:1092F0002405000210E50031240400130000282199
62017+:1093000000003021240700010E000D2F0000000096
62018+:109310000A000F008F8600588F83009824020002F5
62019+:109320001462FFF6240400120E000D9A00000000E3
62020+:109330008F85009400403021240400120E000D2F70
62021+:10934000000038210A000F008F8600588F83009894
62022+:109350002411000310710029241F0002107FFFCE8A
62023+:1093600026090001240400100000282100003021FB
62024+:109370000A000F1D240700018F91009824060002A7
62025+:109380001626FFF9240400100E000E410000000014
62026+:10939000144000238F9800588F8600580A000EFF53
62027+:1093A00024020003240400140E000D2F00002821C5
62028+:1093B0008F8600580A000EFF240200020E000EA93C
62029+:1093C000000000000A000F008F8600580E000D3FBD
62030+:1093D00000000000241900022404001400002821C9
62031+:1093E0000000302100003821AF9900980E000D2FA9
62032+:1093F000000000000A000F008F8600580E000D5775
62033+:10940000000000008F8500942419000200403021E4
62034+:1094100024040010000038210A000F56AF9900986C
62035+:109420000040382124040010970F0002000028217A
62036+:109430000E000D2F31E6FFFF8F8600580A000F0047
62037+:10944000AF9100988F84FF2C3C077FFF34E6FFFF2D
62038+:109450008C8500182402000100A61824AC83001893
62039+:1094600003E00008A08200053084FFFF30A5FFFF65
62040+:109470001080000700001821308200011040000217
62041+:1094800000042042006518211480FFFB00052840DD
62042+:1094900003E000080060102110C000070000000079
62043+:1094A0008CA2000024C6FFFF24A50004AC820000AB
62044+:1094B00014C0FFFB2484000403E000080000000047
62045+:1094C00010A0000824A3FFFFAC86000000000000ED
62046+:1094D000000000002402FFFF2463FFFF1462FFFA74
62047+:1094E0002484000403E0000800000000000411C010
62048+:1094F00003E000082442024027BDFFE8AFB000109F
62049+:1095000000808021AFBF00140E000F9600A0202124
62050+:1095100000504821240AFF808FBF00148FB0001034
62051+:10952000012A30243127007F3C08800A3C042100B6
62052+:1095300000E8102100C428253C03800027BD001846
62053+:10954000AC650024AF820038AC400000AC6500245C
62054+:1095500003E00008AC4000403C0D08008DAD005811
62055+:1095600000056180240AFF8001A45821016C482174
62056+:10957000012A30243127007F3C08800C3C04210064
62057+:1095800000E8102100C428253C038000AC650028B9
62058+:10959000AF82003403E00008AC40002430A5FFFF98
62059+:1095A0003C0680008CC201B80440FFFE3C086015F8
62060+:1095B00000A838253C031000ACC40180ACC0018475
62061+:1095C000ACC7018803E00008ACC301B83C0D08003B
62062+:1095D0008DAD005800056180240AFF8001A4582148
62063+:1095E000016C4021010A4824000931403107007F05
62064+:1095F00000C728253C04200000A418253C02800058
62065+:10960000AC43083003E00008AF80003427BDFFE81A
62066+:10961000AFB0001000808021AFBF00140E000F9685
62067+:1096200000A0202100504821240BFF80012B502452
62068+:10963000000A39403128007F3C0620008FBF00140B
62069+:109640008FB0001000E8282534C2000100A21825C0
62070+:109650003C04800027BD0018AC83083003E00008FC
62071+:10966000AF8000383C0580088CA700603C0680086D
62072+:109670000087102B144000112C8340008CA8006040
62073+:109680002D0340001060000F240340008CC90060CF
62074+:109690000089282B14A00002008018218CC30060D0
62075+:1096A00000035A42000B30803C0A0800254A59202A
62076+:1096B00000CA202103E000088C8200001460FFF340
62077+:1096C0002403400000035A42000B30803C0A08008B
62078+:1096D000254A592000CA202103E000088C8200009E
62079+:1096E0003C05800890A60008938400AB24C20001CA
62080+:1096F000304200FF3043007F1064000C0002382726
62081+:10970000A0A200083C0480008C85017804A0FFFE24
62082+:109710008F8A00A0240900023C081000AC8A014096
62083+:10972000A089014403E00008AC8801780A00101BFE
62084+:1097300030E2008027BDFFD8AFB200188F9200A49E
62085+:10974000AFBF0020AFB3001CAFB00010AFB100142A
62086+:109750008F9300348E5900283C1000803C0EFFEFA0
62087+:10976000AE7900008E580024A260000A35CDFFFFBC
62088+:10977000AE7800049251002C3C0BFF9F356AFFFF2E
62089+:10978000A271000C8E6F000C3C080040A271000B0F
62090+:1097900001F06025018D4824012A382400E8302595
62091+:1097A000AE66000C8E450004AE6000183C0400FF5D
62092+:1097B000AE6500148E43002C3482FFFFA6600008C3
62093+:1097C0000062F824AE7F00108E5900088F9000A030
62094+:1097D000964E0012AE7900208E51000C31D83FFF1A
62095+:1097E00000187980AE7100248E4D001401F06021C4
62096+:1097F00031CB0001AE6D00288E4A0018000C41C22A
62097+:10980000000B4B80AE6A002C8E46001C01093821EB
62098+:10981000A667001CAE660030964500028E4400200C
62099+:10982000A665001EAE64003492430033306200042B
62100+:1098300054400006924700003C0280083443010077
62101+:109840008C7F00D0AE7F0030924700008F860038BA
62102+:10985000A0C700309245003330A4000250800007BA
62103+:10986000925100018F880038240BFF80910A00304C
62104+:10987000014B4825A1090030925100018F9000381A
62105+:10988000240CFFBF2404FFDFA21100318F8D0038AC
62106+:109890003C1880083711008091AF003C31EE007F0A
62107+:1098A000A1AE003C8F890038912B003C016C502404
62108+:1098B000A12A003C8F9F00388E68001493E6003C7C
62109+:1098C0002D0700010007114000C4282400A218251C
62110+:1098D000A3E3003C8F87003896590012A4F90032A8
62111+:1098E0008E450004922E007C30B0000300107823D7
62112+:1098F00031ED000300AD102131CC000215800002D3
62113+:1099000024460034244600303C0280083443008062
62114+:10991000907F007C00BFC824333800041700000289
62115+:1099200024C2000400C010218F98003824190002BE
62116+:10993000ACE20034A3190000924F003F8F8E003834
62117+:109940003C0C8008358B0080A1CF00018F9100383E
62118+:10995000924D003F8E440004A62D0002956A005CE3
62119+:109960000E000FF43150FFFF00024B800209382532
62120+:109970003C08420000E82825AE2500048E4400384B
62121+:109980008F850038ACA400188E460034ACA6001CAD
62122+:10999000ACA0000CACA00010A4A00014A4A0001661
62123+:1099A000A4A00020A4A00022ACA000248E62001479
62124+:1099B00050400001240200018FBF00208FB3001C23
62125+:1099C0008FB200188FB100148FB00010ACA2000845
62126+:1099D0000A00101327BD002827BDFFC83C058008DA
62127+:1099E00034A40080AFBF0034AFBE0030AFB7002C4E
62128+:1099F000AFB60028AFB50024AFB40020AFB3001C51
62129+:109A0000AFB20018AFB10014AFB00010948300786B
62130+:109A10009482007A104300512405FFFF0080F0215A
62131+:109A20000A0011230080B821108B004D8FBF003435
62132+:109A30008F8600A03C1808008F18005C2411FF805E
62133+:109A40003C1680000306782101F18024AED0002C62
62134+:109A500096EE007A31EC007F3C0D800E31CB7FFF1B
62135+:109A6000018D5021000B4840012AA82196A4000036
62136+:109A70003C0808008D0800582405FF8030953FFF02
62137+:109A800001061821001539800067C8210325F82434
62138+:109A90003C02010003E290253338007F3C11800C2A
62139+:109AA000AED20028031190219250000D320F000415
62140+:109AB00011E0003702E0982196E3007A96E8007AF8
62141+:109AC00096E5007A2404800031077FFF24E300013B
62142+:109AD00030627FFF00A4F82403E2C825A6F9007ACB
62143+:109AE00096E6007A3C1408008E94006030D67FFF22
62144+:109AF00012D400C1000000008E5800188F8400A00E
62145+:109B000002A028212713FFFF0E000FCEAE53002C1A
62146+:109B100097D5007897D4007A12950010000028217C
62147+:109B20003C098008352401003C0A8008914800085F
62148+:109B3000908700D53114007F30E400FF0284302B81
62149+:109B400014C0FFB9268B0001938E00AB268C000158
62150+:109B5000008E682115ACFFB78F8600A08FBF003440
62151+:109B60008FBE00308FB7002C8FB600288FB5002431
62152+:109B70008FB400208FB3001C8FB200188FB1001477
62153+:109B80008FB0001000A0102103E0000827BD0038AE
62154+:109B900000C020210E000F99028028218E4B00105A
62155+:109BA0008E4C00308F84003824090002016C502351
62156+:109BB000AE4A0010A089000096E3005C8E4400309D
62157+:109BC0008F9100380E000FF43070FFFF00024380C9
62158+:109BD000020838253C02420000E22825AE25000498
62159+:109BE0008E5F00048F8A00388E590000240B000815
62160+:109BF000AD5F001CAD590018AD40000CAD40001029
62161+:109C00009246000A240400052408C00030D000FF5A
62162+:109C1000A550001496580008A55800169251000A45
62163+:109C20003C188008322F00FFA54F0020964E0008F8
62164+:109C300037110100A54E0022AD400024924D000BCB
62165+:109C400031AC00FFA54C0002A14B00018E49003051
62166+:109C50008F830038240BFFBFAC690008A06400307C
62167+:109C60008F9000382403FFDF9607003200E8282495
62168+:109C700000B51025A6020032921F003233F9003FD2
62169+:109C800037260040A20600328F8C0038AD800034A9
62170+:109C90008E2F00D0AD8F0038918E003C3C0F7FFF9F
62171+:109CA00031CD007FA18D003C8F84003835EEFFFF61
62172+:109CB000908A003C014B4824A089003C8F850038E5
62173+:109CC00090A8003C01033824A0A7003C8E42003439
62174+:109CD0008F9100383C038008AE2200408E59002C42
62175+:109CE0008E5F0030033F3023AE26004492300048A0
62176+:109CF0003218007FA23800488F8800388E4D00301F
62177+:109D00008D0C004801AE582401965024014B482583
62178+:109D1000AD0900489244000AA104004C964700088F
62179+:109D20008F850038A4A7004E8E5000308E4400303E
62180+:109D30000E0003818C65006092F9007C0002F940FE
62181+:109D4000004028210002110003E2302133360002D6
62182+:109D500012C00003020680210005B0800216802197
62183+:109D6000926D007C31B30004126000020005708027
62184+:109D7000020E80218E4B00308F8800382405800031
62185+:109D8000316A0003000A4823312400030204182129
62186+:109D9000AD03003496E4007A96F0007A96F1007AEA
62187+:109DA00032027FFF2447000130FF7FFF0225C824D5
62188+:109DB000033F3025A6E6007A96F8007A3C120800A8
62189+:109DC0008E520060330F7FFF11F200180000000078
62190+:109DD0008F8400A00E000FCE02A028218F8400A047
62191+:109DE0000E000FDE028028210E001013000000007C
62192+:109DF0000A00111F0000000096F1007A022480245E
62193+:109E0000A6F0007A92EF007A92EB007A31EE00FF32
62194+:109E1000000E69C2000D6027000C51C03169007F3F
62195+:109E2000012A20250A001119A2E4007A96E6007A98
62196+:109E300000C5C024A6F8007A92EF007A92F3007A67
62197+:109E400031F200FF001271C2000E6827000DB1C090
62198+:109E5000326C007F01962825A2E5007A0A0011D015
62199+:109E60008F8400A03C0380003084FFFF30A5FFFFFB
62200+:109E7000AC640018AC65001C03E000088C620014A0
62201+:109E800027BDFFA03C068008AFBF005CAFBE0058F6
62202+:109E9000AFB70054AFB60050AFB5004CAFB40048F8
62203+:109EA000AFB30044AFB20040AFB1003CAFB0003838
62204+:109EB00034C80100910500D590C700083084FFFF29
62205+:109EC00030A500FF30E2007F0045182AAFA4001043
62206+:109ED000A7A00018A7A0002610600055AFA000148E
62207+:109EE00090CA00083149007F00A9302324D3FFFF26
62208+:109EF0000013802B8FB400100014902B02128824C2
62209+:109F0000522000888FB300143C03800894790052DB
62210+:109F1000947E00508FB60010033EC0230018BC0092
62211+:109F2000001714030016FC0002C2A82A16A00002A3
62212+:109F3000001F2C030040282100133C0000072403CD
62213+:109F400000A4102A5440000100A020212885000907
62214+:109F500014A000020080A021241400083C0C8008FA
62215+:109F60008D860048001459808D88004C3C03800089
62216+:109F70003169FFFF3C0A0010012A202534710400DA
62217+:109F8000AC660038AF9100A4AC68003CAC64003013
62218+:109F900000000000000000000000000000000000C1
62219+:109FA00000000000000000000000000000000000B1
62220+:109FB0008C6E000031CD002011A0FFFD0014782A26
62221+:109FC00001F01024104000390000A8213C16800840
62222+:109FD00092D700083C1280008E44010032F6007FC8
62223+:109FE0000E000F9902C028218E3900108E44010006
62224+:109FF0000000902133373FFF0E000FB102E028210F
62225+:10A00000923800003302003F2C500008520000102C
62226+:10A0100000008821000210803C030800246358E4FB
62227+:10A020000043F8218FFE000003C00008000000007C
62228+:10A0300090CF0008938C00AB31EE007F00AE682318
62229+:10A04000018D58210A0012172573FFFF0000882197
62230+:10A050003C1E80008FC401000E000FCE02E02821BC
62231+:10A060008FC401000E000FDE02C028211220000F55
62232+:10A070000013802B8F8B00A426A400010004AC00E9
62233+:10A08000027298230015AC032578004002B4B02A70
62234+:10A090000013802B241700010300882102D0102414
62235+:10A0A000AF9800A41440FFC9AFB700143C07800864
62236+:10A0B00094E200508FAE00103C05800002A288217F
62237+:10A0C0003C060020A4F10050ACA6003094F40050EF
62238+:10A0D00094EF005201D51823306CFFFF11F4001EDD
62239+:10A0E000AFAC00108CEF004C001561808CF500487F
62240+:10A0F00001EC28210000202100AC582B02A4C02133
62241+:10A10000030BB021ACE5004CACF600488FB4001056
62242+:10A110000014902B021288241620FF7C3C03800838
62243+:10A120008FB300148FBF005C8FBE00583A620001ED
62244+:10A130008FB700548FB600508FB5004C8FB40048D5
62245+:10A140008FB300448FB200408FB1003C8FB0003815
62246+:10A1500003E0000827BD006094FE00548CF2004428
62247+:10A1600033C9FFFE0009C8C00259F821ACBF003C4A
62248+:10A170008CE800448CAD003C010D50231940003B9D
62249+:10A18000000000008CF7004026E20001ACA200387D
62250+:10A190003C05005034A700103C038000AC67003041
62251+:10A1A00000000000000000000000000000000000AF
62252+:10A1B000000000000000000000000000000000009F
62253+:10A1C0008C7800003316002012C0FFFD3C1180087F
62254+:10A1D000962200543C1580003C068008304E000159
62255+:10A1E000000E18C0007578218DEC04003C070800B3
62256+:10A1F0008CE700443C040020ACCC00488DF40404FF
62257+:10A20000240B0001ACD4004C10EB0260AEA4003073
62258+:10A21000963900523C0508008CA5004000B99021F9
62259+:10A22000A6320052963F005427ED0001A62D00549F
62260+:10A230009626005430C4FFFF5487FF2F8FB40010C0
62261+:10A2400030A5FFFF0E0011F4A62000543C070800C3
62262+:10A250008CE70024963E00520047B82303D74823DA
62263+:10A26000A62900520A0012198FB400108CE2004097
62264+:10A270000A0012BE00000000922400012407000121
62265+:10A280003085007F14A7001C97AD00268E2B00148C
62266+:10A29000240CC000316A3FFF01AC48243C06080092
62267+:10A2A0008CC60060012A402531043FFF0086882BC0
62268+:10A2B00012200011A7A800263C0508008CA5005814
62269+:10A2C0008F9100A0000439802402FF8000B1182182
62270+:10A2D0000067F82103E2F02433F8007F3C1280008D
62271+:10A2E0003C19800EAE5E002C0319702191D0000D38
62272+:10A2F000360F0004A1CF000D0E001028241200011B
62273+:10A30000241100013C1E80008FC401000E000FCEFE
62274+:10A3100002E028218FC401000E000FDE02C02821B8
62275+:10A320001620FF558F8B00A40A0012860013802B85
62276+:10A330008F8600A490C80001310400201080019194
62277+:10A34000241000013C048008348B0080916A007C5A
62278+:10A350008F9E0034AFA0002C314900011120000F66
62279+:10A36000AFB000288CCD00148C8E006001AE602B45
62280+:10A370001580000201A038218C8700603C188008FD
62281+:10A38000370300808C70007000F0782B15E000021D
62282+:10A3900000E020218C640070AFA4002C3C028008F7
62283+:10A3A000344500808CD200148CBF0070025FC82B33
62284+:10A3B00017200002024020218CA400708FA7002CDF
62285+:10A3C0000087182310600003AFA3003024050002AB
62286+:10A3D000AFA500288FA400280264882B162000BA9D
62287+:10A3E000000018218CD000388FCE000C3C0F00806C
62288+:10A3F000AFD000008CCD00343C0CFF9F01CF58251E
62289+:10A40000AFCD000490CA003F3586FFFF01662024CF
62290+:10A410003C0900203C08FFEFA3CA000B0089382547
62291+:10A420003511FFFF00F118243C0500088F8700A4B8
62292+:10A430000065C825AFD9000C8CE20014AFC000182D
62293+:10A440008FA60030AFC200148CF800188FB0002C1B
62294+:10A450003C1FFFFBAFD8001C8CEF000837F2FFFF5A
62295+:10A4600003326824AFCF00248CEC000C020670216C
62296+:10A47000AFCD000CA7C00038A7C0003AAFCE002C6B
62297+:10A48000AFCC0020AFC000288CEA00148FAB002CAA
62298+:10A49000014B48230126402311000011AFC80010D2
62299+:10A4A00090EB003D8FC900048FC80000000B5100E5
62300+:10A4B000012A28210000102100AA882B010218215E
62301+:10A4C0000071F821AFC50004AFDF000090F2003D3D
62302+:10A4D000A3D2000A8F9900A497380006A7D80008D5
62303+:10A4E0008F910038240800023C038008A228000055
62304+:10A4F0003465008094BF005C8FA4002C33F0FFFF14
62305+:10A500000E000FF48F9200380002CB808F8500A4DC
62306+:10A51000021978253C18420001F87025AE4E00045F
62307+:10A520008F8400388CAD0038AC8D00188CAC0034B2
62308+:10A53000AC8C001CAC80000CAC800010A48000141B
62309+:10A54000A4800016A4800020A4800022AC800024F7
62310+:10A5500090A6003F8FA7002CA486000250E0019235
62311+:10A56000240700018FA200305040000290A2003D5D
62312+:10A5700090A2003E244A0001A08A00018F84003886
62313+:10A580008FA9002CAC8900083C128008364D008051
62314+:10A5900091AC007C3186000214C000022407003414
62315+:10A5A000240700308F8500A43C198008373F0080C5
62316+:10A5B00090B0000093F9007C240E0004A0900030BD
62317+:10A5C0008F8F00A48FB8002C8F8D003891F200017E
62318+:10A5D0003304000301C46023A1B200318F8E003820
62319+:10A5E0008F8600A42402C00095CA003294C90012CC
62320+:10A5F0008FAB002C0142402431233FFF010388250B
62321+:10A60000A5D1003291D000323185000300EBF82152
62322+:10A610003218003F370F0040A1CF00328FA4002C2A
62323+:10A6200003E5382133280004108000028F850038AC
62324+:10A6300000E838213C0A8008ACA700343549010005
62325+:10A640008D2800D08FA3002C2419FFBFACA80038A0
62326+:10A6500090B1003C2C640001240FFFDF3227007F03
62327+:10A66000A0A7003C8F98003800049140931F003C45
62328+:10A6700003F98024A310003C8F8C0038918E003C9D
62329+:10A6800001CF682401B23025A186003C8F8900A447
62330+:10A690008F8800388D2B0020AD0B00408D220024C8
62331+:10A6A000AD0200448D2A0028AD0A00488D23002CFD
62332+:10A6B0000E001013AD03004C8FB1002824070002D8
62333+:10A6C000122700118FA300280003282B00058023E8
62334+:10A6D0000270982400608021006090210A00126FAF
62335+:10A6E0000010882B962900128F8400A00000902172
62336+:10A6F0003125FFFFA7A900180E000FC22411000189
62337+:10A700000A00131D3C1E80003C0B80003C12800898
62338+:10A710008D640100924900088F92FF340E000F995A
62339+:10A720003125007F8F9900388FA700288FA4003033
62340+:10A73000A3270000965F005C33F0FFFF0E000FF4CC
62341+:10A740008F91003800026B80020D80253C0842008A
62342+:10A750008F8D00A402085025AE2A00048DA5003874
62343+:10A760008F8A003800007821000F1100AD450018D5
62344+:10A770008DB800343C047FFF3488FFFFAD58001CC7
62345+:10A7800091A6003E8D4C001C8D4900180006190052
62346+:10A79000000677020183C821004E58250323882B29
62347+:10A7A000012B382100F1F821AD59001CAD5F0018D4
62348+:10A7B000AD40000CAD40001091B0003E8FA40030C1
62349+:10A7C00024090005A550001495A500042419C00013
62350+:10A7D00000884024A545001691B8003EA5580020E9
62351+:10A7E00095AF0004A54F0022AD40002491AE003F7C
62352+:10A7F000A54E000291A6003E91AC003D01861023BB
62353+:10A80000244B0001A14B00018F9100388FA3003031
62354+:10A810003C028008344B0100AE230008A22900301E
62355+:10A820008F8C00388F8700A4959F003294F000121F
62356+:10A830002407FFBF033FC02432053FFF03057825EF
62357+:10A84000A58F0032918E00322418FFDF31CD003FFA
62358+:10A8500035A60040A18600328F910038240DFFFFFD
62359+:10A86000240CFF80AE2000348D6A00D0AE2A003860
62360+:10A870009223003C3069007FA229003C8F90003871
62361+:10A880003C0380009219003C0327F824A21F003CDF
62362+:10A890008F8E003891C5003C00B87824A1CF003CD1
62363+:10A8A0008F8A00383C0E8008AD4D00408FA6002CEA
62364+:10A8B000AD46004491420048004C5825A14B004849
62365+:10A8C0008F9000388F9900A48E09004801238824B6
62366+:10A8D00002283825AE070048933F003EA21F004CD7
62367+:10A8E0008F9800A48F8F003897050004A5E5004ECF
62368+:10A8F0000E0003818DC500609246007C8FAC003055
62369+:10A9000000026940000291000040282130CB000283
62370+:10A9100001B21021156000AA018230213C0E80088E
62371+:10A9200035C20080904C007C31830004106000032D
62372+:10A930008FB900300005788000CF3021241F00043B
62373+:10A940008F910038332D000303ED8023320800037C
62374+:10A9500000C85021AE2A00343C188000A7C500383A
62375+:10A960003C0680088F04010090DE00080E000FDE18
62376+:10A9700033C5007F0E001013000000000A00140D04
62377+:10A980008FA300288F9800348CC90038241F00033F
62378+:10A99000A7000008AF0900008CC50034A300000A1E
62379+:10A9A0008F9900A4AF0500043C080080932D003F60
62380+:10A9B000A31F000C8F0A000C3C02FF9FA30D000B8D
62381+:10A9C0000148F0253451FFFF3C12FFEF8F9900A49E
62382+:10A9D00003D170243646FFFF01C61824AF03000CD4
62383+:10A9E0008F2C0014972900128F8400A0AF0C001048
62384+:10A9F0008F2F0014AF000018AF000020AF0F00141D
62385+:10AA0000AF0000248F270018312F3FFF000F59801F
62386+:10AA1000AF0700288F2500080164F821312D0001BF
62387+:10AA2000AF0500308F31000C8F920038001F51C2EB
62388+:10AA3000000D438001481021241E00023C068008BE
62389+:10AA4000A702001CA7000034AF11002CA25E00007A
62390+:10AA500034D20080964E005C8F9900383C0342004F
62391+:10AA600031CCFFFF01833825AF2700048F8B00A472
62392+:10AA7000240500012402C0008D640038240700343E
62393+:10AA8000AF2400188D690034AF29001CAF20000CE2
62394+:10AA9000AF200010A7200014A7200016A720002038
62395+:10AAA000A7200022AF200024A7300002A325000128
62396+:10AAB0008F8800388F9F00A4AD10000893ED000030
62397+:10AAC000A10D00308F8A00A48F98003891510001A9
62398+:10AAD000A31100318F8B0038957E003203C27024A1
62399+:10AAE00001CF6025A56C0032916300323064003FD5
62400+:10AAF000A16400329249007C3125000214A00002BA
62401+:10AB00008F840038240700303C198008AC8700345B
62402+:10AB1000373201008E5F00D0240AFFBF020090216F
62403+:10AB2000AC9F0038908D003C31A8007FA088003C8D
62404+:10AB30008F9E003893C2003C004A8824A3D1003C79
62405+:10AB40008F8300380010882B9066003C34CE0020A4
62406+:10AB5000A06E003C8F8400A48F9800388C8C00205D
62407+:10AB6000AF0C00408C8F0024AF0F00448C8700286E
62408+:10AB7000AF0700488C8B002CAF0B004C0E0010135D
62409+:10AB80003C1E80000A0012700000000094C80052B1
62410+:10AB90003C0A08008D4A002401488821A4D10052B3
62411+:10ABA0000A0012198FB40010A08700018F840038AA
62412+:10ABB000240B0001AC8B00080A0013BE3C12800875
62413+:10ABC000000520800A0014A200C4302127BDFFE048
62414+:10ABD0003C0D8008AFB20018AFB00010AFBF001C32
62415+:10ABE000AFB1001435B200808E4C001835A80100BA
62416+:10ABF000964B000695A70050910900FC000C5602E8
62417+:10AC0000016728233143007F312600FF240200031F
62418+:10AC1000AF8300A8AF8400A010C2001B30B0FFFFBC
62419+:10AC2000910600FC2412000530C200FF10520033D0
62420+:10AC300000000000160000098FBF001C8FB2001832
62421+:10AC40008FB100148FB00010240D0C003C0C80005C
62422+:10AC500027BD002003E00008AD8D00240E0011FB8D
62423+:10AC6000020020218FBF001C8FB200188FB100148A
62424+:10AC70008FB00010240D0C003C0C800027BD00207C
62425+:10AC800003E00008AD8D0024965800789651007AB4
62426+:10AC9000924E007D0238782631E8FFFF31C400C0B3
62427+:10ACA000148000092D11000116000037000000007B
62428+:10ACB0005620FFE28FBF001C0E0010D100000000E4
62429+:10ACC0000A00156A8FBF001C1620FFDA0000000082
62430+:10ACD0000E0010D1000000001440FFD88FBF001CF0
62431+:10ACE0001600002200000000925F007D33E2003F6A
62432+:10ACF000A242007D0A00156A8FBF001C950900EA78
62433+:10AD00008F86008000802821240400050E0007257E
62434+:10AD10003130FFFF978300923C0480002465FFFFE1
62435+:10AD2000A78500928C8A01B80540FFFE0000000054
62436+:10AD3000AC8001808FBF001CAC9001848FB20018E2
62437+:10AD40008FB100148FB000103C0760133C0B100053
62438+:10AD5000240D0C003C0C800027BD0020AC8701882E
62439+:10AD6000AC8B01B803E00008AD8D00240E0011FB90
62440+:10AD7000020020215040FFB18FBF001C925F007D78
62441+:10AD80000A00159733E2003F0E0011FB020020215C
62442+:10AD90001440FFAA8FBF001C122000070000000013
62443+:10ADA0009259007D3330003F36020040A242007DC0
62444+:10ADB0000A00156A8FBF001C0E0010D100000000B1
62445+:10ADC0005040FF9E8FBF001C9259007D3330003FE2
62446+:10ADD0000A0015C636020040000000000000001BFB
62447+:10ADE0000000000F0000000A00000008000000063C
62448+:10ADF0000000000500000005000000040000000441
62449+:10AE00000000000300000003000000030000000336
62450+:10AE10000000000300000002000000020000000229
62451+:10AE2000000000020000000200000002000000021A
62452+:10AE3000000000020000000200000002000000020A
62453+:10AE400000000002000000020000000200000002FA
62454+:10AE50000000000100000001000000018008010066
62455+:10AE6000800800808008000000000C000000308096
62456+:10AE7000080011D00800127C08001294080012A8E3
62457+:10AE8000080012BC080011D0080011D0080012F010
62458+:10AE90000800132C080013400800138808001A8CBF
62459+:10AEA00008001A8C08001AC408001AC408001AD82E
62460+:10AEB00008001AA808001D0008001CCC08001D5836
62461+:10AEC00008001D5808001DE008001D108008024001
62462+:10AED000080027340800256C0800275C080027F4C8
62463+:10AEE0000800293C0800298808002AAC080029B479
62464+:10AEF00008002A38080025DC08002EDC08002EA4F3
62465+:10AF000008002588080025880800258808002B20CF
62466+:10AF100008002B20080025880800258808002DD06F
62467+:10AF2000080025880800258808002588080025884D
62468+:10AF300008002E0C080025880800258808002588B0
62469+:10AF4000080025880800258808002588080025882D
62470+:10AF5000080025880800258808002588080025881D
62471+:10AF6000080025880800258808002588080029A8E9
62472+:10AF7000080025880800258808002E680800258814
62473+:10AF800008002588080025880800258808002588ED
62474+:10AF900008002588080025880800258808002588DD
62475+:10AFA00008002588080025880800258808002588CD
62476+:10AFB00008002588080025880800258808002588BD
62477+:10AFC00008002CF4080025880800258808002C6853
62478+:10AFD00008002BC408003CE408003CB808003C848E
62479+:10AFE00008003C5808003C3808003BEC8008010091
62480+:10AFF00080080080800800008008008008004C6401
62481+:10B0000008004C9C08004BE408004C6408004C64A9
62482+:10B01000080049B808004C64080050500A000C842D
62483+:10B0200000000000000000000000000D7278703683
62484+:10B030002E322E31620000000602010300000000E3
62485+:10B0400000000001000000000000000000000000FF
62486+:10B0500000000000000000000000000000000000F0
62487+:10B0600000000000000000000000000000000000E0
62488+:10B0700000000000000000000000000000000000D0
62489+:10B0800000000000000000000000000000000000C0
62490+:10B0900000000000000000000000000000000000B0
62491+:10B0A00000000000000000000000000000000000A0
62492+:10B0B0000000000000000000000000000000000090
62493+:10B0C0000000000000000000000000000000000080
62494+:10B0D0000000000000000000000000000000000070
62495+:10B0E0000000000000000000000000000000000060
62496+:10B0F0000000000000000000000000000000000050
62497+:10B10000000000000000000000000000000000003F
62498+:10B11000000000000000000000000000000000002F
62499+:10B12000000000000000000000000000000000001F
62500+:10B13000000000000000000000000000000000000F
62501+:10B1400000000000000000000000000000000000FF
62502+:10B1500000000000000000000000000000000000EF
62503+:10B1600000000000000000000000000000000000DF
62504+:10B1700000000000000000000000000000000000CF
62505+:10B1800000000000000000000000000000000000BF
62506+:10B1900000000000000000000000000000000000AF
62507+:10B1A000000000000000000000000000000000009F
62508+:10B1B000000000000000000000000000000000008F
62509+:10B1C000000000000000000000000000000000007F
62510+:10B1D000000000000000000000000000000000006F
62511+:10B1E000000000000000000000000000000000005F
62512+:10B1F000000000000000000000000000000000004F
62513+:10B20000000000000000000000000000000000003E
62514+:10B21000000000000000000000000000000000002E
62515+:10B22000000000000000000000000000000000001E
62516+:10B23000000000000000000000000000000000000E
62517+:10B2400000000000000000000000000000000000FE
62518+:10B2500000000000000000000000000000000000EE
62519+:10B2600000000000000000000000000000000000DE
62520+:10B2700000000000000000000000000000000000CE
62521+:10B2800000000000000000000000000000000000BE
62522+:10B2900000000000000000000000000000000000AE
62523+:10B2A000000000000000000000000000000000009E
62524+:10B2B000000000000000000000000000000000008E
62525+:10B2C000000000000000000000000000000000007E
62526+:10B2D000000000000000000000000000000000006E
62527+:10B2E000000000000000000000000000000000005E
62528+:10B2F000000000000000000000000000000000004E
62529+:10B30000000000000000000000000000000000003D
62530+:10B31000000000000000000000000000000000002D
62531+:10B32000000000000000000000000000000000001D
62532+:10B33000000000000000000000000000000000000D
62533+:10B3400000000000000000000000000000000000FD
62534+:10B3500000000000000000000000000000000000ED
62535+:10B3600000000000000000000000000000000000DD
62536+:10B3700000000000000000000000000000000000CD
62537+:10B3800000000000000000000000000000000000BD
62538+:10B3900000000000000000000000000000000000AD
62539+:10B3A000000000000000000000000000000000009D
62540+:10B3B000000000000000000000000000000000008D
62541+:10B3C000000000000000000000000000000000007D
62542+:10B3D000000000000000000000000000000000006D
62543+:10B3E000000000000000000000000000000000005D
62544+:10B3F000000000000000000000000000000000004D
62545+:10B40000000000000000000000000000000000003C
62546+:10B41000000000000000000000000000000000002C
62547+:10B42000000000000000000000000000000000001C
62548+:10B43000000000000000000000000000000000000C
62549+:10B4400000000000000000000000000000000000FC
62550+:10B4500000000000000000000000000000000000EC
62551+:10B4600000000000000000000000000000000000DC
62552+:10B4700000000000000000000000000000000000CC
62553+:10B4800000000000000000000000000000000000BC
62554+:10B4900000000000000000000000000000000000AC
62555+:10B4A000000000000000000000000000000000009C
62556+:10B4B000000000000000000000000000000000008C
62557+:10B4C000000000000000000000000000000000007C
62558+:10B4D000000000000000000000000000000000006C
62559+:10B4E000000000000000000000000000000000005C
62560+:10B4F000000000000000000000000000000000004C
62561+:10B50000000000000000000000000000000000003B
62562+:10B51000000000000000000000000000000000002B
62563+:10B52000000000000000000000000000000000001B
62564+:10B53000000000000000000000000000000000000B
62565+:10B5400000000000000000000000000000000000FB
62566+:10B5500000000000000000000000000000000000EB
62567+:10B5600000000000000000000000000000000000DB
62568+:10B5700000000000000000000000000000000000CB
62569+:10B5800000000000000000000000000000000000BB
62570+:10B5900000000000000000000000000000000000AB
62571+:10B5A000000000000000000000000000000000009B
62572+:10B5B000000000000000000000000000000000008B
62573+:10B5C000000000000000000000000000000000007B
62574+:10B5D000000000000000000000000000000000006B
62575+:10B5E000000000000000000000000000000000005B
62576+:10B5F000000000000000000000000000000000004B
62577+:10B60000000000000000000000000000000000003A
62578+:10B61000000000000000000000000000000000002A
62579+:10B62000000000000000000000000000000000001A
62580+:10B63000000000000000000000000000000000000A
62581+:10B6400000000000000000000000000000000000FA
62582+:10B6500000000000000000000000000000000000EA
62583+:10B6600000000000000000000000000000000000DA
62584+:10B6700000000000000000000000000000000000CA
62585+:10B6800000000000000000000000000000000000BA
62586+:10B6900000000000000000000000000000000000AA
62587+:10B6A000000000000000000000000000000000009A
62588+:10B6B000000000000000000000000000000000008A
62589+:10B6C000000000000000000000000000000000007A
62590+:10B6D000000000000000000000000000000000006A
62591+:10B6E000000000000000000000000000000000005A
62592+:10B6F000000000000000000000000000000000004A
62593+:10B700000000000000000000000000000000000039
62594+:10B710000000000000000000000000000000000029
62595+:10B720000000000000000000000000000000000019
62596+:10B730000000000000000000000000000000000009
62597+:10B7400000000000000000000000000000000000F9
62598+:10B7500000000000000000000000000000000000E9
62599+:10B7600000000000000000000000000000000000D9
62600+:10B7700000000000000000000000000000000000C9
62601+:10B7800000000000000000000000000000000000B9
62602+:10B7900000000000000000000000000000000000A9
62603+:10B7A0000000000000000000000000000000000099
62604+:10B7B0000000000000000000000000000000000089
62605+:10B7C0000000000000000000000000000000000079
62606+:10B7D0000000000000000000000000000000000069
62607+:10B7E0000000000000000000000000000000000059
62608+:10B7F0000000000000000000000000000000000049
62609+:10B800000000000000000000000000000000000038
62610+:10B810000000000000000000000000000000000028
62611+:10B820000000000000000000000000000000000018
62612+:10B830000000000000000000000000000000000008
62613+:10B8400000000000000000000000000000000000F8
62614+:10B8500000000000000000000000000000000000E8
62615+:10B8600000000000000000000000000000000000D8
62616+:10B8700000000000000000000000000000000000C8
62617+:10B8800000000000000000000000000000000000B8
62618+:10B8900000000000000000000000000000000000A8
62619+:10B8A0000000000000000000000000000000000098
62620+:10B8B0000000000000000000000000000000000088
62621+:10B8C0000000000000000000000000000000000078
62622+:10B8D0000000000000000000000000000000000068
62623+:10B8E0000000000000000000000000000000000058
62624+:10B8F0000000000000000000000000000000000048
62625+:10B900000000000000000000000000000000000037
62626+:10B910000000000000000000000000000000000027
62627+:10B920000000000000000000000000000000000017
62628+:10B930000000000000000000000000000000000007
62629+:10B9400000000000000000000000000000000000F7
62630+:10B9500000000000000000000000000000000000E7
62631+:10B9600000000000000000000000000000000000D7
62632+:10B9700000000000000000000000000000000000C7
62633+:10B9800000000000000000000000000000000000B7
62634+:10B9900000000000000000000000000000000000A7
62635+:10B9A0000000000000000000000000000000000097
62636+:10B9B0000000000000000000000000000000000087
62637+:10B9C0000000000000000000000000000000000077
62638+:10B9D0000000000000000000000000000000000067
62639+:10B9E0000000000000000000000000000000000057
62640+:10B9F0000000000000000000000000000000000047
62641+:10BA00000000000000000000000000000000000036
62642+:10BA10000000000000000000000000000000000026
62643+:10BA20000000000000000000000000000000000016
62644+:10BA30000000000000000000000000000000000006
62645+:10BA400000000000000000000000000000000000F6
62646+:10BA500000000000000000000000000000000000E6
62647+:10BA600000000000000000000000000000000000D6
62648+:10BA700000000000000000000000000000000000C6
62649+:10BA800000000000000000000000000000000000B6
62650+:10BA900000000000000000000000000000000000A6
62651+:10BAA0000000000000000000000000000000000096
62652+:10BAB0000000000000000000000000000000000086
62653+:10BAC0000000000000000000000000000000000076
62654+:10BAD0000000000000000000000000000000000066
62655+:10BAE0000000000000000000000000000000000056
62656+:10BAF0000000000000000000000000000000000046
62657+:10BB00000000000000000000000000000000000035
62658+:10BB10000000000000000000000000000000000025
62659+:10BB20000000000000000000000000000000000015
62660+:10BB30000000000000000000000000000000000005
62661+:10BB400000000000000000000000000000000000F5
62662+:10BB500000000000000000000000000000000000E5
62663+:10BB600000000000000000000000000000000000D5
62664+:10BB700000000000000000000000000000000000C5
62665+:10BB800000000000000000000000000000000000B5
62666+:10BB900000000000000000000000000000000000A5
62667+:10BBA0000000000000000000000000000000000095
62668+:10BBB0000000000000000000000000000000000085
62669+:10BBC0000000000000000000000000000000000075
62670+:10BBD0000000000000000000000000000000000065
62671+:10BBE0000000000000000000000000000000000055
62672+:10BBF0000000000000000000000000000000000045
62673+:10BC00000000000000000000000000000000000034
62674+:10BC10000000000000000000000000000000000024
62675+:10BC20000000000000000000000000000000000014
62676+:10BC30000000000000000000000000000000000004
62677+:10BC400000000000000000000000000000000000F4
62678+:10BC500000000000000000000000000000000000E4
62679+:10BC600000000000000000000000000000000000D4
62680+:10BC700000000000000000000000000000000000C4
62681+:10BC800000000000000000000000000000000000B4
62682+:10BC900000000000000000000000000000000000A4
62683+:10BCA0000000000000000000000000000000000094
62684+:10BCB0000000000000000000000000000000000084
62685+:10BCC0000000000000000000000000000000000074
62686+:10BCD0000000000000000000000000000000000064
62687+:10BCE0000000000000000000000000000000000054
62688+:10BCF0000000000000000000000000000000000044
62689+:10BD00000000000000000000000000000000000033
62690+:10BD10000000000000000000000000000000000023
62691+:10BD20000000000000000000000000000000000013
62692+:10BD30000000000000000000000000000000000003
62693+:10BD400000000000000000000000000000000000F3
62694+:10BD500000000000000000000000000000000000E3
62695+:10BD600000000000000000000000000000000000D3
62696+:10BD700000000000000000000000000000000000C3
62697+:10BD800000000000000000000000000000000000B3
62698+:10BD900000000000000000000000000000000000A3
62699+:10BDA0000000000000000000000000000000000093
62700+:10BDB0000000000000000000000000000000000083
62701+:10BDC0000000000000000000000000000000000073
62702+:10BDD0000000000000000000000000000000000063
62703+:10BDE0000000000000000000000000000000000053
62704+:10BDF0000000000000000000000000000000000043
62705+:10BE00000000000000000000000000000000000032
62706+:10BE10000000000000000000000000000000000022
62707+:10BE20000000000000000000000000000000000012
62708+:10BE30000000000000000000000000000000000002
62709+:10BE400000000000000000000000000000000000F2
62710+:10BE500000000000000000000000000000000000E2
62711+:10BE600000000000000000000000000000000000D2
62712+:10BE700000000000000000000000000000000000C2
62713+:10BE800000000000000000000000000000000000B2
62714+:10BE900000000000000000000000000000000000A2
62715+:10BEA0000000000000000000000000000000000092
62716+:10BEB0000000000000000000000000000000000082
62717+:10BEC0000000000000000000000000000000000072
62718+:10BED0000000000000000000000000000000000062
62719+:10BEE0000000000000000000000000000000000052
62720+:10BEF0000000000000000000000000000000000042
62721+:10BF00000000000000000000000000000000000031
62722+:10BF10000000000000000000000000000000000021
62723+:10BF20000000000000000000000000000000000011
62724+:10BF30000000000000000000000000000000000001
62725+:10BF400000000000000000000000000000000000F1
62726+:10BF500000000000000000000000000000000000E1
62727+:10BF600000000000000000000000000000000000D1
62728+:10BF700000000000000000000000000000000000C1
62729+:10BF800000000000000000000000000000000000B1
62730+:10BF900000000000000000000000000000000000A1
62731+:10BFA0000000000000000000000000000000000091
62732+:10BFB0000000000000000000000000000000000081
62733+:10BFC0000000000000000000000000000000000071
62734+:10BFD0000000000000000000000000000000000061
62735+:10BFE0000000000000000000000000000000000051
62736+:10BFF0000000000000000000000000000000000041
62737+:10C000000000000000000000000000000000000030
62738+:10C010000000000000000000000000000000000020
62739+:10C020000000000000000000000000000000000010
62740+:10C030000000000000000000000000000000000000
62741+:10C0400000000000000000000000000000000000F0
62742+:10C0500000000000000000000000000000000000E0
62743+:10C0600000000000000000000000000000000000D0
62744+:10C0700000000000000000000000000000000000C0
62745+:10C0800000000000000000000000000000000000B0
62746+:10C0900000000000000000000000000000000000A0
62747+:10C0A0000000000000000000000000000000000090
62748+:10C0B0000000000000000000000000000000000080
62749+:10C0C0000000000000000000000000000000000070
62750+:10C0D0000000000000000000000000000000000060
62751+:10C0E0000000000000000000000000000000000050
62752+:10C0F0000000000000000000000000000000000040
62753+:10C10000000000000000000000000000000000002F
62754+:10C11000000000000000000000000000000000001F
62755+:10C12000000000000000000000000000000000000F
62756+:10C1300000000000000000000000000000000000FF
62757+:10C1400000000000000000000000000000000000EF
62758+:10C1500000000000000000000000000000000000DF
62759+:10C1600000000000000000000000000000000000CF
62760+:10C1700000000000000000000000000000000000BF
62761+:10C1800000000000000000000000000000000000AF
62762+:10C19000000000000000000000000000000000009F
62763+:10C1A000000000000000000000000000000000008F
62764+:10C1B000000000000000000000000000000000007F
62765+:10C1C000000000000000000000000000000000006F
62766+:10C1D000000000000000000000000000000000005F
62767+:10C1E000000000000000000000000000000000004F
62768+:10C1F000000000000000000000000000000000003F
62769+:10C20000000000000000000000000000000000002E
62770+:10C21000000000000000000000000000000000001E
62771+:10C22000000000000000000000000000000000000E
62772+:10C2300000000000000000000000000000000000FE
62773+:10C2400000000000000000000000000000000000EE
62774+:10C2500000000000000000000000000000000000DE
62775+:10C2600000000000000000000000000000000000CE
62776+:10C2700000000000000000000000000000000000BE
62777+:10C2800000000000000000000000000000000000AE
62778+:10C29000000000000000000000000000000000009E
62779+:10C2A000000000000000000000000000000000008E
62780+:10C2B000000000000000000000000000000000007E
62781+:10C2C000000000000000000000000000000000006E
62782+:10C2D000000000000000000000000000000000005E
62783+:10C2E000000000000000000000000000000000004E
62784+:10C2F000000000000000000000000000000000003E
62785+:10C30000000000000000000000000000000000002D
62786+:10C31000000000000000000000000000000000001D
62787+:10C32000000000000000000000000000000000000D
62788+:10C3300000000000000000000000000000000000FD
62789+:10C3400000000000000000000000000000000000ED
62790+:10C3500000000000000000000000000000000000DD
62791+:10C3600000000000000000000000000000000000CD
62792+:10C3700000000000000000000000000000000000BD
62793+:10C3800000000000000000000000000000000000AD
62794+:10C39000000000000000000000000000000000009D
62795+:10C3A000000000000000000000000000000000008D
62796+:10C3B000000000000000000000000000000000007D
62797+:10C3C000000000000000000000000000000000006D
62798+:10C3D000000000000000000000000000000000005D
62799+:10C3E000000000000000000000000000000000004D
62800+:10C3F000000000000000000000000000000000003D
62801+:10C40000000000000000000000000000000000002C
62802+:10C41000000000000000000000000000000000001C
62803+:10C42000000000000000000000000000000000000C
62804+:10C4300000000000000000000000000000000000FC
62805+:10C4400000000000000000000000000000000000EC
62806+:10C4500000000000000000000000000000000000DC
62807+:10C4600000000000000000000000000000000000CC
62808+:10C4700000000000000000000000000000000000BC
62809+:10C4800000000000000000000000000000000000AC
62810+:10C49000000000000000000000000000000000009C
62811+:10C4A000000000000000000000000000000000008C
62812+:10C4B000000000000000000000000000000000007C
62813+:10C4C000000000000000000000000000000000006C
62814+:10C4D000000000000000000000000000000000005C
62815+:10C4E000000000000000000000000000000000004C
62816+:10C4F000000000000000000000000000000000003C
62817+:10C50000000000000000000000000000000000002B
62818+:10C51000000000000000000000000000000000001B
62819+:10C52000000000000000000000000000000000000B
62820+:10C5300000000000000000000000000000000000FB
62821+:10C5400000000000000000000000000000000000EB
62822+:10C5500000000000000000000000000000000000DB
62823+:10C5600000000000000000000000000000000000CB
62824+:10C5700000000000000000000000000000000000BB
62825+:10C5800000000000000000000000000000000000AB
62826+:10C59000000000000000000000000000000000009B
62827+:10C5A000000000000000000000000000000000008B
62828+:10C5B000000000000000000000000000000000007B
62829+:10C5C000000000000000000000000000000000006B
62830+:10C5D000000000000000000000000000000000005B
62831+:10C5E000000000000000000000000000000000004B
62832+:10C5F000000000000000000000000000000000003B
62833+:10C60000000000000000000000000000000000002A
62834+:10C61000000000000000000000000000000000001A
62835+:10C62000000000000000000000000000000000000A
62836+:10C6300000000000000000000000000000000000FA
62837+:10C6400000000000000000000000000000000000EA
62838+:10C6500000000000000000000000000000000000DA
62839+:10C6600000000000000000000000000000000000CA
62840+:10C6700000000000000000000000000000000000BA
62841+:10C6800000000000000000000000000000000000AA
62842+:10C69000000000000000000000000000000000009A
62843+:10C6A000000000000000000000000000000000008A
62844+:10C6B000000000000000000000000000000000007A
62845+:10C6C000000000000000000000000000000000006A
62846+:10C6D000000000000000000000000000000000005A
62847+:10C6E000000000000000000000000000000000004A
62848+:10C6F000000000000000000000000000000000003A
62849+:10C700000000000000000000000000000000000029
62850+:10C710000000000000000000000000000000000019
62851+:10C720000000000000000000000000000000000009
62852+:10C7300000000000000000000000000000000000F9
62853+:10C7400000000000000000000000000000000000E9
62854+:10C7500000000000000000000000000000000000D9
62855+:10C7600000000000000000000000000000000000C9
62856+:10C7700000000000000000000000000000000000B9
62857+:10C7800000000000000000000000000000000000A9
62858+:10C790000000000000000000000000000000000099
62859+:10C7A0000000000000000000000000000000000089
62860+:10C7B0000000000000000000000000000000000079
62861+:10C7C0000000000000000000000000000000000069
62862+:10C7D0000000000000000000000000000000000059
62863+:10C7E0000000000000000000000000000000000049
62864+:10C7F0000000000000000000000000000000000039
62865+:10C800000000000000000000000000000000000028
62866+:10C810000000000000000000000000000000000018
62867+:10C820000000000000000000000000000000000008
62868+:10C8300000000000000000000000000000000000F8
62869+:10C8400000000000000000000000000000000000E8
62870+:10C8500000000000000000000000000000000000D8
62871+:10C8600000000000000000000000000000000000C8
62872+:10C8700000000000000000000000000000000000B8
62873+:10C8800000000000000000000000000000000000A8
62874+:10C890000000000000000000000000000000000098
62875+:10C8A0000000000000000000000000000000000088
62876+:10C8B0000000000000000000000000000000000078
62877+:10C8C0000000000000000000000000000000000068
62878+:10C8D0000000000000000000000000000000000058
62879+:10C8E0000000000000000000000000000000000048
62880+:10C8F0000000000000000000000000000000000038
62881+:10C900000000000000000000000000000000000027
62882+:10C910000000000000000000000000000000000017
62883+:10C920000000000000000000000000000000000007
62884+:10C9300000000000000000000000000000000000F7
62885+:10C9400000000000000000000000000000000000E7
62886+:10C9500000000000000000000000000000000000D7
62887+:10C9600000000000000000000000000000000000C7
62888+:10C9700000000000000000000000000000000000B7
62889+:10C9800000000000000000000000000000000000A7
62890+:10C990000000000000000000000000000000000097
62891+:10C9A0000000000000000000000000000000000087
62892+:10C9B0000000000000000000000000000000000077
62893+:10C9C0000000000000000000000000000000000067
62894+:10C9D0000000000000000000000000000000000057
62895+:10C9E0000000000000000000000000000000000047
62896+:10C9F0000000000000000000000000000000000037
62897+:10CA00000000000000000000000000000000000026
62898+:10CA10000000000000000000000000000000000016
62899+:10CA20000000000000000000000000000000000006
62900+:10CA300000000000000000000000000000000000F6
62901+:10CA400000000000000000000000000000000000E6
62902+:10CA500000000000000000000000000000000000D6
62903+:10CA600000000000000000000000000000000000C6
62904+:10CA700000000000000000000000000000000000B6
62905+:10CA800000000000000000000000000000000000A6
62906+:10CA90000000000000000000000000000000000096
62907+:10CAA0000000000000000000000000000000000086
62908+:10CAB0000000000000000000000000000000000076
62909+:10CAC0000000000000000000000000000000000066
62910+:10CAD0000000000000000000000000000000000056
62911+:10CAE0000000000000000000000000000000000046
62912+:10CAF0000000000000000000000000000000000036
62913+:10CB00000000000000000000000000000000000025
62914+:10CB10000000000000000000000000000000000015
62915+:10CB20000000000000000000000000000000000005
62916+:10CB300000000000000000000000000000000000F5
62917+:10CB400000000000000000000000000000000000E5
62918+:10CB500000000000000000000000000000000000D5
62919+:10CB600000000000000000000000000000000000C5
62920+:10CB700000000000000000000000000000000000B5
62921+:10CB800000000000000000000000000000000000A5
62922+:10CB90000000000000000000000000000000000095
62923+:10CBA0000000000000000000000000000000000085
62924+:10CBB0000000000000000000000000000000000075
62925+:10CBC0000000000000000000000000000000000065
62926+:10CBD0000000000000000000000000000000000055
62927+:10CBE0000000000000000000000000000000000045
62928+:10CBF0000000000000000000000000000000000035
62929+:10CC00000000000000000000000000000000000024
62930+:10CC10000000000000000000000000000000000014
62931+:10CC20000000000000000000000000000000000004
62932+:10CC300000000000000000000000000000000000F4
62933+:10CC400000000000000000000000000000000000E4
62934+:10CC500000000000000000000000000000000000D4
62935+:10CC600000000000000000000000000000000000C4
62936+:10CC700000000000000000000000000000000000B4
62937+:10CC800000000000000000000000000000000000A4
62938+:10CC90000000000000000000000000000000000094
62939+:10CCA0000000000000000000000000000000000084
62940+:10CCB0000000000000000000000000000000000074
62941+:10CCC0000000000000000000000000000000000064
62942+:10CCD0000000000000000000000000000000000054
62943+:10CCE0000000000000000000000000000000000044
62944+:10CCF0000000000000000000000000000000000034
62945+:10CD00000000000000000000000000000000000023
62946+:10CD10000000000000000000000000000000000013
62947+:10CD20000000000000000000000000000000000003
62948+:10CD300000000000000000000000000000000000F3
62949+:10CD400000000000000000000000000000000000E3
62950+:10CD500000000000000000000000000000000000D3
62951+:10CD600000000000000000000000000000000000C3
62952+:10CD700000000000000000000000000000000000B3
62953+:10CD800000000000000000000000000000000000A3
62954+:10CD90000000000000000000000000000000000093
62955+:10CDA0000000000000000000000000000000000083
62956+:10CDB0000000000000000000000000000000000073
62957+:10CDC0000000000000000000000000000000000063
62958+:10CDD0000000000000000000000000000000000053
62959+:10CDE0000000000000000000000000000000000043
62960+:10CDF0000000000000000000000000000000000033
62961+:10CE00000000000000000000000000000000000022
62962+:10CE10000000000000000000000000000000000012
62963+:10CE20000000000000000000000000000000000002
62964+:10CE300000000000000000000000000000000000F2
62965+:10CE400000000000000000000000000000000000E2
62966+:10CE500000000000000000000000000000000000D2
62967+:10CE600000000000000000000000000000000000C2
62968+:10CE700000000000000000000000000000000000B2
62969+:10CE800000000000000000000000000000000000A2
62970+:10CE90000000000000000000000000000000000092
62971+:10CEA0000000000000000000000000000000000082
62972+:10CEB0000000000000000000000000000000000072
62973+:10CEC0000000000000000000000000000000000062
62974+:10CED0000000000000000000000000000000000052
62975+:10CEE0000000000000000000000000000000000042
62976+:10CEF0000000000000000000000000000000000032
62977+:10CF00000000000000000000000000000000000021
62978+:10CF10000000000000000000000000000000000011
62979+:10CF20000000000000000000000000000000000001
62980+:10CF300000000000000000000000000000000000F1
62981+:10CF400000000000000000000000000000000000E1
62982+:10CF500000000000000000000000000000000000D1
62983+:10CF600000000000000000000000000000000000C1
62984+:10CF700000000000000000000000000000000000B1
62985+:10CF800000000000000000000000000000000000A1
62986+:10CF90000000000000000000000000000000000091
62987+:10CFA0000000000000000000000000000000000081
62988+:10CFB0000000000000000000000000000000000071
62989+:10CFC0000000000000000000000000000000000061
62990+:10CFD0000000000000000000000000000000000051
62991+:10CFE0000000000000000000000000000000000041
62992+:10CFF0000000000000000000000000000000000031
62993+:10D000000000000000000000000000000000000020
62994+:10D010000000000000000000000000000000000010
62995+:10D020000000000000000000000000000000000000
62996+:10D0300000000000000000000000000000000000F0
62997+:10D0400000000000000000000000000000000000E0
62998+:10D0500000000000000000000000000000000000D0
62999+:10D0600000000000000000000000000000000000C0
63000+:10D0700000000000000000000000000000000000B0
63001+:10D0800000000000000000000000000000000000A0
63002+:10D090000000000000000000000000000000000090
63003+:10D0A0000000000000000000000000000000000080
63004+:10D0B0000000000000000000000000000000000070
63005+:10D0C0000000000000000000000000000000000060
63006+:10D0D0000000000000000000000000000000000050
63007+:10D0E0000000000000000000000000000000000040
63008+:10D0F0000000000000000000000000000000000030
63009+:10D10000000000000000000000000000000000001F
63010+:10D11000000000000000000000000000000000000F
63011+:10D1200000000000000000000000000000000000FF
63012+:10D1300000000000000000000000000000000000EF
63013+:10D1400000000000000000000000000000000000DF
63014+:10D1500000000000000000000000000000000000CF
63015+:10D1600000000000000000000000000000000000BF
63016+:10D1700000000000000000000000000000000000AF
63017+:10D18000000000000000000000000000000000009F
63018+:10D19000000000000000000000000000000000008F
63019+:10D1A000000000000000000000000000000000007F
63020+:10D1B000000000000000000000000000000000006F
63021+:10D1C000000000000000000000000000000000005F
63022+:10D1D000000000000000000000000000000000004F
63023+:10D1E000000000000000000000000000000000003F
63024+:10D1F000000000000000000000000000000000002F
63025+:10D20000000000000000000000000000000000001E
63026+:10D21000000000000000000000000000000000000E
63027+:10D2200000000000000000000000000000000000FE
63028+:10D2300000000000000000000000000000000000EE
63029+:10D2400000000000000000000000000000000000DE
63030+:10D2500000000000000000000000000000000000CE
63031+:10D2600000000000000000000000000000000000BE
63032+:10D2700000000000000000000000000000000000AE
63033+:10D28000000000000000000000000000000000009E
63034+:10D29000000000000000000000000000000000008E
63035+:10D2A000000000000000000000000000000000007E
63036+:10D2B000000000000000000000000000000000006E
63037+:10D2C000000000000000000000000000000000005E
63038+:10D2D000000000000000000000000000000000004E
63039+:10D2E000000000000000000000000000000000003E
63040+:10D2F000000000000000000000000000000000002E
63041+:10D30000000000000000000000000000000000001D
63042+:10D31000000000000000000000000000000000000D
63043+:10D3200000000000000000000000000000000000FD
63044+:10D3300000000000000000000000000000000000ED
63045+:10D3400000000000000000000000000000000000DD
63046+:10D3500000000000000000000000000000000000CD
63047+:10D3600000000000000000000000000000000000BD
63048+:10D3700000000000000000000000000000000000AD
63049+:10D38000000000000000000000000000000000009D
63050+:10D39000000000000000000000000000000000008D
63051+:10D3A000000000000000000000000000000000007D
63052+:10D3B000000000000000000000000000000000006D
63053+:10D3C000000000000000000000000000000000005D
63054+:10D3D000000000000000000000000000000000004D
63055+:10D3E000000000000000000000000000000000003D
63056+:10D3F000000000000000000000000000000000002D
63057+:10D40000000000000000000000000000000000001C
63058+:10D41000000000000000000000000000000000000C
63059+:10D4200000000000000000000000000000000000FC
63060+:10D4300000000000000000000000000000000000EC
63061+:10D4400000000000000000000000000000000000DC
63062+:10D4500000000000000000000000000000000000CC
63063+:10D4600000000000000000000000000000000000BC
63064+:10D4700000000000000000000000000000000000AC
63065+:10D48000000000000000000000000000000000009C
63066+:10D49000000000000000000000000000000000008C
63067+:10D4A000000000000000000000000000000000007C
63068+:10D4B000000000000000000000000000000000006C
63069+:10D4C000000000000000000000000000000000005C
63070+:10D4D000000000000000000000000000000000004C
63071+:10D4E000000000000000000000000000000000003C
63072+:10D4F000000000000000000000000000000000002C
63073+:10D50000000000000000000000000000000000001B
63074+:10D51000000000000000000000000000000000000B
63075+:10D5200000000000000000000000000000000000FB
63076+:10D5300000000000000000000000000000000000EB
63077+:10D5400000000000000000000000000000000000DB
63078+:10D5500000000000000000000000000000000000CB
63079+:10D5600000000000000000000000000000000000BB
63080+:10D5700000000000000000000000000000000000AB
63081+:10D58000000000000000000000000000000000009B
63082+:10D59000000000000000000000000000000000008B
63083+:10D5A000000000000000000000000000000000007B
63084+:10D5B000000000000000000000000000000000006B
63085+:10D5C000000000000000000000000000000000005B
63086+:10D5D000000000000000000000000000000000004B
63087+:10D5E000000000000000000000000000000000003B
63088+:10D5F000000000000000000000000000000000002B
63089+:10D60000000000000000000000000000000000001A
63090+:10D61000000000000000000000000000000000000A
63091+:10D6200000000000000000000000000000000000FA
63092+:10D6300000000000000000000000000000000000EA
63093+:10D6400000000000000000000000000000000000DA
63094+:10D6500000000000000000000000000000000000CA
63095+:10D6600000000000000000000000000000000000BA
63096+:10D6700000000000000000000000000000000000AA
63097+:10D68000000000000000000000000000000000009A
63098+:10D69000000000000000000000000000000000008A
63099+:10D6A000000000000000000000000000000000007A
63100+:10D6B000000000000000000000000000000000006A
63101+:10D6C000000000000000000000000000000000005A
63102+:10D6D000000000000000000000000000000000004A
63103+:10D6E000000000000000000000000000000000003A
63104+:10D6F000000000000000000000000000000000002A
63105+:10D700000000000000000000000000000000000019
63106+:10D710000000000000000000000000000000000009
63107+:10D7200000000000000000000000000000000000F9
63108+:10D7300000000000000000000000000000000000E9
63109+:10D7400000000000000000000000000000000000D9
63110+:10D7500000000000000000000000000000000000C9
63111+:10D7600000000000000000000000000000000000B9
63112+:10D7700000000000000000000000000000000000A9
63113+:10D780000000000000000000000000000000000099
63114+:10D790000000000000000000000000000000000089
63115+:10D7A0000000000000000000000000000000000079
63116+:10D7B0000000000000000000000000000000000069
63117+:10D7C0000000000000000000000000000000000059
63118+:10D7D0000000000000000000000000000000000049
63119+:10D7E0000000000000000000000000000000000039
63120+:10D7F0000000000000000000000000000000000029
63121+:10D800000000000000000000000000000000000018
63122+:10D810000000000000000000000000000000000008
63123+:10D8200000000000000000000000000000000000F8
63124+:10D8300000000000000000000000000000000000E8
63125+:10D8400000000000000000000000000000000000D8
63126+:10D8500000000000000000000000000000000000C8
63127+:10D8600000000000000000000000000000000000B8
63128+:10D8700000000000000000000000000000000000A8
63129+:10D880000000000000000000000000000000000098
63130+:10D890000000000000000000000000000000000088
63131+:10D8A0000000000000000000000000000000000078
63132+:10D8B0000000000000000000000000000000000068
63133+:10D8C0000000000000000000000000000000000058
63134+:10D8D0000000000000000000000000000000000048
63135+:10D8E0000000000000000000000000000000000038
63136+:10D8F0000000000000000000000000000000000028
63137+:10D900000000000000000000000000000000000017
63138+:10D910000000000000000000000000000000000007
63139+:10D9200000000000000000000000000000000000F7
63140+:10D9300000000000000000000000000000000000E7
63141+:10D9400000000000000000000000000000000000D7
63142+:10D9500000000000000000000000000000000000C7
63143+:10D9600000000000000000000000000000000000B7
63144+:10D9700000000000000000000000000000000000A7
63145+:10D980000000000000000000000000000000000097
63146+:10D990000000000000000000000000000000000087
63147+:10D9A0000000000000000000000000000000000077
63148+:10D9B0000000000000000000000000000000000067
63149+:10D9C0000000000000000000000000000000000057
63150+:10D9D0000000000000000000000000000000000047
63151+:10D9E0000000000000000000000000000000000037
63152+:10D9F0000000000000000000000000000000000027
63153+:10DA00000000000000000000000000000000000016
63154+:10DA10000000000000000000000000000000000006
63155+:10DA200000000000000000000000000000000000F6
63156+:10DA300000000000000000000000000000000000E6
63157+:10DA400000000000000000000000000000000000D6
63158+:10DA500000000000000000000000000000000000C6
63159+:10DA600000000000000000000000000000000000B6
63160+:10DA700000000000000000000000000000000000A6
63161+:10DA80000000000000000000000000000000000096
63162+:10DA90000000000000000000000000000000000086
63163+:10DAA0000000000000000000000000000000000076
63164+:10DAB0000000000000000000000000000000000066
63165+:10DAC0000000000000000000000000000000000056
63166+:10DAD0000000000000000000000000000000000046
63167+:10DAE0000000000000000000000000000000000036
63168+:10DAF0000000000000000000000000000000000026
63169+:10DB00000000000000000000000000000000000015
63170+:10DB10000000000000000000000000000000000005
63171+:10DB200000000000000000000000000000000000F5
63172+:10DB300000000000000000000000000000000000E5
63173+:10DB400000000000000000000000000000000000D5
63174+:10DB500000000000000000000000000000000000C5
63175+:10DB600000000000000000000000000000000000B5
63176+:10DB700000000000000000000000000000000000A5
63177+:10DB80000000000000000000000000000000000095
63178+:10DB90000000000000000000000000000000000085
63179+:10DBA0000000000000000000000000000000000075
63180+:10DBB0000000000000000000000000000000000065
63181+:10DBC0000000000000000000000000000000000055
63182+:10DBD0000000000000000000000000000000000045
63183+:10DBE0000000000000000000000000000000000035
63184+:10DBF0000000000000000000000000000000000025
63185+:10DC00000000000000000000000000000000000014
63186+:10DC10000000000000000000000000000000000004
63187+:10DC200000000000000000000000000000000000F4
63188+:10DC300000000000000000000000000000000000E4
63189+:10DC400000000000000000000000000000000000D4
63190+:10DC500000000000000000000000000000000000C4
63191+:10DC600000000000000000000000000000000000B4
63192+:10DC700000000000000000000000000000000000A4
63193+:10DC80000000000000000000000000000000000094
63194+:10DC90000000000000000000000000000000000084
63195+:10DCA0000000000000000000000000000000000074
63196+:10DCB0000000000000000000000000000000000064
63197+:10DCC0000000000000000000000000000000000054
63198+:10DCD0000000000000000000000000000000000044
63199+:10DCE0000000000000000000000000000000000034
63200+:10DCF0000000000000000000000000000000000024
63201+:10DD00000000000000000000000000000000000013
63202+:10DD10000000000000000000000000000000000003
63203+:10DD200000000000000000000000000000000000F3
63204+:10DD300000000000000000000000000000000000E3
63205+:10DD400000000000000000000000000000000000D3
63206+:10DD500000000000000000000000000000000000C3
63207+:10DD600000000000000000000000000000000000B3
63208+:10DD700000000000000000000000000000000000A3
63209+:10DD80000000000000000000000000000000000093
63210+:10DD90000000000000000000000000000000000083
63211+:10DDA0000000000000000000000000000000000073
63212+:10DDB0000000000000000000000000000000000063
63213+:10DDC0000000000000000000000000000000000053
63214+:10DDD0000000000000000000000000000000000043
63215+:10DDE0000000000000000000000000000000000033
63216+:10DDF0000000000000000000000000000000000023
63217+:10DE00000000000000000000000000000000000012
63218+:10DE10000000000000000000000000000000000002
63219+:10DE200000000000000000000000000000000000F2
63220+:10DE300000000000000000000000000000000000E2
63221+:10DE400000000000000000000000000000000000D2
63222+:10DE500000000000000000000000000000000000C2
63223+:10DE600000000000000000000000000000000000B2
63224+:10DE700000000000000000000000000000000000A2
63225+:10DE80000000000000000000000000000000000092
63226+:10DE90000000000000000000000000000000000082
63227+:10DEA0000000000000000000000000000000000072
63228+:10DEB0000000000000000000000000000000000062
63229+:10DEC0000000000000000000000000000000000052
63230+:10DED0000000000000000000000000000000000042
63231+:10DEE0000000000000000000000000000000000032
63232+:10DEF0000000000000000000000000000000000022
63233+:10DF00000000000000000000000000000000000011
63234+:10DF10000000000000000000000000000000000001
63235+:10DF200000000000000000000000000000000000F1
63236+:10DF300000000000000000000000000000000000E1
63237+:10DF400000000000000000000000000000000000D1
63238+:10DF500000000000000000000000000000000000C1
63239+:10DF600000000000000000000000000000000000B1
63240+:10DF700000000000000000000000000000000000A1
63241+:10DF80000000000000000000000000000000000091
63242+:10DF90000000000000000000000000000000000081
63243+:10DFA0000000000000000000000000000000000071
63244+:10DFB0000000000000000000000000000000000061
63245+:10DFC0000000000000000000000000000000000051
63246+:10DFD0000000000000000000000000000000000041
63247+:10DFE0000000000000000000000000000000000031
63248+:10DFF0000000000000000000000000000000000021
63249+:10E000000000000000000000000000000000000010
63250+:10E010000000000000000000000000000000000000
63251+:10E0200000000000000000000000000000000000F0
63252+:10E0300000000000000000000000000000000000E0
63253+:10E0400000000000000000000000000000000000D0
63254+:10E0500000000000000000000000000000000000C0
63255+:10E0600000000000000000000000000000000000B0
63256+:10E0700000000000000000000000000000000000A0
63257+:10E080000000000000000000000000000000000090
63258+:10E090000000000000000000000000000000000080
63259+:10E0A0000000000000000000000000000000000070
63260+:10E0B0000000000000000000000000000000000060
63261+:10E0C0000000000000000000000000000000000050
63262+:10E0D0000000000000000000000000000000000040
63263+:10E0E0000000000000000000000000000000000030
63264+:10E0F0000000000000000000000000000000000020
63265+:10E10000000000000000000000000000000000000F
63266+:10E1100000000000000000000000000000000000FF
63267+:10E1200000000000000000000000000000000000EF
63268+:10E1300000000000000000000000000000000000DF
63269+:10E1400000000000000000000000000000000000CF
63270+:10E1500000000000000000000000000000000000BF
63271+:10E1600000000000000000000000000000000000AF
63272+:10E17000000000000000000000000000000000009F
63273+:10E18000000000000000000000000000000000008F
63274+:10E19000000000000000000000000000000000007F
63275+:10E1A000000000000000000000000000000000006F
63276+:10E1B000000000000000000000000000000000005F
63277+:10E1C000000000000000000000000000000000004F
63278+:10E1D000000000000000000000000000000000003F
63279+:10E1E000000000000000000000000000000000002F
63280+:10E1F000000000000000000000000000000000809F
63281+:10E20000000000000000000000000000000000000E
63282+:10E2100000000000000000000000000000000000FE
63283+:10E220000000000A000000000000000000000000E4
63284+:10E2300010000003000000000000000D0000000DB1
63285+:10E240003C020801244295C03C030801246397FC6A
63286+:10E25000AC4000000043202B1480FFFD244200044A
63287+:10E260003C1D080037BD9FFC03A0F0213C100800B6
63288+:10E27000261032103C1C0801279C95C00E0012BECF
63289+:10E28000000000000000000D3C02800030A5FFFFF0
63290+:10E2900030C600FF344301803C0880008D0901B87E
63291+:10E2A0000520FFFE00000000AC6400002404000212
63292+:10E2B000A4650008A066000AA064000BAC67001803
63293+:10E2C0003C03100003E00008AD0301B83C0560000A
63294+:10E2D0008CA24FF80440FFFE00000000ACA44FC029
63295+:10E2E0003C0310003C040200ACA44FC403E000084F
63296+:10E2F000ACA34FF89486000C00A050212488001491
63297+:10E3000000062B0200051080004448210109182B4B
63298+:10E310001060001100000000910300002C6400094F
63299+:10E320005080000991190001000360803C0D080134
63300+:10E3300025AD9258018D58218D67000000E000083E
63301+:10E340000000000091190001011940210109302B42
63302+:10E3500054C0FFF29103000003E000080000102108
63303+:10E360000A000CCC25080001910F0001240E000AC0
63304+:10E3700015EE00400128C8232F38000A1700003D81
63305+:10E38000250D00028D580000250F0006370E0100F4
63306+:10E39000AD4E0000910C000291AB000191A400026F
63307+:10E3A00091A60003000C2E00000B3C0000A71025D6
63308+:10E3B00000041A000043C8250326C025AD580004F8
63309+:10E3C000910E000691ED000191E7000291E5000336
63310+:10E3D000000E5E00000D6400016C30250007220075
63311+:10E3E00000C41025004518252508000A0A000CCC99
63312+:10E3F000AD430008910F000125040002240800022B
63313+:10E4000055E80001012020210A000CCC00804021A9
63314+:10E41000910C0001240B0003158B00160000000076
63315+:10E420008D580000910E000225080003370D0008EA
63316+:10E43000A14E00100A000CCCAD4D00009119000156
63317+:10E44000240F0004172F000B0000000091070002AA
63318+:10E45000910400038D43000000072A0000A410254A
63319+:10E460003466000425080004AD42000C0A000CCC00
63320+:10E47000AD46000003E000082402000127BDFFE8CC
63321+:10E48000AFBF0014AFB000100E00164E0080802108
63322+:10E490003C0480083485008090A600052403FFFE1C
63323+:10E4A0000200202100C310248FBF00148FB0001081
63324+:10E4B000A0A200050A00165827BD001827BDFFE8D6
63325+:10E4C000AFB00010AFBF00140E000FD40080802149
63326+:10E4D0003C06800834C5008090A40000240200504F
63327+:10E4E000308300FF106200073C09800002002021F9
63328+:10E4F0008FBF00148FB00010AD2001800A00108F74
63329+:10E5000027BD0018240801003C07800002002021DC
63330+:10E510008FBF00148FB00010ACE801800A00108F8C
63331+:10E5200027BD001827BDFF783C058008AFBE0080DE
63332+:10E53000AFB7007CAFB3006CAFB10064AFBF008475
63333+:10E54000AFB60078AFB50074AFB40070AFB200687A
63334+:10E55000AFB0006034A600803C0580008CB201287A
63335+:10E5600090C400098CA701043C020001309100FF17
63336+:10E5700000E218240000B8210000F021106000071C
63337+:10E58000000098213C0908008D2931F02413000176
63338+:10E59000252800013C010800AC2831F0ACA0008423
63339+:10E5A00090CC0005000C5827316A0001154000721C
63340+:10E5B000AFA0005090CD00002406002031A400FF41
63341+:10E5C00010860018240E0050108E009300000000EA
63342+:10E5D0003C1008008E1000DC260F00013C010800F2
63343+:10E5E000AC2F00DC0E0016C7000000000040182110
63344+:10E5F0008FBF00848FBE00808FB7007C8FB60078FD
63345+:10E600008FB500748FB400708FB3006C8FB2006848
63346+:10E610008FB100648FB000600060102103E000083B
63347+:10E6200027BD00880000000D3C1F8000AFA0003017
63348+:10E6300097E501168FE201043C04002030B9FFFF8A
63349+:10E64000004438240007182B00033140AFA60030E7
63350+:10E650008FF5010437F80C003C1600400338802188
63351+:10E6600002B6A02434C40040128000479215000D69
63352+:10E6700032A800201500000234860080008030217E
63353+:10E6800014C0009FAFA600303C0D800835A6008066
63354+:10E6900090CC0008318B0040516000063C06800899
63355+:10E6A000240E0004122E00A8240F0012122F003294
63356+:10E6B0003C06800834C401003C0280009447011AE3
63357+:10E6C0009619000E909F00088E18000830E3FFFF97
63358+:10E6D00003F9B00432B40004AFB6005CAFA3005835
63359+:10E6E0008E1600041280002EAFB8005434C3008090
63360+:10E6F000906800083105004014A0002500000000CB
63361+:10E700008C70005002D090230640000500000000ED
63362+:10E710008C71003402D1A82306A201678EE20008A2
63363+:10E72000126000063C1280003C1508008EB531F4E2
63364+:10E7300026B600013C010800AC3631F4AE4000447E
63365+:10E74000240300018FBF00848FBE00808FB7007C40
63366+:10E750008FB600788FB500748FB400708FB3006CE3
63367+:10E760008FB200688FB100648FB00060006010212C
63368+:10E7700003E0000827BD00880E000D2800002021BE
63369+:10E780000A000D75004018210A000D9500C02021D7
63370+:10E790000E00171702C020211440FFE10000000006
63371+:10E7A0003C0B8008356400808C8A003402CA482300
63372+:10E7B0000520001D000000003C1E08008FDE310017
63373+:10E7C00027D700013C010800AC3731001260000679
63374+:10E7D000024020213C1408008E9431F42690000160
63375+:10E7E0003C010800AC3031F40E00164E3C1E80088F
63376+:10E7F00037CD008091B700250240202136EE00047D
63377+:10E800000E001658A1AE00250E000CAC02402021CF
63378+:10E810000A000DCA240300013C17080126F796C020
63379+:10E820000A000D843C1F80008C86003002C66023E5
63380+:10E830001980000C2419000C908F004F3C14080024
63381+:10E840008E94310032B500FC35ED0001268E0001BA
63382+:10E850003C010800AC2E3100A08D004FAFA0005845
63383+:10E860002419000CAFB900308C9800300316A02397
63384+:10E870001A80010B8FA300580074F82A17E0FFD309
63385+:10E88000000000001074002A8FA5005802D4B021A7
63386+:10E8900000B410233044FFFFAFA4005832A8000298
63387+:10E8A0001100002E32AB00103C15800836B00080FD
63388+:10E8B0009216000832D30040526000FB8EE200083E
63389+:10E8C0000E00164E02402021240A0018A20A000958
63390+:10E8D000921100052409FFFE024020210229902404
63391+:10E8E0000E001658A2120005240400390000282149
63392+:10E8F0000E0016F2240600180A000DCA24030001B7
63393+:10E9000092FE000C3C0A800835490080001EBB00C6
63394+:10E910008D27003836F10081024020213225F08118
63395+:10E920000E000C9B30C600FF0A000DC10000000065
63396+:10E930003AA7000130E300011460FFA402D4B02123
63397+:10E940000A000E1D00000000024020210E001734B6
63398+:10E95000020028210A000D75004018211160FF7087
63399+:10E960003C0F80083C0D800835EE00808DC40038D7
63400+:10E970008FA300548DA60004006660231D80FF68ED
63401+:10E98000000000000064C02307020001AFA400548F
63402+:10E990003C1F08008FFF31E433F9000113200015FC
63403+:10E9A0008FAC00583C07800094E3011A10600012FD
63404+:10E9B0003C0680080E00216A024020213C03080129
63405+:10E9C000906396F13064000214800145000000005D
63406+:10E9D000306C0004118000078FAC0058306600FBDB
63407+:10E9E0003C010801A02696F132B500FCAFA000580A
63408+:10E9F0008FAC00583C06800834D30080AFB40018B8
63409+:10EA0000AFB60010AFAC00143C088000950B01209D
63410+:10EA10008E6F0030966A005C8FA3005C8FBF003061
63411+:10EA20003169FFFF3144FFFF8FAE005401341021E4
63412+:10EA3000350540000064382B0045C82103E7C02598
63413+:10EA4000AFB90020AFAF0028AFB80030AFAF00249F
63414+:10EA5000AFA0002CAFAE0034926D000831B40008B6
63415+:10EA6000168000BB020020218EE200040040F8095D
63416+:10EA700027A400108FAF003031F300025660000170
63417+:10EA800032B500FE3C048008349F008093F90008F2
63418+:10EA900033380040530000138FA400248C850004F9
63419+:10EAA0008FA7005410A700D52404001432B0000131
63420+:10EAB0001200000C8FA400242414000C1234011A3C
63421+:10EAC0002A2D000D11A001022413000E240E000AAD
63422+:10EAD000522E0001241E00088FAF002425E40001FF
63423+:10EAE000AFA400248FAA00143C0B80083565008079
63424+:10EAF000008A48218CB10030ACA9003090A4004EAF
63425+:10EB00008CA700303408FFFF0088180400E3F821C8
63426+:10EB1000ACBF00348FA600308FB900548FB8005CB2
63427+:10EB200030C200081040000B033898218CAC002044
63428+:10EB3000119300D330C600FF92EE000C8FA7003473
63429+:10EB400002402021000E6B0035B400800E000C9BAB
63430+:10EB50003285F0803C028008345000808E0F0030F7
63431+:10EB600001F1302318C00097264800803C070800B8
63432+:10EB70008CE731E42404FF80010418243118007F5D
63433+:10EB80003C1F80003C19800430F10001AFE300908D
63434+:10EB900012200006031928213C030801906396F116
63435+:10EBA00030690008152000C6306A00F73C10800864
63436+:10EBB00036040080908C004F318B000115600042BC
63437+:10EBC000000000003C0608008CC6319830CE0010D2
63438+:10EBD00051C0004230F9000190AF006B55E0003F9A
63439+:10EBE00030F9000124180001A0B8006B3C1180002E
63440+:10EBF0009622007A24470064A48700123C0D800806
63441+:10EC000035A5008090B40008329000401600000442
63442+:10EC10003C03800832AE000115C0008B00000000EC
63443+:10EC2000346400808C86002010D3000A3463010015
63444+:10EC30008C67000002C7782319E000978FBF00544B
63445+:10EC4000AC93002024130001AC760000AFB3005059
63446+:10EC5000AC7F000417C0004E000000008FA90050D8
63447+:10EC60001520000B000000003C030801906396F1A2
63448+:10EC7000306A00011140002E8FAB0058306400FE56
63449+:10EC80003C010801A02496F10A000D75000018212E
63450+:10EC90000E000CAC024020210A000F1300000000FF
63451+:10ECA0000A000E200000A0210040F80924040017EB
63452+:10ECB0000A000DCA240300010040F80924040016CC
63453+:10ECC0000A000DCA240300019094004F240DFFFE9A
63454+:10ECD000028D2824A085004F30F900011320000682
63455+:10ECE0003C0480083C030801906396F1307F0010DB
63456+:10ECF00017E00051306800EF34900080240A0001D2
63457+:10ED0000024020210E00164EA60A00129203002592
63458+:10ED100024090001AFA90050346200010240202103
63459+:10ED20000E001658A20200250A000EF93C0D8008BC
63460+:10ED30001160FE83000018218FA5003030AC000464
63461+:10ED40001180FE2C8FBF00840A000DCB240300012C
63462+:10ED500027A500380E000CB6AFA000385440FF4382
63463+:10ED60008EE200048FB40038329001005200FF3F61
63464+:10ED70008EE200048FA3003C8E6E0058006E682364
63465+:10ED800005A3FF39AE6300580A000E948EE200041A
63466+:10ED90000E00164E024020213C038008346800809B
63467+:10EDA000024020210E001658A11E000903C0302188
63468+:10EDB000240400370E0016F2000028210A000F116B
63469+:10EDC0008FA900508FAB00185960FF8D3C0D800853
63470+:10EDD0000E00164E02402021920C00252405000151
63471+:10EDE000AFA5005035820004024020210E001658C5
63472+:10EDF000A20200250A000EF93C0D800812240059D9
63473+:10EE00002A2300151060004D240900162408000C68
63474+:10EE10005628FF2732B000013C0A8008914C001BA5
63475+:10EE20002406FFBD241E000E01865824A14B001BA2
63476+:10EE30000A000EA532B000013C010801A02896F19D
63477+:10EE40000A000EF93C0D80088CB500308EFE0008DB
63478+:10EE50002404001826B6000103C0F809ACB600303F
63479+:10EE60003C030801906396F13077000116E0FF81C2
63480+:10EE7000306A00018FB200300A000D753243000481
63481+:10EE80003C1080009605011A50A0FF2B34C60010DC
63482+:10EE90000A000EC892EE000C8C6200001456FF6D42
63483+:10EEA000000000008C7800048FB9005403388823D8
63484+:10EEB0000621FF638FBF00540A000F0E0000000000
63485+:10EEC0003C010801A02A96F10A000F3030F9000138
63486+:10EED0001633FF028FAF00240A000EB0241E00106C
63487+:10EEE0000E00164E024020213C0B80083568008041
63488+:10EEF00091090025240A0001AFAA0050353300040F
63489+:10EF0000024020210E001658A11300253C050801DF
63490+:10EF100090A596F130A200FD3C010801A02296F1D7
63491+:10EF20000A000E6D004018212411000E53D1FEEA94
63492+:10EF3000241E00100A000EAF241E00165629FEDC07
63493+:10EF400032B000013C0A8008914C001B2406FFBD32
63494+:10EF5000241E001001865824A14B001B0A000EA598
63495+:10EF600032B000010A000EA4241E00123C038000EF
63496+:10EF70008C6201B80440FFFE24040800AC6401B8B0
63497+:10EF800003E000080000000030A5FFFF30C6FFFFCF
63498+:10EF90003C0780008CE201B80440FFFE34EA0180A7
63499+:10EFA000AD440000ACE400203C0480089483004899
63500+:10EFB0003068FFFF11000016AF88000824AB001274
63501+:10EFC000010B482B512000133C04800034EF01005A
63502+:10EFD00095EE00208F890000240D001A31CCFFFF30
63503+:10EFE00031274000A14D000B10E000362583FFFEC5
63504+:10EFF0000103C02B170000348F9900048F88000490
63505+:10F00000A5430014350700010A001003AF87000470
63506+:10F010003C04800024030003348201808F890000B7
63507+:10F020008F870004A043000B3C088000350C018052
63508+:10F03000A585000EA585001A8F85000C30EB800099
63509+:10F04000A5890010AD850028A58600081160000F75
63510+:10F050008F85001435190100972A00163158FFFCDE
63511+:10F06000270F000401E870218DCD400031A6FFFF7D
63512+:10F0700014C000072403BFFF3C02FFFF34487FFF9A
63513+:10F0800000E83824AF8700048F8500142403BFFFF5
63514+:10F090003C04800000E3582434830180A46B0026E4
63515+:10F0A000AC69002C10A0000300054C02A465001000
63516+:10F0B000A46900263C071000AC8701B803E00008F3
63517+:10F0C000000000008F990004240AFFFE032A382460
63518+:10F0D0000A001003AF87000427BDFFE88FA20028B5
63519+:10F0E00030A5FFFF30C6FFFFAFBF0010AF87000C99
63520+:10F0F000AF820014AF8000040E000FDBAF80000071
63521+:10F100008FBF001027BD001803E00008AF80001477
63522+:10F110003C06800034C4007034C701008C8A0000B3
63523+:10F1200090E500128F84000027BDFFF030A300FFA0
63524+:10F13000000318823082400010400037246500032D
63525+:10F140000005C8800326C0218F0E4000246F0004F4
63526+:10F15000000F6880AFAE000001A660218D8B4000DB
63527+:10F16000AFAB000494E900163128FFFC01063821FA
63528+:10F170008CE64000AFA600088FA9000800003021EF
63529+:10F18000000028213C07080024E701000A0010675E
63530+:10F19000240800089059000024A500012CAC000CA4
63531+:10F1A0000079C0210018788001E770218DCD000022
63532+:10F1B0001180000600CD302603A5102114A8FFF50C
63533+:10F1C00000051A005520FFF4905900003C0480000F
63534+:10F1D000348700703C0508008CA531048CE30000E6
63535+:10F1E0002CA2002010400009006A38230005488046
63536+:10F1F0003C0B0800256B3108012B402124AA00019B
63537+:10F20000AD0700003C010800AC2A310400C0102109
63538+:10F2100003E0000827BD0010308220001040000BE2
63539+:10F2200000055880016648218D24400024680004B0
63540+:10F2300000083880AFA4000000E618218C6540006B
63541+:10F24000AFA000080A001057AFA500040000000D91
63542+:10F250000A0010588FA9000827BDFFE03C07800076
63543+:10F2600034E60100AFBF001CAFB20018AFB100140C
63544+:10F27000AFB0001094C5000E8F87000030A4FFFFD0
63545+:10F280002483000430E2400010400010AF830028C7
63546+:10F290003C09002000E940241100000D30EC800002
63547+:10F2A0008F8A0004240BBFFF00EB38243543100085
63548+:10F2B000AF87000030F220001640000B3C1900041C
63549+:10F2C000241FFFBF0A0010B7007F102430EC80001D
63550+:10F2D000158000423C0E002030F220001240FFF862
63551+:10F2E0008F8300043C19000400F9C0241300FFF5CB
63552+:10F2F000241FFFBF34620040AF82000430E20100EF
63553+:10F300001040001130F010008F83002C10600006B8
63554+:10F310003C0F80003C05002000E52024148000C044
63555+:10F320003C0800043C0F800035EE010095CD001E26
63556+:10F3300095CC001C31AAFFFF000C5C00014B482556
63557+:10F34000AF89000C30F010001200000824110001F9
63558+:10F3500030F100201620008B3C18100000F890249B
63559+:10F36000164000823C040C002411000130E801002A
63560+:10F370001500000B3C0900018F85000430A94000F6
63561+:10F38000152000073C0900013C0C1F0100EC58242B
63562+:10F390003C0A1000116A01183C1080003C09000171
63563+:10F3A00000E9302410C000173C0B10003C18080086
63564+:10F3B0008F1800243307000214E0014024030001E9
63565+:10F3C0008FBF001C8FB200188FB100148FB00010D7
63566+:10F3D0000060102103E0000827BD002000EE682433
63567+:10F3E00011A0FFBE30F220008F8F00043C11FFFF00
63568+:10F3F00036307FFF00F0382435E380000A0010A685
63569+:10F40000AF87000000EB102450400065AF8000245F
63570+:10F410008F8C002C3C0D0F0000ED18241580008807
63571+:10F42000AF83001030E8010011000086938F0010B8
63572+:10F430003C0A0200106A00833C1280003650010032
63573+:10F44000920500139789002A3626000230AF00FF8C
63574+:10F4500025EE0004000E19C03C0480008C9801B811
63575+:10F460000700FFFE34880180AD0300003C198008CE
63576+:10F47000AC830020973100483225FFFF10A0015CCB
63577+:10F48000AF8500082523001200A3F82B53E0015993
63578+:10F490008F850004348D010095AC00202402001AF1
63579+:10F4A00030E44000318BFFFFA102000B108001927D
63580+:10F4B0002563FFFE00A3502B154001908F8F0004A1
63581+:10F4C000A50300148F88000435050001AF850004F2
63582+:10F4D0003C08800035190180A729000EA729001AD1
63583+:10F4E0008F89000C30B18000A7270010AF290028B9
63584+:10F4F000A72600081220000E3C04800035020100FF
63585+:10F50000944C0016318BFFFC256400040088182100
63586+:10F510008C7F400033E6FFFF14C000053C048000F0
63587+:10F520003C0AFFFF354D7FFF00AD2824AF85000466
63588+:10F53000240EBFFF00AE402434850180A4A800261D
63589+:10F54000ACA7002C3C071000AC8701B800001821C4
63590+:10F550008FBF001C8FB200188FB100148FB0001045
63591+:10F560000060102103E0000827BD00203C020BFFD3
63592+:10F5700000E41824345FFFFF03E3C82B5320FF7B14
63593+:10F58000241100013C0608008CC6002C24C5000193
63594+:10F590003C010800AC25002C0A0010D42411000501
63595+:10F5A0008F85002410A0002FAF80001090A30000D2
63596+:10F5B000146000792419000310A0002A30E601002D
63597+:10F5C00010C000CC8F860010241F000210DF00C97D
63598+:10F5D0008F8B000C3C0708008CE7003824E4FFFF09
63599+:10F5E00014E0000201641824000018213C0D0800FA
63600+:10F5F00025AD0038006D1021904C00048F85002847
63601+:10F6000025830004000321C030A5FFFF3626000239
63602+:10F610000E000FDB000000000A00114D0000182151
63603+:10F6200000E8302414C0FF403C0F80000E00103D65
63604+:10F63000000000008F8700000A0010CAAF82000C93
63605+:10F64000938F00103C18080127189640000F90C0B7
63606+:10F6500002588021AF9000248F85002414A0FFD38E
63607+:10F66000AF8F00103C0480008C86400030C5010044
63608+:10F6700010A000BC322300043C0C08008D8C002438
63609+:10F6800024120004106000C23190000D3C04800080
63610+:10F690008C8D40003402FFFF11A201003231FFFBCC
63611+:10F6A0008C884000310A01005540000124110010EF
63612+:10F6B00030EE080011C000BE2419FFFB8F9800280F
63613+:10F6C0002F0F03EF51E000010219802430E90100FF
63614+:10F6D00011200014320800018F87002C14E000FB79
63615+:10F6E0008F8C000C3C05800034AB0100917F00132F
63616+:10F6F00033E300FF246A00042403FFFE0203802496
63617+:10F70000000A21C012000002023230253226FFFF1B
63618+:10F710000E000FDB9785002A1200FF290000182138
63619+:10F72000320800011100000D32180004240E0001FF
63620+:10F73000120E0002023230253226FFFF9785002A82
63621+:10F740000E000FDB00002021240FFFFE020F80249B
63622+:10F750001200FF1B00001821321800045300FF188C
63623+:10F760002403000102323025241200045612000145
63624+:10F770003226FFFF9785002A0E000FDB24040100CC
63625+:10F780002419FFFB021988241220FF0D0000182104
63626+:10F790000A0010E9240300011079009C00003021C8
63627+:10F7A00090AD00012402000211A200BE30EA004028
63628+:10F7B00090B90001241800011338007F30E900409F
63629+:10F7C0008CA600049785002A00C020210E000FDBC4
63630+:10F7D0003626000200004021010018218FBF001CC6
63631+:10F7E0008FB200188FB100148FB00010006010218C
63632+:10F7F00003E0000827BD0020360F010095EE000C45
63633+:10F8000031CD020015A0FEE63C0900013C1880083D
63634+:10F81000971200489789002A362600023248FFFFD7
63635+:10F82000AF8800083C0380008C7101B80620FFFE01
63636+:10F83000346A0180AD4000001100008E3C0F800052
63637+:10F84000253F0012011FC82B1320008B240E00033C
63638+:10F85000346C0100958B00202402001A30E4400033
63639+:10F860003163FFFFA142000B108000A72463FFFE5D
63640+:10F870000103682B15A000A52408FFFE34A5000194
63641+:10F88000A5430014AF8500043C0480002412BFFF90
63642+:10F8900000B2802434850180A4A9000EA4A9001A16
63643+:10F8A000A4A60008A4B00026A4A700103C071000DE
63644+:10F8B000AC8701B80A00114D000018213C038000FC
63645+:10F8C00034640100949F000E3C1908008F3900D861
63646+:10F8D0002404008033E5FFFF273100013C010800CC
63647+:10F8E000AC3100D80E000FDB240600030A00114DD6
63648+:10F8F00000001821240A000210CA00598F85002830
63649+:10F900003C0308008C6300D0240E0001106E005EE2
63650+:10F910002CCF000C24D2FFFC2E5000041600002136
63651+:10F9200000002021241800021078001B2CD9000CA4
63652+:10F9300024DFFFF82FE900041520FF330000202109
63653+:10F9400030EB020051600004000621C054C00022C8
63654+:10F9500030A5FFFF000621C030A5FFFF0A00117D82
63655+:10F96000362600023C0908008D29002431300001B0
63656+:10F970005200FEF7000018219785002A3626000263
63657+:10F980000E000FDB000020210A00114D000018219D
63658+:10F990000A00119C241200021320FFE624DFFFF866
63659+:10F9A0000000202130A5FFFF0A00117D362600024D
63660+:10F9B0000A0011AC021980245120FF828CA6000499
63661+:10F9C0003C05080190A5964110A0FF7E2408000187
63662+:10F9D0000A0011F0010018210E000FDB3226000191
63663+:10F9E0008F8600108F8500280A00124F000621C064
63664+:10F9F0008F8500043C18800024120003371001801A
63665+:10FA0000A212000B0A00112E3C08800090A30001F6
63666+:10FA1000241100011071FF70240800012409000264
63667+:10FA20005069000430E60040240800010A0011F08B
63668+:10FA30000100182150C0FFFD240800013C0C80008B
63669+:10FA4000358B01009563001094A40002307FFFFF06
63670+:10FA5000509FFF62010018210A001284240800014F
63671+:10FA60002CA803EF1100FE56240300010A001239EE
63672+:10FA700000000000240E000335EA0180A14E000BB7
63673+:10FA80000A00121C3C04800011E0FFA2000621C005
63674+:10FA900030A5FFFF0A00117D362600020A0011A5DD
63675+:10FAA000241100201140FFC63C1280003650010096
63676+:10FAB000960F001094AE000231E80FFF15C8FFC08A
63677+:10FAC000000000000A0011E690B900013C060800A1
63678+:10FAD0008CC6003824C4FFFF14C00002018418241F
63679+:10FAE000000018213C0D080025AD0038006D1021E4
63680+:10FAF0000A0011B6904300048F8F0004240EFFFE0D
63681+:10FB00000A00112C01EE28242408FFFE0A00121A14
63682+:10FB100000A8282427BDFFC8AFB00010AFBF003435
63683+:10FB20003C10600CAFBE0030AFB7002CAFB6002861
63684+:10FB3000AFB50024AFB40020AFB3001CAFB20018C3
63685+:10FB4000AFB100148E0E5000240FFF7F3C068000E2
63686+:10FB500001CF682435AC380C240B0003AE0C5000E8
63687+:10FB6000ACCB00083C010800AC2000200E001819A6
63688+:10FB7000000000003C0A0010354980513C06601628
63689+:10FB8000AE09537C8CC700003C0860148D0500A0B2
63690+:10FB90003C03FFFF00E320243C02535300051FC237
63691+:10FBA0001482000634C57C000003A08002869821E0
63692+:10FBB0008E7200043C116000025128218CBF007C31
63693+:10FBC0008CA200783C1E600037C420203C05080150
63694+:10FBD00024A59288AF820018AF9F001C0E0016DD8E
63695+:10FBE0002406000A3C190001273996403C01080010
63696+:10FBF000AC3931DC0E0020DDAF8000148FD708084F
63697+:10FC00002418FFF03C15570902F8B02412D502F56C
63698+:10FC100024040001AF80002C3C1480003697018042
63699+:10FC20003C1E080127DE9644369301008E900000AA
63700+:10FC30003205000310A0FFFD3207000110E000882C
63701+:10FC4000320600028E7100283C048000AE91002034
63702+:10FC50008E6500048E66000000A0382100C040219F
63703+:10FC60008C8301B80460FFFE3C0B0010240A0800DE
63704+:10FC700000AB4824AC8A01B8552000E0240BBFFF3C
63705+:10FC80009675000E3C1208008E52002030AC4000E9
63706+:10FC900032AFFFFF264E000125ED00043C010800B5
63707+:10FCA000AC2E0020118000E8AF8D00283C18002009
63708+:10FCB00000B8B02412C000E530B980002408BFFFAE
63709+:10FCC00000A8382434C81000AF87000030E62000B8
63710+:10FCD00010C000E92409FFBF3C03000400E328240E
63711+:10FCE00010A00002010910243502004030EA010092
63712+:10FCF00011400010AF8200048F8B002C11600007B0
63713+:10FD00003C0D002000ED6024118000043C0F000435
63714+:10FD100000EF702411C00239000000009668001E38
63715+:10FD20009678001C3115FFFF0018B40002B690252C
63716+:10FD3000AF92000C30F910001320001324150001BD
63717+:10FD400030FF002017E0000A3C04100000E41024FB
63718+:10FD50001040000D3C0A0C003C090BFF00EA18247F
63719+:10FD60003525FFFF00A3302B10C0000830ED010047
63720+:10FD70003C0C08008D8C002C24150005258B0001FF
63721+:10FD80003C010800AC2B002C30ED010015A0000B4D
63722+:10FD90003C0500018F85000430AE400055C00007CF
63723+:10FDA0003C0500013C161F0100F690243C0F10009A
63724+:10FDB000124F01CE000000003C05000100E5302498
63725+:10FDC00010C000AF3C0C10003C1F08008FFF002447
63726+:10FDD00033E90002152000712403000100601021A6
63727+:10FDE000104000083C0680003C08800035180100E7
63728+:10FDF0008F0F00243C056020ACAF00140000000011
63729+:10FE00003C0680003C194000ACD9013800000000DD
63730+:10FE10005220001332060002262B0140262C0080BF
63731+:10FE2000240EFF80016E2024018E6824000D1940ED
63732+:10FE3000318A007F0004A9403172007F3C16200007
63733+:10FE400036C20002006A482502B2382500E2882541
63734+:10FE50000122F825ACDF0830ACD1083032060002B0
63735+:10FE600010C0FF723C188000370501408CA80000CC
63736+:10FE700024100040AF08002090AF000831E300706C
63737+:10FE8000107000D428790041532000082405006038
63738+:10FE9000241100201071000E3C0A40003C09800033
63739+:10FEA000AD2A01780A001304000000001465FFFB6E
63740+:10FEB0003C0A40000E001FFA000000003C0A40000F
63741+:10FEC0003C098000AD2A01780A00130400000000FC
63742+:10FED00090A90009241F00048CA70000312800FF0E
63743+:10FEE000111F01B22503FFFA2C7200061240001404
63744+:10FEF0003C0680008CA9000494A4000A310500FF90
63745+:10FF000000095E022D6A00083086FFFF15400002DE
63746+:10FF10002567000424070003240C000910AC01FA33
63747+:10FF200028AD000A11A001DE2410000A240E0008EA
63748+:10FF300010AE0028000731C000C038213C06800008
63749+:10FF40008CD501B806A0FFFE34D20180AE47000078
63750+:10FF500034CB0140916E0008240300023C0A4000AB
63751+:10FF600031C400FF00046A0001A86025A64C000807
63752+:10FF7000A243000B9562000A3C0810003C09800077
63753+:10FF8000A64200108D670004AE470024ACC801B83B
63754+:10FF9000AD2A01780A001304000000003C0A80002A
63755+:10FFA000354401009483000E3C0208008C4200D8C6
63756+:10FFB000240400803065FFFF245500013C01080047
63757+:10FFC000AC3500D80E000FDB240600030A001370C6
63758+:10FFD000000018210009320230D900FF2418000166
63759+:10FFE0001738FFD5000731C08F910020262200016D
63760+:10FFF000AF8200200A0013C800C0382100CB2024A3
63761+:020000021000EC
63762+:10000000AF85000010800008AF860004240D87FF34
63763+:1000100000CD6024158000083C0E006000AE302446
63764+:1000200010C00005000000000E000D42000000009E
63765+:100030000A001371000000000E0016050000000009
63766+:100040000A0013710000000030B980005320FF1F28
63767+:10005000AF8500003C02002000A2F82453E0FF1B03
63768+:10006000AF8500003C07FFFF34E47FFF00A4382485
63769+:100070000A00132B34C880000A001334010910242D
63770+:1000800000EC58245160005AAF8000248F8D002C62
63771+:100090003C0E0F0000EE182415A00075AF83001071
63772+:1000A00030EF010011E00073939800103C12020041
63773+:1000B000107200703C06800034D9010093280013B0
63774+:1000C0009789002A36A60002311800FF271600047F
63775+:1000D000001619C03C0480008C8501B804A0FFFE06
63776+:1000E00034880180AD0300003C158008AC830020FB
63777+:1000F00096BF004833E5FFFF10A001BCAF850008A4
63778+:100100002523001200A3102B504001B98F85000455
63779+:10011000348D010095AC0020240B001A30E440001F
63780+:10012000318AFFFFA10B000B108001BA2543FFFEAF
63781+:1001300000A3702B15C001B88F9600048F8F0004A8
63782+:10014000A503001435E50001AF8500043C088000DC
63783+:1001500035150180A6A9000EA6A9001A8F89000CEA
63784+:1001600030BF8000A6A70010AEA90028A6A60008F0
63785+:1001700013E0000F3C0F8000350C0100958B00163A
63786+:10018000316AFFFC25440004008818218C6240007D
63787+:100190003046FFFF14C000072416BFFF3C0EFFFFD0
63788+:1001A00035CD7FFF00AD2824AF8500043C0F8000D3
63789+:1001B0002416BFFF00B6902435E50180A4B20026C6
63790+:1001C000ACA7002C3C071000ADE701B80A00137083
63791+:1001D000000018210E00165D000000003C0A4000DF
63792+:1001E0003C098000AD2A01780A00130400000000D9
63793+:1001F0008F85002410A00027AF80001090A300007E
63794+:10020000106000742409000310690101000030210E
63795+:1002100090AE0001240D000211CD014230EF0040EC
63796+:1002200090A90001241F0001113F000930E20040A5
63797+:100230008CA600049785002A00C020210E000FDB49
63798+:1002400036A60002000040210A00137001001821A8
63799+:100250005040FFF88CA600043C07080190E7964147
63800+:1002600010E0FFF4240800010A00137001001821B7
63801+:10027000939800103C1F080127FF96400018C8C043
63802+:10028000033F4021AF8800248F85002414A0FFDBAA
63803+:10029000AF9800103C0480008C86400030C50100FF
63804+:1002A00010A0008732AB00043C0C08008D8C0024A9
63805+:1002B00024160004156000033192000D241600027C
63806+:1002C0003C0480008C8E4000340DFFFF11CD0113E3
63807+:1002D00032B5FFFB8C984000330F010055E0000160
63808+:1002E0002415001030E80800110000382409FFFB35
63809+:1002F0008F9F00282FF903EF53200001024990241B
63810+:1003000030E2010010400014325F00018F87002CA2
63811+:1003100014E0010E8F8C000C3C0480003486010038
63812+:1003200090C5001330AA00FF25430004000321C03C
63813+:100330002419FFFE025990241240000202B6302513
63814+:1003400032A6FFFF0E000FDB9785002A1240FEA3A6
63815+:1003500000001821325F000113E0000D3247000455
63816+:10036000240900011249000202B6302532A6FFFF1F
63817+:100370009785002A0E000FDB000020212402FFFEDB
63818+:10038000024290241240FE950000182132470004DA
63819+:1003900050E0FE922403000102B63025241600042A
63820+:1003A0005656000132A6FFFF9785002A0E000FDB8C
63821+:1003B000240401002403FFFB0243A82412A0FE87AB
63822+:1003C000000018210A001370240300010A0014B968
63823+:1003D0000249902410A0FFAF30E5010010A00017E3
63824+:1003E0008F8600102403000210C300148F84000CB9
63825+:1003F0003C0608008CC6003824CAFFFF14C0000267
63826+:10040000008A1024000010213C0E080025CE003880
63827+:10041000004E682191AC00048F850028258B0004D4
63828+:10042000000B21C030A5FFFF36A600020E000FDB37
63829+:10043000000000000A00137000001821240F0002C1
63830+:1004400010CF0088241600013C0308008C6300D004
63831+:100450001076008D8F85002824D9FFFC2F280004FA
63832+:100460001500006300002021241F0002107F005DA2
63833+:100470002CC9000C24C3FFF82C6200041440FFE9CF
63834+:100480000000202130EA020051400004000621C093
63835+:1004900054C0000530A5FFFF000621C030A5FFFFB6
63836+:1004A0000A00150436A600020E000FDB32A600017A
63837+:1004B0008F8600108F8500280A001520000621C0B5
63838+:1004C0003C0A08008D4A0024315200015240FE438C
63839+:1004D000000018219785002A36A600020E000FDBC7
63840+:1004E000000020210A001370000018219668000CFB
63841+:1004F000311802005700FE313C0500013C1F800806
63842+:1005000097F900489789002A36A600023328FFFF92
63843+:10051000AF8800083C0380008C7501B806A0FFFE80
63844+:100520003C04800034820180AC400000110000B621
63845+:1005300024180003252A0012010A182B106000B2AB
63846+:1005400000000000966F00203C0E8000240D001A71
63847+:1005500031ECFFFF35CA018030EB4000A14D000BAC
63848+:10056000116000B02583FFFE0103902B164000AE02
63849+:100570002416FFFE34A50001A5430014AF85000436
63850+:100580002419BFFF00B94024A6E9000EA6E9001A0D
63851+:10059000A6E60008A6E80026A6E700103C07100023
63852+:1005A000AE8701B80A001370000018213C048000D7
63853+:1005B0008C8201B80440FFFE349601802415001C93
63854+:1005C000AEC70000A2D5000B3C071000AC8701B8F5
63855+:1005D0003C0A40003C098000AD2A01780A0013045F
63856+:1005E000000000005120FFA424C3FFF800002021D8
63857+:1005F00030A5FFFF0A00150436A600020E00103DCC
63858+:10060000000000008F8700000A001346AF82000C34
63859+:1006100090A30001241500011075FF0B24080001B0
63860+:10062000240600021066000430E2004024080001A5
63861+:100630000A001370010018215040FFFD240800013A
63862+:100640003C0C8000358B0100956A001094A40002D8
63863+:100650003143FFFF5083FDE1010018210A00158599
63864+:10066000240800018F8500282CB203EF1240FDDB27
63865+:10067000240300013C0308008C6300D02416000111
63866+:100680001476FF7624D9FFFC2CD8000C1300FF72DF
63867+:10069000000621C030A5FFFF0A00150436A600029F
63868+:1006A00010B00037240F000B14AFFE23000731C039
63869+:1006B000312600FF00065600000A4E0305220047BF
63870+:1006C00030C6007F0006F8C03C16080126D69640CA
63871+:1006D00003F68021A2000001A20000003C0F600090
63872+:1006E0008DF918202405000100C588040011302769
63873+:1006F0000326C024000731C000C03821ADF81820FF
63874+:100700000A0013C8A60000028F850020000731C030
63875+:1007100024A2FFFF0A0013F6AF8200200A0014B2E1
63876+:100720002415002011E0FECC3C1980003728010080
63877+:100730009518001094B6000233120FFF16D2FEC6B1
63878+:10074000000000000A00148290A900013C0B080080
63879+:100750008D6B0038256DFFFF15600002018D1024A0
63880+:10076000000010213C080800250800380048C0217E
63881+:10077000930F000425EE00040A0014C5000E21C0EA
63882+:1007800000065202241F00FF115FFDEB000731C07D
63883+:10079000000A20C03C0E080125CE9640008EA821FC
63884+:1007A000009E602100095C02240D00013C076000EE
63885+:1007B000A2AD0000AD860000A2AB00018CF21820B3
63886+:1007C00024030001014310040242B025ACF61820B6
63887+:1007D00000C038210A0013C8A6A900020A0015AA01
63888+:1007E000AF8000200A0012FFAF84002C8F85000428
63889+:1007F0003C1980002408000337380180A308000B4F
63890+:100800000A00144D3C088000A2F8000B0A00155A9B
63891+:100810002419BFFF8F9600042412FFFE0A00144B18
63892+:1008200002D228242416FFFE0A00155800B62824F8
63893+:100830003C038000346401008C85000030A2003E3F
63894+:100840001440000800000000AC6000488C870000E5
63895+:1008500030E607C010C0000500000000AC60004C8E
63896+:10086000AC60005003E0000824020001AC600054BA
63897+:10087000AC6000408C880000310438001080FFF923
63898+:10088000000000002402000103E00008AC60004406
63899+:100890003C0380008C6201B80440FFFE3467018095
63900+:1008A000ACE4000024080001ACE00004A4E500086A
63901+:1008B00024050002A0E8000A34640140A0E5000B12
63902+:1008C0009483000A14C00008A4E30010ACE00024E4
63903+:1008D0003C07800034E901803C041000AD20002872
63904+:1008E00003E00008ACE401B88C8600043C0410006E
63905+:1008F000ACE600243C07800034E90180AD200028EC
63906+:1009000003E00008ACE401B83C0680008CC201B8EA
63907+:100910000440FFFE34C7018024090002ACE400005B
63908+:10092000ACE40004A4E50008A0E9000A34C50140D5
63909+:10093000A0E9000B94A8000A3C041000A4E80010F1
63910+:10094000ACE000248CA30004ACE3002803E0000822
63911+:10095000ACC401B83C039000346200010082202541
63912+:100960003C038000AC6400208C65002004A0FFFEE6
63913+:100970000000000003E00008000000003C028000CE
63914+:10098000344300010083202503E00008AC4400202C
63915+:1009900027BDFFE03C098000AFBF0018AFB10014D5
63916+:1009A000AFB00010352801408D10000091040009FF
63917+:1009B0009107000891050008308400FF30E600FF31
63918+:1009C00000061A002C820081008330251040002A86
63919+:1009D00030A50080000460803C0D080125AD92B078
63920+:1009E000018D58218D6A00000140000800000000C0
63921+:1009F0003C038000346201409445000A14A0001EAC
63922+:100A00008F91FCC09227000530E6000414C0001A44
63923+:100A1000000000000E00164E02002021922A000560
63924+:100A200002002021354900040E001658A2290005B5
63925+:100A30009228000531040004148000020000000028
63926+:100A40000000000D922D0000240B002031AC00FFAF
63927+:100A5000158B00093C0580008CAE01B805C0FFFE77
63928+:100A600034B10180AE3000003C0F100024100005AE
63929+:100A7000A230000BACAF01B80000000D8FBF001812
63930+:100A80008FB100148FB0001003E0000827BD0020D4
63931+:100A90000200202100C028218FBF00188FB1001450
63932+:100AA0008FB00010240600010A00161D27BD00208B
63933+:100AB0000000000D0200202100C028218FBF001877
63934+:100AC0008FB100148FB00010000030210A00161DF5
63935+:100AD00027BD002014A0FFE8000000000200202134
63936+:100AE0008FBF00188FB100148FB0001000C02821F4
63937+:100AF0000A00163B27BD00203C0780008CEE01B8A1
63938+:100B000005C0FFFE34F00180241F0002A21F000B6D
63939+:100B100034F80140A60600089719000A3C0F10009F
63940+:100B2000A61900108F110004A6110012ACEF01B835
63941+:100B30000A0016998FBF001827BDFFE8AFBF00104D
63942+:100B40000E000FD4000000003C0280008FBF001098
63943+:100B500000002021AC4001800A00108F27BD001842
63944+:100B60003084FFFF30A5FFFF108000070000182130
63945+:100B7000308200011040000200042042006518216C
63946+:100B80001480FFFB0005284003E0000800601021EE
63947+:100B900010C00007000000008CA2000024C6FFFF68
63948+:100BA00024A50004AC82000014C0FFFB24840004D0
63949+:100BB00003E000080000000010A0000824A3FFFFCD
63950+:100BC000AC86000000000000000000002402FFFFCF
63951+:100BD0002463FFFF1462FFFA2484000403E000088A
63952+:100BE000000000003C03800027BDFFF83462018054
63953+:100BF000AFA20000308C00FF30AD00FF30CE00FF10
63954+:100C00003C0B80008D6401B80480FFFE00000000F2
63955+:100C10008FA900008D6801288FAA00008FA700000F
63956+:100C20008FA400002405000124020002A085000A10
63957+:100C30008FA30000359940003C051000A062000B16
63958+:100C40008FB800008FAC00008FA600008FAF0000AF
63959+:100C500027BD0008AD280000AD400004AD80002491
63960+:100C6000ACC00028A4F90008A70D0010A5EE0012E2
63961+:100C700003E00008AD6501B83C06800827BDFFE829
63962+:100C800034C50080AFBF001090A7000924020012F5
63963+:100C900030E300FF1062000B008030218CA8005070
63964+:100CA00000882023048000088FBF00108CAA003425
63965+:100CB000240400390000282100CA4823052000052B
63966+:100CC000240600128FBF00102402000103E0000878
63967+:100CD00027BD00180E0016F2000000008FBF0010A4
63968+:100CE0002402000103E0000827BD001827BDFFC84B
63969+:100CF000AFB20030AFB00028AFBF0034AFB1002CAE
63970+:100D000000A0802190A5000D30A6001010C000109A
63971+:100D1000008090213C0280088C4400048E0300086F
63972+:100D20001064000C30A7000530A6000510C0009329
63973+:100D3000240400018FBF00348FB200308FB1002C2B
63974+:100D40008FB000280080102103E0000827BD003884
63975+:100D500030A7000510E0000F30AB001210C00006F5
63976+:100D6000240400013C0980088E0800088D25000439
63977+:100D70005105009C240400388FBF00348FB200302E
63978+:100D80008FB1002C8FB000280080102103E00008F4
63979+:100D900027BD0038240A0012156AFFE6240400016A
63980+:100DA0000200202127A500100E000CB6AFA00010F5
63981+:100DB0001440007C3C19800837240080909800087B
63982+:100DC000331100081220000A8FA7001030FF010025
63983+:100DD00013E000A48FA300148C8600580066102333
63984+:100DE000044000043C0A8008AC8300588FA7001020
63985+:100DF0003C0A800835480080910900083124000829
63986+:100E00001480000224080003000040213C1F8008D9
63987+:100E100093F1001193F9001237E600808CCC005456
63988+:100E2000333800FF03087821322D00FF000F708057
63989+:100E300001AE282100AC582B1160006F00000000AB
63990+:100E400094CA005C8CC900543144FFFF0125102373
63991+:100E50000082182B14600068000000008CCB005446
63992+:100E60000165182330EC00041180006C000830800C
63993+:100E70008FA8001C0068102B1040006230ED0004A9
63994+:100E8000006610232C46008010C00002004088211C
63995+:100E9000241100800E00164E024020213C0D8008D7
63996+:100EA00035A6008024070001ACC7000C90C80008DC
63997+:100EB0000011484035A70100310C007FA0CC00088C
63998+:100EC0008E05000424AB0001ACCB0030A4D1005C43
63999+:100ED0008CCA003C9602000E01422021ACC40020C6
64000+:100EE0008CC3003C0069F821ACDF001C8E190004A3
64001+:100EF000ACF900008E180008ACF800048FB10010A7
64002+:100F0000322F000855E0004793A60020A0C0004EF5
64003+:100F100090D8004E2411FFDFA0F8000890CF000801
64004+:100F200001F17024A0CE00088E0500083C0B80085B
64005+:100F300035690080AD2500388D6A00148D2200309F
64006+:100F40002419005001422021AD24003491230000D7
64007+:100F5000307F00FF13F90036264F01000E001658AF
64008+:100F60000240202124040038000028210E0016F23F
64009+:100F70002406000A0A001757240400010E000D2859
64010+:100F8000000020218FBF00348FB200308FB1002CC1
64011+:100F90008FB00028004020210080102103E00008CD
64012+:100FA00027BD00388E0E00083C0F800835F0008009
64013+:100FB000AE0E005402402021AE0000300E00164E4E
64014+:100FC00000000000920D00250240202135AC0020D9
64015+:100FD0000E001658A20C00250E000CAC0240202179
64016+:100FE000240400382405008D0E0016F22406001299
64017+:100FF0000A0017572404000194C5005C0A001792E8
64018+:1010000030A3FFFF2407021811A0FF9E00E6102363
64019+:101010008FAE001C0A00179A01C610230A0017970A
64020+:101020002C620218A0E600080A0017C48E0500080A
64021+:101030002406FF8001E6C0243C118000AE38002861
64022+:101040008E0D000831E7007F3C0E800C00EE602121
64023+:10105000AD8D00E08E080008AF8C00380A0017D074
64024+:10106000AD8800E4AC800058908500082403FFF7A9
64025+:1010700000A33824A08700080A0017758FA7001066
64026+:101080003C05080024A560A83C04080024846FF4F3
64027+:101090003C020800244260B0240300063C01080121
64028+:1010A000AC2596C03C010801AC2496C43C01080163
64029+:1010B000AC2296C83C010801A02396CC03E00008AE
64030+:1010C0000000000003E00008240200013C02800050
64031+:1010D000308800FF344701803C0680008CC301B893
64032+:1010E0000460FFFE000000008CC501282418FF806A
64033+:1010F0003C0D800A24AF010001F8702431EC007F20
64034+:10110000ACCE0024018D2021ACE50000948B00EAD8
64035+:101110003509600024080002316AFFFFACEA0004D0
64036+:1011200024020001A4E90008A0E8000BACE00024C0
64037+:101130003C071000ACC701B8AF84003803E00008DA
64038+:10114000AF85006C938800488F8900608F820038DB
64039+:1011500030C600FF0109382330E900FF01221821C1
64040+:1011600030A500FF2468008810C000020124382147
64041+:101170000080382130E400031480000330AA00030B
64042+:101180001140000D312B000310A0000900001021B8
64043+:1011900090ED0000244E000131C200FF0045602B9D
64044+:1011A000A10D000024E700011580FFF925080001CA
64045+:1011B00003E00008000000001560FFF300000000DD
64046+:1011C00010A0FFFB000010218CF80000245900043F
64047+:1011D000332200FF0045782BAD18000024E70004FF
64048+:1011E00015E0FFF92508000403E0000800000000F6
64049+:1011F00093850048938800588F8700600004320070
64050+:101200003103007F00E5102B30C47F001040000F39
64051+:10121000006428258F8400383C0980008C8A00EC0B
64052+:10122000AD2A00A43C03800000A35825AC6B00A0AD
64053+:101230008C6C00A00580FFFE000000008C6D00ACEF
64054+:10124000AC8D00EC03E000088C6200A80A00188254
64055+:101250008F840038938800593C0280000080502120
64056+:10126000310300FEA383005930ABFFFF30CC00FFF9
64057+:1012700030E7FFFF344801803C0980008D2401B82D
64058+:101280000480FFFE8F8D006C24180016AD0D000049
64059+:101290008D2201248F8D0038AD0200048D5900206D
64060+:1012A000A5070008240201C4A119000AA118000B17
64061+:1012B000952F01208D4E00088D4700049783005C18
64062+:1012C0008D59002401CF302100C7282100A32023FD
64063+:1012D0002418FFFFA504000CA50B000EA5020010AA
64064+:1012E000A50C0012AD190018AD18002495AF00E848
64065+:1012F0003C0B10002407FFF731EEFFFFAD0E002876
64066+:101300008DAC0084AD0C002CAD2B01B88D460020B7
64067+:1013100000C7282403E00008AD4500208F8800386E
64068+:101320000080582130E7FFFF910900D63C02800081
64069+:1013300030A5FFFF312400FF00041A00006750258C
64070+:1013400030C600FF344701803C0980008D2C01B875
64071+:101350000580FFFE8F82006C240F0017ACE20000B6
64072+:101360008D390124ACF900048D780020A4EA00082E
64073+:10137000241901C4A0F8000AA0EF000B9523012056
64074+:101380008D6E00088D6D00049784005C01C35021B0
64075+:10139000014D602101841023A4E2000CA4E5000E9D
64076+:1013A000A4F90010A4E60012ACE000148D7800242B
64077+:1013B000240DFFFFACF800188D0F007CACEF001C73
64078+:1013C0008D0E00783C0F1000ACEE0020ACED002438
64079+:1013D000950A00BE240DFFF73146FFFFACE600285A
64080+:1013E000950C00809504008231837FFF0003CA00C2
64081+:1013F0003082FFFF0322C021ACF8002CAD2F01B8D2
64082+:10140000950E00828D6A002000AE3021014D282407
64083+:10141000A506008203E00008AD6500203C028000C4
64084+:10142000344501803C0480008C8301B80460FFFED9
64085+:101430008F8A0044240600199549001C3128FFFFBB
64086+:10144000000839C0ACA70000A0A6000B3C051000A6
64087+:1014500003E00008AC8501B88F87004C0080402174
64088+:1014600030C400FF3C0680008CC201B80440FFFE7F
64089+:101470008F89006C9383006834996000ACA90000E8
64090+:10148000A0A300058CE20010240F00022403FFF744
64091+:10149000A4A20006A4B900088D180020A0B8000A74
64092+:1014A000A0AF000B8CEE0000ACAE00108CED000481
64093+:1014B000ACAD00148CEC001CACAC00248CEB002018
64094+:1014C000ACAB00288CEA002C3C071000ACAA002C26
64095+:1014D0008D090024ACA90018ACC701B88D05002007
64096+:1014E00000A3202403E00008AD0400208F8600380C
64097+:1014F00027BDFFE0AFB10014AFBF0018AFB00010C0
64098+:1015000090C300D430A500FF3062002010400008D6
64099+:10151000008088218CCB00D02409FFDF256A0001E0
64100+:10152000ACCA00D090C800D401093824A0C700D4A8
64101+:1015300014A000403C0C80008F840038908700D4B9
64102+:101540002418FFBF2406FFEF30E3007FA08300D400
64103+:10155000979F005C8F8200608F8D003803E2C82364
64104+:10156000A799005CA5A000BC91AF00D401F870243D
64105+:10157000A1AE00D48F8C0038A18000D78F8A0038AC
64106+:10158000A5400082AD4000EC914500D400A658244F
64107+:10159000A14B00D48F9000348F8400609786005C4C
64108+:1015A0000204282110C0000FAF850034A38000582A
64109+:1015B0003C0780008E2C000894ED01208E2B000447
64110+:1015C000018D5021014B8021020620233086FFFF30
64111+:1015D00030C8000F3909000131310001162000091F
64112+:1015E000A3880058938600488FBF00188FB100145D
64113+:1015F0008FB0001027BD0020AF85006403E0000815
64114+:10160000AF86006000C870238FBF00189386004823
64115+:101610008FB100148FB0001034EF0C00010F28219F
64116+:1016200027BD0020ACEE0084AF85006403E0000815
64117+:10163000AF86006035900180020028210E00190F4E
64118+:10164000240600828F840038908600D430C5004084
64119+:1016500050A0FFBAA38000688F85004C3C06800034
64120+:101660008CCD01B805A0FFFE8F89006C2408608234
64121+:1016700024070002AE090000A6080008A207000B1C
64122+:101680008CA300083C0E1000AE0300108CA2000CCE
64123+:10169000AE0200148CBF0014AE1F00188CB90018E5
64124+:1016A000AE1900248CB80024AE1800288CAF002896
64125+:1016B000AE0F002CACCE01B80A001948A380006818
64126+:1016C0008F8A003827BDFFE0AFB10014AFB0001023
64127+:1016D0008F880060AFBF00189389003C954200BC22
64128+:1016E00030D100FF0109182B0080802130AC00FFB1
64129+:1016F0003047FFFF0000582114600003310600FF4F
64130+:1017000001203021010958239783005C0068202BB9
64131+:101710001480002700000000106800562419000102
64132+:101720001199006334E708803165FFFF0E0018C08F
64133+:10173000020020218F83006C3C07800034E601808A
64134+:101740003C0580008CAB01B80560FFFE240A001840
64135+:101750008F840038ACC30000A0CA000B948900BE7F
64136+:101760003C081000A4C90010ACC00030ACA801B8FF
64137+:101770009482008024430001A4830080949F008011
64138+:101780003C0608008CC6318833EC7FFF1186005E72
64139+:101790000000000002002021022028218FBF001835
64140+:1017A0008FB100148FB000100A00193427BD00203B
64141+:1017B000914400D42403FF8000838825A15100D4E4
64142+:1017C0009784005C3088FFFF51000023938C003C1D
64143+:1017D0008F8500382402EFFF008B782394AE00BC85
64144+:1017E0000168502B31E900FF01C26824A4AD00BCA0
64145+:1017F00051400039010058213C1F800037E60100AC
64146+:101800008CD800043C190001031940245500000144
64147+:1018100034E740008E0A00202403FFFB241100015E
64148+:1018200001432024AE0400201191002D34E78000F4
64149+:1018300002002021012030210E0018C03165FFFF79
64150+:101840009787005C8F890060A780005C0127802358
64151+:10185000AF900060938C003C8F8B00388FBF0018D6
64152+:101860008FB100148FB0001027BD002003E00008E6
64153+:10187000A16C00D73C0D800035AA01008D48000402
64154+:101880003C0900010109282454A0000134E740006C
64155+:101890008E0F00202418FFFB34E7800001F870242D
64156+:1018A00024190001AE0E00201599FF9F34E708802F
64157+:1018B000020020210E00188E3165FFFF020020215A
64158+:1018C000022028218FBF00188FB100148FB00010A4
64159+:1018D0000A00193427BD00200A0019F7000048212A
64160+:1018E00002002021012030210E00188E3165FFFFFB
64161+:1018F0009787005C8F890060A780005C01278023A8
64162+:101900000A001A0EAF900060948C0080241F8000A3
64163+:10191000019F3024A4860080908B0080908F0080EF
64164+:10192000316700FF0007C9C20019C027001871C045
64165+:1019300031ED007F01AE2825A08500800A0019DF67
64166+:1019400002002021938500682403000127BDFFE8E1
64167+:1019500000A330042CA20020AFB00010AFBF0014D1
64168+:1019600000C01821104000132410FFFE3C0708009F
64169+:101970008CE7319000E610243C088000350501809A
64170+:1019800014400005240600848F890038240A0004CE
64171+:101990002410FFFFA12A00FC0E00190F0000000018
64172+:1019A000020010218FBF00148FB0001003E0000868
64173+:1019B00027BD00183C0608008CC631940A001A574F
64174+:1019C00000C310248F87004427BDFFE0AFB200188A
64175+:1019D000AFB10014AFB00010AFBF001C30D000FF9B
64176+:1019E00090E6000D00A088210080902130C5007F86
64177+:1019F000A0E5000D8F8500388E2300188CA200D042
64178+:101A00001062002E240A000E0E001A4AA38A0068F3
64179+:101A10002409FFFF104900222404FFFF5200002088
64180+:101A2000000020218E2600003C0C001000CC582421
64181+:101A3000156000393C0E000800CE682455A0003F18
64182+:101A4000024020213C18000200D880241200001F10
64183+:101A50003C0A00048F8700448CE200148CE30010E1
64184+:101A60008CE500140043F82303E5C82B1320000580
64185+:101A7000024020218E24002C8CF1001010910031A6
64186+:101A80000240202124020012A38200680E001A4A9C
64187+:101A90002412FFFF105200022404FFFF0000202147
64188+:101AA0008FBF001C8FB200188FB100148FB00010D0
64189+:101AB0000080102103E0000827BD002090A800D47A
64190+:101AC000350400200A001A80A0A400D400CA4824CB
64191+:101AD0001520000B8F8B00448F8D00448DAC0010BF
64192+:101AE0001580000B024020218E2E002C51C0FFECEF
64193+:101AF00000002021024020210A001A9B2402001726
64194+:101B00008D66001050C0FFE6000020210240202119
64195+:101B10000A001A9B24020011024020212402001511
64196+:101B20000E001A4AA3820068240FFFFF104FFFDC4B
64197+:101B30002404FFFF0A001A8A8E2600000A001AC138
64198+:101B4000240200143C08000400C8382450E0FFD4EC
64199+:101B500000002021024020210A001A9B24020013C9
64200+:101B60008F85003827BDFFD8AFB3001CAFB2001877
64201+:101B7000AFB10014AFB00010AFBF002090A700D4E9
64202+:101B80008F90004C2412FFFF34E2004092060000C8
64203+:101B9000A0A200D48E0300100080982110720006CD
64204+:101BA00030D1003F2408000D0E001A4AA3880068B7
64205+:101BB000105200252404FFFF8F8A00388E09001878
64206+:101BC0008D4400D01124000702602021240C000E57
64207+:101BD0000E001A4AA38C0068240BFFFF104B001A5A
64208+:101BE0002404FFFF24040020122400048F8D0038F9
64209+:101BF00091AF00D435EE0020A1AE00D48F85005403
64210+:101C000010A00019000000001224004A8F9800382C
64211+:101C10008F92FCC0971000809651000A5230004805
64212+:101C20008F9300403C1F08008FFF318C03E5C82BC9
64213+:101C30001720001E02602021000028210E0019A993
64214+:101C400024060001000020218FBF00208FB3001C5C
64215+:101C50008FB200188FB100148FB0001000801021D7
64216+:101C600003E0000827BD00285224002A8E05001436
64217+:101C70008F840038948A008025490001A48900805F
64218+:101C8000948800803C0208008C42318831077FFF35
64219+:101C900010E2000E00000000026020210E00193446
64220+:101CA000240500010A001B0B000020212402002D46
64221+:101CB0000E001A4AA38200682403FFFF1443FFE1C9
64222+:101CC0002404FFFF0A001B0C8FBF002094990080A2
64223+:101CD000241F800024050001033FC024A498008035
64224+:101CE00090920080908E0080325100FF001181C2DE
64225+:101CF00000107827000F69C031CC007F018D582576
64226+:101D0000A08B00800E001934026020210A001B0BFA
64227+:101D1000000020212406FFFF54A6FFD68F84003840
64228+:101D2000026020210E001934240500010A001B0B5B
64229+:101D300000002021026020210A001B252402000A45
64230+:101D40002404FFFD0A001B0BAF9300608F8800384E
64231+:101D500027BDFFE8AFB00010AFBF0014910A00D458
64232+:101D60008F87004C00808021354900408CE60010B0
64233+:101D7000A10900D43C0208008C4231B030C53FFFBD
64234+:101D800000A2182B106000078F850050240DFF80E3
64235+:101D900090AE000D01AE6024318B00FF156000088D
64236+:101DA0000006C382020020212403000D8FBF00140F
64237+:101DB0008FB0001027BD00180A001A4AA3830068DC
64238+:101DC00033060003240F000254CFFFF70200202146
64239+:101DD00094A2001C8F85003824190023A4A200E8D7
64240+:101DE0008CE8000000081E02307F003F13F9003528
64241+:101DF0003C0A00838CE800188CA600D0110600086D
64242+:101E0000000000002405000E0E001A4AA385006899
64243+:101E10002407FFFF104700182404FFFF8F850038B8
64244+:101E200090A900D435240020A0A400D48F8C0044B5
64245+:101E3000918E000D31CD007FA18D000D8F83005458
64246+:101E40001060001C020020218F8400508C9800102C
64247+:101E50000303782B11E0000D241900180200202143
64248+:101E6000A39900680E001A4A2410FFFF10500002C8
64249+:101E70002404FFFF000020218FBF00148FB000104A
64250+:101E80000080102103E0000827BD00188C86001098
64251+:101E90008F9F00440200202100C31023AFE20010F6
64252+:101EA000240500010E0019A9240600010A001B9751
64253+:101EB000000020210E001934240500010A001B97A0
64254+:101EC00000002021010A5824156AFFD98F8C004494
64255+:101ED000A0A600FC0A001B84A386005A30A500FFC0
64256+:101EE0002406000124A9000100C9102B1040000C99
64257+:101EF00000004021240A000100A61823308B0001B5
64258+:101F000024C60001006A3804000420421160000267
64259+:101F100000C9182B010740251460FFF800A61823FC
64260+:101F200003E000080100102127BDFFD8AFB0001862
64261+:101F30008F90004CAFB1001CAFBF00202403FFFF07
64262+:101F40002411002FAFA30010920600002405000802
64263+:101F500026100001006620260E001BB0308400FF12
64264+:101F600000021E003C021EDC34466F410A001BD8F2
64265+:101F70000000102110A00009008018212445000154
64266+:101F800030A2FFFF2C4500080461FFFA0003204047
64267+:101F90000086202614A0FFF9008018210E001BB037
64268+:101FA000240500208FA300102629FFFF313100FFF8
64269+:101FB00000034202240700FF1627FFE20102182651
64270+:101FC00000035027AFAA0014AFAA00100000302170
64271+:101FD00027A8001027A7001400E6782391ED00033E
64272+:101FE00024CE000100C8602131C600FF2CCB0004C4
64273+:101FF0001560FFF9A18D00008FA200108FBF002097
64274+:102000008FB1001C8FB0001803E0000827BD002826
64275+:1020100027BDFFD0AFB3001CAFB00010AFBF00288A
64276+:10202000AFB50024AFB40020AFB20018AFB10014B8
64277+:102030003C0C80008D880128240FFF803C06800A1C
64278+:1020400025100100250B0080020F68243205007F57
64279+:10205000016F7024AD8E009000A62821AD8D002464
64280+:1020600090A600FC3169007F3C0A8004012A1821F7
64281+:10207000A386005A9067007C00809821AF830030CF
64282+:1020800030E20002AF88006CAF85003800A0182154
64283+:10209000144000022404003424040030A3840048C7
64284+:1020A0008C7200DC30D100FF24040004AF92006089
64285+:1020B00012240004A38000688E7400041680001EA1
64286+:1020C0003C0880009386005930C7000110E0000FE3
64287+:1020D0008F9300608CB000848CA800842404FF805F
64288+:1020E000020410240002F940310A007F03EA482567
64289+:1020F0003C0C2000012C902530CD00FE3C038000DC
64290+:10210000AC720830A38D00598F9300608FBF0028F8
64291+:102110008FB50024ACB300DC8FB400208FB3001C5B
64292+:102120008FB200188FB100148FB00010240200018C
64293+:1021300003E0000827BD00308E7F000895020120D3
64294+:102140008E67001003E2C8213326FFFF30D8000F4E
64295+:1021500033150001AF87003416A00058A39800582B
64296+:1021600035090C000309382100D81823AD03008479
64297+:10217000AF8700648E6A00043148FFFF1100007EC3
64298+:10218000A78A005C90AC00D42407FF8000EC3024C8
64299+:1021900030CB00FF1560004B9786005C938E005A91
64300+:1021A000240D000230D5FFFF11CD02A20000A021B6
64301+:1021B0008F85006002A5802B160000BC9388004824
64302+:1021C0003C11800096240120310400FF1485008812
64303+:1021D0008F8400648F9800343312000356400085CA
64304+:1021E00030A500FF8F900064310C00FF24060034FE
64305+:1021F00011860095AF90004C9204000414800118E1
64306+:102200008F8E0038A380003C8E0D00048DC800D84E
64307+:102210003C0600FF34CCFFFF01AC30240106182B34
64308+:1022200014600120AF8600548F8700609798005C8F
64309+:10223000AF8700400307402310C000C7A788005C99
64310+:102240008F91003030C3000300035823922A007C92
64311+:102250003171000302261021000A20823092000111
64312+:102260000012488000492821311FFFFF03E5C82BD9
64313+:10227000132001208F8800388F8500348F880064F8
64314+:102280001105025A3C0E3F018E0600003C0C250051
64315+:1022900000CE682411AC01638F84004C30E500FF50
64316+:1022A0000E00184A000030218F8800388F870060A8
64317+:1022B0008F8500340A001DB78F8600540A001C5613
64318+:1022C000AF87006490A400D400E48024320200FFB1
64319+:1022D000104000169386005990A6008890AE00D753
64320+:1022E00024A8008830D4003F2686FFE02CD10020AF
64321+:1022F000A38E003C1220000CAF88004C240B000180
64322+:1023000000CB20043095001916A0012B3C0680005C
64323+:1023100034CF0002008FC0241700022E3099002015
64324+:1023200017200234000000009386005930CB0001D2
64325+:102330001160000F9788005C8CBF00848CA900841A
64326+:10234000240AFF8003EA6024000C19403132007F28
64327+:10235000007238253C0D200000EDC82530D800FE65
64328+:102360003C0F8000ADF90830A39800599788005CB5
64329+:102370001500FF84000000008E630020306200041E
64330+:102380001040FF51938600592404FFFB0064802411
64331+:102390003C038000AE700020346601808C7301B86D
64332+:1023A0000660FFFE8F98006C347501003C1400013C
64333+:1023B000ACD800008C6B012424076085ACCB0004F2
64334+:1023C0008EAE000401D488245220000124076083CB
64335+:1023D00024190002A4C700083C0F1000A0D9000B6C
64336+:1023E0003C068000ACCF01B80A001C2B9386005934
64337+:1023F00030A500FF0E00184A240600018F88006CEB
64338+:102400003C05800034A90900250201889388004812
64339+:10241000304A0007304B00783C0340802407FF809F
64340+:102420000163C825014980210047F824310C00FFD1
64341+:1024300024060034ACBF0800AF90004CACB90810C3
64342+:102440005586FF6E920400048F8400388E11003090
64343+:10245000908E00D431CD001015A000108F83006045
64344+:102460002C6F000515E000E400000000909800D4F7
64345+:102470002465FFFC331200101640000830A400FF52
64346+:102480008F9F00648F99003413F90004388700018E
64347+:1024900030E20001144001C8000000000E001BC320
64348+:1024A000000000000A001DF8000000008F84006496
64349+:1024B00030C500FF0E00184A24060001939800481A
64350+:1024C000240B0034130B00A08F8500388F8600602A
64351+:1024D0009783005C306EFFFF00CE8823AF910060D1
64352+:1024E000A780005C1280FF90028018212414FFFD59
64353+:1024F0005474FFA28E6300208E6A00042403FFBF81
64354+:102500002408FFEF0155F823AE7F000490AC00D4FF
64355+:102510003189007FA0A900D48E7200208F8F0038EF
64356+:10252000A780005C364D0002AE6D0020A5E000BC27
64357+:1025300091E500D400A3C824A1F900D48F950038F8
64358+:10254000AEA000EC92B800D403085824A2AB00D48B
64359+:102550000A001CD78F8500388F910034AF8000604F
64360+:1025600002275821AF8B0034000020212403FFFFF5
64361+:10257000108301B48F8500388E0C00103C0D0800CC
64362+:102580008DAD31B09208000031843FFF008D802B6B
64363+:1025900012000023310D003F3C1908008F3931A88B
64364+:1025A0008F9F006C000479802408FF80033F202166
64365+:1025B000008FC821938500590328F8243C06008029
64366+:1025C0003C0F800034D80001001F91403331007F60
64367+:1025D0008F8600380251502535EE0940332B0078A4
64368+:1025E000333000073C0310003C02800C017890253A
64369+:1025F000020E48210143C0250222382134AE0001D9
64370+:10260000ADFF0804AF890050ADF20814AF87004455
64371+:10261000ADFF0028ACD90084ADF80830A38E005976
64372+:102620009383005A24070003106700272407000142
64373+:102630001467FFAC8F8500382411002311B1008589
64374+:1026400000000000240E000B026020210E001A4A38
64375+:10265000A38E00680040A0210A001D328F8500383B
64376+:1026600002602021240B000C0E001A4AA38B006884
64377+:10267000240AFFFF104AFFBD2404FFFF8F8E00389D
64378+:10268000A380003C8E0D00048DC800D83C0600FFDE
64379+:1026900034CCFFFF01AC30240106182B1060FEE2A1
64380+:1026A000AF86005402602021241200190E001A4A3D
64381+:1026B000A3920068240FFFFF104FFFAC2404FFFF1C
64382+:1026C0000A001C838F86005425A3FFE02C74002091
64383+:1026D0001280FFDD240E000B000328803C1108014E
64384+:1026E000263194B400B148218D2D000001A00008CE
64385+:1026F000000000008F85003400A710219385003C66
64386+:10270000AF82003402251821A383003C951F00BC32
64387+:102710000226282137F91000A51900BC5240FF926B
64388+:10272000AF850060246A0004A38A003C950900BCC0
64389+:1027300024A40004AF84006035322000A51200BC40
64390+:102740000A001D54000020218F8600602CC800055F
64391+:102750001500FF609783005C3065FFFF00C5C8234C
64392+:102760002F2F000511E00003306400FF24CDFFFC93
64393+:1027700031A400FF8F8900648F920034113200046D
64394+:10278000389F000133EC0001158001380000000083
64395+:102790008F840038908700D434E60010A08600D4DF
64396+:1027A0008F8500388F8600609783005CACA000ECBA
64397+:1027B0000A001D2F306EFFFF8CB500848CB400849E
64398+:1027C0003C04100002A7302400068940328E007FAE
64399+:1027D000022E8025020410253C08800024050001FB
64400+:1027E00002602021240600010E0019A9AD02083064
64401+:1027F0000A001CC38F8500388C8200EC1222FE7EFA
64402+:102800000260202124090005A38900680E001A4AED
64403+:102810002411FFFF1451FE782404FFFF0A001D5508
64404+:102820002403FFFF8F8F004C8F8800388DF8000045
64405+:10283000AD1800888DE70010AD0700988F87006005
64406+:102840000A001DB78F8600542406FFFF118600057D
64407+:10285000000000000E001B4C026020210A001D8FAA
64408+:102860000040A0210E001AD1026020210A001D8F15
64409+:102870000040A0218F90004C3C0208008C4231B0F7
64410+:102880008E110010322C3FFF0182282B10A0000C6B
64411+:10289000240BFF808F85005090A3000D01637024EE
64412+:1028A00031CA00FF1140000702602021001143825D
64413+:1028B000310600032418000110D8010600000000B2
64414+:1028C000026020212403000D0E001A4AA383006831
64415+:1028D000004020218F8500380A001D320080A02191
64416+:1028E0008F90004C3C0A08008D4A31B08F85005013
64417+:1028F0008E0400100000A0218CB1001430823FFF34
64418+:10290000004A602B8CB200205180FFEE0260202133
64419+:1029100090B8000D240BFF800178702431C300FFB4
64420+:102920005060FFE80260202100044382310600036A
64421+:1029300014C0FFE40260202194BF001C8F9900386E
64422+:102940008E060028A73F00E88CAF0010022F20233E
64423+:1029500014C4013A026020218F83005400C368210F
64424+:10296000022D382B14E00136240200188F8A00440F
64425+:102970008F820030024390218D4B00100163702341
64426+:10298000AD4E0010AD5200208C4C00740192282BEB
64427+:1029900014A0015F026020218F8400508E08002463
64428+:1029A0008C86002411060007026020212419001CD7
64429+:1029B0000E001A4AA3990068240FFFFF104FFFC5AD
64430+:1029C0002404FFFF8F8400448C87002424FF00012F
64431+:1029D000AC9F00241251012F8F8D00308DB10074F7
64432+:1029E0001232012C3C0B00808E0E000001CB5024D3
64433+:1029F00015400075000000008E0300142411FFFF35
64434+:102A0000107100073C0808003C0608008CC6319095
64435+:102A100000C8C0241300015202602021A380006876
64436+:102A20008E0300003C19000100792024108000135F
64437+:102A30003C1F0080007FA02416800009020028218E
64438+:102A4000026020212411001A0E001A4AA391006886
64439+:102A50002407FFFF1047FF9F2404FFFF02002821E7
64440+:102A6000026020210E001A6A240600012410FFFFD4
64441+:102A70001050FF982404FFFF241400018F8D0044A0
64442+:102A8000026020210280302195A900342405000134
64443+:102A9000253200010E0019A9A5B200340000202142
64444+:102AA0008F8500380A001D320080A0218F90004CD5
64445+:102AB0003C1408008E9431B08E07001030E53FFFC3
64446+:102AC00000B4C82B132000618F8600502412FF80B1
64447+:102AD00090C9000D0249682431A400FF5080005CB9
64448+:102AE000026020218F8C00541180000700078B8228
64449+:102AF0008F8500388F82FCC094BF0080944A000A02
64450+:102B0000515F00F78F8600403227000314E0006415
64451+:102B100000000000920E000211C000D8000000006A
64452+:102B20008E0B0024156000D902602021920400035E
64453+:102B300024190002308500FF14B90005308900FF18
64454+:102B40008F940054128000EA240D002C308900FF7D
64455+:102B5000392C00102D8400012D3200010244302553
64456+:102B6000020028210E001A6A026020212410FFFFB3
64457+:102B7000105000BF8F8500388F830054106000D341
64458+:102B8000240500013C0A08008D4A318C0143F82BD2
64459+:102B900017E000B22402002D02602021000028214D
64460+:102BA0000E0019A9240600018F85003800001821A5
64461+:102BB0000A001D320060A0210E0018750000000000
64462+:102BC0000A001DF800000000AC8000200A001E78FA
64463+:102BD0008E03001400002821026020210E0019A994
64464+:102BE000240600010A001CC38F8500380A001DB7A7
64465+:102BF0008F8800388CAA00848CAC00843C031000C1
64466+:102C00000147F824001F91403189007F024968255F
64467+:102C100001A32825ACC50830910700012405000157
64468+:102C2000026020210E0019A930E600010A001CC331
64469+:102C30008F850038938F00482403FFFD0A001D3460
64470+:102C4000AF8F00600A001D342403FFFF02602021C3
64471+:102C50002410000D0E001A4AA390006800401821AD
64472+:102C60008F8500380A001D320060A0210E00187503
64473+:102C7000000000009783005C8F86006000402021E8
64474+:102C80003070FFFF00D010232C4A00051140FE11C8
64475+:102C90008F850038ACA400EC0A001D2F306EFFFFBA
64476+:102CA00090CF000D31E300085460FFA192040003AF
64477+:102CB00002602021240200100E001A4AA38200683C
64478+:102CC0002403FFFF5443FF9A920400030A001F12DB
64479+:102CD0008F85003890A4000D308F000811E000951A
64480+:102CE0008F990054572000A6026020218E1F000CEF
64481+:102CF0008CB4002057F40005026020218E0D0008DE
64482+:102D00008CA7002411A7003A026020212402002091
64483+:102D1000A38200680E001A4A2412FFFF1052FEED33
64484+:102D20002404FFFF8F9F00442402FFF73C14800E11
64485+:102D300093EA000D2419FF803C03800001423824EF
64486+:102D4000A3E7000D8F9F00303C0908008D2931ACAE
64487+:102D50008F8C006C97F200788F870044012C302113
64488+:102D6000324D7FFF000D204000C4782131E5007F07
64489+:102D700000B4C02101F94024AC68002CA711000068
64490+:102D80008CEB0028256E0001ACEE00288CEA002CAC
64491+:102D90008E02002C01426021ACEC002C8E09002C2C
64492+:102DA000ACE900308E120014ACF2003494ED003A1D
64493+:102DB00025A40001A4E4003A97E600783C1108003D
64494+:102DC0008E3131B024C3000130707FFF1211005CDE
64495+:102DD000006030218F8F0030026020212405000127
64496+:102DE0000E001934A5E600780A001EA1000020217B
64497+:102DF0008E0900142412FFFF1132006B8F8A0038F5
64498+:102E00008E0200188D4C00D0144C00650260202109
64499+:102E10008E0B00248CAE0028116E005B2402002172
64500+:102E20000E001A4AA38200681452FFBE2404FFFF5A
64501+:102E30008F8500380A001D320080A0212402001F67
64502+:102E40000E001A4AA38200682409FFFF1049FEA160
64503+:102E50002404FFFF0A001E548F83005402602021C7
64504+:102E60000E001A4AA38200681450FF508F85003864
64505+:102E70002403FFFF0A001D320060A0218CD800242B
64506+:102E80008E0800241118FF29026020210A001F2744
64507+:102E90002402000F8E0900003C05008001259024CB
64508+:102EA0001640FF492402001A026020210E001A4A2F
64509+:102EB000A3820068240CFFFF144CFECF2404FFFF04
64510+:102EC0008F8500380A001D320080A0210E001934C1
64511+:102ED000026020218F8500380A001EE500001821BD
64512+:102EE0002403FFFD0060A0210A001D32AF860060B0
64513+:102EF000026020210E001A4AA38D00682403FFFF00
64514+:102F00001043FF588F8500380A001ECC920400033E
64515+:102F10002418001D0E001A4AA39800682403FFFF1E
64516+:102F20001443FE9D2404FFFF8F8500380A001D32E4
64517+:102F30000080A021026020210A001F3D24020024FD
64518+:102F4000240880000068C024330BFFFF000B73C20D
64519+:102F500031D000FF001088270A001F6E001133C017
64520+:102F6000240F001B0E001A4AA38F00681451FEACF8
64521+:102F70002404FFFF8F8500380A001D320080A02145
64522+:102F80000A001F3D240200278E0600288CA3002C77
64523+:102F900010C30008026020210A001F812402001FC4
64524+:102FA0000A001F812402000E026020210A001F81F6
64525+:102FB000240200258E04002C1080000D8F8F00301D
64526+:102FC0008DE800740104C02B5700000C0260202122
64527+:102FD0008CB900140086A0210334282B10A0FF52C6
64528+:102FE0008F9F0044026020210A001F8124020022DA
64529+:102FF000026020210A001F81240200230A001F8191
64530+:103000002402002627BDFFD8AFB3001CAFB10014C7
64531+:10301000AFBF0020AFB20018AFB000103C0280007C
64532+:103020008C5201408C4B01483C048000000B8C0208
64533+:10303000322300FF317300FF8C8501B804A0FFFE2E
64534+:1030400034900180AE1200008C8701442464FFF0AC
64535+:10305000240600022C830013AE070004A61100080A
64536+:10306000A206000BAE1300241060004F8FBF00209B
64537+:10307000000448803C0A0801254A9534012A402171
64538+:103080008D04000000800008000000003C030800E0
64539+:103090008C6331A831693FFF00099980007280215B
64540+:1030A000021370212405FF80264D0100264C00806C
64541+:1030B0003C02800031B1007F3198007F31CA007F2F
64542+:1030C0003C1F800A3C1980043C0F800C01C5202461
64543+:1030D00001A5302401853824014F1821AC46002475
64544+:1030E000023F402103194821AC470090AC4400281E
64545+:1030F000AF830044AF880038AF8900300E0019005C
64546+:10310000016080213C0380008C6B01B80560FFFEEC
64547+:103110008F8700448F8600383465018090E8000D69
64548+:10312000ACB20000A4B0000600082600000416039C
64549+:1031300000029027001227C21080008124C200885C
64550+:10314000241F6082A4BF0008A0A000052402000282
64551+:10315000A0A2000B8F8B0030000424003C08270045
64552+:1031600000889025ACB20010ACA00014ACA00024E4
64553+:10317000ACA00028ACA0002C8D6900382413FF807F
64554+:10318000ACA9001890E3000D02638024320500FF13
64555+:1031900010A000058FBF002090ED000D31AC007F26
64556+:1031A000A0EC000D8FBF00208FB3001C8FB2001861
64557+:1031B0008FB100148FB000103C0A10003C0E80004C
64558+:1031C00027BD002803E00008ADCA01B8265F010052
64559+:1031D0002405FF8033F8007F3C06800003E5782457
64560+:1031E0003C19800A03192021ACCF0024908E00D412
64561+:1031F00000AE682431AC00FF11800024AF84003899
64562+:10320000248E008895CD00123C0C08008D8C31A8CE
64563+:1032100031AB3FFF01924821000B5180012A402130
64564+:1032200001052024ACC400283107007F3C06800C37
64565+:1032300000E620219083000D00A31024304500FFFC
64566+:1032400010A0FFD8AF8400449098000D330F0010F9
64567+:1032500015E0FFD58FBF00200E0019000000000010
64568+:103260003C0380008C7901B80720FFFE00000000BD
64569+:10327000AE1200008C7F0144AE1F0004A6110008AE
64570+:1032800024110002A211000BAE1300243C1308010C
64571+:10329000927396F0327000015200FFC38FBF00207E
64572+:1032A0000E002146024020210A0020638FBF00202B
64573+:1032B0003C1260008E452C083C03F0033462FFFF93
64574+:1032C00000A2F824AE5F2C088E582C083C1901C0CF
64575+:1032D00003199825AE532C080A0020638FBF0020E5
64576+:1032E000264D010031AF007F3C10800A240EFF8084
64577+:1032F00001F0282101AE60243C0B8000AD6C00245D
64578+:103300001660FFA8AF85003824110003A0B100FCAF
64579+:103310000A0020638FBF002026480100310A007F89
64580+:103320003C0B800A2409FF80014B30210109202435
64581+:103330003C078000ACE400240A002062AF8600381D
64582+:10334000944E0012320C3FFF31CD3FFF15ACFF7D94
64583+:10335000241F608290D900D42418FF800319782498
64584+:1033600031EA00FF1140FF7700000000240700044D
64585+:10337000A0C700FC8F870044241160842406000D40
64586+:10338000A4B10008A0A600050A00204D24020002F6
64587+:103390003C040001248496DC24030014240200FE73
64588+:1033A0003C010800AC2431EC3C010800AC2331E8BE
64589+:1033B0003C010801A42296F83C040801248496F8F4
64590+:1033C0000000182100643021A0C300042463000120
64591+:1033D0002C6500FF54A0FFFC006430213C0708006E
64592+:1033E00024E7010003E00008AF87007800A058211F
64593+:1033F000008048210000102114A00012000050217C
64594+:103400000A002142000000003C010801A42096F8B7
64595+:103410003C05080194A596F88F8200783C0C0801C1
64596+:10342000258C96F800E2182100AC2021014B302BAE
64597+:10343000A089000400001021A460000810C0003919
64598+:10344000010048218F8600780009384000E94021BA
64599+:103450000008388000E6282190A8000B90B9000AE7
64600+:103460000008204000881021000218800066C0215A
64601+:10347000A319000A8F85007800E5782191EE000AF3
64602+:1034800091E6000B000E684001AE6021000C208028
64603+:1034900000851021A046000B3C030801906396F2C2
64604+:1034A000106000222462FFFF8F8300383C01080176
64605+:1034B000A02296F2906C00FF118000040000000032
64606+:1034C000906E00FF25CDFFFFA06D00FF3C190801A5
64607+:1034D000973996F8272300013078FFFF2F0F00FF60
64608+:1034E00011E0FFC9254A00013C010801A42396F818
64609+:1034F0003C05080194A596F88F8200783C0C0801E1
64610+:10350000258C96F800E2182100AC2021014B302BCD
64611+:10351000A089000400001021A460000814C0FFC9A5
64612+:103520000100482103E000080000000003E000085B
64613+:103530002402000227BDFFE0248501002407FF804C
64614+:10354000AFB00010AFBF0018AFB1001400A718242F
64615+:103550003C10800030A4007F3C06800A00862821B1
64616+:103560008E110024AE03002490A200FF1440000836
64617+:10357000AF850038A0A000098FBF0018AE1100244D
64618+:103580008FB100148FB0001003E0000827BD0020A9
64619+:1035900090A900FD90A800FF312400FF0E0020F448
64620+:1035A000310500FF8F8500388FBF0018A0A00009EB
64621+:1035B000AE1100248FB100148FB0001003E000089A
64622+:1035C00027BD002027BDFFD0AFB20020AFB1001C47
64623+:1035D000AFB00018AFBF002CAFB40028AFB30024C9
64624+:1035E0003C0980009533011635320C00952F011AE5
64625+:1035F0003271FFFF023280218E08000431EEFFFF9E
64626+:10360000248B0100010E6821240CFF8025A5FFFFFB
64627+:10361000016C50243166007F3C07800AAD2A0024EB
64628+:1036200000C73021AF850074AF8800703C010801ED
64629+:10363000A02096F190C300090200D02100809821BB
64630+:10364000306300FF2862000510400048AF86003854
64631+:10365000286400021480008E24140001240D00054B
64632+:103660003C010801A02D96D590CC00FD3C0108013D
64633+:10367000A02096D63C010801A02096D790CB000A46
64634+:10368000240AFF80318500FF014B4824312700FFC9
64635+:1036900010E0000C000058213C12800836510080D8
64636+:1036A0008E2F00308CD0005C01F0702305C0018E9D
64637+:1036B0008F87007090D4000A3284007FA0C4000A73
64638+:1036C0008F8600383C118008363000808E0F003025
64639+:1036D0008F87007000EF702319C000EE000000001B
64640+:1036E00090D4000924120002328400FF1092024795
64641+:1036F000000000008CC2005800E2F82327F9FFFF09
64642+:103700001B2001300000000090C5000924080004BF
64643+:1037100030A300FF10680057240A00013C01080193
64644+:10372000A02A96D590C900FF252700013C01080179
64645+:10373000A02796D43C030801906396D52406000583
64646+:103740001066006A2C780005130000C40000902168
64647+:103750000003F8803C0408012484958003E4C82118
64648+:103760008F25000000A0000800000000241800FFC2
64649+:103770001078005C0000000090CC000A90CA00099C
64650+:103780003C080801910896F13187008000EA48253D
64651+:103790003C010801A02996DC90C500FD3C140801FD
64652+:1037A000929496F2311100013C010801A02596DDAA
64653+:1037B00090DF00FE3C010801A03F96DE90D200FFA2
64654+:1037C0003C010801A03296DF8CD900543C0108016D
64655+:1037D000AC3996E08CD000583C010801AC3096E43E
64656+:1037E0008CC3005C3C010801AC3496EC3C01080140
64657+:1037F000AC2396E8162000088FBF002C8FB4002859
64658+:103800008FB300248FB200208FB1001C8FB000183E
64659+:1038100003E0000827BD00303C1180009624010E13
64660+:103820000E000FD43094FFFF3C0B08018D6B96F413
64661+:103830000260382102802821AE2B01803C13080150
64662+:103840008E7396D401602021240600830E00102F71
64663+:10385000AFB300108FBF002C8FB400288FB30024AB
64664+:103860008FB200208FB1001C8FB0001803E0000859
64665+:1038700027BD00303C1808008F1831FC270F0001CD
64666+:103880003C010800AC2F31FC0A0021D700000000E9
64667+:103890001474FFB900000000A0C000FF3C05080040
64668+:1038A0008CA531E43C0308008C6331E03C02080045
64669+:1038B0008C4232048F99003834A80001241F000282
64670+:1038C0003C010801AC2396F43C010801A02896F0C5
64671+:1038D0003C010801A02296F3A33F00090A002190B1
64672+:1038E0008F8600380E002146000000000A0021D714
64673+:1038F0008F8600383C1F080193FF96D424190001DD
64674+:1039000013F902298F8700703C100801921096D895
64675+:103910003C06080190C696D610C000050200A02102
64676+:103920003C040801908496D9109001E48F870078B8
64677+:10393000001088408F9F0078023048210009C8801D
64678+:10394000033F702195D80008270F0001A5CF00087C
64679+:103950003C040801908496D93C05080190A596D6B0
64680+:103960000E0020F4000000008F8700780230202134
64681+:103970000004308000C720218C8500048F820074F1
64682+:1039800000A2402305020006AC8200048C8A0000DD
64683+:103990008F830070014310235C400001AC83000062
64684+:1039A0008F86003890CB00FF2D6C00025580002DD3
64685+:1039B000241400010230F821001F40800107282153
64686+:1039C00090B9000B8CAE00040019C0400319782197
64687+:1039D000000F1880006710218C4D000001AE882375
64688+:1039E0002630FFFF5E00001F241400018C440004F9
64689+:1039F0008CAA0000008A482319200019240E000414
64690+:103A00003C010801A02E96D590AD000B8CAB0004B4
64691+:103A1000000D8840022D80210010108000471021E9
64692+:103A20008C44000401646023058202009443000872
64693+:103A300090DF00FE90B9000B33E500FF54B900049D
64694+:103A40000107A021A0D400FE8F8700780107A021E4
64695+:103A50009284000B0E0020F4240500018F860038AC
64696+:103A600024140001125400962E500001160000424A
64697+:103A70003C08FFFF241900021659FF3F0000000018
64698+:103A8000A0C000FF8F860038A0D200090A0021D70D
64699+:103A90008F86003890C700092404000230E300FF3D
64700+:103AA0001064016F24090004106901528F880074AA
64701+:103AB0008CCE0054010E682325B10001062001754B
64702+:103AC000241800043C010801A03896D53C010801E7
64703+:103AD000A02096D490D400FD90D200FF2E4F00027B
64704+:103AE00015E0FF14328400FF000438408F8900780D
64705+:103AF00090DF00FF00E41021000220800089C8212F
64706+:103B00002FE500029324000B14A0FF0A24070002F3
64707+:103B100000041840006480210010588001692821A9
64708+:103B20008CAC0004010C50230540FF020000000093
64709+:103B30003C030801906396D614600005246F0001D1
64710+:103B40003C010801A02496D93C010801A02796D782
64711+:103B50003C010801A02F96D690CE00FF24E700017B
64712+:103B600031CD00FF01A7882B1220FFE990A4000BA4
64713+:103B70000A0021C6000000003C0508018CA596D46F
64714+:103B80003C12000400A8F82413F2000624020005E9
64715+:103B90003C090801912996D5152000022402000352
64716+:103BA000240200053C010801A02296F190C700FF05
64717+:103BB00014E0012024020002A0C200090A0021D75B
64718+:103BC0008F86003890CC00FF1180FEDA240A0001B5
64719+:103BD0008F8C00748F890078240F00030180682186
64720+:103BE0001160001E240E0002000540400105A021C6
64721+:103BF00000142080008990218E51000401918023BF
64722+:103C00000600FECC000000003C020801904296D65F
64723+:103C100014400005245800013C010801A02A96D751
64724+:103C20003C010801A02596D93C010801A03896D690
64725+:103C300090DF00FF010510210002C88033E500FF7E
64726+:103C4000254A00010329202100AA402B1500FEB9B6
64727+:103C50009085000B1560FFE50005404000054040E1
64728+:103C600001051821000310803C010801A02A96D408
64729+:103C70003C010801A02596D8004918218C64000455
64730+:103C800000E4F82327F9FFFF1F20FFE900000000F0
64731+:103C90008C63000000E358230560013A01A38823E8
64732+:103CA00010E301170184C0231B00FEA200000000E6
64733+:103CB0003C010801A02E96D50A002305240B000123
64734+:103CC000240E0004A0CE00093C0D08008DAD31F893
64735+:103CD0008F86003825A200013C010800AC2231F893
64736+:103CE0000A0021D7000000008CD9005C00F9C02335
64737+:103CF0001F00FE7B000000008CDF005C10FFFF65F2
64738+:103D00008F8400748CC3005C008340232502000173
64739+:103D10001C40FF60000000008CC9005C248700018B
64740+:103D200000E9282B10A0FE943C0D80008DAB01040F
64741+:103D30003C0C0001016C50241140FE8F2402001045
64742+:103D40003C010801A02296F10A0021D700000000E2
64743+:103D50008F9100748F86003826220001ACC2005C6F
64744+:103D60000A002292241400018F8700382404FF8067
64745+:103D70000000882190E9000A241400010124302564
64746+:103D8000A0E6000A3C05080190A596D63C0408016F
64747+:103D9000908496D90E0020F4000000008F86003831
64748+:103DA0008F85007890C800FD310700FF0007404074
64749+:103DB0000107F821001FC0800305C8219323000BD1
64750+:103DC000A0C300FD8F8500788F8600380305602131
64751+:103DD000918F000B000F704001CF6821000D808093
64752+:103DE000020510218C4B0000ACCB00548D840004E4
64753+:103DF0008F83007400645023194000022482000164
64754+:103E00002462000101074821ACC2005C0009308037
64755+:103E100000C5402100E02021240500010E0020F40F
64756+:103E20009110000B8F86003890C500FF10A0FF0C8A
64757+:103E3000001070408F85007801D06821000D10803F
64758+:103E4000004558218D6400008F8C0074018450233C
64759+:103E50002547000104E0FF02263100013C03080170
64760+:103E6000906396D62E2F0002247800013C010801B1
64761+:103E7000A03896D63C010801A03496D711E0FEF890
64762+:103E8000020038210A002365000740408F84003873
64763+:103E90008F8300748C85005800A340230502FE9A8E
64764+:103EA000AC8300580A00223B000000003C070801D8
64765+:103EB00090E796F2240200FF10E200BE8F860038E1
64766+:103EC0003C110801963196FA3C030801246396F8E8
64767+:103ED000262500013230FFFF30ABFFFF02036021D7
64768+:103EE0002D6A00FF1540008D918700043C010801F8
64769+:103EF000A42096FA8F88003800074840012728211F
64770+:103F0000911800FF000530802405000127140001EE
64771+:103F1000A11400FF3C120801925296F28F8800789B
64772+:103F20008F8E0070264F000100C820213C0108013F
64773+:103F3000A02F96F2AC8E00008F8D0074A48500082F
64774+:103F4000AC8D00043C030801906396D414600077A4
64775+:103F5000000090213C010801A02596D4A087000B09
64776+:103F60008F8C007800CC5021A147000A8F82003846
64777+:103F7000A04700FD8F840038A08700FE8F860038A0
64778+:103F80008F9F0070ACDF00548F990074ACD900583B
64779+:103F90008F8D00780127C02100185880016DA02165
64780+:103FA000928F000A000F704001CF18210003888013
64781+:103FB000022D8021A207000B8F8600780166602108
64782+:103FC000918A000B000A1040004A2021000428803A
64783+:103FD00000A64021A107000A3C07800834E90080C0
64784+:103FE0008D2200308F860038ACC2005C0A0022921D
64785+:103FF0002414000190CA00FF1540FEAD8F880074A4
64786+:10400000A0C400090A0021D78F860038A0C000FD97
64787+:104010008F98003824060001A30000FE3C0108012F
64788+:10402000A02696D53C010801A02096D40A0021C6FE
64789+:104030000000000090CB00FF3C040801908496F340
64790+:10404000316C00FF0184502B1540000F2402000347
64791+:1040500024020004A0C200090A0021D78F8600387C
64792+:1040600090C3000A2410FF8002035824316C00FF23
64793+:104070001180FDC1000000003C010801A02096D580
64794+:104080000A0021C600000000A0C200090A0021D7D2
64795+:104090008F86003890D4000A2412FF8002544824EE
64796+:1040A000312800FF1500FFF4240200083C0108013C
64797+:1040B000A02296F10A0021D70000000000108840DD
64798+:1040C0008F8B0070023018210003688001A7202127
64799+:1040D000AC8B00008F8A0074240C0001A48C0008B3
64800+:1040E000AC8A00043C05080190A596D62402000184
64801+:1040F00010A2FE1E24A5FFFF0A0022519084000B8F
64802+:104100000184A0231A80FD8B000000003C010801FF
64803+:10411000A02E96D50A002305240B00013C010801BE
64804+:10412000A42596FA0A0023B78F880038240B0001D3
64805+:10413000106B00228F9800388F85003890BF00FFE9
64806+:1041400033F900FF1079002B000000003C1F08012C
64807+:1041500093FF96D8001FC840033FC0210018A080DD
64808+:104160000288782191EE000AA08E000A8F8D0078D7
64809+:104170003C030801906396D800CD88210A0023DD16
64810+:10418000A223000B263000010600003101A4902379
64811+:104190000640002B240200033C010801A02F96D505
64812+:1041A0000A002305240B00018F8900380A00223BF6
64813+:1041B000AD2700540A00229124120001931400FD3F
64814+:1041C000A094000B8F8800388F8F0078910E00FE2E
64815+:1041D00000CF6821A1AE000A8F910038A22700FD10
64816+:1041E0008F8300708F900038AE0300540A0023DEE6
64817+:1041F0008F8D007890B000FEA090000A8F8B003861
64818+:104200008F8C0078916A00FD00CC1021A04A000B31
64819+:104210008F840038A08700FE8F8600748F85003859
64820+:10422000ACA600580A0023DE8F8D007894B80008F1
64821+:10423000ACA40004030378210A002285A4AF00087F
64822+:104240003C010801A02296D50A0021C6000000000A
64823+:1042500090CF0009240D000431EE00FF11CDFD8543
64824+:10426000240200013C010801A02296D50A0021C6C3
64825+:1042700000000000080033440800334408003420E4
64826+:10428000080033F4080033D8080033280800332826
64827+:10429000080033280800334C8008010080080080A3
64828+:1042A000800800005F865437E4AC62CC50103A4579
64829+:1042B00036621985BF14C0E81BC27A1E84F4B55655
64830+:1042C000094EA6FE7DDA01E7C04D748108005A74DC
64831+:1042D00008005AB808005A5C08005A5C08005A5C8A
64832+:1042E00008005A5C08005A7408005A5C08005A5CBE
64833+:1042F00008005AC008005A5C080059D408005A5CEB
64834+:1043000008005A5C08005AC008005A5C08005A5C51
64835+:1043100008005A5C08005A5C08005A5C08005A5CA5
64836+:1043200008005A5C08005A5C08005A5C08005A5C95
64837+:1043300008005A9408005A5C08005A9408005A5C15
64838+:1043400008005A5C08005A5C08005A9808005A9401
64839+:1043500008005A5C08005A5C08005A5C08005A5C65
64840+:1043600008005A5C08005A5C08005A5C08005A5C55
64841+:1043700008005A5C08005A5C08005A5C08005A5C45
64842+:1043800008005A5C08005A5C08005A5C08005A5C35
64843+:1043900008005A5C08005A5C08005A5C08005A5C25
64844+:1043A00008005A9808005A9808005A5C08005A9861
64845+:1043B00008005A5C08005A5C08005A5C08005A5C05
64846+:1043C00008005A5C08005A5C08005A5C08005A5CF5
64847+:1043D00008005A5C08005A5C08005A5C08005A5CE5
64848+:1043E00008005A5C08005A5C08005A5C08005A5CD5
64849+:1043F00008005A5C08005A5C08005A5C08005A5CC5
64850+:1044000008005A5C08005A5C08005A5C08005A5CB4
64851+:1044100008005A5C08005A5C08005A5C08005A5CA4
64852+:1044200008005A5C08005A5C08005A5C08005A5C94
64853+:1044300008005A5C08005A5C08005A5C08005A5C84
64854+:1044400008005A5C08005A5C08005A5C08005A5C74
64855+:1044500008005A5C08005A5C08005A5C08005A5C64
64856+:1044600008005A5C08005A5C08005A5C08005A5C54
64857+:1044700008005A5C08005A5C08005A5C08005A5C44
64858+:1044800008005A5C08005A5C08005A5C08005A5C34
64859+:1044900008005A5C08005A5C08005A5C08005A5C24
64860+:1044A00008005A5C08005A5C08005A5C08005A5C14
64861+:1044B00008005A5C08005A5C08005A5C08005A5C04
64862+:1044C00008005A5C08005A5C08005A5C08005ADC74
64863+:1044D0000800782C08007A900800783808007628C0
64864+:1044E00008007838080078C4080078380800762872
64865+:1044F0000800762808007628080076280800762824
64866+:104500000800762808007628080076280800762813
64867+:1045100008007628080078580800784808007628AF
64868+:1045200008007628080076280800762808007628F3
64869+:1045300008007628080076280800762808007628E3
64870+:1045400008007628080076280800762808007848B1
64871+:10455000080082FC08008188080082C40800818865
64872+:104560000800829408008070080081880800818813
64873+:1045700008008188080081880800818808008188F7
64874+:1045800008008188080081880800818808008188E7
64875+:104590000800818808008188080081B008008D34F7
64876+:1045A00008008E9008008E70080088D808008D4C96
64877+:1045B0000A00012400000000000000000000000DBF
64878+:1045C000747061362E322E31620000000602010145
64879+:1045D00000000000000000000000000000000000DB
64880+:1045E00000000000000000000000000000000000CB
64881+:1045F00000000000000000000000000000000000BB
64882+:1046000000000000000000000000000000000000AA
64883+:10461000000000000000000000000000000000009A
64884+:10462000000000000000000000000000000000008A
64885+:10463000000000000000000000000000000000007A
64886+:104640000000000010000003000000000000000D4A
64887+:104650000000000D3C020800244217203C03080023
64888+:1046600024632A10AC4000000043202B1480FFFD7F
64889+:10467000244200043C1D080037BD2FFC03A0F0219C
64890+:104680003C100800261004903C1C0800279C1720B2
64891+:104690000E000262000000000000000D2402FF80F6
64892+:1046A00027BDFFE000821024AFB00010AF42002011
64893+:1046B000AFBF0018AFB10014936500043084007FD1
64894+:1046C000034418213C0200080062182130A5002094
64895+:1046D000036080213C080111277B000814A0000220
64896+:1046E0002466005C2466005892020004974301048B
64897+:1046F000920400043047000F3063FFFF3084004015
64898+:10470000006728231080000900004821920200055C
64899+:1047100030420004104000050000000010A000031B
64900+:104720000000000024A5FFFC2409000492020005FB
64901+:1047300030420004104000120000000010A00010E1
64902+:10474000000000009602000200A72021010440257D
64903+:104750002442FFFEA7421016920300042402FF80A9
64904+:1047600000431024304200FF104000033C020400CC
64905+:104770000A000174010240258CC20000AF421018EB
64906+:104780008F4201780440FFFE2402000AA742014044
64907+:1047900096020002240400093042000700021023A0
64908+:1047A00030420007A7420142960200022442FFFE67
64909+:1047B000A7420144A740014697420104A74201488D
64910+:1047C0008F420108304200205040000124040001C3
64911+:1047D00092020004304200101440000234830010A2
64912+:1047E00000801821A743014A0000000000000000DB
64913+:1047F0000000000000000000AF48100000000000B2
64914+:104800000000000000000000000000008F421000C7
64915+:104810000441FFFE3102FFFF1040000700000000CE
64916+:1048200092020004304200401440000300000000E7
64917+:104830008F421018ACC20000960200063042FFFF03
64918+:10484000244200020002104300021040036288214B
64919+:10485000962200001120000D3044FFFF00A7102118
64920+:104860008F8300388F45101C0002108200021080D8
64921+:1048700000431021AC45000030A6FFFF0E00058D5F
64922+:1048800000052C0200402021A62200009203000413
64923+:104890002402FF8000431024304200FF1040001F1C
64924+:1048A0000000000092020005304200021040001B90
64925+:1048B000000000009742100C2442FFFEA742101691
64926+:1048C000000000003C02040034420030AF421000FF
64927+:1048D00000000000000000000000000000000000D8
64928+:1048E0008F4210000441FFFE000000009742100CB0
64929+:1048F0008F45101C3042FFFF24420030000210821E
64930+:1049000000021080005B1021AC45000030A6FFFFC4
64931+:104910000E00058D00052C02A62200009604000260
64932+:10492000248400080E0001E93084FFFF974401044D
64933+:104930000E0001F73084FFFF8FBF00188FB1001405
64934+:104940008FB000103C02100027BD002003E00008DB
64935+:10495000AF4201783084FFFF308200078F8500244A
64936+:1049600010400002248300073064FFF800A41021E7
64937+:1049700030421FFF03421821247B4000AF850028EE
64938+:10498000AF82002403E00008AF4200843084FFFFC0
64939+:104990003082000F8F85002C8F860034104000027B
64940+:1049A0002483000F3064FFF000A410210046182B70
64941+:1049B000AF8500300046202314600002AF82002C37
64942+:1049C000AF84002C8F82002C340480000342182115
64943+:1049D00000641821AF83003803E00008AF42008074
64944+:1049E0008F820014104000088F8200048F82FFDC49
64945+:1049F000144000058F8200043C02FFBF3442FFFFD9
64946+:104A0000008220248F82000430430006240200022A
64947+:104A10001062000F3C0201012C62000350400005AF
64948+:104A2000240200041060000F3C0200010A00023062
64949+:104A30000000000010620005240200061462000C51
64950+:104A40003C0201110A000229008210253C020011DB
64951+:104A500000821025AF421000240200010A0002303B
64952+:104A6000AF82000C00821025AF421000AF80000C16
64953+:104A700000000000000000000000000003E000084B
64954+:104A8000000000008F82000C1040000400000000B5
64955+:104A90008F4210000441FFFE0000000003E0000808
64956+:104AA000000000008F8200102443F800000231C291
64957+:104AB00024C2FFF02C6303011060000300021042C7
64958+:104AC0000A000257AC8200008F85001800C5102B29
64959+:104AD0001440000B0000182100C5102324470001DA
64960+:104AE0008F82001C00A210212442FFFF0046102BE1
64961+:104AF000544000042402FFFF0A000257AC87000064
64962+:104B00002402FFFF0A000260AC8200008C820000D9
64963+:104B10000002194000621821000318800062182169
64964+:104B2000000318803C0208002442175C0062182130
64965+:104B300003E000080060102127BDFFD8AFBF0020B0
64966+:104B4000AFB1001CAFB000183C0460088C8250006C
64967+:104B50002403FF7F3C066000004310243442380CDD
64968+:104B6000AC8250008CC24C1C3C1A80000002160221
64969+:104B70003042000F10400007AF82001C8CC34C1C59
64970+:104B80003C02001F3442FC0000621824000319C2DA
64971+:104B9000AF8300188F420008275B400034420001B9
64972+:104BA000AF420008AF8000243C02601CAF40008090
64973+:104BB000AF4000848C4500088CC308083402800094
64974+:104BC000034220212402FFF0006218243C020080EE
64975+:104BD0003C010800AC2204203C025709AF84003895
64976+:104BE00014620004AF850034240200010A0002921E
64977+:104BF000AF820014AF8000148F42000038420001E1
64978+:104C0000304200011440FFFC8F8200141040001657
64979+:104C10000000000097420104104000058F8300004F
64980+:104C2000146000072462FFFF0A0002A72C62000A3A
64981+:104C30002C620010504000048F83000024620001A9
64982+:104C4000AF8200008F8300002C62000A1440000332
64983+:104C50002C6200070A0002AEAF80FFDC10400002A9
64984+:104C600024020001AF82FFDC8F4301088F44010062
64985+:104C700030622000AF83000410400008AF840010B1
64986+:104C80003C0208008C42042C244200013C01080034
64987+:104C9000AC22042C0A00058A3C0240003065020068
64988+:104CA00014A0000324020F001482026024020D00ED
64989+:104CB00097420104104002C83C02400030624000AC
64990+:104CC000144000AD8F8200388C4400088F42017878
64991+:104CD0000440FFFE24020800AF42017824020008CD
64992+:104CE000A7420140A7400142974201048F8400047B
64993+:104CF0003051FFFF30820001104000070220802168
64994+:104D00002623FFFE240200023070FFFFA742014667
64995+:104D10000A0002DBA7430148A74001463C02080005
64996+:104D20008C42043C1440000D8F8300103082002020
64997+:104D30001440000224030009240300010060202124
64998+:104D40008F830010240209005062000134840004A3
64999+:104D5000A744014A0A0002F60000000024020F00E6
65000+:104D60001462000530820020144000062403000D68
65001+:104D70000A0002F524030005144000022403000980
65002+:104D800024030001A743014A3C0208008C4204208E
65003+:104D90003C0400480E00020C004420250E000235A1
65004+:104DA000000000008F82000C1040003E0000000058
65005+:104DB0008F4210003C0300200043102410400039B3
65006+:104DC0008F820004304200021040003600000000D4
65007+:104DD000974210141440003300000000974210085E
65008+:104DE0008F8800383042FFFF2442000600021882FC
65009+:104DF0000003388000E83021304300018CC40000FB
65010+:104E000010600004304200030000000D0A00033768
65011+:104E100000E81021544000103084FFFF3C05FFFFE4
65012+:104E200000852024008518260003182B0004102B71
65013+:104E300000431024104000050000000000000000A6
65014+:104E40000000000D00000000240002228CC20000BF
65015+:104E50000A000336004520253883FFFF0003182B86
65016+:104E60000004102B00431024104000050000000037
65017+:104E7000000000000000000D000000002400022BD4
65018+:104E80008CC200003444FFFF00E81021AC44000055
65019+:104E90003C0208008C420430244200013C0108001E
65020+:104EA000AC2204308F6200008F840038AF8200088B
65021+:104EB0008C8300003402FFFF1462000F00001021F9
65022+:104EC0003C0508008CA504543C0408008C84045064
65023+:104ED00000B0282100B0302B008220210086202144
65024+:104EE0003C010800AC2504543C010800AC240450EB
65025+:104EF0000A000580240400088C8200003042010072
65026+:104F00001040000F000010213C0508008CA5044C47
65027+:104F10003C0408008C84044800B0282100B0302BE9
65028+:104F200000822021008620213C010800AC25044C91
65029+:104F30003C010800AC2404480A0005802404000851
65030+:104F40003C0508008CA504443C0408008C84044003
65031+:104F500000B0282100B0302B0082202100862021C3
65032+:104F60003C010800AC2504443C010800AC2404408A
65033+:104F70000A000580240400088F6200088F62000088
65034+:104F800000021602304300F02402003010620005D7
65035+:104F900024020040106200E08F8200200A00058891
65036+:104FA0002442000114A000050000000000000000E1
65037+:104FB0000000000D00000000240002568F4201781E
65038+:104FC0000440FFFE000000000E00023D27A4001078
65039+:104FD0001440000500408021000000000000000D8A
65040+:104FE000000000002400025D8E0200001040000559
65041+:104FF00000000000000000000000000D00000000A4
65042+:10500000240002608F62000C0443000324020001AC
65043+:105010000A00042EAE000000AE0200008F820038AD
65044+:105020008C480008A20000078F65000C8F64000404
65045+:1050300030A3FFFF0004240200852023308200FFFC
65046+:105040000043102124420005000230832CC200815D
65047+:10505000A605000A14400005A20400040000000098
65048+:105060000000000D00000000240002788F85003849
65049+:105070000E0005AB260400148F6200048F43010864
65050+:10508000A60200083C02100000621824106000080C
65051+:105090000000000097420104920300072442FFEC45
65052+:1050A000346300023045FFFF0A0003C3A203000778
65053+:1050B000974201042442FFF03045FFFF96060008A6
65054+:1050C0002CC200135440000592030007920200070F
65055+:1050D00034420001A20200079203000724020001EB
65056+:1050E00010620005240200031062000B8F8200385A
65057+:1050F0000A0003E030C6FFFF8F8200383C04FFFF48
65058+:105100008C43000C0064182400651825AC43000C87
65059+:105110000A0003E030C6FFFF3C04FFFF8C43001091
65060+:105120000064182400651825AC43001030C6FFFF4A
65061+:1051300024C2000200021083A20200058F830038FF
65062+:10514000304200FF00021080004328218CA800009C
65063+:105150008CA2000024030004000217021443001272
65064+:1051600000000000974201043C03FFFF01031824E4
65065+:105170003042FFFF004610232442FFFE006240251C
65066+:10518000ACA8000092030005306200FF000210800E
65067+:1051900000501021904200143042000F00431021B3
65068+:1051A0000A000415A20200068CA400049742010420
65069+:1051B0009603000A3088FFFF3042FFFF00461023AD
65070+:1051C0002442FFD60002140001024025ACA80004CE
65071+:1051D000920200079204000524630028000318834C
65072+:1051E0000064182134420004A2030006A202000752
65073+:1051F0008F8200042403FFFB34420002004310248A
65074+:10520000AF820004920300068F87003800031880E5
65075+:10521000007010218C4400203C02FFF63442FFFF56
65076+:105220000082402400671821AE04000CAC68000C1A
65077+:10523000920500063C03FF7F8E02000C00052880CB
65078+:1052400000B020213463FFFF01033024948800263E
65079+:1052500000A7282100431024AE02000CAC860020D9
65080+:10526000AC880024ACA8001024020010A742014022
65081+:1052700024020002A7400142A7400144A742014680
65082+:10528000974201043C0400082442FFFEA742014863
65083+:10529000240200010E00020CA742014A9603000AF4
65084+:1052A0009202000400431021244200023042000711
65085+:1052B00000021023304200070E000235AE0200103B
65086+:1052C0008F6200003C0308008C6304442404001037
65087+:1052D000AF820008974201043042FFFF2442FFFEE4
65088+:1052E00000403821000237C33C0208008C420440D1
65089+:1052F000006718210067282B004610210045102167
65090+:105300003C010800AC2304443C010800AC220440EA
65091+:105310000A0005150000000014A0000500000000B0
65092+:10532000000000000000000D000000002400030A3F
65093+:105330008F4201780440FFFE000000000E00023D95
65094+:1053400027A4001414400005004080210000000044
65095+:105350000000000D00000000240003118E02000078
65096+:105360005440000692020007000000000000000DFB
65097+:10537000000000002400031C9202000730420004D9
65098+:10538000104000058F8200042403FFFB344200021A
65099+:1053900000431024AF8200048F620004044300081D
65100+:1053A00092020007920200068E03000CAE0000007D
65101+:1053B0000002108000501021AC4300209202000730
65102+:1053C00030420004544000099602000A920200058F
65103+:1053D0003C03000100021080005010218C46001890
65104+:1053E00000C33021AC4600189602000A9206000461
65105+:1053F000277100080220202100C2302124C60005A8
65106+:10540000260500140E0005AB00063082920400064B
65107+:105410008F6500043C027FFF000420800091202162
65108+:105420008C8300043442FFFF00A228240065182169
65109+:10543000AC8300049202000792040005920300046A
65110+:10544000304200041040001496070008308400FF2A
65111+:1054500000042080009120218C86000497420104E2
65112+:105460009605000A306300FF3042FFFF0043102121
65113+:105470000045102130E3FFFF004310232442FFD8F2
65114+:1054800030C6FFFF0002140000C23025AC860004C5
65115+:105490000A0004C992030007308500FF0005288038
65116+:1054A00000B128218CA4000097420104306300FF62
65117+:1054B0003042FFFF00431021004710233C03FFFF51
65118+:1054C000008320243042FFFF00822025ACA400008E
65119+:1054D0009203000724020001106200060000000091
65120+:1054E0002402000310620011000000000A0004EC16
65121+:1054F0008E03001097420104920300049605000AEF
65122+:105500008E24000C00431021004510212442FFF29C
65123+:105510003C03FFFF008320243042FFFF0082202550
65124+:10552000AE24000C0A0004EC8E0300109742010424
65125+:10553000920300049605000A8E24001000431021F7
65126+:10554000004510212442FFEE3C03FFFF008320248E
65127+:105550003042FFFF00822025AE2400108E03001091
65128+:105560002402000AA7420140A74301429603000A11
65129+:10557000920200043C04004000431021A742014471
65130+:10558000A740014697420104A742014824020001B6
65131+:105590000E00020CA742014A0E0002350000000076
65132+:1055A0008F6200009203000400002021AF820008F7
65133+:1055B000974201049606000A3042FFFF006218215C
65134+:1055C000006028213C0308008C6304443C0208006E
65135+:1055D0008C42044000651821004410210065382BDE
65136+:1055E000004710213C010800AC2304443C010800A2
65137+:1055F000AC22044092040004008620212484000A86
65138+:105600003084FFFF0E0001E9000000009744010410
65139+:105610003084FFFF0E0001F7000000003C02100084
65140+:10562000AF4201780A0005878F820020148200278C
65141+:105630003062000697420104104000673C024000BF
65142+:105640003062400010400005000000000000000033
65143+:105650000000000D00000000240004208F420178AB
65144+:105660000440FFFE24020800AF4201782402000833
65145+:10567000A7420140A74001428F82000497430104E2
65146+:1056800030420001104000073070FFFF2603FFFE8C
65147+:1056900024020002A7420146A74301480A00053F31
65148+:1056A0002402000DA74001462402000DA742014A32
65149+:1056B0008F62000024040008AF8200080E0001E998
65150+:1056C000000000000A0005190200202110400042DD
65151+:1056D0003C02400093620000304300F024020010BE
65152+:1056E0001062000524020070106200358F820020D5
65153+:1056F0000A000588244200018F62000097430104DC
65154+:105700003050FFFF3071FFFF8F4201780440FFFEF1
65155+:105710003202000700021023304200072403000A6F
65156+:105720002604FFFEA7430140A7420142A7440144CB
65157+:10573000A7400146A75101488F420108304200208E
65158+:10574000144000022403000924030001A743014A76
65159+:105750000E00020C3C0400400E0002350000000068
65160+:105760003C0708008CE70444021110212442FFFE8C
65161+:105770003C0608008CC604400040182100E3382194
65162+:10578000000010218F65000000E3402B00C2302193
65163+:105790002604000800C830213084FFFFAF850008D0
65164+:1057A0003C010800AC2704443C010800AC2604403E
65165+:1057B0000E0001E9000000000A0005190220202166
65166+:1057C0000E00013B000000008F82002024420001F7
65167+:1057D000AF8200203C024000AF4201380A00029232
65168+:1057E000000000003084FFFF30C6FFFF00052C00E2
65169+:1057F00000A628253882FFFF004510210045282BF0
65170+:105800000045102100021C023042FFFF004310211E
65171+:1058100000021C023042FFFF004310213842FFFF0C
65172+:1058200003E000083042FFFF3084FFFF30A5FFFF98
65173+:1058300000001821108000070000000030820001E5
65174+:105840001040000200042042006518210A0005A152
65175+:105850000005284003E000080060102110C0000689
65176+:1058600024C6FFFF8CA2000024A50004AC82000027
65177+:105870000A0005AB2484000403E0000800000000D7
65178+:1058800010A0000824A3FFFFAC8600000000000069
65179+:10589000000000002402FFFF2463FFFF1462FFFAF0
65180+:1058A0002484000403E00008000000000000000160
65181+:1058B0000A00002A00000000000000000000000DA7
65182+:1058C000747870362E322E3162000000060201001C
65183+:1058D00000000000000001360000EA600000000047
65184+:1058E00000000000000000000000000000000000B8
65185+:1058F00000000000000000000000000000000000A8
65186+:105900000000000000000000000000000000000097
65187+:105910000000001600000000000000000000000071
65188+:105920000000000000000000000000000000000077
65189+:105930000000000000000000000000000000000067
65190+:1059400000000000000000000000138800000000BC
65191+:10595000000005DC00000000000000001000000353
65192+:10596000000000000000000D0000000D3C020800D7
65193+:1059700024423D683C0308002463401CAC40000006
65194+:105980000043202B1480FFFD244200043C1D08002E
65195+:1059900037BD7FFC03A0F0213C100800261000A8B2
65196+:1059A0003C1C0800279C3D680E00044E00000000CF
65197+:1059B0000000000D27BDFFB4AFA10000AFA200049E
65198+:1059C000AFA30008AFA4000CAFA50010AFA6001451
65199+:1059D000AFA70018AFA8001CAFA90020AFAA0024F1
65200+:1059E000AFAB0028AFAC002CAFAD0030AFAE003491
65201+:1059F000AFAF0038AFB8003CAFB90040AFBC004417
65202+:105A0000AFBF00480E000591000000008FBF0048A6
65203+:105A10008FBC00448FB900408FB8003C8FAF003876
65204+:105A20008FAE00348FAD00308FAC002C8FAB0028D0
65205+:105A30008FAA00248FA900208FA8001C8FA7001810
65206+:105A40008FA600148FA500108FA4000C8FA3000850
65207+:105A50008FA200048FA1000027BD004C3C1B6004F6
65208+:105A60008F7A5030377B502803400008AF7A00000F
65209+:105A70008F86003C3C0390003C0280000086282575
65210+:105A800000A32025AC4400203C0380008C6700204C
65211+:105A900004E0FFFE0000000003E00008000000003A
65212+:105AA0000A000070240400018F85003C3C04800043
65213+:105AB0003483000100A3102503E00008AC8200201D
65214+:105AC00003E00008000010213084FFFF30A5FFFF35
65215+:105AD00010800007000018213082000110400002F1
65216+:105AE00000042042006518211480FFFB00052840B7
65217+:105AF00003E000080060102110C000070000000053
65218+:105B00008CA2000024C6FFFF24A50004AC82000084
65219+:105B100014C0FFFB2484000403E000080000000020
65220+:105B200010A0000824A3FFFFAC86000000000000C6
65221+:105B3000000000002402FFFF2463FFFF1462FFFA4D
65222+:105B40002484000403E000080000000090AA003153
65223+:105B50008FAB00108CAC00403C0300FF8D6800044C
65224+:105B6000AD6C00208CAD004400E060213462FFFF8A
65225+:105B7000AD6D00248CA700483C09FF000109C0243A
65226+:105B8000AD6700288CAE004C0182C824031978252B
65227+:105B9000AD6F0004AD6E002C8CAD0038314A00FFB3
65228+:105BA000AD6D001C94A900323128FFFFAD680010D4
65229+:105BB00090A70030A5600002A1600004A16700006A
65230+:105BC00090A30032306200FF0002198210600005CD
65231+:105BD000240500011065000E0000000003E000082D
65232+:105BE000A16A00018CD80028354A0080AD780018E1
65233+:105BF0008CCF0014AD6F00148CCE0030AD6E000859
65234+:105C00008CC4002CA16A000103E00008AD64000C04
65235+:105C10008CCD001CAD6D00188CC90014AD6900144A
65236+:105C20008CC80024AD6800088CC70020AD67000C4C
65237+:105C30008CC200148C8300700043C82B1320000713
65238+:105C4000000000008CC20014144CFFE400000000AF
65239+:105C5000354A008003E00008A16A00018C820070D0
65240+:105C60000A0000E6000000009089003027BDFFF820
65241+:105C70008FA8001CA3A900008FA300003C0DFF808B
65242+:105C800035A2FFFF8CAC002C00625824AFAB0000A3
65243+:105C9000A100000400C05821A7A000028D06000446
65244+:105CA00000A048210167C8218FA500000080502175
65245+:105CB0003C18FF7F032C20263C0E00FF2C8C00019B
65246+:105CC000370FFFFF35CDFFFF3C02FF0000AFC824B8
65247+:105CD00000EDC02400C27824000C1DC003236825F9
65248+:105CE00001F87025AD0D0000AD0E00048D240024D8
65249+:105CF000AFAD0000AD0400088D2C00202404FFFF90
65250+:105D0000AD0C000C9547003230E6FFFFAD060010E9
65251+:105D10009145004830A200FF000219C25060000106
65252+:105D20008D240034AD0400148D4700388FAA00186C
65253+:105D300027BD0008AD0B0028AD0A0024AD07001CEC
65254+:105D4000AD00002CAD00001803E00008AD000020FD
65255+:105D500027BDFFE0AFB20018AFB10014AFB0001024
65256+:105D6000AFBF001C9098003000C088213C0D00FFA0
65257+:105D7000330F007FA0CF0000908E003135ACFFFFC5
65258+:105D80003C0AFF00A0CE000194A6001EA220000441
65259+:105D90008CAB00148E29000400A08021016C282403
65260+:105DA000012A40240080902101052025A62600021A
65261+:105DB000AE24000426050020262400080E000092D0
65262+:105DC00024060002924700302605002826240014ED
65263+:105DD00000071E000003160324060004044000030D
65264+:105DE0002403FFFF965900323323FFFF0E00009279
65265+:105DF000AE230010262400248FBF001C8FB2001891
65266+:105E00008FB100148FB00010240500030000302172
65267+:105E10000A00009C27BD002027BDFFD8AFB1001CA1
65268+:105E2000AFB00018AFBF002090A9003024020001DD
65269+:105E300000E050213123003F00A040218FB00040FE
65270+:105E40000080882100C04821106200148FA700380C
65271+:105E5000240B000500A0202100C02821106B001396
65272+:105E6000020030210E000128000000009225007C75
65273+:105E700030A400021080000326030030AE00003082
65274+:105E8000260300348FBF00208FB1001C8FB0001894
65275+:105E90000060102103E0000827BD00280E0000A7C5
65276+:105EA000AFB000100A00016F000000008FA3003C9B
65277+:105EB000010020210120282101403021AFA3001042
65278+:105EC0000E0000EEAFB000140A00016F00000000E9
65279+:105ED0003C06800034C20E008C4400108F850044C4
65280+:105EE000ACA400208C43001803E00008ACA30024FD
65281+:105EF0003C06800034C20E008C4400148F850044A0
65282+:105F0000ACA400208C43001C03E00008ACA30024D8
65283+:105F10009382000C1040001B2483000F2404FFF028
65284+:105F20000064382410E00019978B00109784000E4D
65285+:105F30009389000D3C0A601C0A0001AC01644023F7
65286+:105F400001037021006428231126000231C2FFFFE3
65287+:105F500030A2FFFF0047302B50C0000E00E4482164
65288+:105F60008D4D000C31A3FFFF00036400000C2C03D7
65289+:105F700004A1FFF30000302130637FFF0A0001A479
65290+:105F80002406000103E00008000000009784000ED2
65291+:105F900000E448213123FFFF3168FFFF0068382B00
65292+:105FA00054E0FFF8A783000E938A000D114000050E
65293+:105FB000240F0001006BC023A380000D03E0000844
65294+:105FC000A798000E006BC023A38F000D03E000080C
65295+:105FD000A798000E03E000080000000027BDFFE8BE
65296+:105FE000AFB000103C10800036030140308BFFFF43
65297+:105FF00093AA002BAFBF0014A46B000436040E005C
65298+:106000009488001630C600FF8FA90030A4680006EF
65299+:10601000AC650008A0660012A46A001AAC670020F4
65300+:106020008FA5002CA4690018012020210E000198E2
65301+:10603000AC6500143C021000AE0201788FBF001462
65302+:106040008FB0001003E0000827BD00188F85000006
65303+:106050002484000727BDFFF83084FFF83C06800049
65304+:1060600094CB008A316AFFFFAFAA00008FA900001D
65305+:10607000012540232507FFFF30E31FFF0064102B9D
65306+:106080001440FFF700056882000D288034CC4000E2
65307+:1060900000AC102103E0000827BD00088F8200003B
65308+:1060A0002486000730C5FFF800A2182130641FFFC6
65309+:1060B00003E00008AF8400008F87003C8F84004419
65310+:1060C00027BDFFB0AFB70044AFB40038AFB1002C6C
65311+:1060D000AFBF0048AFB60040AFB5003CAFB300342F
65312+:1060E000AFB20030AFB000283C0B80008C8600249B
65313+:1060F000AD6700808C8A002035670E00356901008D
65314+:10610000ACEA00108C8800248D2500040000B82122
65315+:10611000ACE800188CE3001000A688230000A02142
65316+:10612000ACE300148CE20018ACE2001C122000FE6C
65317+:1061300000E0B021936C0008118000F40000000022
65318+:10614000976F001031EEFFFF022E682B15A000EFB5
65319+:1061500000000000977200103250FFFFAED0000028
65320+:106160003C0380008C740000329300081260FFFD35
65321+:106170000000000096D800088EC700043305FFFF1A
65322+:1061800030B5000112A000E4000000000000000D86
65323+:1061900030BFA0402419004013F9011B30B4A00007
65324+:1061A000128000DF000000009373000812600008F6
65325+:1061B00000000000976D001031ACFFFF00EC202BB9
65326+:1061C0001080000330AE004011C000D50000000078
65327+:1061D000A7850040AF87003893630008022028217C
65328+:1061E000AFB10020146000F527B40020AF60000CB0
65329+:1061F000978F004031F14000162000022403001662
65330+:106200002403000E24054007A363000AAF650014B1
65331+:10621000938A00428F70001431550001001512401E
65332+:1062200002024825AF690014979F00408F78001440
65333+:1062300033F9001003194025AF680014979200400D
65334+:106240003247000810E0016E000000008F67001464
65335+:106250003C1210003C11800000F27825AF6F001452
65336+:1062600036230E00946E000A3C0D81002406000EB9
65337+:1062700031CCFFFF018D2025AF640004A36600022E
65338+:106280009373000A3406FFFC266B0004A36B000A1C
65339+:1062900097980040330820001100015F00000000C3
65340+:1062A0003C05800034A90E00979900409538000CF9
65341+:1062B00097870040001940423312C00031030003A9
65342+:1062C00000127B0330F11000006F6825001172038B
65343+:1062D00001AE6025000C20C0A76400129793004017
65344+:1062E000936A000A001359823175003C02AA1021FA
65345+:1062F0002450003CA3700009953F000C33F93FFF88
65346+:10630000A779001097700012936900090130F821F5
65347+:1063100027E5000230B900070019C0233308000741
65348+:10632000A368000B9371000997720012976F001019
65349+:10633000322700FF8F910038978D004000F218211E
65350+:10634000006F702101C6602131A6004010C0000519
65351+:106350003185FFFF00B1102B3C1280001040001768
65352+:10636000000098210225A82B56A0013E8FA50020F1
65353+:106370003C048000348A0E008D5300143C068000DB
65354+:10638000AD5300108D4B001CAD4B0018AD45000007
65355+:106390008CCD000031AC00081180FFFD34CE0E0022
65356+:1063A00095C3000800A0882100009021A783004029
65357+:1063B0008DC6000424130001AF860038976F0010CB
65358+:1063C00031F5FFFF8E9F000003F1282310A0011F6D
65359+:1063D000AE85000093620008144000DD000000005C
65360+:1063E0000E0001E7240400108F900048004028218F
65361+:1063F0003C023200320600FF000654000142F8253C
65362+:1064000026090001AF890048ACBF0000937900095C
65363+:1064100097780012936F000A332800FF3303FFFFC1
65364+:106420000103382100076C0031EE00FF01AE60254A
65365+:10643000ACAC00048F840048978B0040316A200088
65366+:106440001140010AACA4000897640012308BFFFFD2
65367+:1064500006400108ACAB000C978E004031C5000827
65368+:1064600014A0000226280006262800023C1F8000F7
65369+:1064700037E70E0094F900148CE5001C8F670004C8
65370+:10648000937800023324FFFF330300FFAFA3001013
65371+:106490008F6F0014AFA800180E0001CBAFAF00142F
65372+:1064A000240400100E0001FB000000008E9200008A
65373+:1064B00016400005000000008F7800142403FFBF81
65374+:1064C0000303A024AF7400148F67000C00F5C821EB
65375+:1064D000AF79000C9375000816A0000800000000BA
65376+:1064E00012600006000000008F6800143C0AEFFFF5
65377+:1064F0003549FFFE0109F824AF7F0014A37300089B
65378+:106500008FA500200A00034F02202021AED10000F9
65379+:106510000A00022D3C03800014E0FF1E30BFA040A3
65380+:106520000E0001900000A0212E9100010237B0253D
65381+:1065300012C000188FBF00488F87003C24170F003F
65382+:1065400010F700D43C0680008CD901780720FFFEAC
65383+:10655000241F0F0010FF00F634CA0E008D560014E1
65384+:1065600034C7014024080240ACF600048D49001CE9
65385+:106570003C141000ACE90008A0E00012A4E0001AEE
65386+:10658000ACE00020A4E00018ACE80014ACD4017822
65387+:106590008FBF00488FB700448FB600408FB5003CD6
65388+:1065A0008FB400388FB300348FB200308FB1002C1D
65389+:1065B0008FB0002803E0000827BD00508F910038FD
65390+:1065C000978800403C1280000220A821310700403B
65391+:1065D00014E0FF7C00009821977900108F9200381A
65392+:1065E0003338FFFF131200A8000020210080A021F3
65393+:1065F000108000F300A088211620FECE00000000CD
65394+:106600000A00031F2E9100013C0380008C62017878
65395+:106610000440FFFE240808008F860000AC68017863
65396+:106620003C038000946D008A31ACFFFF0186582343
65397+:10663000256AFFFF31441FFF2C8900081520FFF950
65398+:10664000000000008F8F0048347040008F83003CB2
65399+:1066500000E0A021240E0F0025E70001AF870048CD
65400+:1066600000D03021023488233C08800031F500FF3F
65401+:10667000106E0005240700019398004233130001B7
65402+:106680000013924036470001001524003C0A010027
65403+:10669000008A4825ACC900008F82004830BF003610
65404+:1066A00030B90008ACC200041320009900FF9825FF
65405+:1066B00035120E009650000A8F8700003C0F8100B3
65406+:1066C0003203FFFF24ED000835060140006F60250E
65407+:1066D0003C0E100031AB1FFF269200062405000E71
65408+:1066E000ACCC0020026E9825A4C5001AAF8B000028
65409+:1066F000A4D20018162000083C1080008F89003CAE
65410+:1067000024020F00512200022417000136730040BA
65411+:106710000E0001883C10800036060E008CCB001461
65412+:10672000360A014002402021AD4B00048CC5001CFC
65413+:10673000AD450008A1550012AD5300140E0001989C
65414+:106740003C151000AE1501780A000352000000004D
65415+:10675000936F0009976E0012936D000B31E500FFF7
65416+:1067600000AE202131AC00FF008C80212602000AFF
65417+:106770003050FFFF0E0001E7020020218F86004805
65418+:106780003C0341003C05800024CB0001AF8B004856
65419+:10679000936A00099769001230C600FF315F00FF5D
65420+:1067A0003128FFFF03E8382124F900020006C40065
65421+:1067B0000319782501E37025AC4E00008F6D000CA5
65422+:1067C00034A40E00948B001401B26025AC4C00047C
65423+:1067D0008C85001C8F670004936A00023164FFFF00
65424+:1067E000314900FFAFA900108F680014AFB1001845
65425+:1067F0000E0001CBAFA800140A0002FD0200202108
65426+:10680000AF600004A36000029798004033082000A6
65427+:106810001500FEA300003021A760001297840040FD
65428+:10682000936B000A3C10800030931F0000135183CB
65429+:10683000014BA82126A20028A362000936090E00F8
65430+:10684000953F000C0A000295A77F00108F7000147E
65431+:10685000360900400E000188AF6900140A0002C921
65432+:10686000000000000A00034F000020210641FEFA4C
65433+:10687000ACA0000C8CAC000C3C0D8000018D902570
65434+:106880000A0002EAACB2000C000090210A0002C526
65435+:1068900024130001128000073C028000344B0E00DC
65436+:1068A0009566000830D300401260004900000000E7
65437+:1068B0003C0680008CD001780600FFFE34C50E0037
65438+:1068C00094B500103C03050034CC014032B8FFFF02
65439+:1068D00003039025AD92000C8CAF0014240D200012
65440+:1068E0003C041000AD8F00048CAE001CAD8E00087F
65441+:1068F000A1800012A580001AAD800020A58000189C
65442+:10690000AD8D0014ACC401780A0003263C0680005B
65443+:106910008F9F0000351801402692000227F90008D9
65444+:1069200033281FFFA71200180A000391AF88000048
65445+:106930003C02800034450140ACA0000C1280001BDA
65446+:1069400034530E0034510E008E370010ACB70004E3
65447+:106950008E2400183C0B8000ACA400083570014068
65448+:1069600024040040A20000128FBF0048A600001AB5
65449+:106970008FB70044AE0000208FB60040A60000187C
65450+:106980008FB5003CAE0400148FB400388FB30034D0
65451+:106990008FB200308FB1002C8FB000283C02100065
65452+:1069A00027BD005003E00008AD6201788E66001438
65453+:1069B000ACA600048E64001C0A00042A3C0B800074
65454+:1069C0000E0001902E9100010A0003200237B0252D
65455+:1069D000000000000000000D00000000240003691A
65456+:1069E0000A0004013C06800027BDFFD8AFBF00208D
65457+:1069F0003C0980003C1F20FFAFB200183C0760003C
65458+:106A000035320E002402001037F9FFFDACE23008E9
65459+:106A1000AFB3001CAFB10014AFB00010AE5900000E
65460+:106A20000000000000000000000000000000000066
65461+:106A3000000000003C1800FF3713FFFDAE530000BC
65462+:106A40003C0B60048D7050002411FF7F3C0E00024F
65463+:106A50000211782435EC380C35CD0109ACED4C1819
65464+:106A6000240A0009AD6C50008CE80438AD2A0008F7
65465+:106A7000AD2000148CE54C1C3106FFFF38C42F718B
65466+:106A800000051E023062000F2486C0B310400007CC
65467+:106A9000AF8200088CE54C1C3C09001F3528FC0027
65468+:106AA00000A81824000321C2AF8400048CF1080858
65469+:106AB0003C0F57092412F0000232702435F0001008
65470+:106AC00001D0602601CF68262DAA00012D8B000180
65471+:106AD000014B382550E00009A380000C3C1F601CCE
65472+:106AE0008FF8000824190001A399000C33137C00CF
65473+:106AF000A7930010A780000EA380000DAF80004870
65474+:106B000014C00003AF8000003C066000ACC0442C01
65475+:106B10000E0005B93C1080000E000F1A361101005E
65476+:106B20003C12080026523DD03C13080026733E500C
65477+:106B30008E03000038640001308200011440FFFC25
65478+:106B40003C0B800A8E2600002407FF8024C90240E7
65479+:106B5000312A007F014B402101272824AE06002066
65480+:106B6000AF880044AE0500243C048000AF86003CA2
65481+:106B70008C8C01780580FFFE24180800922F0008F5
65482+:106B8000AC980178A38F0042938E004231CD000172
65483+:106B900011A0000F24050D0024DFF8002FF90301D8
65484+:106BA0001320001C000629C224A4FFF00004104298
65485+:106BB000000231400E00020200D2D8213C02400007
65486+:106BC0003C068000ACC201380A0004A000000000AE
65487+:106BD00010C50023240D0F0010CD00273C1F800896
65488+:106BE00037F9008093380000240E0050330F00FF67
65489+:106BF00015EEFFF33C0240000E000A3600000000D4
65490+:106C00003C0240003C068000ACC201380A0004A0EF
65491+:106C1000000000008F83000400A3402B1500000B30
65492+:106C20008F8B0008006B50212547FFFF00E5482BA4
65493+:106C30001520000600A36023000C19400E0002027C
65494+:106C40000073D8210A0004C43C0240000000000D7B
65495+:106C50000E000202000000000A0004C43C024000D2
65496+:106C60003C1B0800277B3F500E0002020000000082
65497+:106C70000A0004C43C0240003C1B0800277B3F7014
65498+:106C80000E000202000000000A0004C43C024000A2
65499+:106C90003C0660043C09080025290104ACC9502CBD
65500+:106CA0008CC850003C0580003C0200023507008083
65501+:106CB000ACC750003C040800248415A43C03080021
65502+:106CC0002463155CACA50008ACA2000C3C010800D4
65503+:106CD000AC243D603C010800AC233D6403E00008A7
65504+:106CE0002402000100A030213C1C0800279C3D68C4
65505+:106CF0003C0C04003C0B0002008B3826008C402624
65506+:106D00002CE200010007502B2D050001000A4880ED
65507+:106D10003C03080024633D60004520250123182121
65508+:106D20001080000300001021AC6600002402000166
65509+:106D300003E00008000000003C1C0800279C3D68A0
65510+:106D40003C0B04003C0A0002008A3026008B3826E7
65511+:106D50002CC200010006482B2CE5000100094080F0
65512+:106D60003C03080024633D600045202501031821F1
65513+:106D700010800005000010213C0C0800258C155CDB
65514+:106D8000AC6C00002402000103E0000800000000D9
65515+:106D90003C0900023C08040000883026008938269F
65516+:106DA0002CC30001008028212CE400010083102561
65517+:106DB0001040000B000030213C1C0800279C3D685F
65518+:106DC0003C0A80008D4E00082406000101CA682597
65519+:106DD000AD4D00088D4C000C01855825AD4B000CC5
65520+:106DE00003E0000800C010213C1C0800279C3D68FF
65521+:106DF0003C0580008CA6000C000420272402000122
65522+:106E000000C4182403E00008ACA3000C3C020002FC
65523+:106E10001082000B3C0560003C0704001087000353
65524+:106E20000000000003E00008000000008CA908D06A
65525+:106E3000240AFFFD012A402403E00008ACA808D082
65526+:106E40008CA408D02406FFFE0086182403E0000866
65527+:106E5000ACA308D03C05601A34A600108CC3008097
65528+:106E600027BDFFF88CC50084AFA3000093A40000E9
65529+:106E70002402000110820003AFA5000403E0000813
65530+:106E800027BD000893A7000114E0001497AC00028E
65531+:106E900097B800023C0F8000330EFFFC01CF682141
65532+:106EA000ADA50000A3A000003C0660008CC708D080
65533+:106EB0002408FFFE3C04601A00E82824ACC508D072
65534+:106EC0008FA300048FA200003499001027BD000892
65535+:106ED000AF22008003E00008AF2300843C0B800059
65536+:106EE000318AFFFC014B48218D2800000A00057DF6
65537+:106EF000AFA8000427BDFFE8AFBF00103C1C08008E
65538+:106F0000279C3D683C0580008CA4000C8CA20004EA
65539+:106F10003C0300020044282410A0000A00A3182407
65540+:106F20003C0604003C0400021460000900A6102482
65541+:106F30001440000F3C0404000000000D3C1C08003D
65542+:106F4000279C3D688FBF001003E0000827BD001894
65543+:106F50003C0208008C423D600040F809000000003F
65544+:106F60003C1C0800279C3D680A0005A68FBF001046
65545+:106F70003C0208008C423D640040F809000000001B
65546+:106F80000A0005AC00000000000411C003E0000886
65547+:106F9000244202403C04080024843FB42405001A23
65548+:106FA0000A00009C0000302127BDFFE0AFB00010B8
65549+:106FB0003C108000AFBF0018AFB1001436110100C3
65550+:106FC000922200090E0005B63044007F8E3F00007B
65551+:106FD0008F89003C3C0F008003E26021258800403F
65552+:106FE0000049F821240DFF80310E00783198007897
65553+:106FF00035F9000135F100020319382501D1482582
65554+:10700000010D302403ED5824018D2824240A00406A
65555+:1070100024040080240300C0AE0B0024AE0008103E
65556+:10702000AE0A0814AE040818AE03081CAE05080426
65557+:10703000AE070820AE060808AE0908243609090084
65558+:107040009539000C3605098033ED007F3338FFFF9A
65559+:10705000001889C0AE110800AE0F0828952C000C4E
65560+:107060008FBF00188FB10014318BFFFF000B51C090
65561+:10707000AE0A002C8CA400508FB000108CA3003CF2
65562+:107080008D2700048CA8001C8CA600383C0E800ABA
65563+:1070900001AE102127BD0020AF820044AF84005014
65564+:1070A000AF830054AF87004CAF88005C03E000085A
65565+:1070B000AF8600603C09080091293FD924A800024E
65566+:1070C0003C05110000093C0000E8302500C51825EA
65567+:1070D00024820008AC83000003E00008AC800004B8
65568+:1070E0003C098000352309009128010B906A0011AA
65569+:1070F0002402002800804821314700FF00A07021B1
65570+:1071000000C068213108004010E20002340C86DD26
65571+:10711000240C08003C0A800035420A9A944700007B
65572+:10712000354B0A9C35460AA030F9FFFFAD39000007
65573+:107130008D780000354B0A8024040001AD3800042E
65574+:107140008CCF0000AD2F00089165001930A300031B
65575+:107150001064009028640002148000AF240500022F
65576+:107160001065009E240F0003106F00B435450AA47B
65577+:10717000240A0800118A0048000000005100003D68
65578+:107180003C0B80003C0480003483090090670012AF
65579+:1071900030E200FF004D7821000FC8802724000155
65580+:1071A0003C0A8000354F090091E50019354C0980F3
65581+:1071B0008D87002830A300FF0003150000475825E5
65582+:1071C0000004C4003C19600001793025370806FF2F
65583+:1071D000AD260000AD2800048DEA002C25280028EB
65584+:1071E000AD2A00088DEC0030AD2C000C8DE500348C
65585+:1071F000AD2500108DE400383C05800034AC093C1E
65586+:10720000AD2400148DE3001CAD2300188DE7002091
65587+:10721000AD27001C8DE20024AD2200208DF900284E
65588+:1072200034A20100AD3900248D830000AD0E0004AE
65589+:1072300034B90900AD0300008C47000C250200148E
65590+:10724000AD070008932B00123C04080090843FD83F
65591+:10725000AD000010317800FF030D302100064F0013
65592+:1072600000047C00012F702535CDFFFC03E00008F1
65593+:10727000AD0D000C35780900930600123C0508009E
65594+:1072800094A53FC830C800FF010D5021000A60805E
65595+:107290000A00063C018520211500005B000000006B
65596+:1072A0003C08080095083FCE3C06080094C63FC83D
65597+:1072B000010610213C0B800035790900933800113C
65598+:1072C000932A001935660A80330800FF94CF002AFC
65599+:1072D00000086082314500FF978A0058000C1E00AC
65600+:1072E000000524003047FFFF006410250047C0253B
65601+:1072F00001EA30213C0B4000030B402500066400EE
65602+:10730000AD280000AD2C0004932500183C030006B6
65603+:107310002528001400053E0000E31025AD220008DA
65604+:107320008F24002C3C05800034AC093CAD24000CBB
65605+:107330008F38001C34A20100254F0001AD38001029
65606+:107340008D830000AD0E000431EB7FFFAD03000024
65607+:107350008C47000C34B90900A78B0058AD07000812
65608+:10736000932B00123C04080090843FD8250200149F
65609+:10737000317800FF030D302100064F0000047C002F
65610+:10738000012F702535CDFFFCAD00001003E0000893
65611+:10739000AD0D000C3C02080094423FD23C050800B1
65612+:1073A00094A53FC835440AA43C07080094E73FC4AD
65613+:1073B000948B00000045C8210327C023000B1C004C
65614+:1073C0002706FFF200665025AD2A000CAD20001004
65615+:1073D000AD2C00140A00063025290018354F0AA4E8
65616+:1073E00095E50000956400280005140000043C00A9
65617+:1073F0003459810000EC5825AD39000CAD2B00103C
65618+:107400000A000630252900143C0C0800958C3FCE5C
65619+:107410000A000681258200015460FF56240A0800F4
65620+:1074200035580AA49706000000061C00006C502581
65621+:10743000AD2A000C0A000630252900103C03080084
65622+:1074400094633FD23C07080094E73FC83C0F080014
65623+:1074500095EF3FC494A4000095790028006710219F
65624+:10746000004F582300041C00001934002578FFEE5B
65625+:1074700000D87825346A8100AD2A000CAD2F0010A9
65626+:10748000AD200014AD2C00180A0006302529001C80
65627+:1074900003E00008240207D027BDFFE0AFB20018C8
65628+:1074A000AFB10014AFB00010AFBF001C0E00007CE5
65629+:1074B000008088218F8800548F87004C3C0580080D
65630+:1074C00034B20080011128213C1080002402008089
65631+:1074D000240300C000A72023AE0208183C06800841
65632+:1074E000AE03081C18800004AF850054ACC500042E
65633+:1074F0008CC90004AF89004C1220000936040980B1
65634+:107500000E0006F800000000924C00278E0B00745D
65635+:1075100001825004014B3021AE46000C3604098034
65636+:107520008C8E001C8F8F005C01CF682319A0000493
65637+:107530008FBF001C8C90001CAF90005C8FBF001CA4
65638+:107540008FB200188FB100148FB000100A00007EB7
65639+:1075500027BD00208F8600508F8300548F82004CFF
65640+:107560003C05800834A40080AC860050AC83003C0D
65641+:1075700003E00008ACA200043C0308008C63005444
65642+:1075800027BDFFF8308400FF2462000130A500FF12
65643+:107590003C010800AC22005430C600FF3C078000CC
65644+:1075A0008CE801780500FFFE3C0C7FFFA3A40003DC
65645+:1075B0008FAA0000358BFFFF014B4824000627C02F
65646+:1075C00001244025AFA8000034E201009043000AE6
65647+:1075D000A3A000023C1980FFA3A300018FAF00000D
65648+:1075E00030AE007F3738FFFF01F86024000E6E00D8
65649+:1075F0003C0A002034E50140018D58253549200022
65650+:107600002406FF803C04100027BD0008ACAB000C32
65651+:10761000ACA90014A4A00018A0A6001203E0000862
65652+:10762000ACE40178308800FF30A700FF3C03800005
65653+:107630008C6201780440FFFE3C0C8000358A0A0011
65654+:107640008D4B00203584014035850980AC8B0004CA
65655+:107650008D4900240007302B00061540AC89000836
65656+:10766000A088001090A3004CA083002D03E0000828
65657+:10767000A480001827BDFFE8308400FFAFBF0010D2
65658+:107680000E00075D30A500FF8F8300548FBF0010F0
65659+:107690003C06800034C50140344700402404FF907C
65660+:1076A0003C02100027BD0018ACA3000CA0A40012DF
65661+:1076B000ACA7001403E00008ACC2017827BDFFE0CE
65662+:1076C0003C088008AFBF001CAFB20018AFB1001477
65663+:1076D000AFB00010351000808E0600183C07800007
65664+:1076E000309200FF00C72025AE0400180E00007C79
65665+:1076F00030B100FF92030005346200080E00007EE6
65666+:10770000A2020005024020210E000771022028215C
65667+:10771000024020218FBF001C8FB200188FB10014CF
65668+:107720008FB0001024050005240600010A0007326E
65669+:1077300027BD00203C05800034A309809066000826
65670+:1077400030C200081040000F3C0A01013549080A08
65671+:10775000AC8900008CA80074AC8800043C070800C9
65672+:1077600090E73FD830E5001050A00008AC8000083A
65673+:107770003C0D800835AC00808D8B0058AC8B000828
65674+:107780002484000C03E00008008010210A0007B5E3
65675+:107790002484000C27BDFFE83C098000AFB0001036
65676+:1077A000AFBF00143526098090C8000924020006E6
65677+:1077B00000A05821310300FF3527090000808021F7
65678+:1077C000240500041062007B2408000294CF005CB2
65679+:1077D0003C0E020431EDFFFF01AE6025AE0C00004F
65680+:1077E00090CA00083144002010800008000000000A
65681+:1077F00090C2004E3C1F010337F90300305800FFD0
65682+:107800000319302524050008AE06000490F9001184
65683+:1078100090E6001290E40011333800FF00187082E7
65684+:1078200030CF00FF01CF5021014B6821308900FF8C
65685+:1078300031AAFFFF39230028000A60801460002C61
65686+:10784000020C482390E400123C198000372F0100FD
65687+:10785000308C00FF018B1821000310800045F821B7
65688+:10786000001F8400360706FFAD270004373F0900DC
65689+:1078700093EC001193EE0012372609800005C082B8
65690+:107880008DE4000C8CC5003431CD00FF01AB10211C
65691+:107890000058182100A4F8230008840000033F00CA
65692+:1078A00000F0302533F9FFFF318F00FC00D970253F
65693+:1078B0000158202101E9682100045080ADAE000C80
65694+:1078C0000E00007C012A80213C088008240B000463
65695+:1078D000350500800E00007EA0AB000902001021DB
65696+:1078E0008FBF00148FB0001003E0000827BD001800
65697+:1078F00090EC001190E300193C18080097183FCE57
65698+:10790000318200FF0002F882307000FF001FCE00BD
65699+:1079100000103C000327302500D870253C0F4000A4
65700+:1079200001CF68253C198000AD2D0000373F0900CC
65701+:1079300093EC001193EE0012372F010037260980D7
65702+:107940000005C0828DE4000C8CC5003431CD00FFF1
65703+:1079500001AB10210058182100A4F823000884006E
65704+:1079600000033F0000F0302533F9FFFF318F00FCAA
65705+:1079700000D970250158202101E9682100045080B8
65706+:10798000ADAE000C0E00007C012A80213C0880086E
65707+:10799000240B0004350500800E00007EA0AB00091A
65708+:1079A000020010218FBF00148FB0001003E0000808
65709+:1079B00027BD00180A0007C72408001227BDFFD002
65710+:1079C0003C038000AFB60028AFB50024AFB4002060
65711+:1079D000AFB10014AFBF002CAFB3001CAFB20018A2
65712+:1079E000AFB000103467010090E6000B309400FF48
65713+:1079F00030B500FF30C200300000B02110400099C7
65714+:107A000000008821346409809088000800082E0056
65715+:107A100000051E03046000C0240400048F86005487
65716+:107A20003C010800A0243FD83C0C8000AD800048F9
65717+:107A30003C048000348E010091CD000B31A5002064
65718+:107A400010A000073C078000349309809272000860
65719+:107A50000012860000107E0305E000C43C1F800871
65720+:107A600034EC0100918A000B34EB09809169000825
65721+:107A7000314400400004402B3123000800C8982303
65722+:107A80001460000224120003000090213C108000CA
65723+:107A900036180A8036040900970E002C90830011D6
65724+:107AA0009089001293050018307F00FF312800FFF5
65725+:107AB000024810210002C880930D0018033F78216E
65726+:107AC00001F1302130B100FF00D11821A78E0058FC
65727+:107AD0003C010800A4263FCE3C010800A4233FD06F
65728+:107AE00015A00002000000000000000D920B010B29
65729+:107AF0003065FFFF3C010800A4233FD2316A0040FB
65730+:107B00003C010800A4203FC83C010800A4203FC459
65731+:107B10001140000224A4000A24A4000B3091FFFFAE
65732+:107B20000E0001E7022020219206010B3C0C080008
65733+:107B3000958C3FD2004020210006698231A70001C8
65734+:107B40000E00060101872821004020210260282123
65735+:107B50000E00060C024030210E0007A1004020213B
65736+:107B600016C00069004020219212010B32560040DD
65737+:107B700012C000053C0500FF8C93000034AEFFFFEF
65738+:107B8000026E8024AC9000000E0001FB0220202138
65739+:107B90003C0F080091EF3FD831F10003122000168E
65740+:107BA0003C1380088F8200543C09800835280080EF
65741+:107BB000245F0001AD1F003C3C0580088CB9000427
65742+:107BC00003E02021033FC0231B000002AF9F0054AD
65743+:107BD0008CA400040E0006F8ACA400043C0780004E
65744+:107BE0008CEB00743C04800834830080004B5021EF
65745+:107BF000AC6A000C3C1380083670008002802021A3
65746+:107C000002A02821A200006B0E00075D3C1480003A
65747+:107C10008F920054368C0140AD92000C8F86004844
65748+:107C20003C151000344D000624D60001AF960048E4
65749+:107C30008FBF002CA18600128FB60028AD8D0014D6
65750+:107C40008FB3001CAE9501788FB200188FB5002459
65751+:107C50008FB400208FB100148FB0001003E0000833
65752+:107C600027BD003034640980908F0008000F760033
65753+:107C7000000E6E0305A00033347F090093F8001B4B
65754+:107C8000241900103C010800A0393FD8331300022A
65755+:107C90001260FF678F8600548F8200601446FF6574
65756+:107CA0003C0480000E00007C000000003C048008C2
65757+:107CB0003485008090A8000924060016310300FFD7
65758+:107CC0001066000D0000000090AB00093C070800A2
65759+:107CD00090E73FD824090008316400FF34EA00012E
65760+:107CE0003C010800A02A3FD81089002F240C000A6C
65761+:107CF000108C00282402000C0E00007E0000000002
65762+:107D00000A0008608F8600540E0007B9024028213F
65763+:107D10000A0008AE004020213C0B8008356A008034
65764+:107D20008D4600548CE9000C1120FF3DAF860054B5
65765+:107D3000240700143C010800A0273FD80A00085F70
65766+:107D40003C0C800090910008241200023C010800C5
65767+:107D5000A0323FD8323000201200000B2416000160
65768+:107D60008F8600540A0008602411000837F800804C
65769+:107D70008F020038AFE200048FF90004AF19003C15
65770+:107D80000A00086C3C0780008F8600540A000860D7
65771+:107D900024110004A0A200090E00007E00000000D3
65772+:107DA0000A0008608F860054240200140A00093A71
65773+:107DB000A0A2000927BDFFE8AFB000103C10800072
65774+:107DC000AFBF001436020100904400090E00075DA9
65775+:107DD000240500013C0480089099000E3483008043
65776+:107DE000909F000F906F00269089000A33F800FFE3
65777+:107DF00000196E000018740031EC00FF01AE502530
65778+:107E0000000C5A00014B3825312800FF3603014091
65779+:107E10003445600000E830252402FF813C04100056
65780+:107E2000AC66000C8FBF0014AC650014A062001299
65781+:107E3000AE0401788FB0001003E0000827BD0018E1
65782+:107E400027BDFFE8308400FFAFBF00100E00075DC4
65783+:107E500030A500FF3C05800034A4014034470040B9
65784+:107E60002406FF92AC870014A08600128F83005472
65785+:107E70008FBF00103C02100027BD0018AC83000C1F
65786+:107E800003E00008ACA2017827BDFFD8AFB0001016
65787+:107E9000308400FF30B000FF3C058000AFB100141B
65788+:107EA000AFBF0020AFB3001CAFB20018000410C277
65789+:107EB00034A60100320300023051000114600007B3
65790+:107EC00090D200093C098008353300809268000593
65791+:107ED0003107000810E0000C308A00100240202119
65792+:107EE0000E00078302202821240200018FBF0020FA
65793+:107EF0008FB3001C8FB200188FB100148FB0001028
65794+:107F000003E0000827BD00281540003434A50A000E
65795+:107F10008CB800248CAF0008130F004B00003821F0
65796+:107F20003C0D800835B30080926C00682406000286
65797+:107F3000318B00FF116600843C06800034C20100D2
65798+:107F40009263004C90590009307F00FF53F9000400
65799+:107F50003213007C10E00069000000003213007C46
65800+:107F60005660005C0240202116200009320D0001FD
65801+:107F70003C0C800035840100358B0A008D6500249F
65802+:107F80008C86000414A6FFD900001021320D0001D8
65803+:107F900011A0000E024020213C1880003710010083
65804+:107FA0008E0F000C8F8E005011EE000800000000B4
65805+:107FB0000E000843022028218E19000C3C1F800867
65806+:107FC00037F00080AE190050024020210E000771EA
65807+:107FD000022028210A00098F240200013C05080024
65808+:107FE0008CA5006424A400013C010800AC240064BA
65809+:107FF0001600000D00000000022028210E0007716D
65810+:1080000002402021926E0068240C000231CD00FF56
65811+:1080100011AC0022024020210E00094100000000A6
65812+:108020000A00098F240200010E00007024040001E0
65813+:10803000926B0025020B30250E00007EA266002503
65814+:108040000A0009D3022028218E6200188CDF000468
65815+:108050008CB9002400021E0217F9FFB13065007FC1
65816+:108060009268004C264400013093007F1265004066
65817+:10807000310300FF1464FFAB3C0D8008264700016C
65818+:1080800030F1007F30E200FF1225000B24070001D1
65819+:10809000004090210A00099C2411000124050004DD
65820+:1080A0000E000732240600010E0009410000000006
65821+:1080B0000A00098F240200012405FF8002452024C4
65822+:1080C00000859026324200FF004090210A00099C62
65823+:1080D000241100010E00084302202821320700303D
65824+:1080E00010E0FFA132100082024020210E00078321
65825+:1080F000022028210A00098F240200018E6900183D
65826+:108100000240202102202821012640250E0009647A
65827+:10811000AE6800189264004C240500032406000198
65828+:108120000E000732308400FF0E00007024040001AE
65829+:1081300092710025021150250E00007EA26A0025D2
65830+:108140000A00098F240200018E6F00183C1880007D
65831+:108150000240202101F87025022028210E0007711D
65832+:10816000AE6E00189264004C0A000A1B240500043D
65833+:10817000324A0080394900801469FF6A3C0D80084A
65834+:108180000A0009F42647000127BDFFC0AFB0001860
65835+:108190003C108000AFBF0038AFB70034AFB600303E
65836+:1081A000AFB5002CAFB40028AFB30024AFB20020AD
65837+:1081B0000E0005BEAFB1001C360201009045000B59
65838+:1081C0000E00097690440008144000E78FBF003885
65839+:1081D0003C08800835070080A0E0006B3606098067
65840+:1081E00090C50000240300503C17080026F73F907C
65841+:1081F00030A400FF3C13080026733FA01083000347
65842+:108200003C1080000000B82100009821241F0010BD
65843+:108210003611010036120A00361509808E580024E6
65844+:108220008E3400048EAF00208F8C00543C01080077
65845+:10823000A03F3FD836190A80972B002C8EF60000FD
65846+:10824000932A00180298702301EC68233C0108006F
65847+:10825000AC2E3FB43C010800AC2D3FB83C010800F7
65848+:10826000AC2C3FDCA78B005802C0F809315400FF4A
65849+:1082700030490002152000E930420001504000C49E
65850+:108280009227000992A90008312800081500000271
65851+:10829000241500030000A8213C0A80003543090092
65852+:1082A00035440A008C8D00249072001190700012E9
65853+:1082B000907F0011325900FF321100FF02B11021EE
65854+:1082C0000002C08033EF00FF0319B021028F70213C
65855+:1082D00002D4602125CB00103C010800A4363FCE1B
65856+:1082E0003C010800AC2D3FE03C010800A42C3FD02D
65857+:1082F0003C010800A42B3FCC3556010035540980C1
65858+:1083000035510E008F8700548F89005C8E850020C8
65859+:1083100024080006012730233C010800AC283FD484
65860+:1083200000A7282304C000B50000902104A000B3DA
65861+:1083300000C5502B114000B5000000003C010800B2
65862+:10834000AC263FB88E6200000040F8090000000033
65863+:108350003046000214C0007400408021304B000100
65864+:10836000556000118E6200043C0D08008DAD3FBCCD
65865+:108370003C0EC0003C04800001AE6025AE2C000025
65866+:108380008C980000330F000811E0FFFD0000000092
65867+:10839000963F000824120001A79F00408E39000478
65868+:1083A000AF9900388E6200040040F8090000000018
65869+:1083B0000202802532030002146000B300000000B6
65870+:1083C0003C09080095293FC43C06080094C63FD0EC
65871+:1083D0003C0A0800954A3FC63C0708008CE73FBCB2
65872+:1083E000012670213C0308008C633FE03C08080034
65873+:1083F00095083FDA01CA20218ED9000C00E9282116
65874+:10840000249F000200A878210067C02133E4FFFF09
65875+:10841000AF9900503C010800AC383FE03C01080037
65876+:10842000A42F3FC83C010800A42E3FD20E0001E754
65877+:10843000000000008F8D0048004020213C01080012
65878+:10844000A02D3FD98E62000825AC0001AF8C0048FA
65879+:108450000040F809000000008F85005402A0302180
65880+:108460000E00060C004020210E0007A10040202134
65881+:108470008E6B000C0160F809004020213C0A0800C6
65882+:10848000954A3FD23C06080094C63FC601464821A3
65883+:10849000252800020E0001FB3104FFFF3C05080007
65884+:1084A0008CA53FB43C0708008CE73FBC00A7202305
65885+:1084B0003C010800AC243FB414800006000000001A
65886+:1084C0003C0208008C423FD4344B00403C01080081
65887+:1084D000AC2B3FD4124000438F8E00448E2D0010F1
65888+:1084E0008F920044AE4D00208E2C0018AE4C00241C
65889+:1084F0003C04080094843FC80E0006FA0000000007
65890+:108500008F9F00548E6700103C010800AC3F3FDC99
65891+:1085100000E0F809000000003C1908008F393FB462
65892+:108520001720FF798F870054979300583C11800ED5
65893+:10853000321601000E000729A633002C16C0004594
65894+:10854000320300105460004C8EE5000432080040F5
65895+:108550005500001D8EF000088EE4000C0080F80924
65896+:10856000000000008FBF00388FB700348FB6003096
65897+:108570008FB5002C8FB400288FB300248FB2002059
65898+:108580008FB1001C8FB0001803E0000827BD004029
65899+:108590008F86003C36110E0000072E0000A6202515
65900+:1085A000AE0400808E4300208E500024AFA3001044
65901+:1085B000AE2300148FB20010AE320010AE30001C9B
65902+:1085C0000A000A75AE3000180200F8090000000029
65903+:1085D0008EE4000C0080F809000000000A000B2E59
65904+:1085E0008FBF003824180001240F0001A5C000200F
65905+:1085F000A5D800220A000B10ADCF00243C010800D2
65906+:10860000AC203FB80A000AA68E6200003C010800B8
65907+:10861000AC253FB80A000AA68E6200009224000929
65908+:108620000E000771000028218FBF00388FB700347B
65909+:108630008FB600308FB5002C8FB400288FB3002484
65910+:108640008FB200208FB1001C8FB0001803E000082B
65911+:1086500027BD00403C1480009295010900002821AC
65912+:108660000E00084332A400FF320300105060FFB830
65913+:10867000320800408EE5000400A0F8090000000068
65914+:108680000A000B28320800405240FFA89793005878
65915+:108690008E3400148F930044AE7400208E35001C7D
65916+:1086A000AE7500240A000B1F979300588F820014A8
65917+:1086B0000004218003E00008008210213C078008AC
65918+:1086C00034E200809043006900804021106000097E
65919+:1086D0003C0401003C0708008CE73FDC8F8300303E
65920+:1086E00000E32023048000089389001C14E30003A6
65921+:1086F0000100202103E00008008010213C0401005B
65922+:1087000003E00008008010211120000B00673823CF
65923+:108710003C0D800035AC0980918B007C316A0002F1
65924+:10872000114000202409003400E9702B15C0FFF12E
65925+:108730000100202100E938232403FFFC00A3C82402
65926+:1087400000E3C02400F9782B15E0FFEA030820219C
65927+:1087500030C400030004102314C000143049000387
65928+:108760000000302100A9782101E6702100EE682B7D
65929+:1087700011A0FFE03C0401002D3800010006C82BC9
65930+:10878000010548210319382414E0FFDA2524FFFCF1
65931+:108790002402FFFC00A218240068202103E0000846
65932+:1087A000008010210A000B9E240900303C0C800040
65933+:1087B0003586098090CB007C316A00041540FFE9C2
65934+:1087C000240600040A000BAD000030213C03080021
65935+:1087D0008C63005C8F82001827BDFFE0AFBF0018DC
65936+:1087E000AFB1001410620005AFB00010000329C043
65937+:1087F00024A40280AF840014AF8300183C108000D2
65938+:1088000036020A0094450032361101000E000B7F3B
65939+:1088100030A43FFF8E240000241FFF803C11008005
65940+:108820000082C021031F60243309007F000CC9406F
65941+:1088300003294025330E0078362F00033C0D10002D
65942+:10884000010D502501CF5825AE0C002836080980AF
65943+:10885000AE0C080CAE0B082CAE0A08309103006970
65944+:108860003C06800C0126382110600006AF870034DA
65945+:108870008D09003C8D03006C0123382318E0008231
65946+:10888000000000003C0B8008356A00803C1080002E
65947+:10889000A1400069360609808CC200383C06800081
65948+:1088A00034C50A0090A8003C310C00201180001A49
65949+:1088B000AF820030240D00013C0E800035D10A004B
65950+:1088C000A38D001CAF8000248E2400248F850024FB
65951+:1088D000240D0008AF800020AF8000283C01080074
65952+:1088E000A42D3FC63C010800A4203FDA0E000B83F4
65953+:1088F000000030219228003C8FBF00188FB1001477
65954+:108900008FB0001000086142AF82002C27BD00200C
65955+:1089100003E000083182000190B80032240E00010B
65956+:10892000330F00FF000F2182108E00412419000236
65957+:108930001099006434C40AC03C03800034640A0007
65958+:108940008C8F002415E0001E34660900909F0030D3
65959+:108950002418000533F9003F1338004E24030001AA
65960+:108960008F860020A383001CAF860028AF860024DA
65961+:108970003C0E800035D10A008E2400248F8500240F
65962+:10898000240D00083C010800A42D3FC63C0108004E
65963+:10899000A4203FDA0E000B83000000009228003C68
65964+:1089A0008FBF00188FB100148FB000100008614213
65965+:1089B000AF82002C27BD002003E0000831820001B7
65966+:1089C0008C8A00088C8B00248CD000643C0E8000C4
65967+:1089D00035D10A00014B2823AF900024A380001C4E
65968+:1089E000AF8500288E2400248F8600208F850024E8
65969+:1089F000240D00083C010800A42D3FC63C010800DE
65970+:108A0000A4203FDA0E000B83000000009228003CF7
65971+:108A10008FBF00188FB100148FB0001000086142A2
65972+:108A2000AF82002C27BD002003E000083182000146
65973+:108A300090A200303051003F5224002834C50AC0B3
65974+:108A40008CB000241600002234CB09008CA600480C
65975+:108A50003C0A7FFF3545FFFF00C510243C0E800017
65976+:108A6000AF82002035C509008F8800208CAD0060E2
65977+:108A7000010D602B15800002010020218CA40060F4
65978+:108A80000A000C22AF8400208D02006C0A000BFC4F
65979+:108A90003C0680008C8200488F8600203C097FFFC6
65980+:108AA0003527FFFF004788243C0480082403000189
65981+:108AB000AF910028AC80006CA383001C0A000C302E
65982+:108AC000AF8600248C9F00140A000C22AF9F002068
65983+:108AD0008D6200680A000C6C3C0E800034C4098072
65984+:108AE0008C8900708CA300140123382B10E0000443
65985+:108AF000000000008C8200700A000C6C3C0E8000AC
65986+:108B00008CA200140A000C6C3C0E80008F8500249F
65987+:108B100027BDFFE0AFBF0018AFB1001414A00008DC
65988+:108B2000AFB000103C04800034870A0090E60030AB
65989+:108B30002402000530C3003F106200B934840900EC
65990+:108B40008F91002000A080213C048000348E0A0018
65991+:108B50008DCD00043C0608008CC63FB831A73FFF0E
65992+:108B600000E6602B5580000100E03021938F001C4F
65993+:108B700011E0007800D0282B349F098093F9007C05
65994+:108B800033380002130000792403003400C3102B93
65995+:108B9000144000D90000000000C3302300D0282B6F
65996+:108BA0003C010800A4233FC414A0006E0200182159
65997+:108BB0003C0408008C843FB40064402B5500000145
65998+:108BC000006020213C05800034A90A00912A003C65
65999+:108BD0003C010800AC243FBC31430020146000037A
66000+:108BE0000000482134AB0E008D6900188F88002CDE
66001+:108BF0000128202B1080005F000000003C050800C9
66002+:108C00008CA53FBC00A96821010D602B1180005C80
66003+:108C100000B0702B0109382300E028213C01080036
66004+:108C2000AC273FBC12000003240AFFFC10B0008DEB
66005+:108C30003224000300AA18243C010800A4203FDAD3
66006+:108C40003C010800AC233FBC006028218F84002435
66007+:108C5000120400063C0B80088D6C006C0200202181
66008+:108C6000AF91002025900001AD70006C8F8D002821
66009+:108C700000858823AF91002401A52023AF8400281C
66010+:108C80001220000224070018240700103C18800856
66011+:108C90003706008090CF00683C010800A0273FD82D
66012+:108CA0002407000131EE00FF11C70047000000005B
66013+:108CB00014800018000028213C06800034D109806F
66014+:108CC00034CD010091A600098E2C001824C40001A7
66015+:108CD000000C86023205007F308B007F1165007F1B
66016+:108CE0002407FF803C19800837290080A124004C0C
66017+:108CF0003C0808008D083FD4241800023C010800FD
66018+:108D0000A0384019350F00083C010800AC2F3FD4B3
66019+:108D1000240500103C02800034440A009083003C8B
66020+:108D2000307F002013E0000500A02021240A00016C
66021+:108D30003C010800AC2A3FBC34A400018FBF0018DE
66022+:108D40008FB100148FB000100080102103E00008E4
66023+:108D500027BD00203C010800A4203FC410A0FF94C0
66024+:108D6000020018210A000CC000C018210A000CB72C
66025+:108D7000240300303C0508008CA53FBC00B0702BDC
66026+:108D800011C0FFA8000000003C19080097393FC43B
66027+:108D90000325C0210307782B11E000072CAA00044B
66028+:108DA0003C0360008C625404305F003F17E0FFE337
66029+:108DB000240400422CAA00041140FF9A240400421B
66030+:108DC0000A000D248FBF00181528FFB9000000000D
66031+:108DD0008CCA00183C1F800024020002015F182585
66032+:108DE000ACC3001837F90A00A0C200689329003C00
66033+:108DF0002404000400A01021312800203C010800B8
66034+:108E0000A0244019110000022405001024020001D2
66035+:108E10003C010800AC223FB40A000D1A3C0280005D
66036+:108E20008F8800288C8900600109282B14A000027B
66037+:108E3000010088218C9100603C048000348B0E007E
66038+:108E40008D640018240A000102202821022030210C
66039+:108E5000A38A001C0E000B83022080210A000CA6AE
66040+:108E6000AF82002C00045823122000073164000355
66041+:108E70003C0E800035C7098090ED007C31AC0004C9
66042+:108E800015800019248F00043C010800A4243FDA57
66043+:108E90003C1F080097FF3FDA03E5C82100D9C02B2B
66044+:108EA0001300FF6B8F8400242CA6000514C0FFA3C1
66045+:108EB0002404004230A200031440000200A2182340
66046+:108EC00024A3FFFC3C010800AC233FBC3C0108008C
66047+:108ED000A4203FDA0A000CE70060282100C77024B4
66048+:108EE0000A000D0D01C720263C010800A42F3FDA1F
66049+:108EF0000A000D78000000003C010800AC203FBCD7
66050+:108F00000A000D23240400428F8300283C058000C2
66051+:108F100034AA0A00146000060000102191470030B6
66052+:108F20002406000530E400FF108600030000000066
66053+:108F300003E0000800000000914B0048316900FF89
66054+:108F4000000941C21500FFFA3C0680083C040800F5
66055+:108F500094843FC43C0308008C633FDC3C19080048
66056+:108F60008F393FBC3C0F080095EF3FDA0064C02109
66057+:108F70008CCD00040319702101CF602134AB0E00A9
66058+:108F8000018D282318A0001D00000000914F004C07
66059+:108F90008F8C0034956D001031EE00FF8D89000438
66060+:108FA00001AE30238D8A000030CEFFFF000E290075
66061+:108FB0000125C82100003821014720210325182B55
66062+:108FC0000083C021AD990004AD980000918F000A84
66063+:108FD00001CF6821A18D000A956500128F8A0034A7
66064+:108FE000A5450008954B003825690001A5490038C2
66065+:108FF0009148000D35070008A147000D03E0000867
66066+:109000000000000027BDFFD8AFB000189388001CF7
66067+:109010008FB000143C0A80003C197FFF8F8700242A
66068+:109020003738FFFFAFBF0020AFB1001C355F0A002B
66069+:109030000218182493EB003C00087FC03C02BFFFDD
66070+:10904000006F60252CF000013449FFFF3C1F080031
66071+:109050008FFF3FDC8F9900303C18080097183FD2F3
66072+:1090600001897824001047803C07EFFF3C05F0FFA2
66073+:1090700001E818253C1180003169002034E2FFFF2F
66074+:1090800034ADFFFF362E098027A50010240600020C
66075+:1090900003F96023270B0002354A0E0000621824F2
66076+:1090A0000080802115200002000040218D48001C16
66077+:1090B000A7AB0012058000392407000030E800FF4C
66078+:1090C00000083F00006758253C028008AFAB001441
66079+:1090D000344F008091EA00683C08080091083FD9AD
66080+:1090E0003C09DFFF352CFFFF000AF82B3C0208008B
66081+:1090F00094423FCCA3A80011016CC024001FCF40B4
66082+:10910000031918258FA70010AFA300143C0C08000A
66083+:10911000918C3FDBA7A200168FAB001400ED482412
66084+:109120003C0F01003C0A0FFF012FC82531980003B6
66085+:10913000355FFFFF016D40243C027000033F38247F
66086+:1091400000181E0000E2482501037825AFAF001487
66087+:10915000AFA9001091CC007C0E000092A3AC0015CA
66088+:10916000362D0A0091A6003C30C400201080000675
66089+:10917000260200083C11080096313FC8262EFFFF4A
66090+:109180003C010800A42E3FC88FBF00208FB1001CF7
66091+:109190008FB0001803E0000827BD00288F8B002C3B
66092+:1091A000010B502B5540FFC5240700010A000E0497
66093+:1091B00030E800FF9383001C3C02800027BDFFD8ED
66094+:1091C00034480A0000805021AFBF002034460AC056
66095+:1091D000010028211060000E3444098091070030FE
66096+:1091E000240B00058F89002030EC003F118B000B11
66097+:1091F00000003821AFA900103C0B80088D69006C7D
66098+:10920000AFAA00180E00015AAFA90014A380001CD9
66099+:109210008FBF002003E0000827BD00288D1F0048F5
66100+:109220003C1808008F183FBC8F9900283C027FFF34
66101+:109230008D0800443443FFFFAFA900103C0B8008A9
66102+:109240008D69006C03E370240319782101CF682332
66103+:1092500001A83821AFAA00180E00015AAFA90014C6
66104+:109260000A000E58A380001C3C05800034A60A00AA
66105+:1092700090C7003C3C06080094C63FDA3C02080058
66106+:109280008C423FD430E30020000624001060001E12
66107+:10929000004438253C0880083505008090A300680C
66108+:1092A00000004821240800010000282124040001B6
66109+:1092B0003C0680008CCD017805A0FFFE34CF014034
66110+:1092C000ADE800083C0208008C423FDCA5E5000444
66111+:1092D000A5E40006ADE2000C3C04080090843FD9F0
66112+:1092E0003C03800834790080A1E40012ADE700144B
66113+:1092F000A5E900189338004C3C0E1000A1F8002D91
66114+:1093000003E00008ACCE017834A90E008D28001CC3
66115+:109310003C0C08008D8C3FBC952B0016952A001440
66116+:10932000018648213164FFFF0A000E803145FFFFAE
66117+:109330003C04800034830A009065003C30A2002089
66118+:109340001040001934870E00000040210000382131
66119+:10935000000020213C0680008CC901780520FFFE1A
66120+:1093600034CA014034CF010091EB0009AD48000838
66121+:109370003C0E08008DCE3FDC240DFF91240C0040F4
66122+:109380003C081000A5440004A5470006AD4E000CA3
66123+:10939000A14D0012AD4C0014A5400018A14B002DAA
66124+:1093A00003E00008ACC801788CE8001894E60012CD
66125+:1093B00094E4001030C7FFFF0A000EA93084FFFFBD
66126+:1093C0003C04800034830A009065003C30A20020F9
66127+:1093D0001040002727BDFFF82409000100003821B4
66128+:1093E000240800013C0680008CCA01780540FFFE7D
66129+:1093F0003C0280FF34C40100908D00093C0C080041
66130+:10940000918C4019A3AD00038FAB00003185007F24
66131+:109410003459FFFF01665025AFAA00009083000A6F
66132+:10942000A3A0000200057E00A3A300018FB80000E6
66133+:1094300034CB0140240C30000319702401CF68257F
66134+:10944000AD6D000C27BD0008AD6C0014A5600018C0
66135+:10945000AD690008A56700042409FF80A56800061F
66136+:109460003C081000A169001203E00008ACC80178B4
66137+:1094700034870E008CE9001894E6001294E4001082
66138+:1094800030C8FFFF0A000ECD3087FFFF27BDFFE089
66139+:10949000AFB100143C118000AFB00010AFBF001896
66140+:1094A00036380A00970F0032363001000E000B7F6D
66141+:1094B00031E43FFF8E0E0000240DFF803C042000AD
66142+:1094C00001C25821016D6024000C4940316A007FBF
66143+:1094D000012A4025010438253C048008AE270830C5
66144+:1094E0003486008090C500682403000230A200FF8B
66145+:1094F000104300048F9F00208F990024AC9F0068C8
66146+:10950000AC9900648FBF00188FB100148FB00010A9
66147+:1095100003E0000827BD00203C0A0800254A3A80E5
66148+:109520003C09080025293B103C08080025082F1C91
66149+:109530003C07080024E73BDC3C06080024C639044D
66150+:109540003C05080024A536583C0408002484325CFD
66151+:109550003C030800246339B83C0208002442375415
66152+:109560003C010800AC2A3F983C010800AC293F941C
66153+:109570003C010800AC283F903C010800AC273F9C10
66154+:109580003C010800AC263FAC3C010800AC253FA4E0
66155+:109590003C010800AC243FA03C010800AC233FB0D4
66156+:1095A0003C010800AC223FA803E0000800000000D6
66157+:1095B00080000940800009008008010080080080C8
66158+:1095C00080080000800E00008008008080080000F5
66159+:1095D00080000A8080000A00800009808000090065
66160+:00000001FF
66161diff --git a/fs/9p/vfs_addr.c b/fs/9p/vfs_addr.c
66162index eb14e05..5156de7 100644
66163--- a/fs/9p/vfs_addr.c
66164+++ b/fs/9p/vfs_addr.c
66165@@ -187,7 +187,7 @@ static int v9fs_vfs_writepage_locked(struct page *page)
66166
66167 retval = v9fs_file_write_internal(inode,
66168 v9inode->writeback_fid,
66169- (__force const char __user *)buffer,
66170+ (const char __force_user *)buffer,
66171 len, &offset, 0);
66172 if (retval > 0)
66173 retval = 0;
66174diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
66175index 3662f1d..90558b5 100644
66176--- a/fs/9p/vfs_inode.c
66177+++ b/fs/9p/vfs_inode.c
66178@@ -1312,7 +1312,7 @@ static void *v9fs_vfs_follow_link(struct dentry *dentry, struct nameidata *nd)
66179 void
66180 v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
66181 {
66182- char *s = nd_get_link(nd);
66183+ const char *s = nd_get_link(nd);
66184
66185 p9_debug(P9_DEBUG_VFS, " %pd %s\n",
66186 dentry, IS_ERR(s) ? "<error>" : s);
66187diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt
66188index 270c481..0d8a962 100644
66189--- a/fs/Kconfig.binfmt
66190+++ b/fs/Kconfig.binfmt
66191@@ -106,7 +106,7 @@ config HAVE_AOUT
66192
66193 config BINFMT_AOUT
66194 tristate "Kernel support for a.out and ECOFF binaries"
66195- depends on HAVE_AOUT
66196+ depends on HAVE_AOUT && BROKEN
66197 ---help---
66198 A.out (Assembler.OUTput) is a set of formats for libraries and
66199 executables used in the earliest versions of UNIX. Linux used
66200diff --git a/fs/afs/inode.c b/fs/afs/inode.c
66201index 8a1d38e..300a14e 100644
66202--- a/fs/afs/inode.c
66203+++ b/fs/afs/inode.c
66204@@ -141,7 +141,7 @@ struct inode *afs_iget_autocell(struct inode *dir, const char *dev_name,
66205 struct afs_vnode *vnode;
66206 struct super_block *sb;
66207 struct inode *inode;
66208- static atomic_t afs_autocell_ino;
66209+ static atomic_unchecked_t afs_autocell_ino;
66210
66211 _enter("{%x:%u},%*.*s,",
66212 AFS_FS_I(dir)->fid.vid, AFS_FS_I(dir)->fid.vnode,
66213@@ -154,7 +154,7 @@ struct inode *afs_iget_autocell(struct inode *dir, const char *dev_name,
66214 data.fid.unique = 0;
66215 data.fid.vnode = 0;
66216
66217- inode = iget5_locked(sb, atomic_inc_return(&afs_autocell_ino),
66218+ inode = iget5_locked(sb, atomic_inc_return_unchecked(&afs_autocell_ino),
66219 afs_iget5_autocell_test, afs_iget5_set,
66220 &data);
66221 if (!inode) {
66222diff --git a/fs/aio.c b/fs/aio.c
66223index a1736e9..c80a8ac 100644
66224--- a/fs/aio.c
66225+++ b/fs/aio.c
66226@@ -409,7 +409,7 @@ static int aio_setup_ring(struct kioctx *ctx)
66227 size += sizeof(struct io_event) * nr_events;
66228
66229 nr_pages = PFN_UP(size);
66230- if (nr_pages < 0)
66231+ if (nr_pages <= 0)
66232 return -EINVAL;
66233
66234 file = aio_private_file(ctx, nr_pages);
66235diff --git a/fs/attr.c b/fs/attr.c
66236index 6530ced..4a827e2 100644
66237--- a/fs/attr.c
66238+++ b/fs/attr.c
66239@@ -102,6 +102,7 @@ int inode_newsize_ok(const struct inode *inode, loff_t offset)
66240 unsigned long limit;
66241
66242 limit = rlimit(RLIMIT_FSIZE);
66243+ gr_learn_resource(current, RLIMIT_FSIZE, (unsigned long)offset, 1);
66244 if (limit != RLIM_INFINITY && offset > limit)
66245 goto out_sig;
66246 if (offset > inode->i_sb->s_maxbytes)
66247diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c
66248index 116fd38..c04182da 100644
66249--- a/fs/autofs4/waitq.c
66250+++ b/fs/autofs4/waitq.c
66251@@ -59,7 +59,7 @@ static int autofs4_write(struct autofs_sb_info *sbi,
66252 {
66253 unsigned long sigpipe, flags;
66254 mm_segment_t fs;
66255- const char *data = (const char *)addr;
66256+ const char __user *data = (const char __force_user *)addr;
66257 ssize_t wr = 0;
66258
66259 sigpipe = sigismember(&current->pending.signal, SIGPIPE);
66260@@ -340,6 +340,10 @@ static int validate_request(struct autofs_wait_queue **wait,
66261 return 1;
66262 }
66263
66264+#ifdef CONFIG_GRKERNSEC_HIDESYM
66265+static atomic_unchecked_t autofs_dummy_name_id = ATOMIC_INIT(0);
66266+#endif
66267+
66268 int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
66269 enum autofs_notify notify)
66270 {
66271@@ -385,7 +389,12 @@ int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
66272
66273 /* If this is a direct mount request create a dummy name */
66274 if (IS_ROOT(dentry) && autofs_type_trigger(sbi->type))
66275+#ifdef CONFIG_GRKERNSEC_HIDESYM
66276+ /* this name does get written to userland via autofs4_write() */
66277+ qstr.len = sprintf(name, "%08x", atomic_inc_return_unchecked(&autofs_dummy_name_id));
66278+#else
66279 qstr.len = sprintf(name, "%p", dentry);
66280+#endif
66281 else {
66282 qstr.len = autofs4_getpath(sbi, dentry, &name);
66283 if (!qstr.len) {
66284diff --git a/fs/befs/endian.h b/fs/befs/endian.h
66285index 2722387..56059b5 100644
66286--- a/fs/befs/endian.h
66287+++ b/fs/befs/endian.h
66288@@ -11,7 +11,7 @@
66289
66290 #include <asm/byteorder.h>
66291
66292-static inline u64
66293+static inline u64 __intentional_overflow(-1)
66294 fs64_to_cpu(const struct super_block *sb, fs64 n)
66295 {
66296 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
66297@@ -29,7 +29,7 @@ cpu_to_fs64(const struct super_block *sb, u64 n)
66298 return (__force fs64)cpu_to_be64(n);
66299 }
66300
66301-static inline u32
66302+static inline u32 __intentional_overflow(-1)
66303 fs32_to_cpu(const struct super_block *sb, fs32 n)
66304 {
66305 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
66306@@ -47,7 +47,7 @@ cpu_to_fs32(const struct super_block *sb, u32 n)
66307 return (__force fs32)cpu_to_be32(n);
66308 }
66309
66310-static inline u16
66311+static inline u16 __intentional_overflow(-1)
66312 fs16_to_cpu(const struct super_block *sb, fs16 n)
66313 {
66314 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
66315diff --git a/fs/binfmt_aout.c b/fs/binfmt_aout.c
66316index 4c55668..eeae150 100644
66317--- a/fs/binfmt_aout.c
66318+++ b/fs/binfmt_aout.c
66319@@ -16,6 +16,7 @@
66320 #include <linux/string.h>
66321 #include <linux/fs.h>
66322 #include <linux/file.h>
66323+#include <linux/security.h>
66324 #include <linux/stat.h>
66325 #include <linux/fcntl.h>
66326 #include <linux/ptrace.h>
66327@@ -58,6 +59,8 @@ static int aout_core_dump(struct coredump_params *cprm)
66328 #endif
66329 # define START_STACK(u) ((void __user *)u.start_stack)
66330
66331+ memset(&dump, 0, sizeof(dump));
66332+
66333 fs = get_fs();
66334 set_fs(KERNEL_DS);
66335 has_dumped = 1;
66336@@ -68,10 +71,12 @@ static int aout_core_dump(struct coredump_params *cprm)
66337
66338 /* If the size of the dump file exceeds the rlimit, then see what would happen
66339 if we wrote the stack, but not the data area. */
66340+ gr_learn_resource(current, RLIMIT_CORE, (dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE, 1);
66341 if ((dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE > cprm->limit)
66342 dump.u_dsize = 0;
66343
66344 /* Make sure we have enough room to write the stack and data areas. */
66345+ gr_learn_resource(current, RLIMIT_CORE, (dump.u_ssize + 1) * PAGE_SIZE, 1);
66346 if ((dump.u_ssize + 1) * PAGE_SIZE > cprm->limit)
66347 dump.u_ssize = 0;
66348
66349@@ -232,6 +237,8 @@ static int load_aout_binary(struct linux_binprm * bprm)
66350 rlim = rlimit(RLIMIT_DATA);
66351 if (rlim >= RLIM_INFINITY)
66352 rlim = ~0;
66353+
66354+ gr_learn_resource(current, RLIMIT_DATA, ex.a_data + ex.a_bss, 1);
66355 if (ex.a_data + ex.a_bss > rlim)
66356 return -ENOMEM;
66357
66358@@ -261,6 +268,27 @@ static int load_aout_binary(struct linux_binprm * bprm)
66359
66360 install_exec_creds(bprm);
66361
66362+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
66363+ current->mm->pax_flags = 0UL;
66364+#endif
66365+
66366+#ifdef CONFIG_PAX_PAGEEXEC
66367+ if (!(N_FLAGS(ex) & F_PAX_PAGEEXEC)) {
66368+ current->mm->pax_flags |= MF_PAX_PAGEEXEC;
66369+
66370+#ifdef CONFIG_PAX_EMUTRAMP
66371+ if (N_FLAGS(ex) & F_PAX_EMUTRAMP)
66372+ current->mm->pax_flags |= MF_PAX_EMUTRAMP;
66373+#endif
66374+
66375+#ifdef CONFIG_PAX_MPROTECT
66376+ if (!(N_FLAGS(ex) & F_PAX_MPROTECT))
66377+ current->mm->pax_flags |= MF_PAX_MPROTECT;
66378+#endif
66379+
66380+ }
66381+#endif
66382+
66383 if (N_MAGIC(ex) == OMAGIC) {
66384 unsigned long text_addr, map_size;
66385 loff_t pos;
66386@@ -312,7 +340,7 @@ static int load_aout_binary(struct linux_binprm * bprm)
66387 return error;
66388
66389 error = vm_mmap(bprm->file, N_DATADDR(ex), ex.a_data,
66390- PROT_READ | PROT_WRITE | PROT_EXEC,
66391+ PROT_READ | PROT_WRITE,
66392 MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
66393 fd_offset + ex.a_text);
66394 if (error != N_DATADDR(ex))
66395diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
66396index 8081aba..90a7bdd 100644
66397--- a/fs/binfmt_elf.c
66398+++ b/fs/binfmt_elf.c
66399@@ -34,6 +34,7 @@
66400 #include <linux/utsname.h>
66401 #include <linux/coredump.h>
66402 #include <linux/sched.h>
66403+#include <linux/xattr.h>
66404 #include <asm/uaccess.h>
66405 #include <asm/param.h>
66406 #include <asm/page.h>
66407@@ -47,7 +48,7 @@
66408
66409 static int load_elf_binary(struct linux_binprm *bprm);
66410 static unsigned long elf_map(struct file *, unsigned long, struct elf_phdr *,
66411- int, int, unsigned long);
66412+ int, int, unsigned long) __intentional_overflow(-1);
66413
66414 #ifdef CONFIG_USELIB
66415 static int load_elf_library(struct file *);
66416@@ -65,6 +66,14 @@ static int elf_core_dump(struct coredump_params *cprm);
66417 #define elf_core_dump NULL
66418 #endif
66419
66420+#ifdef CONFIG_PAX_MPROTECT
66421+static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags);
66422+#endif
66423+
66424+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
66425+static void elf_handle_mmap(struct file *file);
66426+#endif
66427+
66428 #if ELF_EXEC_PAGESIZE > PAGE_SIZE
66429 #define ELF_MIN_ALIGN ELF_EXEC_PAGESIZE
66430 #else
66431@@ -84,6 +93,15 @@ static struct linux_binfmt elf_format = {
66432 .load_binary = load_elf_binary,
66433 .load_shlib = load_elf_library,
66434 .core_dump = elf_core_dump,
66435+
66436+#ifdef CONFIG_PAX_MPROTECT
66437+ .handle_mprotect= elf_handle_mprotect,
66438+#endif
66439+
66440+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
66441+ .handle_mmap = elf_handle_mmap,
66442+#endif
66443+
66444 .min_coredump = ELF_EXEC_PAGESIZE,
66445 };
66446
66447@@ -91,6 +109,8 @@ static struct linux_binfmt elf_format = {
66448
66449 static int set_brk(unsigned long start, unsigned long end)
66450 {
66451+ unsigned long e = end;
66452+
66453 start = ELF_PAGEALIGN(start);
66454 end = ELF_PAGEALIGN(end);
66455 if (end > start) {
66456@@ -99,7 +119,7 @@ static int set_brk(unsigned long start, unsigned long end)
66457 if (BAD_ADDR(addr))
66458 return addr;
66459 }
66460- current->mm->start_brk = current->mm->brk = end;
66461+ current->mm->start_brk = current->mm->brk = e;
66462 return 0;
66463 }
66464
66465@@ -160,12 +180,13 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
66466 elf_addr_t __user *u_rand_bytes;
66467 const char *k_platform = ELF_PLATFORM;
66468 const char *k_base_platform = ELF_BASE_PLATFORM;
66469- unsigned char k_rand_bytes[16];
66470+ u32 k_rand_bytes[4];
66471 int items;
66472 elf_addr_t *elf_info;
66473 int ei_index = 0;
66474 const struct cred *cred = current_cred();
66475 struct vm_area_struct *vma;
66476+ unsigned long saved_auxv[AT_VECTOR_SIZE];
66477
66478 /*
66479 * In some cases (e.g. Hyper-Threading), we want to avoid L1
66480@@ -207,8 +228,12 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
66481 * Generate 16 random bytes for userspace PRNG seeding.
66482 */
66483 get_random_bytes(k_rand_bytes, sizeof(k_rand_bytes));
66484- u_rand_bytes = (elf_addr_t __user *)
66485- STACK_ALLOC(p, sizeof(k_rand_bytes));
66486+ prandom_seed(k_rand_bytes[0] ^ prandom_u32());
66487+ prandom_seed(k_rand_bytes[1] ^ prandom_u32());
66488+ prandom_seed(k_rand_bytes[2] ^ prandom_u32());
66489+ prandom_seed(k_rand_bytes[3] ^ prandom_u32());
66490+ p = STACK_ROUND(p, sizeof(k_rand_bytes));
66491+ u_rand_bytes = (elf_addr_t __user *) p;
66492 if (__copy_to_user(u_rand_bytes, k_rand_bytes, sizeof(k_rand_bytes)))
66493 return -EFAULT;
66494
66495@@ -323,9 +348,11 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
66496 return -EFAULT;
66497 current->mm->env_end = p;
66498
66499+ memcpy(saved_auxv, elf_info, ei_index * sizeof(elf_addr_t));
66500+
66501 /* Put the elf_info on the stack in the right place. */
66502 sp = (elf_addr_t __user *)envp + 1;
66503- if (copy_to_user(sp, elf_info, ei_index * sizeof(elf_addr_t)))
66504+ if (copy_to_user(sp, saved_auxv, ei_index * sizeof(elf_addr_t)))
66505 return -EFAULT;
66506 return 0;
66507 }
66508@@ -514,14 +541,14 @@ static inline int arch_check_elf(struct elfhdr *ehdr, bool has_interp,
66509 an ELF header */
66510
66511 static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
66512- struct file *interpreter, unsigned long *interp_map_addr,
66513+ struct file *interpreter,
66514 unsigned long no_base, struct elf_phdr *interp_elf_phdata)
66515 {
66516 struct elf_phdr *eppnt;
66517- unsigned long load_addr = 0;
66518+ unsigned long load_addr = 0, pax_task_size = TASK_SIZE;
66519 int load_addr_set = 0;
66520 unsigned long last_bss = 0, elf_bss = 0;
66521- unsigned long error = ~0UL;
66522+ unsigned long error = -EINVAL;
66523 unsigned long total_size;
66524 int i;
66525
66526@@ -541,6 +568,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
66527 goto out;
66528 }
66529
66530+#ifdef CONFIG_PAX_SEGMEXEC
66531+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
66532+ pax_task_size = SEGMEXEC_TASK_SIZE;
66533+#endif
66534+
66535 eppnt = interp_elf_phdata;
66536 for (i = 0; i < interp_elf_ex->e_phnum; i++, eppnt++) {
66537 if (eppnt->p_type == PT_LOAD) {
66538@@ -564,8 +596,6 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
66539 map_addr = elf_map(interpreter, load_addr + vaddr,
66540 eppnt, elf_prot, elf_type, total_size);
66541 total_size = 0;
66542- if (!*interp_map_addr)
66543- *interp_map_addr = map_addr;
66544 error = map_addr;
66545 if (BAD_ADDR(map_addr))
66546 goto out;
66547@@ -584,8 +614,8 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
66548 k = load_addr + eppnt->p_vaddr;
66549 if (BAD_ADDR(k) ||
66550 eppnt->p_filesz > eppnt->p_memsz ||
66551- eppnt->p_memsz > TASK_SIZE ||
66552- TASK_SIZE - eppnt->p_memsz < k) {
66553+ eppnt->p_memsz > pax_task_size ||
66554+ pax_task_size - eppnt->p_memsz < k) {
66555 error = -ENOMEM;
66556 goto out;
66557 }
66558@@ -624,9 +654,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
66559 elf_bss = ELF_PAGESTART(elf_bss + ELF_MIN_ALIGN - 1);
66560
66561 /* Map the last of the bss segment */
66562- error = vm_brk(elf_bss, last_bss - elf_bss);
66563- if (BAD_ADDR(error))
66564- goto out;
66565+ if (last_bss > elf_bss) {
66566+ error = vm_brk(elf_bss, last_bss - elf_bss);
66567+ if (BAD_ADDR(error))
66568+ goto out;
66569+ }
66570 }
66571
66572 error = load_addr;
66573@@ -634,6 +666,336 @@ out:
66574 return error;
66575 }
66576
66577+#ifdef CONFIG_PAX_PT_PAX_FLAGS
66578+#ifdef CONFIG_PAX_SOFTMODE
66579+static unsigned long pax_parse_pt_pax_softmode(const struct elf_phdr * const elf_phdata)
66580+{
66581+ unsigned long pax_flags = 0UL;
66582+
66583+#ifdef CONFIG_PAX_PAGEEXEC
66584+ if (elf_phdata->p_flags & PF_PAGEEXEC)
66585+ pax_flags |= MF_PAX_PAGEEXEC;
66586+#endif
66587+
66588+#ifdef CONFIG_PAX_SEGMEXEC
66589+ if (elf_phdata->p_flags & PF_SEGMEXEC)
66590+ pax_flags |= MF_PAX_SEGMEXEC;
66591+#endif
66592+
66593+#ifdef CONFIG_PAX_EMUTRAMP
66594+ if ((elf_phdata->p_flags & PF_EMUTRAMP) && (pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)))
66595+ pax_flags |= MF_PAX_EMUTRAMP;
66596+#endif
66597+
66598+#ifdef CONFIG_PAX_MPROTECT
66599+ if (elf_phdata->p_flags & PF_MPROTECT)
66600+ pax_flags |= MF_PAX_MPROTECT;
66601+#endif
66602+
66603+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
66604+ if (randomize_va_space && (elf_phdata->p_flags & PF_RANDMMAP))
66605+ pax_flags |= MF_PAX_RANDMMAP;
66606+#endif
66607+
66608+ return pax_flags;
66609+}
66610+#endif
66611+
66612+static unsigned long pax_parse_pt_pax_hardmode(const struct elf_phdr * const elf_phdata)
66613+{
66614+ unsigned long pax_flags = 0UL;
66615+
66616+#ifdef CONFIG_PAX_PAGEEXEC
66617+ if (!(elf_phdata->p_flags & PF_NOPAGEEXEC))
66618+ pax_flags |= MF_PAX_PAGEEXEC;
66619+#endif
66620+
66621+#ifdef CONFIG_PAX_SEGMEXEC
66622+ if (!(elf_phdata->p_flags & PF_NOSEGMEXEC))
66623+ pax_flags |= MF_PAX_SEGMEXEC;
66624+#endif
66625+
66626+#ifdef CONFIG_PAX_EMUTRAMP
66627+ if (!(elf_phdata->p_flags & PF_NOEMUTRAMP))
66628+ pax_flags |= MF_PAX_EMUTRAMP;
66629+#endif
66630+
66631+#ifdef CONFIG_PAX_MPROTECT
66632+ if (!(elf_phdata->p_flags & PF_NOMPROTECT))
66633+ pax_flags |= MF_PAX_MPROTECT;
66634+#endif
66635+
66636+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
66637+ if (randomize_va_space && !(elf_phdata->p_flags & PF_NORANDMMAP))
66638+ pax_flags |= MF_PAX_RANDMMAP;
66639+#endif
66640+
66641+ return pax_flags;
66642+}
66643+#endif
66644+
66645+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
66646+#ifdef CONFIG_PAX_SOFTMODE
66647+static unsigned long pax_parse_xattr_pax_softmode(unsigned long pax_flags_softmode)
66648+{
66649+ unsigned long pax_flags = 0UL;
66650+
66651+#ifdef CONFIG_PAX_PAGEEXEC
66652+ if (pax_flags_softmode & MF_PAX_PAGEEXEC)
66653+ pax_flags |= MF_PAX_PAGEEXEC;
66654+#endif
66655+
66656+#ifdef CONFIG_PAX_SEGMEXEC
66657+ if (pax_flags_softmode & MF_PAX_SEGMEXEC)
66658+ pax_flags |= MF_PAX_SEGMEXEC;
66659+#endif
66660+
66661+#ifdef CONFIG_PAX_EMUTRAMP
66662+ if ((pax_flags_softmode & MF_PAX_EMUTRAMP) && (pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)))
66663+ pax_flags |= MF_PAX_EMUTRAMP;
66664+#endif
66665+
66666+#ifdef CONFIG_PAX_MPROTECT
66667+ if (pax_flags_softmode & MF_PAX_MPROTECT)
66668+ pax_flags |= MF_PAX_MPROTECT;
66669+#endif
66670+
66671+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
66672+ if (randomize_va_space && (pax_flags_softmode & MF_PAX_RANDMMAP))
66673+ pax_flags |= MF_PAX_RANDMMAP;
66674+#endif
66675+
66676+ return pax_flags;
66677+}
66678+#endif
66679+
66680+static unsigned long pax_parse_xattr_pax_hardmode(unsigned long pax_flags_hardmode)
66681+{
66682+ unsigned long pax_flags = 0UL;
66683+
66684+#ifdef CONFIG_PAX_PAGEEXEC
66685+ if (!(pax_flags_hardmode & MF_PAX_PAGEEXEC))
66686+ pax_flags |= MF_PAX_PAGEEXEC;
66687+#endif
66688+
66689+#ifdef CONFIG_PAX_SEGMEXEC
66690+ if (!(pax_flags_hardmode & MF_PAX_SEGMEXEC))
66691+ pax_flags |= MF_PAX_SEGMEXEC;
66692+#endif
66693+
66694+#ifdef CONFIG_PAX_EMUTRAMP
66695+ if (!(pax_flags_hardmode & MF_PAX_EMUTRAMP))
66696+ pax_flags |= MF_PAX_EMUTRAMP;
66697+#endif
66698+
66699+#ifdef CONFIG_PAX_MPROTECT
66700+ if (!(pax_flags_hardmode & MF_PAX_MPROTECT))
66701+ pax_flags |= MF_PAX_MPROTECT;
66702+#endif
66703+
66704+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
66705+ if (randomize_va_space && !(pax_flags_hardmode & MF_PAX_RANDMMAP))
66706+ pax_flags |= MF_PAX_RANDMMAP;
66707+#endif
66708+
66709+ return pax_flags;
66710+}
66711+#endif
66712+
66713+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
66714+static unsigned long pax_parse_defaults(void)
66715+{
66716+ unsigned long pax_flags = 0UL;
66717+
66718+#ifdef CONFIG_PAX_SOFTMODE
66719+ if (pax_softmode)
66720+ return pax_flags;
66721+#endif
66722+
66723+#ifdef CONFIG_PAX_PAGEEXEC
66724+ pax_flags |= MF_PAX_PAGEEXEC;
66725+#endif
66726+
66727+#ifdef CONFIG_PAX_SEGMEXEC
66728+ pax_flags |= MF_PAX_SEGMEXEC;
66729+#endif
66730+
66731+#ifdef CONFIG_PAX_MPROTECT
66732+ pax_flags |= MF_PAX_MPROTECT;
66733+#endif
66734+
66735+#ifdef CONFIG_PAX_RANDMMAP
66736+ if (randomize_va_space)
66737+ pax_flags |= MF_PAX_RANDMMAP;
66738+#endif
66739+
66740+ return pax_flags;
66741+}
66742+
66743+static unsigned long pax_parse_ei_pax(const struct elfhdr * const elf_ex)
66744+{
66745+ unsigned long pax_flags = PAX_PARSE_FLAGS_FALLBACK;
66746+
66747+#ifdef CONFIG_PAX_EI_PAX
66748+
66749+#ifdef CONFIG_PAX_SOFTMODE
66750+ if (pax_softmode)
66751+ return pax_flags;
66752+#endif
66753+
66754+ pax_flags = 0UL;
66755+
66756+#ifdef CONFIG_PAX_PAGEEXEC
66757+ if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_PAGEEXEC))
66758+ pax_flags |= MF_PAX_PAGEEXEC;
66759+#endif
66760+
66761+#ifdef CONFIG_PAX_SEGMEXEC
66762+ if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_SEGMEXEC))
66763+ pax_flags |= MF_PAX_SEGMEXEC;
66764+#endif
66765+
66766+#ifdef CONFIG_PAX_EMUTRAMP
66767+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && (elf_ex->e_ident[EI_PAX] & EF_PAX_EMUTRAMP))
66768+ pax_flags |= MF_PAX_EMUTRAMP;
66769+#endif
66770+
66771+#ifdef CONFIG_PAX_MPROTECT
66772+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && !(elf_ex->e_ident[EI_PAX] & EF_PAX_MPROTECT))
66773+ pax_flags |= MF_PAX_MPROTECT;
66774+#endif
66775+
66776+#ifdef CONFIG_PAX_ASLR
66777+ if (randomize_va_space && !(elf_ex->e_ident[EI_PAX] & EF_PAX_RANDMMAP))
66778+ pax_flags |= MF_PAX_RANDMMAP;
66779+#endif
66780+
66781+#endif
66782+
66783+ return pax_flags;
66784+
66785+}
66786+
66787+static unsigned long pax_parse_pt_pax(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata)
66788+{
66789+
66790+#ifdef CONFIG_PAX_PT_PAX_FLAGS
66791+ unsigned long i;
66792+
66793+ for (i = 0UL; i < elf_ex->e_phnum; i++)
66794+ if (elf_phdata[i].p_type == PT_PAX_FLAGS) {
66795+ if (((elf_phdata[i].p_flags & PF_PAGEEXEC) && (elf_phdata[i].p_flags & PF_NOPAGEEXEC)) ||
66796+ ((elf_phdata[i].p_flags & PF_SEGMEXEC) && (elf_phdata[i].p_flags & PF_NOSEGMEXEC)) ||
66797+ ((elf_phdata[i].p_flags & PF_EMUTRAMP) && (elf_phdata[i].p_flags & PF_NOEMUTRAMP)) ||
66798+ ((elf_phdata[i].p_flags & PF_MPROTECT) && (elf_phdata[i].p_flags & PF_NOMPROTECT)) ||
66799+ ((elf_phdata[i].p_flags & PF_RANDMMAP) && (elf_phdata[i].p_flags & PF_NORANDMMAP)))
66800+ return PAX_PARSE_FLAGS_FALLBACK;
66801+
66802+#ifdef CONFIG_PAX_SOFTMODE
66803+ if (pax_softmode)
66804+ return pax_parse_pt_pax_softmode(&elf_phdata[i]);
66805+ else
66806+#endif
66807+
66808+ return pax_parse_pt_pax_hardmode(&elf_phdata[i]);
66809+ break;
66810+ }
66811+#endif
66812+
66813+ return PAX_PARSE_FLAGS_FALLBACK;
66814+}
66815+
66816+static unsigned long pax_parse_xattr_pax(struct file * const file)
66817+{
66818+
66819+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
66820+ ssize_t xattr_size, i;
66821+ unsigned char xattr_value[sizeof("pemrs") - 1];
66822+ unsigned long pax_flags_hardmode = 0UL, pax_flags_softmode = 0UL;
66823+
66824+ xattr_size = pax_getxattr(file->f_path.dentry, xattr_value, sizeof xattr_value);
66825+ if (xattr_size < 0 || xattr_size > sizeof xattr_value)
66826+ return PAX_PARSE_FLAGS_FALLBACK;
66827+
66828+ for (i = 0; i < xattr_size; i++)
66829+ switch (xattr_value[i]) {
66830+ default:
66831+ return PAX_PARSE_FLAGS_FALLBACK;
66832+
66833+#define parse_flag(option1, option2, flag) \
66834+ case option1: \
66835+ if (pax_flags_hardmode & MF_PAX_##flag) \
66836+ return PAX_PARSE_FLAGS_FALLBACK;\
66837+ pax_flags_hardmode |= MF_PAX_##flag; \
66838+ break; \
66839+ case option2: \
66840+ if (pax_flags_softmode & MF_PAX_##flag) \
66841+ return PAX_PARSE_FLAGS_FALLBACK;\
66842+ pax_flags_softmode |= MF_PAX_##flag; \
66843+ break;
66844+
66845+ parse_flag('p', 'P', PAGEEXEC);
66846+ parse_flag('e', 'E', EMUTRAMP);
66847+ parse_flag('m', 'M', MPROTECT);
66848+ parse_flag('r', 'R', RANDMMAP);
66849+ parse_flag('s', 'S', SEGMEXEC);
66850+
66851+#undef parse_flag
66852+ }
66853+
66854+ if (pax_flags_hardmode & pax_flags_softmode)
66855+ return PAX_PARSE_FLAGS_FALLBACK;
66856+
66857+#ifdef CONFIG_PAX_SOFTMODE
66858+ if (pax_softmode)
66859+ return pax_parse_xattr_pax_softmode(pax_flags_softmode);
66860+ else
66861+#endif
66862+
66863+ return pax_parse_xattr_pax_hardmode(pax_flags_hardmode);
66864+#else
66865+ return PAX_PARSE_FLAGS_FALLBACK;
66866+#endif
66867+
66868+}
66869+
66870+static long pax_parse_pax_flags(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata, struct file * const file)
66871+{
66872+ unsigned long pax_flags, ei_pax_flags, pt_pax_flags, xattr_pax_flags;
66873+
66874+ pax_flags = pax_parse_defaults();
66875+ ei_pax_flags = pax_parse_ei_pax(elf_ex);
66876+ pt_pax_flags = pax_parse_pt_pax(elf_ex, elf_phdata);
66877+ xattr_pax_flags = pax_parse_xattr_pax(file);
66878+
66879+ if (pt_pax_flags != PAX_PARSE_FLAGS_FALLBACK &&
66880+ xattr_pax_flags != PAX_PARSE_FLAGS_FALLBACK &&
66881+ pt_pax_flags != xattr_pax_flags)
66882+ return -EINVAL;
66883+ if (xattr_pax_flags != PAX_PARSE_FLAGS_FALLBACK)
66884+ pax_flags = xattr_pax_flags;
66885+ else if (pt_pax_flags != PAX_PARSE_FLAGS_FALLBACK)
66886+ pax_flags = pt_pax_flags;
66887+ else if (ei_pax_flags != PAX_PARSE_FLAGS_FALLBACK)
66888+ pax_flags = ei_pax_flags;
66889+
66890+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
66891+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
66892+ if ((__supported_pte_mask & _PAGE_NX))
66893+ pax_flags &= ~MF_PAX_SEGMEXEC;
66894+ else
66895+ pax_flags &= ~MF_PAX_PAGEEXEC;
66896+ }
66897+#endif
66898+
66899+ if (0 > pax_check_flags(&pax_flags))
66900+ return -EINVAL;
66901+
66902+ current->mm->pax_flags = pax_flags;
66903+ return 0;
66904+}
66905+#endif
66906+
66907 /*
66908 * These are the functions used to load ELF style executables and shared
66909 * libraries. There is no binary dependent code anywhere else.
66910@@ -647,6 +1009,11 @@ static unsigned long randomize_stack_top(unsigned long stack_top)
66911 {
66912 unsigned long random_variable = 0;
66913
66914+#ifdef CONFIG_PAX_RANDUSTACK
66915+ if (current->mm->pax_flags & MF_PAX_RANDMMAP)
66916+ return stack_top - current->mm->delta_stack;
66917+#endif
66918+
66919 if ((current->flags & PF_RANDOMIZE) &&
66920 !(current->personality & ADDR_NO_RANDOMIZE)) {
66921 random_variable = (unsigned long) get_random_int();
66922@@ -666,7 +1033,7 @@ static int load_elf_binary(struct linux_binprm *bprm)
66923 unsigned long load_addr = 0, load_bias = 0;
66924 int load_addr_set = 0;
66925 char * elf_interpreter = NULL;
66926- unsigned long error;
66927+ unsigned long error = 0;
66928 struct elf_phdr *elf_ppnt, *elf_phdata, *interp_elf_phdata = NULL;
66929 unsigned long elf_bss, elf_brk;
66930 int retval, i;
66931@@ -681,6 +1048,7 @@ static int load_elf_binary(struct linux_binprm *bprm)
66932 struct elfhdr interp_elf_ex;
66933 } *loc;
66934 struct arch_elf_state arch_state = INIT_ARCH_ELF_STATE;
66935+ unsigned long pax_task_size;
66936
66937 loc = kmalloc(sizeof(*loc), GFP_KERNEL);
66938 if (!loc) {
66939@@ -839,6 +1207,77 @@ static int load_elf_binary(struct linux_binprm *bprm)
66940 /* Do this immediately, since STACK_TOP as used in setup_arg_pages
66941 may depend on the personality. */
66942 SET_PERSONALITY2(loc->elf_ex, &arch_state);
66943+
66944+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
66945+ current->mm->pax_flags = 0UL;
66946+#endif
66947+
66948+#ifdef CONFIG_PAX_DLRESOLVE
66949+ current->mm->call_dl_resolve = 0UL;
66950+#endif
66951+
66952+#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
66953+ current->mm->call_syscall = 0UL;
66954+#endif
66955+
66956+#ifdef CONFIG_PAX_ASLR
66957+ current->mm->delta_mmap = 0UL;
66958+ current->mm->delta_stack = 0UL;
66959+#endif
66960+
66961+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
66962+ if (0 > pax_parse_pax_flags(&loc->elf_ex, elf_phdata, bprm->file)) {
66963+ send_sig(SIGKILL, current, 0);
66964+ goto out_free_dentry;
66965+ }
66966+#endif
66967+
66968+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
66969+ pax_set_initial_flags(bprm);
66970+#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
66971+ if (pax_set_initial_flags_func)
66972+ (pax_set_initial_flags_func)(bprm);
66973+#endif
66974+
66975+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
66976+ if ((current->mm->pax_flags & MF_PAX_PAGEEXEC) && !(__supported_pte_mask & _PAGE_NX)) {
66977+ current->mm->context.user_cs_limit = PAGE_SIZE;
66978+ current->mm->def_flags |= VM_PAGEEXEC | VM_NOHUGEPAGE;
66979+ }
66980+#endif
66981+
66982+#ifdef CONFIG_PAX_SEGMEXEC
66983+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
66984+ current->mm->context.user_cs_base = SEGMEXEC_TASK_SIZE;
66985+ current->mm->context.user_cs_limit = TASK_SIZE-SEGMEXEC_TASK_SIZE;
66986+ pax_task_size = SEGMEXEC_TASK_SIZE;
66987+ current->mm->def_flags |= VM_NOHUGEPAGE;
66988+ } else
66989+#endif
66990+
66991+ pax_task_size = TASK_SIZE;
66992+
66993+#if defined(CONFIG_ARCH_TRACK_EXEC_LIMIT) || defined(CONFIG_PAX_SEGMEXEC)
66994+ if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
66995+ set_user_cs(current->mm->context.user_cs_base, current->mm->context.user_cs_limit, get_cpu());
66996+ put_cpu();
66997+ }
66998+#endif
66999+
67000+#ifdef CONFIG_PAX_ASLR
67001+ if (current->mm->pax_flags & MF_PAX_RANDMMAP) {
67002+ current->mm->delta_mmap = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN)-1)) << PAGE_SHIFT;
67003+ current->mm->delta_stack = (pax_get_random_long() & ((1UL << PAX_DELTA_STACK_LEN)-1)) << PAGE_SHIFT;
67004+ }
67005+#endif
67006+
67007+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
67008+ if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
67009+ executable_stack = EXSTACK_DISABLE_X;
67010+ current->personality &= ~READ_IMPLIES_EXEC;
67011+ } else
67012+#endif
67013+
67014 if (elf_read_implies_exec(loc->elf_ex, executable_stack))
67015 current->personality |= READ_IMPLIES_EXEC;
67016
67017@@ -925,8 +1364,21 @@ static int load_elf_binary(struct linux_binprm *bprm)
67018 #else
67019 load_bias = ELF_PAGESTART(ELF_ET_DYN_BASE - vaddr);
67020 #endif
67021- total_size = total_mapping_size(elf_phdata,
67022- loc->elf_ex.e_phnum);
67023+
67024+#ifdef CONFIG_PAX_RANDMMAP
67025+ /* PaX: randomize base address at the default exe base if requested */
67026+ if ((current->mm->pax_flags & MF_PAX_RANDMMAP) && elf_interpreter) {
67027+#ifdef CONFIG_SPARC64
67028+ load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << (PAGE_SHIFT+1);
67029+#else
67030+ load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << PAGE_SHIFT;
67031+#endif
67032+ load_bias = ELF_PAGESTART(PAX_ELF_ET_DYN_BASE - vaddr + load_bias);
67033+ elf_flags |= MAP_FIXED;
67034+ }
67035+#endif
67036+
67037+ total_size = total_mapping_size(elf_phdata, loc->elf_ex.e_phnum);
67038 if (!total_size) {
67039 retval = -EINVAL;
67040 goto out_free_dentry;
67041@@ -962,9 +1414,9 @@ static int load_elf_binary(struct linux_binprm *bprm)
67042 * allowed task size. Note that p_filesz must always be
67043 * <= p_memsz so it is only necessary to check p_memsz.
67044 */
67045- if (BAD_ADDR(k) || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
67046- elf_ppnt->p_memsz > TASK_SIZE ||
67047- TASK_SIZE - elf_ppnt->p_memsz < k) {
67048+ if (k >= pax_task_size || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
67049+ elf_ppnt->p_memsz > pax_task_size ||
67050+ pax_task_size - elf_ppnt->p_memsz < k) {
67051 /* set_brk can never work. Avoid overflows. */
67052 retval = -EINVAL;
67053 goto out_free_dentry;
67054@@ -1000,16 +1452,43 @@ static int load_elf_binary(struct linux_binprm *bprm)
67055 if (retval)
67056 goto out_free_dentry;
67057 if (likely(elf_bss != elf_brk) && unlikely(padzero(elf_bss))) {
67058- retval = -EFAULT; /* Nobody gets to see this, but.. */
67059- goto out_free_dentry;
67060+ /*
67061+ * This bss-zeroing can fail if the ELF
67062+ * file specifies odd protections. So
67063+ * we don't check the return value
67064+ */
67065 }
67066
67067+#ifdef CONFIG_PAX_RANDMMAP
67068+ if (current->mm->pax_flags & MF_PAX_RANDMMAP) {
67069+ unsigned long start, size, flags;
67070+ vm_flags_t vm_flags;
67071+
67072+ start = ELF_PAGEALIGN(elf_brk);
67073+ size = PAGE_SIZE + ((pax_get_random_long() & ((1UL << 22) - 1UL)) << 4);
67074+ flags = MAP_FIXED | MAP_PRIVATE;
67075+ vm_flags = VM_DONTEXPAND | VM_DONTDUMP;
67076+
67077+ down_write(&current->mm->mmap_sem);
67078+ start = get_unmapped_area(NULL, start, PAGE_ALIGN(size), 0, flags);
67079+ retval = -ENOMEM;
67080+ if (!IS_ERR_VALUE(start) && !find_vma_intersection(current->mm, start, start + size + PAGE_SIZE)) {
67081+// if (current->personality & ADDR_NO_RANDOMIZE)
67082+// vm_flags |= VM_READ | VM_MAYREAD;
67083+ start = mmap_region(NULL, start, PAGE_ALIGN(size), vm_flags, 0);
67084+ retval = IS_ERR_VALUE(start) ? start : 0;
67085+ }
67086+ up_write(&current->mm->mmap_sem);
67087+ if (retval == 0)
67088+ retval = set_brk(start + size, start + size + PAGE_SIZE);
67089+ if (retval < 0)
67090+ goto out_free_dentry;
67091+ }
67092+#endif
67093+
67094 if (elf_interpreter) {
67095- unsigned long interp_map_addr = 0;
67096-
67097 elf_entry = load_elf_interp(&loc->interp_elf_ex,
67098 interpreter,
67099- &interp_map_addr,
67100 load_bias, interp_elf_phdata);
67101 if (!IS_ERR((void *)elf_entry)) {
67102 /*
67103@@ -1237,7 +1716,7 @@ static bool always_dump_vma(struct vm_area_struct *vma)
67104 * Decide what to dump of a segment, part, all or none.
67105 */
67106 static unsigned long vma_dump_size(struct vm_area_struct *vma,
67107- unsigned long mm_flags)
67108+ unsigned long mm_flags, long signr)
67109 {
67110 #define FILTER(type) (mm_flags & (1UL << MMF_DUMP_##type))
67111
67112@@ -1275,7 +1754,7 @@ static unsigned long vma_dump_size(struct vm_area_struct *vma,
67113 if (vma->vm_file == NULL)
67114 return 0;
67115
67116- if (FILTER(MAPPED_PRIVATE))
67117+ if (signr == SIGKILL || FILTER(MAPPED_PRIVATE))
67118 goto whole;
67119
67120 /*
67121@@ -1482,9 +1961,9 @@ static void fill_auxv_note(struct memelfnote *note, struct mm_struct *mm)
67122 {
67123 elf_addr_t *auxv = (elf_addr_t *) mm->saved_auxv;
67124 int i = 0;
67125- do
67126+ do {
67127 i += 2;
67128- while (auxv[i - 2] != AT_NULL);
67129+ } while (auxv[i - 2] != AT_NULL);
67130 fill_note(note, "CORE", NT_AUXV, i * sizeof(elf_addr_t), auxv);
67131 }
67132
67133@@ -1493,7 +1972,7 @@ static void fill_siginfo_note(struct memelfnote *note, user_siginfo_t *csigdata,
67134 {
67135 mm_segment_t old_fs = get_fs();
67136 set_fs(KERNEL_DS);
67137- copy_siginfo_to_user((user_siginfo_t __user *) csigdata, siginfo);
67138+ copy_siginfo_to_user((user_siginfo_t __force_user *) csigdata, siginfo);
67139 set_fs(old_fs);
67140 fill_note(note, "CORE", NT_SIGINFO, sizeof(*csigdata), csigdata);
67141 }
67142@@ -2213,7 +2692,7 @@ static int elf_core_dump(struct coredump_params *cprm)
67143 vma = next_vma(vma, gate_vma)) {
67144 unsigned long dump_size;
67145
67146- dump_size = vma_dump_size(vma, cprm->mm_flags);
67147+ dump_size = vma_dump_size(vma, cprm->mm_flags, cprm->siginfo->si_signo);
67148 vma_filesz[i++] = dump_size;
67149 vma_data_size += dump_size;
67150 }
67151@@ -2321,6 +2800,167 @@ out:
67152
67153 #endif /* CONFIG_ELF_CORE */
67154
67155+#ifdef CONFIG_PAX_MPROTECT
67156+/* PaX: non-PIC ELF libraries need relocations on their executable segments
67157+ * therefore we'll grant them VM_MAYWRITE once during their life. Similarly
67158+ * we'll remove VM_MAYWRITE for good on RELRO segments.
67159+ *
67160+ * The checks favour ld-linux.so behaviour which operates on a per ELF segment
67161+ * basis because we want to allow the common case and not the special ones.
67162+ */
67163+static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags)
67164+{
67165+ struct elfhdr elf_h;
67166+ struct elf_phdr elf_p;
67167+ unsigned long i;
67168+ unsigned long oldflags;
67169+ bool is_textrel_rw, is_textrel_rx, is_relro;
67170+
67171+ if (!(vma->vm_mm->pax_flags & MF_PAX_MPROTECT) || !vma->vm_file)
67172+ return;
67173+
67174+ oldflags = vma->vm_flags & (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ);
67175+ newflags &= VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ;
67176+
67177+#ifdef CONFIG_PAX_ELFRELOCS
67178+ /* possible TEXTREL */
67179+ is_textrel_rw = !vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYREAD | VM_EXEC | VM_READ) && newflags == (VM_WRITE | VM_READ);
67180+ is_textrel_rx = vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_WRITE | VM_READ) && newflags == (VM_EXEC | VM_READ);
67181+#else
67182+ is_textrel_rw = false;
67183+ is_textrel_rx = false;
67184+#endif
67185+
67186+ /* possible RELRO */
67187+ is_relro = vma->anon_vma && oldflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ) && newflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ);
67188+
67189+ if (!is_textrel_rw && !is_textrel_rx && !is_relro)
67190+ return;
67191+
67192+ if (sizeof(elf_h) != kernel_read(vma->vm_file, 0UL, (char *)&elf_h, sizeof(elf_h)) ||
67193+ memcmp(elf_h.e_ident, ELFMAG, SELFMAG) ||
67194+
67195+#ifdef CONFIG_PAX_ETEXECRELOCS
67196+ ((is_textrel_rw || is_textrel_rx) && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
67197+#else
67198+ ((is_textrel_rw || is_textrel_rx) && elf_h.e_type != ET_DYN) ||
67199+#endif
67200+
67201+ (is_relro && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
67202+ !elf_check_arch(&elf_h) ||
67203+ elf_h.e_phentsize != sizeof(struct elf_phdr) ||
67204+ elf_h.e_phnum > 65536UL / sizeof(struct elf_phdr))
67205+ return;
67206+
67207+ for (i = 0UL; i < elf_h.e_phnum; i++) {
67208+ if (sizeof(elf_p) != kernel_read(vma->vm_file, elf_h.e_phoff + i*sizeof(elf_p), (char *)&elf_p, sizeof(elf_p)))
67209+ return;
67210+ switch (elf_p.p_type) {
67211+ case PT_DYNAMIC:
67212+ if (!is_textrel_rw && !is_textrel_rx)
67213+ continue;
67214+ i = 0UL;
67215+ while ((i+1) * sizeof(elf_dyn) <= elf_p.p_filesz) {
67216+ elf_dyn dyn;
67217+
67218+ if (sizeof(dyn) != kernel_read(vma->vm_file, elf_p.p_offset + i*sizeof(dyn), (char *)&dyn, sizeof(dyn)))
67219+ break;
67220+ if (dyn.d_tag == DT_NULL)
67221+ break;
67222+ if (dyn.d_tag == DT_TEXTREL || (dyn.d_tag == DT_FLAGS && (dyn.d_un.d_val & DF_TEXTREL))) {
67223+ gr_log_textrel(vma);
67224+ if (is_textrel_rw)
67225+ vma->vm_flags |= VM_MAYWRITE;
67226+ else
67227+ /* PaX: disallow write access after relocs are done, hopefully noone else needs it... */
67228+ vma->vm_flags &= ~VM_MAYWRITE;
67229+ break;
67230+ }
67231+ i++;
67232+ }
67233+ is_textrel_rw = false;
67234+ is_textrel_rx = false;
67235+ continue;
67236+
67237+ case PT_GNU_RELRO:
67238+ if (!is_relro)
67239+ continue;
67240+ if ((elf_p.p_offset >> PAGE_SHIFT) == vma->vm_pgoff && ELF_PAGEALIGN(elf_p.p_memsz) == vma->vm_end - vma->vm_start)
67241+ vma->vm_flags &= ~VM_MAYWRITE;
67242+ is_relro = false;
67243+ continue;
67244+
67245+#ifdef CONFIG_PAX_PT_PAX_FLAGS
67246+ case PT_PAX_FLAGS: {
67247+ const char *msg_mprotect = "", *msg_emutramp = "";
67248+ char *buffer_lib, *buffer_exe;
67249+
67250+ if (elf_p.p_flags & PF_NOMPROTECT)
67251+ msg_mprotect = "MPROTECT disabled";
67252+
67253+#ifdef CONFIG_PAX_EMUTRAMP
67254+ if (!(vma->vm_mm->pax_flags & MF_PAX_EMUTRAMP) && !(elf_p.p_flags & PF_NOEMUTRAMP))
67255+ msg_emutramp = "EMUTRAMP enabled";
67256+#endif
67257+
67258+ if (!msg_mprotect[0] && !msg_emutramp[0])
67259+ continue;
67260+
67261+ if (!printk_ratelimit())
67262+ continue;
67263+
67264+ buffer_lib = (char *)__get_free_page(GFP_KERNEL);
67265+ buffer_exe = (char *)__get_free_page(GFP_KERNEL);
67266+ if (buffer_lib && buffer_exe) {
67267+ char *path_lib, *path_exe;
67268+
67269+ path_lib = pax_get_path(&vma->vm_file->f_path, buffer_lib, PAGE_SIZE);
67270+ path_exe = pax_get_path(&vma->vm_mm->exe_file->f_path, buffer_exe, PAGE_SIZE);
67271+
67272+ pr_info("PAX: %s wants %s%s%s on %s\n", path_lib, msg_mprotect,
67273+ (msg_mprotect[0] && msg_emutramp[0] ? " and " : ""), msg_emutramp, path_exe);
67274+
67275+ }
67276+ free_page((unsigned long)buffer_exe);
67277+ free_page((unsigned long)buffer_lib);
67278+ continue;
67279+ }
67280+#endif
67281+
67282+ }
67283+ }
67284+}
67285+#endif
67286+
67287+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
67288+
67289+extern int grsec_enable_log_rwxmaps;
67290+
67291+static void elf_handle_mmap(struct file *file)
67292+{
67293+ struct elfhdr elf_h;
67294+ struct elf_phdr elf_p;
67295+ unsigned long i;
67296+
67297+ if (!grsec_enable_log_rwxmaps)
67298+ return;
67299+
67300+ if (sizeof(elf_h) != kernel_read(file, 0UL, (char *)&elf_h, sizeof(elf_h)) ||
67301+ memcmp(elf_h.e_ident, ELFMAG, SELFMAG) ||
67302+ (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC) || !elf_check_arch(&elf_h) ||
67303+ elf_h.e_phentsize != sizeof(struct elf_phdr) ||
67304+ elf_h.e_phnum > 65536UL / sizeof(struct elf_phdr))
67305+ return;
67306+
67307+ for (i = 0UL; i < elf_h.e_phnum; i++) {
67308+ if (sizeof(elf_p) != kernel_read(file, elf_h.e_phoff + i*sizeof(elf_p), (char *)&elf_p, sizeof(elf_p)))
67309+ return;
67310+ if (elf_p.p_type == PT_GNU_STACK && (elf_p.p_flags & PF_X))
67311+ gr_log_ptgnustack(file);
67312+ }
67313+}
67314+#endif
67315+
67316 static int __init init_elf_binfmt(void)
67317 {
67318 register_binfmt(&elf_format);
67319diff --git a/fs/block_dev.c b/fs/block_dev.c
67320index 975266b..c3d1856 100644
67321--- a/fs/block_dev.c
67322+++ b/fs/block_dev.c
67323@@ -734,7 +734,7 @@ static bool bd_may_claim(struct block_device *bdev, struct block_device *whole,
67324 else if (bdev->bd_contains == bdev)
67325 return true; /* is a whole device which isn't held */
67326
67327- else if (whole->bd_holder == bd_may_claim)
67328+ else if (whole->bd_holder == (void *)bd_may_claim)
67329 return true; /* is a partition of a device that is being partitioned */
67330 else if (whole->bd_holder != NULL)
67331 return false; /* is a partition of a held device */
67332diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
67333index 6d67f32..8f33187 100644
67334--- a/fs/btrfs/ctree.c
67335+++ b/fs/btrfs/ctree.c
67336@@ -1181,9 +1181,12 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans,
67337 free_extent_buffer(buf);
67338 add_root_to_dirty_list(root);
67339 } else {
67340- if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID)
67341- parent_start = parent->start;
67342- else
67343+ if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID) {
67344+ if (parent)
67345+ parent_start = parent->start;
67346+ else
67347+ parent_start = 0;
67348+ } else
67349 parent_start = 0;
67350
67351 WARN_ON(trans->transid != btrfs_header_generation(parent));
67352diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c
67353index 82f0c7c..dff78a8 100644
67354--- a/fs/btrfs/delayed-inode.c
67355+++ b/fs/btrfs/delayed-inode.c
67356@@ -462,7 +462,7 @@ static int __btrfs_add_delayed_deletion_item(struct btrfs_delayed_node *node,
67357
67358 static void finish_one_item(struct btrfs_delayed_root *delayed_root)
67359 {
67360- int seq = atomic_inc_return(&delayed_root->items_seq);
67361+ int seq = atomic_inc_return_unchecked(&delayed_root->items_seq);
67362 if ((atomic_dec_return(&delayed_root->items) <
67363 BTRFS_DELAYED_BACKGROUND || seq % BTRFS_DELAYED_BATCH == 0) &&
67364 waitqueue_active(&delayed_root->wait))
67365@@ -1412,7 +1412,7 @@ void btrfs_assert_delayed_root_empty(struct btrfs_root *root)
67366
67367 static int could_end_wait(struct btrfs_delayed_root *delayed_root, int seq)
67368 {
67369- int val = atomic_read(&delayed_root->items_seq);
67370+ int val = atomic_read_unchecked(&delayed_root->items_seq);
67371
67372 if (val < seq || val >= seq + BTRFS_DELAYED_BATCH)
67373 return 1;
67374@@ -1436,7 +1436,7 @@ void btrfs_balance_delayed_items(struct btrfs_root *root)
67375 int seq;
67376 int ret;
67377
67378- seq = atomic_read(&delayed_root->items_seq);
67379+ seq = atomic_read_unchecked(&delayed_root->items_seq);
67380
67381 ret = btrfs_wq_run_delayed_node(delayed_root, root, 0);
67382 if (ret)
67383diff --git a/fs/btrfs/delayed-inode.h b/fs/btrfs/delayed-inode.h
67384index f70119f..ab5894d 100644
67385--- a/fs/btrfs/delayed-inode.h
67386+++ b/fs/btrfs/delayed-inode.h
67387@@ -43,7 +43,7 @@ struct btrfs_delayed_root {
67388 */
67389 struct list_head prepare_list;
67390 atomic_t items; /* for delayed items */
67391- atomic_t items_seq; /* for delayed items */
67392+ atomic_unchecked_t items_seq; /* for delayed items */
67393 int nodes; /* for delayed nodes */
67394 wait_queue_head_t wait;
67395 };
67396@@ -90,7 +90,7 @@ static inline void btrfs_init_delayed_root(
67397 struct btrfs_delayed_root *delayed_root)
67398 {
67399 atomic_set(&delayed_root->items, 0);
67400- atomic_set(&delayed_root->items_seq, 0);
67401+ atomic_set_unchecked(&delayed_root->items_seq, 0);
67402 delayed_root->nodes = 0;
67403 spin_lock_init(&delayed_root->lock);
67404 init_waitqueue_head(&delayed_root->wait);
67405diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
67406index e477ed6..480c0db 100644
67407--- a/fs/btrfs/super.c
67408+++ b/fs/btrfs/super.c
67409@@ -271,7 +271,7 @@ void __btrfs_abort_transaction(struct btrfs_trans_handle *trans,
67410 function, line, errstr);
67411 return;
67412 }
67413- ACCESS_ONCE(trans->transaction->aborted) = errno;
67414+ ACCESS_ONCE_RW(trans->transaction->aborted) = errno;
67415 /* Wake up anybody who may be waiting on this transaction */
67416 wake_up(&root->fs_info->transaction_wait);
67417 wake_up(&root->fs_info->transaction_blocked_wait);
67418diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c
67419index 94edb0a..e94dc93 100644
67420--- a/fs/btrfs/sysfs.c
67421+++ b/fs/btrfs/sysfs.c
67422@@ -472,7 +472,7 @@ static int addrm_unknown_feature_attrs(struct btrfs_fs_info *fs_info, bool add)
67423 for (set = 0; set < FEAT_MAX; set++) {
67424 int i;
67425 struct attribute *attrs[2];
67426- struct attribute_group agroup = {
67427+ attribute_group_no_const agroup = {
67428 .name = "features",
67429 .attrs = attrs,
67430 };
67431diff --git a/fs/btrfs/tests/free-space-tests.c b/fs/btrfs/tests/free-space-tests.c
67432index 2299bfd..4098e72 100644
67433--- a/fs/btrfs/tests/free-space-tests.c
67434+++ b/fs/btrfs/tests/free-space-tests.c
67435@@ -463,7 +463,9 @@ test_steal_space_from_bitmap_to_extent(struct btrfs_block_group_cache *cache)
67436 * extent entry.
67437 */
67438 use_bitmap_op = cache->free_space_ctl->op->use_bitmap;
67439- cache->free_space_ctl->op->use_bitmap = test_use_bitmap;
67440+ pax_open_kernel();
67441+ *(void **)&cache->free_space_ctl->op->use_bitmap = test_use_bitmap;
67442+ pax_close_kernel();
67443
67444 /*
67445 * Extent entry covering free space range [128Mb - 256Kb, 128Mb - 128Kb[
67446@@ -870,7 +872,9 @@ test_steal_space_from_bitmap_to_extent(struct btrfs_block_group_cache *cache)
67447 if (ret)
67448 return ret;
67449
67450- cache->free_space_ctl->op->use_bitmap = use_bitmap_op;
67451+ pax_open_kernel();
67452+ *(void **)&cache->free_space_ctl->op->use_bitmap = use_bitmap_op;
67453+ pax_close_kernel();
67454 __btrfs_remove_free_space_cache(cache->free_space_ctl);
67455
67456 return 0;
67457diff --git a/fs/btrfs/tree-log.h b/fs/btrfs/tree-log.h
67458index 154990c..d0cf699 100644
67459--- a/fs/btrfs/tree-log.h
67460+++ b/fs/btrfs/tree-log.h
67461@@ -43,7 +43,7 @@ static inline void btrfs_init_log_ctx(struct btrfs_log_ctx *ctx)
67462 static inline void btrfs_set_log_full_commit(struct btrfs_fs_info *fs_info,
67463 struct btrfs_trans_handle *trans)
67464 {
67465- ACCESS_ONCE(fs_info->last_trans_log_full_commit) = trans->transid;
67466+ ACCESS_ONCE_RW(fs_info->last_trans_log_full_commit) = trans->transid;
67467 }
67468
67469 static inline int btrfs_need_log_full_commit(struct btrfs_fs_info *fs_info,
67470diff --git a/fs/buffer.c b/fs/buffer.c
67471index 20805db..2e8fc69 100644
67472--- a/fs/buffer.c
67473+++ b/fs/buffer.c
67474@@ -3417,7 +3417,7 @@ void __init buffer_init(void)
67475 bh_cachep = kmem_cache_create("buffer_head",
67476 sizeof(struct buffer_head), 0,
67477 (SLAB_RECLAIM_ACCOUNT|SLAB_PANIC|
67478- SLAB_MEM_SPREAD),
67479+ SLAB_MEM_SPREAD|SLAB_NO_SANITIZE),
67480 NULL);
67481
67482 /*
67483diff --git a/fs/cachefiles/bind.c b/fs/cachefiles/bind.c
67484index fbb08e9..0fda764 100644
67485--- a/fs/cachefiles/bind.c
67486+++ b/fs/cachefiles/bind.c
67487@@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachefiles_cache *cache, char *args)
67488 args);
67489
67490 /* start by checking things over */
67491- ASSERT(cache->fstop_percent >= 0 &&
67492- cache->fstop_percent < cache->fcull_percent &&
67493+ ASSERT(cache->fstop_percent < cache->fcull_percent &&
67494 cache->fcull_percent < cache->frun_percent &&
67495 cache->frun_percent < 100);
67496
67497- ASSERT(cache->bstop_percent >= 0 &&
67498- cache->bstop_percent < cache->bcull_percent &&
67499+ ASSERT(cache->bstop_percent < cache->bcull_percent &&
67500 cache->bcull_percent < cache->brun_percent &&
67501 cache->brun_percent < 100);
67502
67503diff --git a/fs/cachefiles/daemon.c b/fs/cachefiles/daemon.c
67504index f601def..b2cf704 100644
67505--- a/fs/cachefiles/daemon.c
67506+++ b/fs/cachefiles/daemon.c
67507@@ -196,7 +196,7 @@ static ssize_t cachefiles_daemon_read(struct file *file, char __user *_buffer,
67508 if (n > buflen)
67509 return -EMSGSIZE;
67510
67511- if (copy_to_user(_buffer, buffer, n) != 0)
67512+ if (n > sizeof(buffer) || copy_to_user(_buffer, buffer, n) != 0)
67513 return -EFAULT;
67514
67515 return n;
67516@@ -222,7 +222,7 @@ static ssize_t cachefiles_daemon_write(struct file *file,
67517 if (test_bit(CACHEFILES_DEAD, &cache->flags))
67518 return -EIO;
67519
67520- if (datalen < 0 || datalen > PAGE_SIZE - 1)
67521+ if (datalen > PAGE_SIZE - 1)
67522 return -EOPNOTSUPP;
67523
67524 /* drag the command string into the kernel so we can parse it */
67525@@ -385,7 +385,7 @@ static int cachefiles_daemon_fstop(struct cachefiles_cache *cache, char *args)
67526 if (args[0] != '%' || args[1] != '\0')
67527 return -EINVAL;
67528
67529- if (fstop < 0 || fstop >= cache->fcull_percent)
67530+ if (fstop >= cache->fcull_percent)
67531 return cachefiles_daemon_range_error(cache, args);
67532
67533 cache->fstop_percent = fstop;
67534@@ -457,7 +457,7 @@ static int cachefiles_daemon_bstop(struct cachefiles_cache *cache, char *args)
67535 if (args[0] != '%' || args[1] != '\0')
67536 return -EINVAL;
67537
67538- if (bstop < 0 || bstop >= cache->bcull_percent)
67539+ if (bstop >= cache->bcull_percent)
67540 return cachefiles_daemon_range_error(cache, args);
67541
67542 cache->bstop_percent = bstop;
67543diff --git a/fs/cachefiles/internal.h b/fs/cachefiles/internal.h
67544index 8c52472..c4e3a69 100644
67545--- a/fs/cachefiles/internal.h
67546+++ b/fs/cachefiles/internal.h
67547@@ -66,7 +66,7 @@ struct cachefiles_cache {
67548 wait_queue_head_t daemon_pollwq; /* poll waitqueue for daemon */
67549 struct rb_root active_nodes; /* active nodes (can't be culled) */
67550 rwlock_t active_lock; /* lock for active_nodes */
67551- atomic_t gravecounter; /* graveyard uniquifier */
67552+ atomic_unchecked_t gravecounter; /* graveyard uniquifier */
67553 unsigned frun_percent; /* when to stop culling (% files) */
67554 unsigned fcull_percent; /* when to start culling (% files) */
67555 unsigned fstop_percent; /* when to stop allocating (% files) */
67556@@ -178,19 +178,19 @@ extern int cachefiles_check_in_use(struct cachefiles_cache *cache,
67557 * proc.c
67558 */
67559 #ifdef CONFIG_CACHEFILES_HISTOGRAM
67560-extern atomic_t cachefiles_lookup_histogram[HZ];
67561-extern atomic_t cachefiles_mkdir_histogram[HZ];
67562-extern atomic_t cachefiles_create_histogram[HZ];
67563+extern atomic_unchecked_t cachefiles_lookup_histogram[HZ];
67564+extern atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
67565+extern atomic_unchecked_t cachefiles_create_histogram[HZ];
67566
67567 extern int __init cachefiles_proc_init(void);
67568 extern void cachefiles_proc_cleanup(void);
67569 static inline
67570-void cachefiles_hist(atomic_t histogram[], unsigned long start_jif)
67571+void cachefiles_hist(atomic_unchecked_t histogram[], unsigned long start_jif)
67572 {
67573 unsigned long jif = jiffies - start_jif;
67574 if (jif >= HZ)
67575 jif = HZ - 1;
67576- atomic_inc(&histogram[jif]);
67577+ atomic_inc_unchecked(&histogram[jif]);
67578 }
67579
67580 #else
67581diff --git a/fs/cachefiles/namei.c b/fs/cachefiles/namei.c
67582index 1e51714..411eded 100644
67583--- a/fs/cachefiles/namei.c
67584+++ b/fs/cachefiles/namei.c
67585@@ -309,7 +309,7 @@ try_again:
67586 /* first step is to make up a grave dentry in the graveyard */
67587 sprintf(nbuffer, "%08x%08x",
67588 (uint32_t) get_seconds(),
67589- (uint32_t) atomic_inc_return(&cache->gravecounter));
67590+ (uint32_t) atomic_inc_return_unchecked(&cache->gravecounter));
67591
67592 /* do the multiway lock magic */
67593 trap = lock_rename(cache->graveyard, dir);
67594diff --git a/fs/cachefiles/proc.c b/fs/cachefiles/proc.c
67595index eccd339..4c1d995 100644
67596--- a/fs/cachefiles/proc.c
67597+++ b/fs/cachefiles/proc.c
67598@@ -14,9 +14,9 @@
67599 #include <linux/seq_file.h>
67600 #include "internal.h"
67601
67602-atomic_t cachefiles_lookup_histogram[HZ];
67603-atomic_t cachefiles_mkdir_histogram[HZ];
67604-atomic_t cachefiles_create_histogram[HZ];
67605+atomic_unchecked_t cachefiles_lookup_histogram[HZ];
67606+atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
67607+atomic_unchecked_t cachefiles_create_histogram[HZ];
67608
67609 /*
67610 * display the latency histogram
67611@@ -35,9 +35,9 @@ static int cachefiles_histogram_show(struct seq_file *m, void *v)
67612 return 0;
67613 default:
67614 index = (unsigned long) v - 3;
67615- x = atomic_read(&cachefiles_lookup_histogram[index]);
67616- y = atomic_read(&cachefiles_mkdir_histogram[index]);
67617- z = atomic_read(&cachefiles_create_histogram[index]);
67618+ x = atomic_read_unchecked(&cachefiles_lookup_histogram[index]);
67619+ y = atomic_read_unchecked(&cachefiles_mkdir_histogram[index]);
67620+ z = atomic_read_unchecked(&cachefiles_create_histogram[index]);
67621 if (x == 0 && y == 0 && z == 0)
67622 return 0;
67623
67624diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c
67625index 83e9976..bfd1eee 100644
67626--- a/fs/ceph/dir.c
67627+++ b/fs/ceph/dir.c
67628@@ -127,6 +127,8 @@ static int __dcache_readdir(struct file *file, struct dir_context *ctx,
67629 struct dentry *dentry, *last;
67630 struct ceph_dentry_info *di;
67631 int err = 0;
67632+ char d_name[DNAME_INLINE_LEN];
67633+ const unsigned char *name;
67634
67635 /* claim ref on last dentry we returned */
67636 last = fi->dentry;
67637@@ -190,7 +192,12 @@ more:
67638
67639 dout(" %llu (%llu) dentry %p %pd %p\n", di->offset, ctx->pos,
67640 dentry, dentry, dentry->d_inode);
67641- if (!dir_emit(ctx, dentry->d_name.name,
67642+ name = dentry->d_name.name;
67643+ if (name == dentry->d_iname) {
67644+ memcpy(d_name, name, dentry->d_name.len);
67645+ name = d_name;
67646+ }
67647+ if (!dir_emit(ctx, name,
67648 dentry->d_name.len,
67649 ceph_translate_ino(dentry->d_sb, dentry->d_inode->i_ino),
67650 dentry->d_inode->i_mode >> 12)) {
67651@@ -248,7 +255,7 @@ static int ceph_readdir(struct file *file, struct dir_context *ctx)
67652 struct ceph_fs_client *fsc = ceph_inode_to_client(inode);
67653 struct ceph_mds_client *mdsc = fsc->mdsc;
67654 unsigned frag = fpos_frag(ctx->pos);
67655- int off = fpos_off(ctx->pos);
67656+ unsigned int off = fpos_off(ctx->pos);
67657 int err;
67658 u32 ftype;
67659 struct ceph_mds_reply_info_parsed *rinfo;
67660diff --git a/fs/ceph/super.c b/fs/ceph/super.c
67661index a63997b..ddc0577 100644
67662--- a/fs/ceph/super.c
67663+++ b/fs/ceph/super.c
67664@@ -889,7 +889,7 @@ static int ceph_compare_super(struct super_block *sb, void *data)
67665 /*
67666 * construct our own bdi so we can control readahead, etc.
67667 */
67668-static atomic_long_t bdi_seq = ATOMIC_LONG_INIT(0);
67669+static atomic_long_unchecked_t bdi_seq = ATOMIC_LONG_INIT(0);
67670
67671 static int ceph_register_bdi(struct super_block *sb,
67672 struct ceph_fs_client *fsc)
67673@@ -906,7 +906,7 @@ static int ceph_register_bdi(struct super_block *sb,
67674 VM_MAX_READAHEAD * 1024 / PAGE_CACHE_SIZE;
67675
67676 err = bdi_register(&fsc->backing_dev_info, NULL, "ceph-%ld",
67677- atomic_long_inc_return(&bdi_seq));
67678+ atomic_long_inc_return_unchecked(&bdi_seq));
67679 if (!err)
67680 sb->s_bdi = &fsc->backing_dev_info;
67681 return err;
67682diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
67683index 7febcf2..62a5721 100644
67684--- a/fs/cifs/cifs_debug.c
67685+++ b/fs/cifs/cifs_debug.c
67686@@ -269,8 +269,8 @@ static ssize_t cifs_stats_proc_write(struct file *file,
67687
67688 if (strtobool(&c, &bv) == 0) {
67689 #ifdef CONFIG_CIFS_STATS2
67690- atomic_set(&totBufAllocCount, 0);
67691- atomic_set(&totSmBufAllocCount, 0);
67692+ atomic_set_unchecked(&totBufAllocCount, 0);
67693+ atomic_set_unchecked(&totSmBufAllocCount, 0);
67694 #endif /* CONFIG_CIFS_STATS2 */
67695 spin_lock(&cifs_tcp_ses_lock);
67696 list_for_each(tmp1, &cifs_tcp_ses_list) {
67697@@ -283,7 +283,7 @@ static ssize_t cifs_stats_proc_write(struct file *file,
67698 tcon = list_entry(tmp3,
67699 struct cifs_tcon,
67700 tcon_list);
67701- atomic_set(&tcon->num_smbs_sent, 0);
67702+ atomic_set_unchecked(&tcon->num_smbs_sent, 0);
67703 if (server->ops->clear_stats)
67704 server->ops->clear_stats(tcon);
67705 }
67706@@ -315,8 +315,8 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
67707 smBufAllocCount.counter, cifs_min_small);
67708 #ifdef CONFIG_CIFS_STATS2
67709 seq_printf(m, "Total Large %d Small %d Allocations\n",
67710- atomic_read(&totBufAllocCount),
67711- atomic_read(&totSmBufAllocCount));
67712+ atomic_read_unchecked(&totBufAllocCount),
67713+ atomic_read_unchecked(&totSmBufAllocCount));
67714 #endif /* CONFIG_CIFS_STATS2 */
67715
67716 seq_printf(m, "Operations (MIDs): %d\n", atomic_read(&midCount));
67717@@ -345,7 +345,7 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
67718 if (tcon->need_reconnect)
67719 seq_puts(m, "\tDISCONNECTED ");
67720 seq_printf(m, "\nSMBs: %d",
67721- atomic_read(&tcon->num_smbs_sent));
67722+ atomic_read_unchecked(&tcon->num_smbs_sent));
67723 if (server->ops->print_stats)
67724 server->ops->print_stats(m, tcon);
67725 }
67726diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
67727index d72fe37..ded5511 100644
67728--- a/fs/cifs/cifsfs.c
67729+++ b/fs/cifs/cifsfs.c
67730@@ -1092,7 +1092,7 @@ cifs_init_request_bufs(void)
67731 */
67732 cifs_req_cachep = kmem_cache_create("cifs_request",
67733 CIFSMaxBufSize + max_hdr_size, 0,
67734- SLAB_HWCACHE_ALIGN, NULL);
67735+ SLAB_HWCACHE_ALIGN | SLAB_USERCOPY, NULL);
67736 if (cifs_req_cachep == NULL)
67737 return -ENOMEM;
67738
67739@@ -1119,7 +1119,7 @@ cifs_init_request_bufs(void)
67740 efficient to alloc 1 per page off the slab compared to 17K (5page)
67741 alloc of large cifs buffers even when page debugging is on */
67742 cifs_sm_req_cachep = kmem_cache_create("cifs_small_rq",
67743- MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN,
67744+ MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN | SLAB_USERCOPY,
67745 NULL);
67746 if (cifs_sm_req_cachep == NULL) {
67747 mempool_destroy(cifs_req_poolp);
67748@@ -1204,8 +1204,8 @@ init_cifs(void)
67749 atomic_set(&bufAllocCount, 0);
67750 atomic_set(&smBufAllocCount, 0);
67751 #ifdef CONFIG_CIFS_STATS2
67752- atomic_set(&totBufAllocCount, 0);
67753- atomic_set(&totSmBufAllocCount, 0);
67754+ atomic_set_unchecked(&totBufAllocCount, 0);
67755+ atomic_set_unchecked(&totSmBufAllocCount, 0);
67756 #endif /* CONFIG_CIFS_STATS2 */
67757
67758 atomic_set(&midCount, 0);
67759diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
67760index 22b289a..bbbba082 100644
67761--- a/fs/cifs/cifsglob.h
67762+++ b/fs/cifs/cifsglob.h
67763@@ -823,35 +823,35 @@ struct cifs_tcon {
67764 __u16 Flags; /* optional support bits */
67765 enum statusEnum tidStatus;
67766 #ifdef CONFIG_CIFS_STATS
67767- atomic_t num_smbs_sent;
67768+ atomic_unchecked_t num_smbs_sent;
67769 union {
67770 struct {
67771- atomic_t num_writes;
67772- atomic_t num_reads;
67773- atomic_t num_flushes;
67774- atomic_t num_oplock_brks;
67775- atomic_t num_opens;
67776- atomic_t num_closes;
67777- atomic_t num_deletes;
67778- atomic_t num_mkdirs;
67779- atomic_t num_posixopens;
67780- atomic_t num_posixmkdirs;
67781- atomic_t num_rmdirs;
67782- atomic_t num_renames;
67783- atomic_t num_t2renames;
67784- atomic_t num_ffirst;
67785- atomic_t num_fnext;
67786- atomic_t num_fclose;
67787- atomic_t num_hardlinks;
67788- atomic_t num_symlinks;
67789- atomic_t num_locks;
67790- atomic_t num_acl_get;
67791- atomic_t num_acl_set;
67792+ atomic_unchecked_t num_writes;
67793+ atomic_unchecked_t num_reads;
67794+ atomic_unchecked_t num_flushes;
67795+ atomic_unchecked_t num_oplock_brks;
67796+ atomic_unchecked_t num_opens;
67797+ atomic_unchecked_t num_closes;
67798+ atomic_unchecked_t num_deletes;
67799+ atomic_unchecked_t num_mkdirs;
67800+ atomic_unchecked_t num_posixopens;
67801+ atomic_unchecked_t num_posixmkdirs;
67802+ atomic_unchecked_t num_rmdirs;
67803+ atomic_unchecked_t num_renames;
67804+ atomic_unchecked_t num_t2renames;
67805+ atomic_unchecked_t num_ffirst;
67806+ atomic_unchecked_t num_fnext;
67807+ atomic_unchecked_t num_fclose;
67808+ atomic_unchecked_t num_hardlinks;
67809+ atomic_unchecked_t num_symlinks;
67810+ atomic_unchecked_t num_locks;
67811+ atomic_unchecked_t num_acl_get;
67812+ atomic_unchecked_t num_acl_set;
67813 } cifs_stats;
67814 #ifdef CONFIG_CIFS_SMB2
67815 struct {
67816- atomic_t smb2_com_sent[NUMBER_OF_SMB2_COMMANDS];
67817- atomic_t smb2_com_failed[NUMBER_OF_SMB2_COMMANDS];
67818+ atomic_unchecked_t smb2_com_sent[NUMBER_OF_SMB2_COMMANDS];
67819+ atomic_unchecked_t smb2_com_failed[NUMBER_OF_SMB2_COMMANDS];
67820 } smb2_stats;
67821 #endif /* CONFIG_CIFS_SMB2 */
67822 } stats;
67823@@ -1198,7 +1198,7 @@ convert_delimiter(char *path, char delim)
67824 }
67825
67826 #ifdef CONFIG_CIFS_STATS
67827-#define cifs_stats_inc atomic_inc
67828+#define cifs_stats_inc atomic_inc_unchecked
67829
67830 static inline void cifs_stats_bytes_written(struct cifs_tcon *tcon,
67831 unsigned int bytes)
67832@@ -1565,8 +1565,8 @@ GLOBAL_EXTERN atomic_t tconInfoReconnectCount;
67833 /* Various Debug counters */
67834 GLOBAL_EXTERN atomic_t bufAllocCount; /* current number allocated */
67835 #ifdef CONFIG_CIFS_STATS2
67836-GLOBAL_EXTERN atomic_t totBufAllocCount; /* total allocated over all time */
67837-GLOBAL_EXTERN atomic_t totSmBufAllocCount;
67838+GLOBAL_EXTERN atomic_unchecked_t totBufAllocCount; /* total allocated over all time */
67839+GLOBAL_EXTERN atomic_unchecked_t totSmBufAllocCount;
67840 #endif
67841 GLOBAL_EXTERN atomic_t smBufAllocCount;
67842 GLOBAL_EXTERN atomic_t midCount;
67843diff --git a/fs/cifs/file.c b/fs/cifs/file.c
67844index ca30c39..570fb94 100644
67845--- a/fs/cifs/file.c
67846+++ b/fs/cifs/file.c
67847@@ -2055,10 +2055,14 @@ static int cifs_writepages(struct address_space *mapping,
67848 index = mapping->writeback_index; /* Start from prev offset */
67849 end = -1;
67850 } else {
67851- index = wbc->range_start >> PAGE_CACHE_SHIFT;
67852- end = wbc->range_end >> PAGE_CACHE_SHIFT;
67853- if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX)
67854+ if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX) {
67855 range_whole = true;
67856+ index = 0;
67857+ end = ULONG_MAX;
67858+ } else {
67859+ index = wbc->range_start >> PAGE_CACHE_SHIFT;
67860+ end = wbc->range_end >> PAGE_CACHE_SHIFT;
67861+ }
67862 scanned = true;
67863 }
67864 server = cifs_sb_master_tcon(cifs_sb)->ses->server;
67865diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c
67866index 3379463..3af418a 100644
67867--- a/fs/cifs/misc.c
67868+++ b/fs/cifs/misc.c
67869@@ -170,7 +170,7 @@ cifs_buf_get(void)
67870 memset(ret_buf, 0, buf_size + 3);
67871 atomic_inc(&bufAllocCount);
67872 #ifdef CONFIG_CIFS_STATS2
67873- atomic_inc(&totBufAllocCount);
67874+ atomic_inc_unchecked(&totBufAllocCount);
67875 #endif /* CONFIG_CIFS_STATS2 */
67876 }
67877
67878@@ -205,7 +205,7 @@ cifs_small_buf_get(void)
67879 /* memset(ret_buf, 0, sizeof(struct smb_hdr) + 27);*/
67880 atomic_inc(&smBufAllocCount);
67881 #ifdef CONFIG_CIFS_STATS2
67882- atomic_inc(&totSmBufAllocCount);
67883+ atomic_inc_unchecked(&totSmBufAllocCount);
67884 #endif /* CONFIG_CIFS_STATS2 */
67885
67886 }
67887diff --git a/fs/cifs/smb1ops.c b/fs/cifs/smb1ops.c
67888index d297903..1cb7516 100644
67889--- a/fs/cifs/smb1ops.c
67890+++ b/fs/cifs/smb1ops.c
67891@@ -622,27 +622,27 @@ static void
67892 cifs_clear_stats(struct cifs_tcon *tcon)
67893 {
67894 #ifdef CONFIG_CIFS_STATS
67895- atomic_set(&tcon->stats.cifs_stats.num_writes, 0);
67896- atomic_set(&tcon->stats.cifs_stats.num_reads, 0);
67897- atomic_set(&tcon->stats.cifs_stats.num_flushes, 0);
67898- atomic_set(&tcon->stats.cifs_stats.num_oplock_brks, 0);
67899- atomic_set(&tcon->stats.cifs_stats.num_opens, 0);
67900- atomic_set(&tcon->stats.cifs_stats.num_posixopens, 0);
67901- atomic_set(&tcon->stats.cifs_stats.num_posixmkdirs, 0);
67902- atomic_set(&tcon->stats.cifs_stats.num_closes, 0);
67903- atomic_set(&tcon->stats.cifs_stats.num_deletes, 0);
67904- atomic_set(&tcon->stats.cifs_stats.num_mkdirs, 0);
67905- atomic_set(&tcon->stats.cifs_stats.num_rmdirs, 0);
67906- atomic_set(&tcon->stats.cifs_stats.num_renames, 0);
67907- atomic_set(&tcon->stats.cifs_stats.num_t2renames, 0);
67908- atomic_set(&tcon->stats.cifs_stats.num_ffirst, 0);
67909- atomic_set(&tcon->stats.cifs_stats.num_fnext, 0);
67910- atomic_set(&tcon->stats.cifs_stats.num_fclose, 0);
67911- atomic_set(&tcon->stats.cifs_stats.num_hardlinks, 0);
67912- atomic_set(&tcon->stats.cifs_stats.num_symlinks, 0);
67913- atomic_set(&tcon->stats.cifs_stats.num_locks, 0);
67914- atomic_set(&tcon->stats.cifs_stats.num_acl_get, 0);
67915- atomic_set(&tcon->stats.cifs_stats.num_acl_set, 0);
67916+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_writes, 0);
67917+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_reads, 0);
67918+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_flushes, 0);
67919+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_oplock_brks, 0);
67920+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_opens, 0);
67921+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_posixopens, 0);
67922+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_posixmkdirs, 0);
67923+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_closes, 0);
67924+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_deletes, 0);
67925+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_mkdirs, 0);
67926+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_rmdirs, 0);
67927+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_renames, 0);
67928+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_t2renames, 0);
67929+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_ffirst, 0);
67930+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_fnext, 0);
67931+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_fclose, 0);
67932+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_hardlinks, 0);
67933+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_symlinks, 0);
67934+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_locks, 0);
67935+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_acl_get, 0);
67936+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_acl_set, 0);
67937 #endif
67938 }
67939
67940@@ -651,36 +651,36 @@ cifs_print_stats(struct seq_file *m, struct cifs_tcon *tcon)
67941 {
67942 #ifdef CONFIG_CIFS_STATS
67943 seq_printf(m, " Oplocks breaks: %d",
67944- atomic_read(&tcon->stats.cifs_stats.num_oplock_brks));
67945+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_oplock_brks));
67946 seq_printf(m, "\nReads: %d Bytes: %llu",
67947- atomic_read(&tcon->stats.cifs_stats.num_reads),
67948+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_reads),
67949 (long long)(tcon->bytes_read));
67950 seq_printf(m, "\nWrites: %d Bytes: %llu",
67951- atomic_read(&tcon->stats.cifs_stats.num_writes),
67952+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_writes),
67953 (long long)(tcon->bytes_written));
67954 seq_printf(m, "\nFlushes: %d",
67955- atomic_read(&tcon->stats.cifs_stats.num_flushes));
67956+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_flushes));
67957 seq_printf(m, "\nLocks: %d HardLinks: %d Symlinks: %d",
67958- atomic_read(&tcon->stats.cifs_stats.num_locks),
67959- atomic_read(&tcon->stats.cifs_stats.num_hardlinks),
67960- atomic_read(&tcon->stats.cifs_stats.num_symlinks));
67961+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_locks),
67962+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_hardlinks),
67963+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_symlinks));
67964 seq_printf(m, "\nOpens: %d Closes: %d Deletes: %d",
67965- atomic_read(&tcon->stats.cifs_stats.num_opens),
67966- atomic_read(&tcon->stats.cifs_stats.num_closes),
67967- atomic_read(&tcon->stats.cifs_stats.num_deletes));
67968+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_opens),
67969+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_closes),
67970+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_deletes));
67971 seq_printf(m, "\nPosix Opens: %d Posix Mkdirs: %d",
67972- atomic_read(&tcon->stats.cifs_stats.num_posixopens),
67973- atomic_read(&tcon->stats.cifs_stats.num_posixmkdirs));
67974+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_posixopens),
67975+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_posixmkdirs));
67976 seq_printf(m, "\nMkdirs: %d Rmdirs: %d",
67977- atomic_read(&tcon->stats.cifs_stats.num_mkdirs),
67978- atomic_read(&tcon->stats.cifs_stats.num_rmdirs));
67979+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_mkdirs),
67980+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_rmdirs));
67981 seq_printf(m, "\nRenames: %d T2 Renames %d",
67982- atomic_read(&tcon->stats.cifs_stats.num_renames),
67983- atomic_read(&tcon->stats.cifs_stats.num_t2renames));
67984+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_renames),
67985+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_t2renames));
67986 seq_printf(m, "\nFindFirst: %d FNext %d FClose %d",
67987- atomic_read(&tcon->stats.cifs_stats.num_ffirst),
67988- atomic_read(&tcon->stats.cifs_stats.num_fnext),
67989- atomic_read(&tcon->stats.cifs_stats.num_fclose));
67990+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_ffirst),
67991+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_fnext),
67992+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_fclose));
67993 #endif
67994 }
67995
67996diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
67997index eab05e1..ffe5ea4 100644
67998--- a/fs/cifs/smb2ops.c
67999+++ b/fs/cifs/smb2ops.c
68000@@ -418,8 +418,8 @@ smb2_clear_stats(struct cifs_tcon *tcon)
68001 #ifdef CONFIG_CIFS_STATS
68002 int i;
68003 for (i = 0; i < NUMBER_OF_SMB2_COMMANDS; i++) {
68004- atomic_set(&tcon->stats.smb2_stats.smb2_com_sent[i], 0);
68005- atomic_set(&tcon->stats.smb2_stats.smb2_com_failed[i], 0);
68006+ atomic_set_unchecked(&tcon->stats.smb2_stats.smb2_com_sent[i], 0);
68007+ atomic_set_unchecked(&tcon->stats.smb2_stats.smb2_com_failed[i], 0);
68008 }
68009 #endif
68010 }
68011@@ -459,65 +459,65 @@ static void
68012 smb2_print_stats(struct seq_file *m, struct cifs_tcon *tcon)
68013 {
68014 #ifdef CONFIG_CIFS_STATS
68015- atomic_t *sent = tcon->stats.smb2_stats.smb2_com_sent;
68016- atomic_t *failed = tcon->stats.smb2_stats.smb2_com_failed;
68017+ atomic_unchecked_t *sent = tcon->stats.smb2_stats.smb2_com_sent;
68018+ atomic_unchecked_t *failed = tcon->stats.smb2_stats.smb2_com_failed;
68019 seq_printf(m, "\nNegotiates: %d sent %d failed",
68020- atomic_read(&sent[SMB2_NEGOTIATE_HE]),
68021- atomic_read(&failed[SMB2_NEGOTIATE_HE]));
68022+ atomic_read_unchecked(&sent[SMB2_NEGOTIATE_HE]),
68023+ atomic_read_unchecked(&failed[SMB2_NEGOTIATE_HE]));
68024 seq_printf(m, "\nSessionSetups: %d sent %d failed",
68025- atomic_read(&sent[SMB2_SESSION_SETUP_HE]),
68026- atomic_read(&failed[SMB2_SESSION_SETUP_HE]));
68027+ atomic_read_unchecked(&sent[SMB2_SESSION_SETUP_HE]),
68028+ atomic_read_unchecked(&failed[SMB2_SESSION_SETUP_HE]));
68029 seq_printf(m, "\nLogoffs: %d sent %d failed",
68030- atomic_read(&sent[SMB2_LOGOFF_HE]),
68031- atomic_read(&failed[SMB2_LOGOFF_HE]));
68032+ atomic_read_unchecked(&sent[SMB2_LOGOFF_HE]),
68033+ atomic_read_unchecked(&failed[SMB2_LOGOFF_HE]));
68034 seq_printf(m, "\nTreeConnects: %d sent %d failed",
68035- atomic_read(&sent[SMB2_TREE_CONNECT_HE]),
68036- atomic_read(&failed[SMB2_TREE_CONNECT_HE]));
68037+ atomic_read_unchecked(&sent[SMB2_TREE_CONNECT_HE]),
68038+ atomic_read_unchecked(&failed[SMB2_TREE_CONNECT_HE]));
68039 seq_printf(m, "\nTreeDisconnects: %d sent %d failed",
68040- atomic_read(&sent[SMB2_TREE_DISCONNECT_HE]),
68041- atomic_read(&failed[SMB2_TREE_DISCONNECT_HE]));
68042+ atomic_read_unchecked(&sent[SMB2_TREE_DISCONNECT_HE]),
68043+ atomic_read_unchecked(&failed[SMB2_TREE_DISCONNECT_HE]));
68044 seq_printf(m, "\nCreates: %d sent %d failed",
68045- atomic_read(&sent[SMB2_CREATE_HE]),
68046- atomic_read(&failed[SMB2_CREATE_HE]));
68047+ atomic_read_unchecked(&sent[SMB2_CREATE_HE]),
68048+ atomic_read_unchecked(&failed[SMB2_CREATE_HE]));
68049 seq_printf(m, "\nCloses: %d sent %d failed",
68050- atomic_read(&sent[SMB2_CLOSE_HE]),
68051- atomic_read(&failed[SMB2_CLOSE_HE]));
68052+ atomic_read_unchecked(&sent[SMB2_CLOSE_HE]),
68053+ atomic_read_unchecked(&failed[SMB2_CLOSE_HE]));
68054 seq_printf(m, "\nFlushes: %d sent %d failed",
68055- atomic_read(&sent[SMB2_FLUSH_HE]),
68056- atomic_read(&failed[SMB2_FLUSH_HE]));
68057+ atomic_read_unchecked(&sent[SMB2_FLUSH_HE]),
68058+ atomic_read_unchecked(&failed[SMB2_FLUSH_HE]));
68059 seq_printf(m, "\nReads: %d sent %d failed",
68060- atomic_read(&sent[SMB2_READ_HE]),
68061- atomic_read(&failed[SMB2_READ_HE]));
68062+ atomic_read_unchecked(&sent[SMB2_READ_HE]),
68063+ atomic_read_unchecked(&failed[SMB2_READ_HE]));
68064 seq_printf(m, "\nWrites: %d sent %d failed",
68065- atomic_read(&sent[SMB2_WRITE_HE]),
68066- atomic_read(&failed[SMB2_WRITE_HE]));
68067+ atomic_read_unchecked(&sent[SMB2_WRITE_HE]),
68068+ atomic_read_unchecked(&failed[SMB2_WRITE_HE]));
68069 seq_printf(m, "\nLocks: %d sent %d failed",
68070- atomic_read(&sent[SMB2_LOCK_HE]),
68071- atomic_read(&failed[SMB2_LOCK_HE]));
68072+ atomic_read_unchecked(&sent[SMB2_LOCK_HE]),
68073+ atomic_read_unchecked(&failed[SMB2_LOCK_HE]));
68074 seq_printf(m, "\nIOCTLs: %d sent %d failed",
68075- atomic_read(&sent[SMB2_IOCTL_HE]),
68076- atomic_read(&failed[SMB2_IOCTL_HE]));
68077+ atomic_read_unchecked(&sent[SMB2_IOCTL_HE]),
68078+ atomic_read_unchecked(&failed[SMB2_IOCTL_HE]));
68079 seq_printf(m, "\nCancels: %d sent %d failed",
68080- atomic_read(&sent[SMB2_CANCEL_HE]),
68081- atomic_read(&failed[SMB2_CANCEL_HE]));
68082+ atomic_read_unchecked(&sent[SMB2_CANCEL_HE]),
68083+ atomic_read_unchecked(&failed[SMB2_CANCEL_HE]));
68084 seq_printf(m, "\nEchos: %d sent %d failed",
68085- atomic_read(&sent[SMB2_ECHO_HE]),
68086- atomic_read(&failed[SMB2_ECHO_HE]));
68087+ atomic_read_unchecked(&sent[SMB2_ECHO_HE]),
68088+ atomic_read_unchecked(&failed[SMB2_ECHO_HE]));
68089 seq_printf(m, "\nQueryDirectories: %d sent %d failed",
68090- atomic_read(&sent[SMB2_QUERY_DIRECTORY_HE]),
68091- atomic_read(&failed[SMB2_QUERY_DIRECTORY_HE]));
68092+ atomic_read_unchecked(&sent[SMB2_QUERY_DIRECTORY_HE]),
68093+ atomic_read_unchecked(&failed[SMB2_QUERY_DIRECTORY_HE]));
68094 seq_printf(m, "\nChangeNotifies: %d sent %d failed",
68095- atomic_read(&sent[SMB2_CHANGE_NOTIFY_HE]),
68096- atomic_read(&failed[SMB2_CHANGE_NOTIFY_HE]));
68097+ atomic_read_unchecked(&sent[SMB2_CHANGE_NOTIFY_HE]),
68098+ atomic_read_unchecked(&failed[SMB2_CHANGE_NOTIFY_HE]));
68099 seq_printf(m, "\nQueryInfos: %d sent %d failed",
68100- atomic_read(&sent[SMB2_QUERY_INFO_HE]),
68101- atomic_read(&failed[SMB2_QUERY_INFO_HE]));
68102+ atomic_read_unchecked(&sent[SMB2_QUERY_INFO_HE]),
68103+ atomic_read_unchecked(&failed[SMB2_QUERY_INFO_HE]));
68104 seq_printf(m, "\nSetInfos: %d sent %d failed",
68105- atomic_read(&sent[SMB2_SET_INFO_HE]),
68106- atomic_read(&failed[SMB2_SET_INFO_HE]));
68107+ atomic_read_unchecked(&sent[SMB2_SET_INFO_HE]),
68108+ atomic_read_unchecked(&failed[SMB2_SET_INFO_HE]));
68109 seq_printf(m, "\nOplockBreaks: %d sent %d failed",
68110- atomic_read(&sent[SMB2_OPLOCK_BREAK_HE]),
68111- atomic_read(&failed[SMB2_OPLOCK_BREAK_HE]));
68112+ atomic_read_unchecked(&sent[SMB2_OPLOCK_BREAK_HE]),
68113+ atomic_read_unchecked(&failed[SMB2_OPLOCK_BREAK_HE]));
68114 #endif
68115 }
68116
68117diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
68118index 65cd7a8..3518676 100644
68119--- a/fs/cifs/smb2pdu.c
68120+++ b/fs/cifs/smb2pdu.c
68121@@ -2147,8 +2147,7 @@ SMB2_query_directory(const unsigned int xid, struct cifs_tcon *tcon,
68122 default:
68123 cifs_dbg(VFS, "info level %u isn't supported\n",
68124 srch_inf->info_level);
68125- rc = -EINVAL;
68126- goto qdir_exit;
68127+ return -EINVAL;
68128 }
68129
68130 req->FileIndex = cpu_to_le32(index);
68131diff --git a/fs/coda/cache.c b/fs/coda/cache.c
68132index 46ee6f2..89a9e7f 100644
68133--- a/fs/coda/cache.c
68134+++ b/fs/coda/cache.c
68135@@ -24,7 +24,7 @@
68136 #include "coda_linux.h"
68137 #include "coda_cache.h"
68138
68139-static atomic_t permission_epoch = ATOMIC_INIT(0);
68140+static atomic_unchecked_t permission_epoch = ATOMIC_INIT(0);
68141
68142 /* replace or extend an acl cache hit */
68143 void coda_cache_enter(struct inode *inode, int mask)
68144@@ -32,7 +32,7 @@ void coda_cache_enter(struct inode *inode, int mask)
68145 struct coda_inode_info *cii = ITOC(inode);
68146
68147 spin_lock(&cii->c_lock);
68148- cii->c_cached_epoch = atomic_read(&permission_epoch);
68149+ cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch);
68150 if (!uid_eq(cii->c_uid, current_fsuid())) {
68151 cii->c_uid = current_fsuid();
68152 cii->c_cached_perm = mask;
68153@@ -46,14 +46,14 @@ void coda_cache_clear_inode(struct inode *inode)
68154 {
68155 struct coda_inode_info *cii = ITOC(inode);
68156 spin_lock(&cii->c_lock);
68157- cii->c_cached_epoch = atomic_read(&permission_epoch) - 1;
68158+ cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch) - 1;
68159 spin_unlock(&cii->c_lock);
68160 }
68161
68162 /* remove all acl caches */
68163 void coda_cache_clear_all(struct super_block *sb)
68164 {
68165- atomic_inc(&permission_epoch);
68166+ atomic_inc_unchecked(&permission_epoch);
68167 }
68168
68169
68170@@ -66,7 +66,7 @@ int coda_cache_check(struct inode *inode, int mask)
68171 spin_lock(&cii->c_lock);
68172 hit = (mask & cii->c_cached_perm) == mask &&
68173 uid_eq(cii->c_uid, current_fsuid()) &&
68174- cii->c_cached_epoch == atomic_read(&permission_epoch);
68175+ cii->c_cached_epoch == atomic_read_unchecked(&permission_epoch);
68176 spin_unlock(&cii->c_lock);
68177
68178 return hit;
68179diff --git a/fs/compat.c b/fs/compat.c
68180index 6fd272d..dd34ba2 100644
68181--- a/fs/compat.c
68182+++ b/fs/compat.c
68183@@ -54,7 +54,7 @@
68184 #include <asm/ioctls.h>
68185 #include "internal.h"
68186
68187-int compat_log = 1;
68188+int compat_log = 0;
68189
68190 int compat_printk(const char *fmt, ...)
68191 {
68192@@ -512,7 +512,7 @@ COMPAT_SYSCALL_DEFINE2(io_setup, unsigned, nr_reqs, u32 __user *, ctx32p)
68193
68194 set_fs(KERNEL_DS);
68195 /* The __user pointer cast is valid because of the set_fs() */
68196- ret = sys_io_setup(nr_reqs, (aio_context_t __user *) &ctx64);
68197+ ret = sys_io_setup(nr_reqs, (aio_context_t __force_user *) &ctx64);
68198 set_fs(oldfs);
68199 /* truncating is ok because it's a user address */
68200 if (!ret)
68201@@ -562,7 +562,7 @@ ssize_t compat_rw_copy_check_uvector(int type,
68202 goto out;
68203
68204 ret = -EINVAL;
68205- if (nr_segs > UIO_MAXIOV || nr_segs < 0)
68206+ if (nr_segs > UIO_MAXIOV)
68207 goto out;
68208 if (nr_segs > fast_segs) {
68209 ret = -ENOMEM;
68210@@ -844,6 +844,7 @@ struct compat_old_linux_dirent {
68211 struct compat_readdir_callback {
68212 struct dir_context ctx;
68213 struct compat_old_linux_dirent __user *dirent;
68214+ struct file * file;
68215 int result;
68216 };
68217
68218@@ -863,6 +864,10 @@ static int compat_fillonedir(struct dir_context *ctx, const char *name,
68219 buf->result = -EOVERFLOW;
68220 return -EOVERFLOW;
68221 }
68222+
68223+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
68224+ return 0;
68225+
68226 buf->result++;
68227 dirent = buf->dirent;
68228 if (!access_ok(VERIFY_WRITE, dirent,
68229@@ -894,6 +899,7 @@ COMPAT_SYSCALL_DEFINE3(old_readdir, unsigned int, fd,
68230 if (!f.file)
68231 return -EBADF;
68232
68233+ buf.file = f.file;
68234 error = iterate_dir(f.file, &buf.ctx);
68235 if (buf.result)
68236 error = buf.result;
68237@@ -913,6 +919,7 @@ struct compat_getdents_callback {
68238 struct dir_context ctx;
68239 struct compat_linux_dirent __user *current_dir;
68240 struct compat_linux_dirent __user *previous;
68241+ struct file * file;
68242 int count;
68243 int error;
68244 };
68245@@ -935,6 +942,10 @@ static int compat_filldir(struct dir_context *ctx, const char *name, int namlen,
68246 buf->error = -EOVERFLOW;
68247 return -EOVERFLOW;
68248 }
68249+
68250+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
68251+ return 0;
68252+
68253 dirent = buf->previous;
68254 if (dirent) {
68255 if (__put_user(offset, &dirent->d_off))
68256@@ -980,6 +991,7 @@ COMPAT_SYSCALL_DEFINE3(getdents, unsigned int, fd,
68257 if (!f.file)
68258 return -EBADF;
68259
68260+ buf.file = f.file;
68261 error = iterate_dir(f.file, &buf.ctx);
68262 if (error >= 0)
68263 error = buf.error;
68264@@ -1000,6 +1012,7 @@ struct compat_getdents_callback64 {
68265 struct dir_context ctx;
68266 struct linux_dirent64 __user *current_dir;
68267 struct linux_dirent64 __user *previous;
68268+ struct file * file;
68269 int count;
68270 int error;
68271 };
68272@@ -1018,6 +1031,10 @@ static int compat_filldir64(struct dir_context *ctx, const char *name,
68273 buf->error = -EINVAL; /* only used if we fail.. */
68274 if (reclen > buf->count)
68275 return -EINVAL;
68276+
68277+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
68278+ return 0;
68279+
68280 dirent = buf->previous;
68281
68282 if (dirent) {
68283@@ -1067,6 +1084,7 @@ COMPAT_SYSCALL_DEFINE3(getdents64, unsigned int, fd,
68284 if (!f.file)
68285 return -EBADF;
68286
68287+ buf.file = f.file;
68288 error = iterate_dir(f.file, &buf.ctx);
68289 if (error >= 0)
68290 error = buf.error;
68291diff --git a/fs/compat_binfmt_elf.c b/fs/compat_binfmt_elf.c
68292index 4d24d17..4f8c09e 100644
68293--- a/fs/compat_binfmt_elf.c
68294+++ b/fs/compat_binfmt_elf.c
68295@@ -30,11 +30,13 @@
68296 #undef elf_phdr
68297 #undef elf_shdr
68298 #undef elf_note
68299+#undef elf_dyn
68300 #undef elf_addr_t
68301 #define elfhdr elf32_hdr
68302 #define elf_phdr elf32_phdr
68303 #define elf_shdr elf32_shdr
68304 #define elf_note elf32_note
68305+#define elf_dyn Elf32_Dyn
68306 #define elf_addr_t Elf32_Addr
68307
68308 /*
68309diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
68310index afec645..9c65620 100644
68311--- a/fs/compat_ioctl.c
68312+++ b/fs/compat_ioctl.c
68313@@ -621,7 +621,7 @@ static int serial_struct_ioctl(unsigned fd, unsigned cmd,
68314 return -EFAULT;
68315 if (__get_user(udata, &ss32->iomem_base))
68316 return -EFAULT;
68317- ss.iomem_base = compat_ptr(udata);
68318+ ss.iomem_base = (unsigned char __force_kernel *)compat_ptr(udata);
68319 if (__get_user(ss.iomem_reg_shift, &ss32->iomem_reg_shift) ||
68320 __get_user(ss.port_high, &ss32->port_high))
68321 return -EFAULT;
68322@@ -703,8 +703,8 @@ static int do_i2c_rdwr_ioctl(unsigned int fd, unsigned int cmd,
68323 for (i = 0; i < nmsgs; i++) {
68324 if (copy_in_user(&tmsgs[i].addr, &umsgs[i].addr, 3*sizeof(u16)))
68325 return -EFAULT;
68326- if (get_user(datap, &umsgs[i].buf) ||
68327- put_user(compat_ptr(datap), &tmsgs[i].buf))
68328+ if (get_user(datap, (compat_caddr_t __user *)&umsgs[i].buf) ||
68329+ put_user(compat_ptr(datap), (u8 __user * __user *)&tmsgs[i].buf))
68330 return -EFAULT;
68331 }
68332 return sys_ioctl(fd, cmd, (unsigned long)tdata);
68333@@ -797,7 +797,7 @@ static int compat_ioctl_preallocate(struct file *file,
68334 copy_in_user(&p->l_len, &p32->l_len, sizeof(s64)) ||
68335 copy_in_user(&p->l_sysid, &p32->l_sysid, sizeof(s32)) ||
68336 copy_in_user(&p->l_pid, &p32->l_pid, sizeof(u32)) ||
68337- copy_in_user(&p->l_pad, &p32->l_pad, 4*sizeof(u32)))
68338+ copy_in_user(p->l_pad, p32->l_pad, 4*sizeof(u32)))
68339 return -EFAULT;
68340
68341 return ioctl_preallocate(file, p);
68342@@ -1618,8 +1618,8 @@ COMPAT_SYSCALL_DEFINE3(ioctl, unsigned int, fd, unsigned int, cmd,
68343 static int __init init_sys32_ioctl_cmp(const void *p, const void *q)
68344 {
68345 unsigned int a, b;
68346- a = *(unsigned int *)p;
68347- b = *(unsigned int *)q;
68348+ a = *(const unsigned int *)p;
68349+ b = *(const unsigned int *)q;
68350 if (a > b)
68351 return 1;
68352 if (a < b)
68353diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c
68354index cf0db00..c7f70e8 100644
68355--- a/fs/configfs/dir.c
68356+++ b/fs/configfs/dir.c
68357@@ -1540,7 +1540,8 @@ static int configfs_readdir(struct file *file, struct dir_context *ctx)
68358 }
68359 for (p = q->next; p != &parent_sd->s_children; p = p->next) {
68360 struct configfs_dirent *next;
68361- const char *name;
68362+ const unsigned char * name;
68363+ char d_name[sizeof(next->s_dentry->d_iname)];
68364 int len;
68365 struct inode *inode = NULL;
68366
68367@@ -1549,7 +1550,12 @@ static int configfs_readdir(struct file *file, struct dir_context *ctx)
68368 continue;
68369
68370 name = configfs_get_name(next);
68371- len = strlen(name);
68372+ if (next->s_dentry && name == next->s_dentry->d_iname) {
68373+ len = next->s_dentry->d_name.len;
68374+ memcpy(d_name, name, len);
68375+ name = d_name;
68376+ } else
68377+ len = strlen(name);
68378
68379 /*
68380 * We'll have a dentry and an inode for
68381diff --git a/fs/coredump.c b/fs/coredump.c
68382index bbbe139..b76fae5 100644
68383--- a/fs/coredump.c
68384+++ b/fs/coredump.c
68385@@ -450,8 +450,8 @@ static void wait_for_dump_helpers(struct file *file)
68386 struct pipe_inode_info *pipe = file->private_data;
68387
68388 pipe_lock(pipe);
68389- pipe->readers++;
68390- pipe->writers--;
68391+ atomic_inc(&pipe->readers);
68392+ atomic_dec(&pipe->writers);
68393 wake_up_interruptible_sync(&pipe->wait);
68394 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
68395 pipe_unlock(pipe);
68396@@ -460,11 +460,11 @@ static void wait_for_dump_helpers(struct file *file)
68397 * We actually want wait_event_freezable() but then we need
68398 * to clear TIF_SIGPENDING and improve dump_interrupted().
68399 */
68400- wait_event_interruptible(pipe->wait, pipe->readers == 1);
68401+ wait_event_interruptible(pipe->wait, atomic_read(&pipe->readers) == 1);
68402
68403 pipe_lock(pipe);
68404- pipe->readers--;
68405- pipe->writers++;
68406+ atomic_dec(&pipe->readers);
68407+ atomic_inc(&pipe->writers);
68408 pipe_unlock(pipe);
68409 }
68410
68411@@ -511,7 +511,9 @@ void do_coredump(const siginfo_t *siginfo)
68412 struct files_struct *displaced;
68413 bool need_nonrelative = false;
68414 bool core_dumped = false;
68415- static atomic_t core_dump_count = ATOMIC_INIT(0);
68416+ static atomic_unchecked_t core_dump_count = ATOMIC_INIT(0);
68417+ long signr = siginfo->si_signo;
68418+ int dumpable;
68419 struct coredump_params cprm = {
68420 .siginfo = siginfo,
68421 .regs = signal_pt_regs(),
68422@@ -524,12 +526,17 @@ void do_coredump(const siginfo_t *siginfo)
68423 .mm_flags = mm->flags,
68424 };
68425
68426- audit_core_dumps(siginfo->si_signo);
68427+ audit_core_dumps(signr);
68428+
68429+ dumpable = __get_dumpable(cprm.mm_flags);
68430+
68431+ if (signr == SIGSEGV || signr == SIGBUS || signr == SIGKILL || signr == SIGILL)
68432+ gr_handle_brute_attach(dumpable);
68433
68434 binfmt = mm->binfmt;
68435 if (!binfmt || !binfmt->core_dump)
68436 goto fail;
68437- if (!__get_dumpable(cprm.mm_flags))
68438+ if (!dumpable)
68439 goto fail;
68440
68441 cred = prepare_creds();
68442@@ -548,7 +555,7 @@ void do_coredump(const siginfo_t *siginfo)
68443 need_nonrelative = true;
68444 }
68445
68446- retval = coredump_wait(siginfo->si_signo, &core_state);
68447+ retval = coredump_wait(signr, &core_state);
68448 if (retval < 0)
68449 goto fail_creds;
68450
68451@@ -591,7 +598,7 @@ void do_coredump(const siginfo_t *siginfo)
68452 }
68453 cprm.limit = RLIM_INFINITY;
68454
68455- dump_count = atomic_inc_return(&core_dump_count);
68456+ dump_count = atomic_inc_return_unchecked(&core_dump_count);
68457 if (core_pipe_limit && (core_pipe_limit < dump_count)) {
68458 printk(KERN_WARNING "Pid %d(%s) over core_pipe_limit\n",
68459 task_tgid_vnr(current), current->comm);
68460@@ -623,6 +630,8 @@ void do_coredump(const siginfo_t *siginfo)
68461 } else {
68462 struct inode *inode;
68463
68464+ gr_learn_resource(current, RLIMIT_CORE, binfmt->min_coredump, 1);
68465+
68466 if (cprm.limit < binfmt->min_coredump)
68467 goto fail_unlock;
68468
68469@@ -681,7 +690,7 @@ close_fail:
68470 filp_close(cprm.file, NULL);
68471 fail_dropcount:
68472 if (ispipe)
68473- atomic_dec(&core_dump_count);
68474+ atomic_dec_unchecked(&core_dump_count);
68475 fail_unlock:
68476 kfree(cn.corename);
68477 coredump_finish(mm, core_dumped);
68478@@ -702,6 +711,8 @@ int dump_emit(struct coredump_params *cprm, const void *addr, int nr)
68479 struct file *file = cprm->file;
68480 loff_t pos = file->f_pos;
68481 ssize_t n;
68482+
68483+ gr_learn_resource(current, RLIMIT_CORE, cprm->written + nr, 1);
68484 if (cprm->written + nr > cprm->limit)
68485 return 0;
68486 while (nr) {
68487diff --git a/fs/dcache.c b/fs/dcache.c
68488index 922f23e..05e38ae 100644
68489--- a/fs/dcache.c
68490+++ b/fs/dcache.c
68491@@ -511,7 +511,7 @@ static void __dentry_kill(struct dentry *dentry)
68492 * dentry_iput drops the locks, at which point nobody (except
68493 * transient RCU lookups) can reach this dentry.
68494 */
68495- BUG_ON(dentry->d_lockref.count > 0);
68496+ BUG_ON(__lockref_read(&dentry->d_lockref) > 0);
68497 this_cpu_dec(nr_dentry);
68498 if (dentry->d_op && dentry->d_op->d_release)
68499 dentry->d_op->d_release(dentry);
68500@@ -564,7 +564,7 @@ static inline struct dentry *lock_parent(struct dentry *dentry)
68501 struct dentry *parent = dentry->d_parent;
68502 if (IS_ROOT(dentry))
68503 return NULL;
68504- if (unlikely(dentry->d_lockref.count < 0))
68505+ if (unlikely(__lockref_read(&dentry->d_lockref) < 0))
68506 return NULL;
68507 if (likely(spin_trylock(&parent->d_lock)))
68508 return parent;
68509@@ -626,8 +626,8 @@ static inline bool fast_dput(struct dentry *dentry)
68510 */
68511 if (unlikely(ret < 0)) {
68512 spin_lock(&dentry->d_lock);
68513- if (dentry->d_lockref.count > 1) {
68514- dentry->d_lockref.count--;
68515+ if (__lockref_read(&dentry->d_lockref) > 1) {
68516+ __lockref_dec(&dentry->d_lockref);
68517 spin_unlock(&dentry->d_lock);
68518 return 1;
68519 }
68520@@ -682,7 +682,7 @@ static inline bool fast_dput(struct dentry *dentry)
68521 * else could have killed it and marked it dead. Either way, we
68522 * don't need to do anything else.
68523 */
68524- if (dentry->d_lockref.count) {
68525+ if (__lockref_read(&dentry->d_lockref)) {
68526 spin_unlock(&dentry->d_lock);
68527 return 1;
68528 }
68529@@ -692,7 +692,7 @@ static inline bool fast_dput(struct dentry *dentry)
68530 * lock, and we just tested that it was zero, so we can just
68531 * set it to 1.
68532 */
68533- dentry->d_lockref.count = 1;
68534+ __lockref_set(&dentry->d_lockref, 1);
68535 return 0;
68536 }
68537
68538@@ -751,7 +751,7 @@ repeat:
68539 dentry->d_flags |= DCACHE_REFERENCED;
68540 dentry_lru_add(dentry);
68541
68542- dentry->d_lockref.count--;
68543+ __lockref_dec(&dentry->d_lockref);
68544 spin_unlock(&dentry->d_lock);
68545 return;
68546
68547@@ -766,7 +766,7 @@ EXPORT_SYMBOL(dput);
68548 /* This must be called with d_lock held */
68549 static inline void __dget_dlock(struct dentry *dentry)
68550 {
68551- dentry->d_lockref.count++;
68552+ __lockref_inc(&dentry->d_lockref);
68553 }
68554
68555 static inline void __dget(struct dentry *dentry)
68556@@ -807,8 +807,8 @@ repeat:
68557 goto repeat;
68558 }
68559 rcu_read_unlock();
68560- BUG_ON(!ret->d_lockref.count);
68561- ret->d_lockref.count++;
68562+ BUG_ON(!__lockref_read(&ret->d_lockref));
68563+ __lockref_inc(&ret->d_lockref);
68564 spin_unlock(&ret->d_lock);
68565 return ret;
68566 }
68567@@ -886,9 +886,9 @@ restart:
68568 spin_lock(&inode->i_lock);
68569 hlist_for_each_entry(dentry, &inode->i_dentry, d_u.d_alias) {
68570 spin_lock(&dentry->d_lock);
68571- if (!dentry->d_lockref.count) {
68572+ if (!__lockref_read(&dentry->d_lockref)) {
68573 struct dentry *parent = lock_parent(dentry);
68574- if (likely(!dentry->d_lockref.count)) {
68575+ if (likely(!__lockref_read(&dentry->d_lockref))) {
68576 __dentry_kill(dentry);
68577 dput(parent);
68578 goto restart;
68579@@ -923,7 +923,7 @@ static void shrink_dentry_list(struct list_head *list)
68580 * We found an inuse dentry which was not removed from
68581 * the LRU because of laziness during lookup. Do not free it.
68582 */
68583- if (dentry->d_lockref.count > 0) {
68584+ if (__lockref_read(&dentry->d_lockref) > 0) {
68585 spin_unlock(&dentry->d_lock);
68586 if (parent)
68587 spin_unlock(&parent->d_lock);
68588@@ -961,8 +961,8 @@ static void shrink_dentry_list(struct list_head *list)
68589 dentry = parent;
68590 while (dentry && !lockref_put_or_lock(&dentry->d_lockref)) {
68591 parent = lock_parent(dentry);
68592- if (dentry->d_lockref.count != 1) {
68593- dentry->d_lockref.count--;
68594+ if (__lockref_read(&dentry->d_lockref) != 1) {
68595+ __lockref_inc(&dentry->d_lockref);
68596 spin_unlock(&dentry->d_lock);
68597 if (parent)
68598 spin_unlock(&parent->d_lock);
68599@@ -1002,7 +1002,7 @@ static enum lru_status dentry_lru_isolate(struct list_head *item,
68600 * counts, just remove them from the LRU. Otherwise give them
68601 * another pass through the LRU.
68602 */
68603- if (dentry->d_lockref.count) {
68604+ if (__lockref_read(&dentry->d_lockref)) {
68605 d_lru_isolate(lru, dentry);
68606 spin_unlock(&dentry->d_lock);
68607 return LRU_REMOVED;
68608@@ -1336,7 +1336,7 @@ static enum d_walk_ret select_collect(void *_data, struct dentry *dentry)
68609 } else {
68610 if (dentry->d_flags & DCACHE_LRU_LIST)
68611 d_lru_del(dentry);
68612- if (!dentry->d_lockref.count) {
68613+ if (!__lockref_read(&dentry->d_lockref)) {
68614 d_shrink_add(dentry, &data->dispose);
68615 data->found++;
68616 }
68617@@ -1384,7 +1384,7 @@ static enum d_walk_ret umount_check(void *_data, struct dentry *dentry)
68618 return D_WALK_CONTINUE;
68619
68620 /* root with refcount 1 is fine */
68621- if (dentry == _data && dentry->d_lockref.count == 1)
68622+ if (dentry == _data && __lockref_read(&dentry->d_lockref) == 1)
68623 return D_WALK_CONTINUE;
68624
68625 printk(KERN_ERR "BUG: Dentry %p{i=%lx,n=%pd} "
68626@@ -1393,7 +1393,7 @@ static enum d_walk_ret umount_check(void *_data, struct dentry *dentry)
68627 dentry->d_inode ?
68628 dentry->d_inode->i_ino : 0UL,
68629 dentry,
68630- dentry->d_lockref.count,
68631+ __lockref_read(&dentry->d_lockref),
68632 dentry->d_sb->s_type->name,
68633 dentry->d_sb->s_id);
68634 WARN_ON(1);
68635@@ -1534,7 +1534,7 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
68636 dentry->d_iname[DNAME_INLINE_LEN-1] = 0;
68637 if (name->len > DNAME_INLINE_LEN-1) {
68638 size_t size = offsetof(struct external_name, name[1]);
68639- struct external_name *p = kmalloc(size + name->len, GFP_KERNEL);
68640+ struct external_name *p = kmalloc(round_up(size + name->len, sizeof(unsigned long)), GFP_KERNEL);
68641 if (!p) {
68642 kmem_cache_free(dentry_cache, dentry);
68643 return NULL;
68644@@ -1557,7 +1557,7 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
68645 smp_wmb();
68646 dentry->d_name.name = dname;
68647
68648- dentry->d_lockref.count = 1;
68649+ __lockref_set(&dentry->d_lockref, 1);
68650 dentry->d_flags = 0;
68651 spin_lock_init(&dentry->d_lock);
68652 seqcount_init(&dentry->d_seq);
68653@@ -1566,6 +1566,9 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
68654 dentry->d_sb = sb;
68655 dentry->d_op = NULL;
68656 dentry->d_fsdata = NULL;
68657+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
68658+ atomic_set(&dentry->chroot_refcnt, 0);
68659+#endif
68660 INIT_HLIST_BL_NODE(&dentry->d_hash);
68661 INIT_LIST_HEAD(&dentry->d_lru);
68662 INIT_LIST_HEAD(&dentry->d_subdirs);
68663@@ -2290,7 +2293,7 @@ struct dentry *__d_lookup(const struct dentry *parent, const struct qstr *name)
68664 goto next;
68665 }
68666
68667- dentry->d_lockref.count++;
68668+ __lockref_inc(&dentry->d_lockref);
68669 found = dentry;
68670 spin_unlock(&dentry->d_lock);
68671 break;
68672@@ -2358,7 +2361,7 @@ again:
68673 spin_lock(&dentry->d_lock);
68674 inode = dentry->d_inode;
68675 isdir = S_ISDIR(inode->i_mode);
68676- if (dentry->d_lockref.count == 1) {
68677+ if (__lockref_read(&dentry->d_lockref) == 1) {
68678 if (!spin_trylock(&inode->i_lock)) {
68679 spin_unlock(&dentry->d_lock);
68680 cpu_relax();
68681@@ -3311,7 +3314,7 @@ static enum d_walk_ret d_genocide_kill(void *data, struct dentry *dentry)
68682
68683 if (!(dentry->d_flags & DCACHE_GENOCIDE)) {
68684 dentry->d_flags |= DCACHE_GENOCIDE;
68685- dentry->d_lockref.count--;
68686+ __lockref_dec(&dentry->d_lockref);
68687 }
68688 }
68689 return D_WALK_CONTINUE;
68690@@ -3427,7 +3430,8 @@ void __init vfs_caches_init(unsigned long mempages)
68691 mempages -= reserve;
68692
68693 names_cachep = kmem_cache_create("names_cache", PATH_MAX, 0,
68694- SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
68695+ SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_USERCOPY|
68696+ SLAB_NO_SANITIZE, NULL);
68697
68698 dcache_init();
68699 inode_init();
68700diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c
68701index 96400ab..906103d 100644
68702--- a/fs/debugfs/inode.c
68703+++ b/fs/debugfs/inode.c
68704@@ -386,6 +386,10 @@ struct dentry *debugfs_create_file_size(const char *name, umode_t mode,
68705 }
68706 EXPORT_SYMBOL_GPL(debugfs_create_file_size);
68707
68708+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
68709+extern int grsec_enable_sysfs_restrict;
68710+#endif
68711+
68712 /**
68713 * debugfs_create_dir - create a directory in the debugfs filesystem
68714 * @name: a pointer to a string containing the name of the directory to
68715@@ -404,6 +408,10 @@ EXPORT_SYMBOL_GPL(debugfs_create_file_size);
68716 * If debugfs is not enabled in the kernel, the value -%ENODEV will be
68717 * returned.
68718 */
68719+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
68720+extern int grsec_enable_sysfs_restrict;
68721+#endif
68722+
68723 struct dentry *debugfs_create_dir(const char *name, struct dentry *parent)
68724 {
68725 struct dentry *dentry = start_creating(name, parent);
68726@@ -416,7 +424,12 @@ struct dentry *debugfs_create_dir(const char *name, struct dentry *parent)
68727 if (unlikely(!inode))
68728 return failed_creating(dentry);
68729
68730- inode->i_mode = S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO;
68731+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
68732+ if (grsec_enable_sysfs_restrict)
68733+ inode->i_mode = S_IFDIR | S_IRWXU;
68734+ else
68735+#endif
68736+ inode->i_mode = S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO;
68737 inode->i_op = &simple_dir_inode_operations;
68738 inode->i_fop = &simple_dir_operations;
68739
68740diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
68741index b08b518..d6acffa 100644
68742--- a/fs/ecryptfs/inode.c
68743+++ b/fs/ecryptfs/inode.c
68744@@ -663,7 +663,7 @@ static char *ecryptfs_readlink_lower(struct dentry *dentry, size_t *bufsiz)
68745 old_fs = get_fs();
68746 set_fs(get_ds());
68747 rc = lower_dentry->d_inode->i_op->readlink(lower_dentry,
68748- (char __user *)lower_buf,
68749+ (char __force_user *)lower_buf,
68750 PATH_MAX);
68751 set_fs(old_fs);
68752 if (rc < 0)
68753diff --git a/fs/ecryptfs/miscdev.c b/fs/ecryptfs/miscdev.c
68754index e4141f2..d8263e8 100644
68755--- a/fs/ecryptfs/miscdev.c
68756+++ b/fs/ecryptfs/miscdev.c
68757@@ -304,7 +304,7 @@ check_list:
68758 goto out_unlock_msg_ctx;
68759 i = PKT_TYPE_SIZE + PKT_CTR_SIZE;
68760 if (msg_ctx->msg) {
68761- if (copy_to_user(&buf[i], packet_length, packet_length_size))
68762+ if (packet_length_size > sizeof(packet_length) || copy_to_user(&buf[i], packet_length, packet_length_size))
68763 goto out_unlock_msg_ctx;
68764 i += packet_length_size;
68765 if (copy_to_user(&buf[i], msg_ctx->msg, msg_ctx->msg_size))
68766diff --git a/fs/exec.c b/fs/exec.c
68767index 1202445..7a6fde9 100644
68768--- a/fs/exec.c
68769+++ b/fs/exec.c
68770@@ -56,8 +56,20 @@
68771 #include <linux/pipe_fs_i.h>
68772 #include <linux/oom.h>
68773 #include <linux/compat.h>
68774+#include <linux/random.h>
68775+#include <linux/seq_file.h>
68776+#include <linux/coredump.h>
68777+#include <linux/mman.h>
68778+
68779+#ifdef CONFIG_PAX_REFCOUNT
68780+#include <linux/kallsyms.h>
68781+#include <linux/kdebug.h>
68782+#endif
68783+
68784+#include <trace/events/fs.h>
68785
68786 #include <asm/uaccess.h>
68787+#include <asm/sections.h>
68788 #include <asm/mmu_context.h>
68789 #include <asm/tlb.h>
68790
68791@@ -66,19 +78,34 @@
68792
68793 #include <trace/events/sched.h>
68794
68795+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
68796+void __weak pax_set_initial_flags(struct linux_binprm *bprm)
68797+{
68798+ 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");
68799+}
68800+#endif
68801+
68802+#ifdef CONFIG_PAX_HOOK_ACL_FLAGS
68803+void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
68804+EXPORT_SYMBOL(pax_set_initial_flags_func);
68805+#endif
68806+
68807 int suid_dumpable = 0;
68808
68809 static LIST_HEAD(formats);
68810 static DEFINE_RWLOCK(binfmt_lock);
68811
68812+extern int gr_process_kernel_exec_ban(void);
68813+extern int gr_process_suid_exec_ban(const struct linux_binprm *bprm);
68814+
68815 void __register_binfmt(struct linux_binfmt * fmt, int insert)
68816 {
68817 BUG_ON(!fmt);
68818 if (WARN_ON(!fmt->load_binary))
68819 return;
68820 write_lock(&binfmt_lock);
68821- insert ? list_add(&fmt->lh, &formats) :
68822- list_add_tail(&fmt->lh, &formats);
68823+ insert ? pax_list_add((struct list_head *)&fmt->lh, &formats) :
68824+ pax_list_add_tail((struct list_head *)&fmt->lh, &formats);
68825 write_unlock(&binfmt_lock);
68826 }
68827
68828@@ -87,7 +114,7 @@ EXPORT_SYMBOL(__register_binfmt);
68829 void unregister_binfmt(struct linux_binfmt * fmt)
68830 {
68831 write_lock(&binfmt_lock);
68832- list_del(&fmt->lh);
68833+ pax_list_del((struct list_head *)&fmt->lh);
68834 write_unlock(&binfmt_lock);
68835 }
68836
68837@@ -183,18 +210,10 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
68838 int write)
68839 {
68840 struct page *page;
68841- int ret;
68842
68843-#ifdef CONFIG_STACK_GROWSUP
68844- if (write) {
68845- ret = expand_downwards(bprm->vma, pos);
68846- if (ret < 0)
68847- return NULL;
68848- }
68849-#endif
68850- ret = get_user_pages(current, bprm->mm, pos,
68851- 1, write, 1, &page, NULL);
68852- if (ret <= 0)
68853+ if (0 > expand_downwards(bprm->vma, pos))
68854+ return NULL;
68855+ if (0 >= get_user_pages(current, bprm->mm, pos, 1, write, 1, &page, NULL))
68856 return NULL;
68857
68858 if (write) {
68859@@ -210,6 +229,17 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
68860 if (size <= ARG_MAX)
68861 return page;
68862
68863+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
68864+ // only allow 512KB for argv+env on suid/sgid binaries
68865+ // to prevent easy ASLR exhaustion
68866+ if (((!uid_eq(bprm->cred->euid, current_euid())) ||
68867+ (!gid_eq(bprm->cred->egid, current_egid()))) &&
68868+ (size > (512 * 1024))) {
68869+ put_page(page);
68870+ return NULL;
68871+ }
68872+#endif
68873+
68874 /*
68875 * Limit to 1/4-th the stack size for the argv+env strings.
68876 * This ensures that:
68877@@ -269,6 +299,11 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
68878 vma->vm_end = STACK_TOP_MAX;
68879 vma->vm_start = vma->vm_end - PAGE_SIZE;
68880 vma->vm_flags = VM_SOFTDIRTY | VM_STACK_FLAGS | VM_STACK_INCOMPLETE_SETUP;
68881+
68882+#ifdef CONFIG_PAX_SEGMEXEC
68883+ vma->vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
68884+#endif
68885+
68886 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
68887 INIT_LIST_HEAD(&vma->anon_vma_chain);
68888
68889@@ -280,6 +315,12 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
68890 arch_bprm_mm_init(mm, vma);
68891 up_write(&mm->mmap_sem);
68892 bprm->p = vma->vm_end - sizeof(void *);
68893+
68894+#ifdef CONFIG_PAX_RANDUSTACK
68895+ if (randomize_va_space)
68896+ bprm->p ^= prandom_u32() & ~PAGE_MASK;
68897+#endif
68898+
68899 return 0;
68900 err:
68901 up_write(&mm->mmap_sem);
68902@@ -396,7 +437,7 @@ struct user_arg_ptr {
68903 } ptr;
68904 };
68905
68906-static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
68907+const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
68908 {
68909 const char __user *native;
68910
68911@@ -405,14 +446,14 @@ static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
68912 compat_uptr_t compat;
68913
68914 if (get_user(compat, argv.ptr.compat + nr))
68915- return ERR_PTR(-EFAULT);
68916+ return (const char __force_user *)ERR_PTR(-EFAULT);
68917
68918 return compat_ptr(compat);
68919 }
68920 #endif
68921
68922 if (get_user(native, argv.ptr.native + nr))
68923- return ERR_PTR(-EFAULT);
68924+ return (const char __force_user *)ERR_PTR(-EFAULT);
68925
68926 return native;
68927 }
68928@@ -431,7 +472,7 @@ static int count(struct user_arg_ptr argv, int max)
68929 if (!p)
68930 break;
68931
68932- if (IS_ERR(p))
68933+ if (IS_ERR((const char __force_kernel *)p))
68934 return -EFAULT;
68935
68936 if (i >= max)
68937@@ -466,7 +507,7 @@ static int copy_strings(int argc, struct user_arg_ptr argv,
68938
68939 ret = -EFAULT;
68940 str = get_user_arg_ptr(argv, argc);
68941- if (IS_ERR(str))
68942+ if (IS_ERR((const char __force_kernel *)str))
68943 goto out;
68944
68945 len = strnlen_user(str, MAX_ARG_STRLEN);
68946@@ -548,7 +589,7 @@ int copy_strings_kernel(int argc, const char *const *__argv,
68947 int r;
68948 mm_segment_t oldfs = get_fs();
68949 struct user_arg_ptr argv = {
68950- .ptr.native = (const char __user *const __user *)__argv,
68951+ .ptr.native = (const char __user * const __force_user *)__argv,
68952 };
68953
68954 set_fs(KERNEL_DS);
68955@@ -583,7 +624,8 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
68956 unsigned long new_end = old_end - shift;
68957 struct mmu_gather tlb;
68958
68959- BUG_ON(new_start > new_end);
68960+ if (new_start >= new_end || new_start < mmap_min_addr)
68961+ return -ENOMEM;
68962
68963 /*
68964 * ensure there are no vmas between where we want to go
68965@@ -592,6 +634,10 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
68966 if (vma != find_vma(mm, new_start))
68967 return -EFAULT;
68968
68969+#ifdef CONFIG_PAX_SEGMEXEC
68970+ BUG_ON(pax_find_mirror_vma(vma));
68971+#endif
68972+
68973 /*
68974 * cover the whole range: [new_start, old_end)
68975 */
68976@@ -675,10 +721,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
68977 stack_top = arch_align_stack(stack_top);
68978 stack_top = PAGE_ALIGN(stack_top);
68979
68980- if (unlikely(stack_top < mmap_min_addr) ||
68981- unlikely(vma->vm_end - vma->vm_start >= stack_top - mmap_min_addr))
68982- return -ENOMEM;
68983-
68984 stack_shift = vma->vm_end - stack_top;
68985
68986 bprm->p -= stack_shift;
68987@@ -690,8 +732,28 @@ int setup_arg_pages(struct linux_binprm *bprm,
68988 bprm->exec -= stack_shift;
68989
68990 down_write(&mm->mmap_sem);
68991+
68992+ /* Move stack pages down in memory. */
68993+ if (stack_shift) {
68994+ ret = shift_arg_pages(vma, stack_shift);
68995+ if (ret)
68996+ goto out_unlock;
68997+ }
68998+
68999 vm_flags = VM_STACK_FLAGS;
69000
69001+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
69002+ if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
69003+ vm_flags &= ~VM_EXEC;
69004+
69005+#ifdef CONFIG_PAX_MPROTECT
69006+ if (mm->pax_flags & MF_PAX_MPROTECT)
69007+ vm_flags &= ~VM_MAYEXEC;
69008+#endif
69009+
69010+ }
69011+#endif
69012+
69013 /*
69014 * Adjust stack execute permissions; explicitly enable for
69015 * EXSTACK_ENABLE_X, disable for EXSTACK_DISABLE_X and leave alone
69016@@ -710,13 +772,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
69017 goto out_unlock;
69018 BUG_ON(prev != vma);
69019
69020- /* Move stack pages down in memory. */
69021- if (stack_shift) {
69022- ret = shift_arg_pages(vma, stack_shift);
69023- if (ret)
69024- goto out_unlock;
69025- }
69026-
69027 /* mprotect_fixup is overkill to remove the temporary stack flags */
69028 vma->vm_flags &= ~VM_STACK_INCOMPLETE_SETUP;
69029
69030@@ -740,6 +795,27 @@ int setup_arg_pages(struct linux_binprm *bprm,
69031 #endif
69032 current->mm->start_stack = bprm->p;
69033 ret = expand_stack(vma, stack_base);
69034+
69035+#if !defined(CONFIG_STACK_GROWSUP) && defined(CONFIG_PAX_RANDMMAP)
69036+ if (!ret && (mm->pax_flags & MF_PAX_RANDMMAP) && STACK_TOP <= 0xFFFFFFFFU && STACK_TOP > vma->vm_end) {
69037+ unsigned long size;
69038+ vm_flags_t vm_flags;
69039+
69040+ size = STACK_TOP - vma->vm_end;
69041+ vm_flags = VM_NONE | VM_DONTEXPAND | VM_DONTDUMP;
69042+
69043+ ret = vma->vm_end != mmap_region(NULL, vma->vm_end, size, vm_flags, 0);
69044+
69045+#ifdef CONFIG_X86
69046+ if (!ret) {
69047+ size = PAGE_SIZE + mmap_min_addr + ((mm->delta_mmap ^ mm->delta_stack) & (0xFFUL << PAGE_SHIFT));
69048+ ret = 0 != mmap_region(NULL, 0, PAGE_ALIGN(size), vm_flags, 0);
69049+ }
69050+#endif
69051+
69052+ }
69053+#endif
69054+
69055 if (ret)
69056 ret = -EFAULT;
69057
69058@@ -784,8 +860,10 @@ static struct file *do_open_execat(int fd, struct filename *name, int flags)
69059 if (err)
69060 goto exit;
69061
69062- if (name->name[0] != '\0')
69063+ if (name->name[0] != '\0') {
69064 fsnotify_open(file);
69065+ trace_open_exec(name->name);
69066+ }
69067
69068 out:
69069 return file;
69070@@ -818,7 +896,7 @@ int kernel_read(struct file *file, loff_t offset,
69071 old_fs = get_fs();
69072 set_fs(get_ds());
69073 /* The cast to a user pointer is valid due to the set_fs() */
69074- result = vfs_read(file, (void __user *)addr, count, &pos);
69075+ result = vfs_read(file, (void __force_user *)addr, count, &pos);
69076 set_fs(old_fs);
69077 return result;
69078 }
69079@@ -863,6 +941,7 @@ static int exec_mmap(struct mm_struct *mm)
69080 tsk->mm = mm;
69081 tsk->active_mm = mm;
69082 activate_mm(active_mm, mm);
69083+ populate_stack();
69084 tsk->mm->vmacache_seqnum = 0;
69085 vmacache_flush(tsk);
69086 task_unlock(tsk);
69087@@ -929,10 +1008,14 @@ static int de_thread(struct task_struct *tsk)
69088 if (!thread_group_leader(tsk)) {
69089 struct task_struct *leader = tsk->group_leader;
69090
69091- sig->notify_count = -1; /* for exit_notify() */
69092 for (;;) {
69093 threadgroup_change_begin(tsk);
69094 write_lock_irq(&tasklist_lock);
69095+ /*
69096+ * Do this under tasklist_lock to ensure that
69097+ * exit_notify() can't miss ->group_exit_task
69098+ */
69099+ sig->notify_count = -1;
69100 if (likely(leader->exit_state))
69101 break;
69102 __set_current_state(TASK_KILLABLE);
69103@@ -1261,7 +1344,7 @@ static void check_unsafe_exec(struct linux_binprm *bprm)
69104 }
69105 rcu_read_unlock();
69106
69107- if (p->fs->users > n_fs)
69108+ if (atomic_read(&p->fs->users) > n_fs)
69109 bprm->unsafe |= LSM_UNSAFE_SHARE;
69110 else
69111 p->fs->in_exec = 1;
69112@@ -1462,6 +1545,31 @@ static int exec_binprm(struct linux_binprm *bprm)
69113 return ret;
69114 }
69115
69116+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
69117+static DEFINE_PER_CPU(u64, exec_counter);
69118+static int __init init_exec_counters(void)
69119+{
69120+ unsigned int cpu;
69121+
69122+ for_each_possible_cpu(cpu) {
69123+ per_cpu(exec_counter, cpu) = (u64)cpu;
69124+ }
69125+
69126+ return 0;
69127+}
69128+early_initcall(init_exec_counters);
69129+static inline void increment_exec_counter(void)
69130+{
69131+ BUILD_BUG_ON(NR_CPUS > (1 << 16));
69132+ current->exec_id = this_cpu_add_return(exec_counter, 1 << 16);
69133+}
69134+#else
69135+static inline void increment_exec_counter(void) {}
69136+#endif
69137+
69138+extern void gr_handle_exec_args(struct linux_binprm *bprm,
69139+ struct user_arg_ptr argv);
69140+
69141 /*
69142 * sys_execve() executes a new program.
69143 */
69144@@ -1470,6 +1578,11 @@ static int do_execveat_common(int fd, struct filename *filename,
69145 struct user_arg_ptr envp,
69146 int flags)
69147 {
69148+#ifdef CONFIG_GRKERNSEC
69149+ struct file *old_exec_file;
69150+ struct acl_subject_label *old_acl;
69151+ struct rlimit old_rlim[RLIM_NLIMITS];
69152+#endif
69153 char *pathbuf = NULL;
69154 struct linux_binprm *bprm;
69155 struct file *file;
69156@@ -1479,6 +1592,8 @@ static int do_execveat_common(int fd, struct filename *filename,
69157 if (IS_ERR(filename))
69158 return PTR_ERR(filename);
69159
69160+ gr_learn_resource(current, RLIMIT_NPROC, atomic_read(&current_user()->processes), 1);
69161+
69162 /*
69163 * We move the actual failure in case of RLIMIT_NPROC excess from
69164 * set*uid() to execve() because too many poorly written programs
69165@@ -1516,6 +1631,11 @@ static int do_execveat_common(int fd, struct filename *filename,
69166 if (IS_ERR(file))
69167 goto out_unmark;
69168
69169+ if (gr_ptrace_readexec(file, bprm->unsafe)) {
69170+ retval = -EPERM;
69171+ goto out_unmark;
69172+ }
69173+
69174 sched_exec();
69175
69176 bprm->file = file;
69177@@ -1542,6 +1662,11 @@ static int do_execveat_common(int fd, struct filename *filename,
69178 }
69179 bprm->interp = bprm->filename;
69180
69181+ if (!gr_acl_handle_execve(file->f_path.dentry, file->f_path.mnt)) {
69182+ retval = -EACCES;
69183+ goto out_unmark;
69184+ }
69185+
69186 retval = bprm_mm_init(bprm);
69187 if (retval)
69188 goto out_unmark;
69189@@ -1558,24 +1683,70 @@ static int do_execveat_common(int fd, struct filename *filename,
69190 if (retval < 0)
69191 goto out;
69192
69193+#ifdef CONFIG_GRKERNSEC
69194+ old_acl = current->acl;
69195+ memcpy(old_rlim, current->signal->rlim, sizeof(old_rlim));
69196+ old_exec_file = current->exec_file;
69197+ get_file(file);
69198+ current->exec_file = file;
69199+#endif
69200+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
69201+ /* limit suid stack to 8MB
69202+ * we saved the old limits above and will restore them if this exec fails
69203+ */
69204+ if (((!uid_eq(bprm->cred->euid, current_euid())) || (!gid_eq(bprm->cred->egid, current_egid()))) &&
69205+ (old_rlim[RLIMIT_STACK].rlim_cur > (8 * 1024 * 1024)))
69206+ current->signal->rlim[RLIMIT_STACK].rlim_cur = 8 * 1024 * 1024;
69207+#endif
69208+
69209+ if (gr_process_kernel_exec_ban() || gr_process_suid_exec_ban(bprm)) {
69210+ retval = -EPERM;
69211+ goto out_fail;
69212+ }
69213+
69214+ if (!gr_tpe_allow(file)) {
69215+ retval = -EACCES;
69216+ goto out_fail;
69217+ }
69218+
69219+ if (gr_check_crash_exec(file)) {
69220+ retval = -EACCES;
69221+ goto out_fail;
69222+ }
69223+
69224+ retval = gr_set_proc_label(file->f_path.dentry, file->f_path.mnt,
69225+ bprm->unsafe);
69226+ if (retval < 0)
69227+ goto out_fail;
69228+
69229 retval = copy_strings_kernel(1, &bprm->filename, bprm);
69230 if (retval < 0)
69231- goto out;
69232+ goto out_fail;
69233
69234 bprm->exec = bprm->p;
69235 retval = copy_strings(bprm->envc, envp, bprm);
69236 if (retval < 0)
69237- goto out;
69238+ goto out_fail;
69239
69240 retval = copy_strings(bprm->argc, argv, bprm);
69241 if (retval < 0)
69242- goto out;
69243+ goto out_fail;
69244+
69245+ gr_log_chroot_exec(file->f_path.dentry, file->f_path.mnt);
69246+
69247+ gr_handle_exec_args(bprm, argv);
69248
69249 retval = exec_binprm(bprm);
69250 if (retval < 0)
69251- goto out;
69252+ goto out_fail;
69253+#ifdef CONFIG_GRKERNSEC
69254+ if (old_exec_file)
69255+ fput(old_exec_file);
69256+#endif
69257
69258 /* execve succeeded */
69259+
69260+ increment_exec_counter();
69261 current->fs->in_exec = 0;
69262 current->in_execve = 0;
69263 acct_update_integrals(current);
69264@@ -1587,6 +1758,14 @@ static int do_execveat_common(int fd, struct filename *filename,
69265 put_files_struct(displaced);
69266 return retval;
69267
69268+out_fail:
69269+#ifdef CONFIG_GRKERNSEC
69270+ current->acl = old_acl;
69271+ memcpy(current->signal->rlim, old_rlim, sizeof(old_rlim));
69272+ fput(current->exec_file);
69273+ current->exec_file = old_exec_file;
69274+#endif
69275+
69276 out:
69277 if (bprm->mm) {
69278 acct_arg_size(bprm, 0);
69279@@ -1733,3 +1912,312 @@ COMPAT_SYSCALL_DEFINE5(execveat, int, fd,
69280 argv, envp, flags);
69281 }
69282 #endif
69283+
69284+int pax_check_flags(unsigned long *flags)
69285+{
69286+ int retval = 0;
69287+
69288+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_SEGMEXEC)
69289+ if (*flags & MF_PAX_SEGMEXEC)
69290+ {
69291+ *flags &= ~MF_PAX_SEGMEXEC;
69292+ retval = -EINVAL;
69293+ }
69294+#endif
69295+
69296+ if ((*flags & MF_PAX_PAGEEXEC)
69297+
69298+#ifdef CONFIG_PAX_PAGEEXEC
69299+ && (*flags & MF_PAX_SEGMEXEC)
69300+#endif
69301+
69302+ )
69303+ {
69304+ *flags &= ~MF_PAX_PAGEEXEC;
69305+ retval = -EINVAL;
69306+ }
69307+
69308+ if ((*flags & MF_PAX_MPROTECT)
69309+
69310+#ifdef CONFIG_PAX_MPROTECT
69311+ && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
69312+#endif
69313+
69314+ )
69315+ {
69316+ *flags &= ~MF_PAX_MPROTECT;
69317+ retval = -EINVAL;
69318+ }
69319+
69320+ if ((*flags & MF_PAX_EMUTRAMP)
69321+
69322+#ifdef CONFIG_PAX_EMUTRAMP
69323+ && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
69324+#endif
69325+
69326+ )
69327+ {
69328+ *flags &= ~MF_PAX_EMUTRAMP;
69329+ retval = -EINVAL;
69330+ }
69331+
69332+ return retval;
69333+}
69334+
69335+EXPORT_SYMBOL(pax_check_flags);
69336+
69337+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
69338+char *pax_get_path(const struct path *path, char *buf, int buflen)
69339+{
69340+ char *pathname = d_path(path, buf, buflen);
69341+
69342+ if (IS_ERR(pathname))
69343+ goto toolong;
69344+
69345+ pathname = mangle_path(buf, pathname, "\t\n\\");
69346+ if (!pathname)
69347+ goto toolong;
69348+
69349+ *pathname = 0;
69350+ return buf;
69351+
69352+toolong:
69353+ return "<path too long>";
69354+}
69355+EXPORT_SYMBOL(pax_get_path);
69356+
69357+void pax_report_fault(struct pt_regs *regs, void *pc, void *sp)
69358+{
69359+ struct task_struct *tsk = current;
69360+ struct mm_struct *mm = current->mm;
69361+ char *buffer_exec = (char *)__get_free_page(GFP_KERNEL);
69362+ char *buffer_fault = (char *)__get_free_page(GFP_KERNEL);
69363+ char *path_exec = NULL;
69364+ char *path_fault = NULL;
69365+ unsigned long start = 0UL, end = 0UL, offset = 0UL;
69366+ siginfo_t info = { };
69367+
69368+ if (buffer_exec && buffer_fault) {
69369+ struct vm_area_struct *vma, *vma_exec = NULL, *vma_fault = NULL;
69370+
69371+ down_read(&mm->mmap_sem);
69372+ vma = mm->mmap;
69373+ while (vma && (!vma_exec || !vma_fault)) {
69374+ if (vma->vm_file && mm->exe_file == vma->vm_file && (vma->vm_flags & VM_EXEC))
69375+ vma_exec = vma;
69376+ if (vma->vm_start <= (unsigned long)pc && (unsigned long)pc < vma->vm_end)
69377+ vma_fault = vma;
69378+ vma = vma->vm_next;
69379+ }
69380+ if (vma_exec)
69381+ path_exec = pax_get_path(&vma_exec->vm_file->f_path, buffer_exec, PAGE_SIZE);
69382+ if (vma_fault) {
69383+ start = vma_fault->vm_start;
69384+ end = vma_fault->vm_end;
69385+ offset = vma_fault->vm_pgoff << PAGE_SHIFT;
69386+ if (vma_fault->vm_file)
69387+ path_fault = pax_get_path(&vma_fault->vm_file->f_path, buffer_fault, PAGE_SIZE);
69388+ else if ((unsigned long)pc >= mm->start_brk && (unsigned long)pc < mm->brk)
69389+ path_fault = "<heap>";
69390+ else if (vma_fault->vm_flags & (VM_GROWSDOWN | VM_GROWSUP))
69391+ path_fault = "<stack>";
69392+ else
69393+ path_fault = "<anonymous mapping>";
69394+ }
69395+ up_read(&mm->mmap_sem);
69396+ }
69397+ if (tsk->signal->curr_ip)
69398+ printk(KERN_ERR "PAX: From %pI4: execution attempt in: %s, %08lx-%08lx %08lx\n", &tsk->signal->curr_ip, path_fault, start, end, offset);
69399+ else
69400+ printk(KERN_ERR "PAX: execution attempt in: %s, %08lx-%08lx %08lx\n", path_fault, start, end, offset);
69401+ 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),
69402+ from_kuid_munged(&init_user_ns, task_uid(tsk)), from_kuid_munged(&init_user_ns, task_euid(tsk)), pc, sp);
69403+ free_page((unsigned long)buffer_exec);
69404+ free_page((unsigned long)buffer_fault);
69405+ pax_report_insns(regs, pc, sp);
69406+ info.si_signo = SIGKILL;
69407+ info.si_errno = 0;
69408+ info.si_code = SI_KERNEL;
69409+ info.si_pid = 0;
69410+ info.si_uid = 0;
69411+ do_coredump(&info);
69412+}
69413+#endif
69414+
69415+#ifdef CONFIG_PAX_REFCOUNT
69416+void pax_report_refcount_overflow(struct pt_regs *regs)
69417+{
69418+ if (current->signal->curr_ip)
69419+ printk(KERN_EMERG "PAX: From %pI4: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n",
69420+ &current->signal->curr_ip, current->comm, task_pid_nr(current),
69421+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
69422+ else
69423+ printk(KERN_EMERG "PAX: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n", current->comm, task_pid_nr(current),
69424+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
69425+ print_symbol(KERN_EMERG "PAX: refcount overflow occured at: %s\n", instruction_pointer(regs));
69426+ preempt_disable();
69427+ show_regs(regs);
69428+ preempt_enable();
69429+ force_sig_info(SIGKILL, SEND_SIG_FORCED, current);
69430+}
69431+#endif
69432+
69433+#ifdef CONFIG_PAX_USERCOPY
69434+/* 0: not at all, 1: fully, 2: fully inside frame, -1: partially (implies an error) */
69435+static noinline int check_stack_object(const void *obj, unsigned long len)
69436+{
69437+ const void * const stack = task_stack_page(current);
69438+ const void * const stackend = stack + THREAD_SIZE;
69439+
69440+#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
69441+ const void *frame = NULL;
69442+ const void *oldframe;
69443+#endif
69444+
69445+ if (obj + len < obj)
69446+ return -1;
69447+
69448+ if (obj + len <= stack || stackend <= obj)
69449+ return 0;
69450+
69451+ if (obj < stack || stackend < obj + len)
69452+ return -1;
69453+
69454+#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
69455+ oldframe = __builtin_frame_address(1);
69456+ if (oldframe)
69457+ frame = __builtin_frame_address(2);
69458+ /*
69459+ low ----------------------------------------------> high
69460+ [saved bp][saved ip][args][local vars][saved bp][saved ip]
69461+ ^----------------^
69462+ allow copies only within here
69463+ */
69464+ while (stack <= frame && frame < stackend) {
69465+ /* if obj + len extends past the last frame, this
69466+ check won't pass and the next frame will be 0,
69467+ causing us to bail out and correctly report
69468+ the copy as invalid
69469+ */
69470+ if (obj + len <= frame)
69471+ return obj >= oldframe + 2 * sizeof(void *) ? 2 : -1;
69472+ oldframe = frame;
69473+ frame = *(const void * const *)frame;
69474+ }
69475+ return -1;
69476+#else
69477+ return 1;
69478+#endif
69479+}
69480+
69481+static __noreturn void pax_report_usercopy(const void *ptr, unsigned long len, bool to_user, const char *type)
69482+{
69483+ if (current->signal->curr_ip)
69484+ printk(KERN_EMERG "PAX: From %pI4: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
69485+ &current->signal->curr_ip, to_user ? "leak" : "overwrite", to_user ? "from" : "to", ptr, type ? : "unknown", len);
69486+ else
69487+ printk(KERN_EMERG "PAX: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
69488+ to_user ? "leak" : "overwrite", to_user ? "from" : "to", ptr, type ? : "unknown", len);
69489+ dump_stack();
69490+ gr_handle_kernel_exploit();
69491+ do_group_exit(SIGKILL);
69492+}
69493+#endif
69494+
69495+#ifdef CONFIG_PAX_USERCOPY
69496+
69497+static inline bool check_kernel_text_object(unsigned long low, unsigned long high)
69498+{
69499+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
69500+ unsigned long textlow = ktla_ktva((unsigned long)_stext);
69501+#ifdef CONFIG_MODULES
69502+ unsigned long texthigh = (unsigned long)MODULES_EXEC_VADDR;
69503+#else
69504+ unsigned long texthigh = ktla_ktva((unsigned long)_etext);
69505+#endif
69506+
69507+#else
69508+ unsigned long textlow = (unsigned long)_stext;
69509+ unsigned long texthigh = (unsigned long)_etext;
69510+
69511+#ifdef CONFIG_X86_64
69512+ /* check against linear mapping as well */
69513+ if (high > (unsigned long)__va(__pa(textlow)) &&
69514+ low < (unsigned long)__va(__pa(texthigh)))
69515+ return true;
69516+#endif
69517+
69518+#endif
69519+
69520+ if (high <= textlow || low >= texthigh)
69521+ return false;
69522+ else
69523+ return true;
69524+}
69525+#endif
69526+
69527+void __check_object_size(const void *ptr, unsigned long n, bool to_user, bool const_size)
69528+{
69529+#ifdef CONFIG_PAX_USERCOPY
69530+ const char *type;
69531+#endif
69532+
69533+#if !defined(CONFIG_STACK_GROWSUP) && !defined(CONFIG_X86_64)
69534+ unsigned long stackstart = (unsigned long)task_stack_page(current);
69535+ unsigned long currentsp = (unsigned long)&stackstart;
69536+ if (unlikely((currentsp < stackstart + 512 ||
69537+ currentsp >= stackstart + THREAD_SIZE) && !in_interrupt()))
69538+ BUG();
69539+#endif
69540+
69541+#ifndef CONFIG_PAX_USERCOPY_DEBUG
69542+ if (const_size)
69543+ return;
69544+#endif
69545+
69546+#ifdef CONFIG_PAX_USERCOPY
69547+ if (!n)
69548+ return;
69549+
69550+ type = check_heap_object(ptr, n);
69551+ if (!type) {
69552+ int ret = check_stack_object(ptr, n);
69553+ if (ret == 1 || ret == 2)
69554+ return;
69555+ if (ret == 0) {
69556+ if (check_kernel_text_object((unsigned long)ptr, (unsigned long)ptr + n))
69557+ type = "<kernel text>";
69558+ else
69559+ return;
69560+ } else
69561+ type = "<process stack>";
69562+ }
69563+
69564+ pax_report_usercopy(ptr, n, to_user, type);
69565+#endif
69566+
69567+}
69568+EXPORT_SYMBOL(__check_object_size);
69569+
69570+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
69571+void pax_track_stack(void)
69572+{
69573+ unsigned long sp = (unsigned long)&sp;
69574+ if (sp < current_thread_info()->lowest_stack &&
69575+ sp >= (unsigned long)task_stack_page(current) + 2 * sizeof(unsigned long))
69576+ current_thread_info()->lowest_stack = sp;
69577+ if (unlikely((sp & ~(THREAD_SIZE - 1)) < (THREAD_SIZE/16)))
69578+ BUG();
69579+}
69580+EXPORT_SYMBOL(pax_track_stack);
69581+#endif
69582+
69583+#ifdef CONFIG_PAX_SIZE_OVERFLOW
69584+void __nocapture(1, 3, 4) report_size_overflow(const char *file, unsigned int line, const char *func, const char *ssa_name)
69585+{
69586+ printk(KERN_EMERG "PAX: size overflow detected in function %s %s:%u %s", func, file, line, ssa_name);
69587+ dump_stack();
69588+ do_group_exit(SIGKILL);
69589+}
69590+EXPORT_SYMBOL(report_size_overflow);
69591+#endif
69592diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
69593index 9f9992b..8b59411 100644
69594--- a/fs/ext2/balloc.c
69595+++ b/fs/ext2/balloc.c
69596@@ -1184,10 +1184,10 @@ static int ext2_has_free_blocks(struct ext2_sb_info *sbi)
69597
69598 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
69599 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
69600- if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
69601+ if (free_blocks < root_blocks + 1 &&
69602 !uid_eq(sbi->s_resuid, current_fsuid()) &&
69603 (gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) ||
69604- !in_group_p (sbi->s_resgid))) {
69605+ !in_group_p (sbi->s_resgid)) && !capable_nolog(CAP_SYS_RESOURCE)) {
69606 return 0;
69607 }
69608 return 1;
69609diff --git a/fs/ext2/super.c b/fs/ext2/super.c
69610index d0e746e..82e06f0 100644
69611--- a/fs/ext2/super.c
69612+++ b/fs/ext2/super.c
69613@@ -267,10 +267,8 @@ static int ext2_show_options(struct seq_file *seq, struct dentry *root)
69614 #ifdef CONFIG_EXT2_FS_XATTR
69615 if (test_opt(sb, XATTR_USER))
69616 seq_puts(seq, ",user_xattr");
69617- if (!test_opt(sb, XATTR_USER) &&
69618- (def_mount_opts & EXT2_DEFM_XATTR_USER)) {
69619+ if (!test_opt(sb, XATTR_USER))
69620 seq_puts(seq, ",nouser_xattr");
69621- }
69622 #endif
69623
69624 #ifdef CONFIG_EXT2_FS_POSIX_ACL
69625@@ -856,8 +854,8 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent)
69626 if (def_mount_opts & EXT2_DEFM_UID16)
69627 set_opt(sbi->s_mount_opt, NO_UID32);
69628 #ifdef CONFIG_EXT2_FS_XATTR
69629- if (def_mount_opts & EXT2_DEFM_XATTR_USER)
69630- set_opt(sbi->s_mount_opt, XATTR_USER);
69631+ /* always enable user xattrs */
69632+ set_opt(sbi->s_mount_opt, XATTR_USER);
69633 #endif
69634 #ifdef CONFIG_EXT2_FS_POSIX_ACL
69635 if (def_mount_opts & EXT2_DEFM_ACL)
69636diff --git a/fs/ext2/xattr.c b/fs/ext2/xattr.c
69637index 9142614..97484fa 100644
69638--- a/fs/ext2/xattr.c
69639+++ b/fs/ext2/xattr.c
69640@@ -247,7 +247,7 @@ ext2_xattr_list(struct dentry *dentry, char *buffer, size_t buffer_size)
69641 struct buffer_head *bh = NULL;
69642 struct ext2_xattr_entry *entry;
69643 char *end;
69644- size_t rest = buffer_size;
69645+ size_t rest = buffer_size, total_size = 0;
69646 int error;
69647
69648 ea_idebug(inode, "buffer=%p, buffer_size=%ld",
69649@@ -305,9 +305,10 @@ bad_block: ext2_error(inode->i_sb, "ext2_xattr_list",
69650 buffer += size;
69651 }
69652 rest -= size;
69653+ total_size += size;
69654 }
69655 }
69656- error = buffer_size - rest; /* total size */
69657+ error = total_size;
69658
69659 cleanup:
69660 brelse(bh);
69661diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c
69662index 158b5d4..2432610 100644
69663--- a/fs/ext3/balloc.c
69664+++ b/fs/ext3/balloc.c
69665@@ -1438,10 +1438,10 @@ static int ext3_has_free_blocks(struct ext3_sb_info *sbi, int use_reservation)
69666
69667 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
69668 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
69669- if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
69670+ if (free_blocks < root_blocks + 1 &&
69671 !use_reservation && !uid_eq(sbi->s_resuid, current_fsuid()) &&
69672 (gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) ||
69673- !in_group_p (sbi->s_resgid))) {
69674+ !in_group_p (sbi->s_resgid)) && !capable_nolog(CAP_SYS_RESOURCE)) {
69675 return 0;
69676 }
69677 return 1;
69678diff --git a/fs/ext3/super.c b/fs/ext3/super.c
69679index d4dbf3c..906a6fb 100644
69680--- a/fs/ext3/super.c
69681+++ b/fs/ext3/super.c
69682@@ -655,10 +655,8 @@ static int ext3_show_options(struct seq_file *seq, struct dentry *root)
69683 #ifdef CONFIG_EXT3_FS_XATTR
69684 if (test_opt(sb, XATTR_USER))
69685 seq_puts(seq, ",user_xattr");
69686- if (!test_opt(sb, XATTR_USER) &&
69687- (def_mount_opts & EXT3_DEFM_XATTR_USER)) {
69688+ if (!test_opt(sb, XATTR_USER))
69689 seq_puts(seq, ",nouser_xattr");
69690- }
69691 #endif
69692 #ifdef CONFIG_EXT3_FS_POSIX_ACL
69693 if (test_opt(sb, POSIX_ACL))
69694@@ -1760,8 +1758,8 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
69695 if (def_mount_opts & EXT3_DEFM_UID16)
69696 set_opt(sbi->s_mount_opt, NO_UID32);
69697 #ifdef CONFIG_EXT3_FS_XATTR
69698- if (def_mount_opts & EXT3_DEFM_XATTR_USER)
69699- set_opt(sbi->s_mount_opt, XATTR_USER);
69700+ /* always enable user xattrs */
69701+ set_opt(sbi->s_mount_opt, XATTR_USER);
69702 #endif
69703 #ifdef CONFIG_EXT3_FS_POSIX_ACL
69704 if (def_mount_opts & EXT3_DEFM_ACL)
69705diff --git a/fs/ext3/xattr.c b/fs/ext3/xattr.c
69706index c6874be..f8a6ae8 100644
69707--- a/fs/ext3/xattr.c
69708+++ b/fs/ext3/xattr.c
69709@@ -330,7 +330,7 @@ static int
69710 ext3_xattr_list_entries(struct dentry *dentry, struct ext3_xattr_entry *entry,
69711 char *buffer, size_t buffer_size)
69712 {
69713- size_t rest = buffer_size;
69714+ size_t rest = buffer_size, total_size = 0;
69715
69716 for (; !IS_LAST_ENTRY(entry); entry = EXT3_XATTR_NEXT(entry)) {
69717 const struct xattr_handler *handler =
69718@@ -347,9 +347,10 @@ ext3_xattr_list_entries(struct dentry *dentry, struct ext3_xattr_entry *entry,
69719 buffer += size;
69720 }
69721 rest -= size;
69722+ total_size += size;
69723 }
69724 }
69725- return buffer_size - rest;
69726+ return total_size;
69727 }
69728
69729 static int
69730diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
69731index 83a6f49..d4e4d03 100644
69732--- a/fs/ext4/balloc.c
69733+++ b/fs/ext4/balloc.c
69734@@ -557,8 +557,8 @@ static int ext4_has_free_clusters(struct ext4_sb_info *sbi,
69735 /* Hm, nope. Are (enough) root reserved clusters available? */
69736 if (uid_eq(sbi->s_resuid, current_fsuid()) ||
69737 (!gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) && in_group_p(sbi->s_resgid)) ||
69738- capable(CAP_SYS_RESOURCE) ||
69739- (flags & EXT4_MB_USE_ROOT_BLOCKS)) {
69740+ (flags & EXT4_MB_USE_ROOT_BLOCKS) ||
69741+ capable_nolog(CAP_SYS_RESOURCE)) {
69742
69743 if (free_clusters >= (nclusters + dirty_clusters +
69744 resv_clusters))
69745diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
69746index f63c3d5..3c1a033 100644
69747--- a/fs/ext4/ext4.h
69748+++ b/fs/ext4/ext4.h
69749@@ -1287,19 +1287,19 @@ struct ext4_sb_info {
69750 unsigned long s_mb_last_start;
69751
69752 /* stats for buddy allocator */
69753- atomic_t s_bal_reqs; /* number of reqs with len > 1 */
69754- atomic_t s_bal_success; /* we found long enough chunks */
69755- atomic_t s_bal_allocated; /* in blocks */
69756- atomic_t s_bal_ex_scanned; /* total extents scanned */
69757- atomic_t s_bal_goals; /* goal hits */
69758- atomic_t s_bal_breaks; /* too long searches */
69759- atomic_t s_bal_2orders; /* 2^order hits */
69760+ atomic_unchecked_t s_bal_reqs; /* number of reqs with len > 1 */
69761+ atomic_unchecked_t s_bal_success; /* we found long enough chunks */
69762+ atomic_unchecked_t s_bal_allocated; /* in blocks */
69763+ atomic_unchecked_t s_bal_ex_scanned; /* total extents scanned */
69764+ atomic_unchecked_t s_bal_goals; /* goal hits */
69765+ atomic_unchecked_t s_bal_breaks; /* too long searches */
69766+ atomic_unchecked_t s_bal_2orders; /* 2^order hits */
69767 spinlock_t s_bal_lock;
69768 unsigned long s_mb_buddies_generated;
69769 unsigned long long s_mb_generation_time;
69770- atomic_t s_mb_lost_chunks;
69771- atomic_t s_mb_preallocated;
69772- atomic_t s_mb_discarded;
69773+ atomic_unchecked_t s_mb_lost_chunks;
69774+ atomic_unchecked_t s_mb_preallocated;
69775+ atomic_unchecked_t s_mb_discarded;
69776 atomic_t s_lock_busy;
69777
69778 /* locality groups */
69779diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
69780index 8d1e602..abf497b 100644
69781--- a/fs/ext4/mballoc.c
69782+++ b/fs/ext4/mballoc.c
69783@@ -1901,7 +1901,7 @@ void ext4_mb_simple_scan_group(struct ext4_allocation_context *ac,
69784 BUG_ON(ac->ac_b_ex.fe_len != ac->ac_g_ex.fe_len);
69785
69786 if (EXT4_SB(sb)->s_mb_stats)
69787- atomic_inc(&EXT4_SB(sb)->s_bal_2orders);
69788+ atomic_inc_unchecked(&EXT4_SB(sb)->s_bal_2orders);
69789
69790 break;
69791 }
69792@@ -2211,7 +2211,7 @@ repeat:
69793 ac->ac_status = AC_STATUS_CONTINUE;
69794 ac->ac_flags |= EXT4_MB_HINT_FIRST;
69795 cr = 3;
69796- atomic_inc(&sbi->s_mb_lost_chunks);
69797+ atomic_inc_unchecked(&sbi->s_mb_lost_chunks);
69798 goto repeat;
69799 }
69800 }
69801@@ -2716,25 +2716,25 @@ int ext4_mb_release(struct super_block *sb)
69802 if (sbi->s_mb_stats) {
69803 ext4_msg(sb, KERN_INFO,
69804 "mballoc: %u blocks %u reqs (%u success)",
69805- atomic_read(&sbi->s_bal_allocated),
69806- atomic_read(&sbi->s_bal_reqs),
69807- atomic_read(&sbi->s_bal_success));
69808+ atomic_read_unchecked(&sbi->s_bal_allocated),
69809+ atomic_read_unchecked(&sbi->s_bal_reqs),
69810+ atomic_read_unchecked(&sbi->s_bal_success));
69811 ext4_msg(sb, KERN_INFO,
69812 "mballoc: %u extents scanned, %u goal hits, "
69813 "%u 2^N hits, %u breaks, %u lost",
69814- atomic_read(&sbi->s_bal_ex_scanned),
69815- atomic_read(&sbi->s_bal_goals),
69816- atomic_read(&sbi->s_bal_2orders),
69817- atomic_read(&sbi->s_bal_breaks),
69818- atomic_read(&sbi->s_mb_lost_chunks));
69819+ atomic_read_unchecked(&sbi->s_bal_ex_scanned),
69820+ atomic_read_unchecked(&sbi->s_bal_goals),
69821+ atomic_read_unchecked(&sbi->s_bal_2orders),
69822+ atomic_read_unchecked(&sbi->s_bal_breaks),
69823+ atomic_read_unchecked(&sbi->s_mb_lost_chunks));
69824 ext4_msg(sb, KERN_INFO,
69825 "mballoc: %lu generated and it took %Lu",
69826 sbi->s_mb_buddies_generated,
69827 sbi->s_mb_generation_time);
69828 ext4_msg(sb, KERN_INFO,
69829 "mballoc: %u preallocated, %u discarded",
69830- atomic_read(&sbi->s_mb_preallocated),
69831- atomic_read(&sbi->s_mb_discarded));
69832+ atomic_read_unchecked(&sbi->s_mb_preallocated),
69833+ atomic_read_unchecked(&sbi->s_mb_discarded));
69834 }
69835
69836 free_percpu(sbi->s_locality_groups);
69837@@ -3190,16 +3190,16 @@ static void ext4_mb_collect_stats(struct ext4_allocation_context *ac)
69838 struct ext4_sb_info *sbi = EXT4_SB(ac->ac_sb);
69839
69840 if (sbi->s_mb_stats && ac->ac_g_ex.fe_len > 1) {
69841- atomic_inc(&sbi->s_bal_reqs);
69842- atomic_add(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
69843+ atomic_inc_unchecked(&sbi->s_bal_reqs);
69844+ atomic_add_unchecked(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
69845 if (ac->ac_b_ex.fe_len >= ac->ac_o_ex.fe_len)
69846- atomic_inc(&sbi->s_bal_success);
69847- atomic_add(ac->ac_found, &sbi->s_bal_ex_scanned);
69848+ atomic_inc_unchecked(&sbi->s_bal_success);
69849+ atomic_add_unchecked(ac->ac_found, &sbi->s_bal_ex_scanned);
69850 if (ac->ac_g_ex.fe_start == ac->ac_b_ex.fe_start &&
69851 ac->ac_g_ex.fe_group == ac->ac_b_ex.fe_group)
69852- atomic_inc(&sbi->s_bal_goals);
69853+ atomic_inc_unchecked(&sbi->s_bal_goals);
69854 if (ac->ac_found > sbi->s_mb_max_to_scan)
69855- atomic_inc(&sbi->s_bal_breaks);
69856+ atomic_inc_unchecked(&sbi->s_bal_breaks);
69857 }
69858
69859 if (ac->ac_op == EXT4_MB_HISTORY_ALLOC)
69860@@ -3626,7 +3626,7 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac)
69861 trace_ext4_mb_new_inode_pa(ac, pa);
69862
69863 ext4_mb_use_inode_pa(ac, pa);
69864- atomic_add(pa->pa_free, &sbi->s_mb_preallocated);
69865+ atomic_add_unchecked(pa->pa_free, &sbi->s_mb_preallocated);
69866
69867 ei = EXT4_I(ac->ac_inode);
69868 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
69869@@ -3686,7 +3686,7 @@ ext4_mb_new_group_pa(struct ext4_allocation_context *ac)
69870 trace_ext4_mb_new_group_pa(ac, pa);
69871
69872 ext4_mb_use_group_pa(ac, pa);
69873- atomic_add(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
69874+ atomic_add_unchecked(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
69875
69876 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
69877 lg = ac->ac_lg;
69878@@ -3775,7 +3775,7 @@ ext4_mb_release_inode_pa(struct ext4_buddy *e4b, struct buffer_head *bitmap_bh,
69879 * from the bitmap and continue.
69880 */
69881 }
69882- atomic_add(free, &sbi->s_mb_discarded);
69883+ atomic_add_unchecked(free, &sbi->s_mb_discarded);
69884
69885 return err;
69886 }
69887@@ -3793,7 +3793,7 @@ ext4_mb_release_group_pa(struct ext4_buddy *e4b,
69888 ext4_get_group_no_and_offset(sb, pa->pa_pstart, &group, &bit);
69889 BUG_ON(group != e4b->bd_group && pa->pa_len != 0);
69890 mb_free_blocks(pa->pa_inode, e4b, bit, pa->pa_len);
69891- atomic_add(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
69892+ atomic_add_unchecked(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
69893 trace_ext4_mballoc_discard(sb, NULL, group, bit, pa->pa_len);
69894
69895 return 0;
69896diff --git a/fs/ext4/mmp.c b/fs/ext4/mmp.c
69897index 8313ca3..8a37d08 100644
69898--- a/fs/ext4/mmp.c
69899+++ b/fs/ext4/mmp.c
69900@@ -111,7 +111,7 @@ static int read_mmp_block(struct super_block *sb, struct buffer_head **bh,
69901 void __dump_mmp_msg(struct super_block *sb, struct mmp_struct *mmp,
69902 const char *function, unsigned int line, const char *msg)
69903 {
69904- __ext4_warning(sb, function, line, msg);
69905+ __ext4_warning(sb, function, line, "%s", msg);
69906 __ext4_warning(sb, function, line,
69907 "MMP failure info: last update time: %llu, last update "
69908 "node: %s, last update device: %s\n",
69909diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c
69910index 8a8ec62..1b02de5 100644
69911--- a/fs/ext4/resize.c
69912+++ b/fs/ext4/resize.c
69913@@ -413,7 +413,7 @@ static int set_flexbg_block_bitmap(struct super_block *sb, handle_t *handle,
69914
69915 ext4_debug("mark blocks [%llu/%u] used\n", block, count);
69916 for (count2 = count; count > 0; count -= count2, block += count2) {
69917- ext4_fsblk_t start;
69918+ ext4_fsblk_t start, diff;
69919 struct buffer_head *bh;
69920 ext4_group_t group;
69921 int err;
69922@@ -422,10 +422,6 @@ static int set_flexbg_block_bitmap(struct super_block *sb, handle_t *handle,
69923 start = ext4_group_first_block_no(sb, group);
69924 group -= flex_gd->groups[0].group;
69925
69926- count2 = EXT4_BLOCKS_PER_GROUP(sb) - (block - start);
69927- if (count2 > count)
69928- count2 = count;
69929-
69930 if (flex_gd->bg_flags[group] & EXT4_BG_BLOCK_UNINIT) {
69931 BUG_ON(flex_gd->count > 1);
69932 continue;
69933@@ -443,9 +439,15 @@ static int set_flexbg_block_bitmap(struct super_block *sb, handle_t *handle,
69934 err = ext4_journal_get_write_access(handle, bh);
69935 if (err)
69936 return err;
69937+
69938+ diff = block - start;
69939+ count2 = EXT4_BLOCKS_PER_GROUP(sb) - diff;
69940+ if (count2 > count)
69941+ count2 = count;
69942+
69943 ext4_debug("mark block bitmap %#04llx (+%llu/%u)\n", block,
69944- block - start, count2);
69945- ext4_set_bits(bh->b_data, block - start, count2);
69946+ diff, count2);
69947+ ext4_set_bits(bh->b_data, diff, count2);
69948
69949 err = ext4_handle_dirty_metadata(handle, NULL, bh);
69950 if (unlikely(err))
69951diff --git a/fs/ext4/super.c b/fs/ext4/super.c
69952index e061e66..87bc092 100644
69953--- a/fs/ext4/super.c
69954+++ b/fs/ext4/super.c
69955@@ -1243,7 +1243,7 @@ static ext4_fsblk_t get_sb_block(void **data)
69956 }
69957
69958 #define DEFAULT_JOURNAL_IOPRIO (IOPRIO_PRIO_VALUE(IOPRIO_CLASS_BE, 3))
69959-static char deprecated_msg[] = "Mount option \"%s\" will be removed by %s\n"
69960+static const char deprecated_msg[] = "Mount option \"%s\" will be removed by %s\n"
69961 "Contact linux-ext4@vger.kernel.org if you think we should keep it.\n";
69962
69963 #ifdef CONFIG_QUOTA
69964@@ -2443,7 +2443,7 @@ struct ext4_attr {
69965 int offset;
69966 int deprecated_val;
69967 } u;
69968-};
69969+} __do_const;
69970
69971 static int parse_strtoull(const char *buf,
69972 unsigned long long max, unsigned long long *value)
69973diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
69974index 1e09fc7..0400dd4 100644
69975--- a/fs/ext4/xattr.c
69976+++ b/fs/ext4/xattr.c
69977@@ -399,7 +399,7 @@ static int
69978 ext4_xattr_list_entries(struct dentry *dentry, struct ext4_xattr_entry *entry,
69979 char *buffer, size_t buffer_size)
69980 {
69981- size_t rest = buffer_size;
69982+ size_t rest = buffer_size, total_size = 0;
69983
69984 for (; !IS_LAST_ENTRY(entry); entry = EXT4_XATTR_NEXT(entry)) {
69985 const struct xattr_handler *handler =
69986@@ -416,9 +416,10 @@ ext4_xattr_list_entries(struct dentry *dentry, struct ext4_xattr_entry *entry,
69987 buffer += size;
69988 }
69989 rest -= size;
69990+ total_size += size;
69991 }
69992 }
69993- return buffer_size - rest;
69994+ return total_size;
69995 }
69996
69997 static int
69998diff --git a/fs/fcntl.c b/fs/fcntl.c
69999index ee85cd4..9dd0d20 100644
70000--- a/fs/fcntl.c
70001+++ b/fs/fcntl.c
70002@@ -102,6 +102,10 @@ void __f_setown(struct file *filp, struct pid *pid, enum pid_type type,
70003 int force)
70004 {
70005 security_file_set_fowner(filp);
70006+ if (gr_handle_chroot_fowner(pid, type))
70007+ return;
70008+ if (gr_check_protected_task_fowner(pid, type))
70009+ return;
70010 f_modown(filp, pid, type, force);
70011 }
70012 EXPORT_SYMBOL(__f_setown);
70013diff --git a/fs/fhandle.c b/fs/fhandle.c
70014index d59712d..2281df9 100644
70015--- a/fs/fhandle.c
70016+++ b/fs/fhandle.c
70017@@ -8,6 +8,7 @@
70018 #include <linux/fs_struct.h>
70019 #include <linux/fsnotify.h>
70020 #include <linux/personality.h>
70021+#include <linux/grsecurity.h>
70022 #include <asm/uaccess.h>
70023 #include "internal.h"
70024 #include "mount.h"
70025@@ -67,8 +68,7 @@ static long do_sys_name_to_handle(struct path *path,
70026 } else
70027 retval = 0;
70028 /* copy the mount id */
70029- if (copy_to_user(mnt_id, &real_mount(path->mnt)->mnt_id,
70030- sizeof(*mnt_id)) ||
70031+ if (put_user(real_mount(path->mnt)->mnt_id, mnt_id) ||
70032 copy_to_user(ufh, handle,
70033 sizeof(struct file_handle) + handle_bytes))
70034 retval = -EFAULT;
70035@@ -175,7 +175,7 @@ static int handle_to_path(int mountdirfd, struct file_handle __user *ufh,
70036 * the directory. Ideally we would like CAP_DAC_SEARCH.
70037 * But we don't have that
70038 */
70039- if (!capable(CAP_DAC_READ_SEARCH)) {
70040+ if (!capable(CAP_DAC_READ_SEARCH) || !gr_chroot_fhandle()) {
70041 retval = -EPERM;
70042 goto out_err;
70043 }
70044diff --git a/fs/file.c b/fs/file.c
70045index ee738ea..f6c15629 100644
70046--- a/fs/file.c
70047+++ b/fs/file.c
70048@@ -16,6 +16,7 @@
70049 #include <linux/slab.h>
70050 #include <linux/vmalloc.h>
70051 #include <linux/file.h>
70052+#include <linux/security.h>
70053 #include <linux/fdtable.h>
70054 #include <linux/bitops.h>
70055 #include <linux/interrupt.h>
70056@@ -139,7 +140,7 @@ out:
70057 * Return <0 error code on error; 1 on successful completion.
70058 * The files->file_lock should be held on entry, and will be held on exit.
70059 */
70060-static int expand_fdtable(struct files_struct *files, int nr)
70061+static int expand_fdtable(struct files_struct *files, unsigned int nr)
70062 __releases(files->file_lock)
70063 __acquires(files->file_lock)
70064 {
70065@@ -184,7 +185,7 @@ static int expand_fdtable(struct files_struct *files, int nr)
70066 * expanded and execution may have blocked.
70067 * The files->file_lock should be held on entry, and will be held on exit.
70068 */
70069-static int expand_files(struct files_struct *files, int nr)
70070+static int expand_files(struct files_struct *files, unsigned int nr)
70071 {
70072 struct fdtable *fdt;
70073
70074@@ -800,6 +801,7 @@ int replace_fd(unsigned fd, struct file *file, unsigned flags)
70075 if (!file)
70076 return __close_fd(files, fd);
70077
70078+ gr_learn_resource(current, RLIMIT_NOFILE, fd, 0);
70079 if (fd >= rlimit(RLIMIT_NOFILE))
70080 return -EBADF;
70081
70082@@ -826,6 +828,7 @@ SYSCALL_DEFINE3(dup3, unsigned int, oldfd, unsigned int, newfd, int, flags)
70083 if (unlikely(oldfd == newfd))
70084 return -EINVAL;
70085
70086+ gr_learn_resource(current, RLIMIT_NOFILE, newfd, 0);
70087 if (newfd >= rlimit(RLIMIT_NOFILE))
70088 return -EBADF;
70089
70090@@ -881,6 +884,7 @@ SYSCALL_DEFINE1(dup, unsigned int, fildes)
70091 int f_dupfd(unsigned int from, struct file *file, unsigned flags)
70092 {
70093 int err;
70094+ gr_learn_resource(current, RLIMIT_NOFILE, from, 0);
70095 if (from >= rlimit(RLIMIT_NOFILE))
70096 return -EINVAL;
70097 err = alloc_fd(from, flags);
70098diff --git a/fs/filesystems.c b/fs/filesystems.c
70099index 5797d45..7d7d79a 100644
70100--- a/fs/filesystems.c
70101+++ b/fs/filesystems.c
70102@@ -275,7 +275,11 @@ struct file_system_type *get_fs_type(const char *name)
70103 int len = dot ? dot - name : strlen(name);
70104
70105 fs = __get_fs_type(name, len);
70106+#ifdef CONFIG_GRKERNSEC_MODHARDEN
70107+ if (!fs && (___request_module(true, "grsec_modharden_fs", "fs-%.*s", len, name) == 0))
70108+#else
70109 if (!fs && (request_module("fs-%.*s", len, name) == 0))
70110+#endif
70111 fs = __get_fs_type(name, len);
70112
70113 if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) {
70114diff --git a/fs/fs_struct.c b/fs/fs_struct.c
70115index 7dca743..1ff87ae 100644
70116--- a/fs/fs_struct.c
70117+++ b/fs/fs_struct.c
70118@@ -4,6 +4,7 @@
70119 #include <linux/path.h>
70120 #include <linux/slab.h>
70121 #include <linux/fs_struct.h>
70122+#include <linux/grsecurity.h>
70123 #include "internal.h"
70124
70125 /*
70126@@ -15,14 +16,18 @@ void set_fs_root(struct fs_struct *fs, const struct path *path)
70127 struct path old_root;
70128
70129 path_get(path);
70130+ gr_inc_chroot_refcnts(path->dentry, path->mnt);
70131 spin_lock(&fs->lock);
70132 write_seqcount_begin(&fs->seq);
70133 old_root = fs->root;
70134 fs->root = *path;
70135+ gr_set_chroot_entries(current, path);
70136 write_seqcount_end(&fs->seq);
70137 spin_unlock(&fs->lock);
70138- if (old_root.dentry)
70139+ if (old_root.dentry) {
70140+ gr_dec_chroot_refcnts(old_root.dentry, old_root.mnt);
70141 path_put(&old_root);
70142+ }
70143 }
70144
70145 /*
70146@@ -67,6 +72,10 @@ void chroot_fs_refs(const struct path *old_root, const struct path *new_root)
70147 int hits = 0;
70148 spin_lock(&fs->lock);
70149 write_seqcount_begin(&fs->seq);
70150+ /* this root replacement is only done by pivot_root,
70151+ leave grsec's chroot tagging alone for this task
70152+ so that a pivoted root isn't treated as a chroot
70153+ */
70154 hits += replace_path(&fs->root, old_root, new_root);
70155 hits += replace_path(&fs->pwd, old_root, new_root);
70156 write_seqcount_end(&fs->seq);
70157@@ -85,6 +94,7 @@ void chroot_fs_refs(const struct path *old_root, const struct path *new_root)
70158
70159 void free_fs_struct(struct fs_struct *fs)
70160 {
70161+ gr_dec_chroot_refcnts(fs->root.dentry, fs->root.mnt);
70162 path_put(&fs->root);
70163 path_put(&fs->pwd);
70164 kmem_cache_free(fs_cachep, fs);
70165@@ -99,7 +109,8 @@ void exit_fs(struct task_struct *tsk)
70166 task_lock(tsk);
70167 spin_lock(&fs->lock);
70168 tsk->fs = NULL;
70169- kill = !--fs->users;
70170+ gr_clear_chroot_entries(tsk);
70171+ kill = !atomic_dec_return(&fs->users);
70172 spin_unlock(&fs->lock);
70173 task_unlock(tsk);
70174 if (kill)
70175@@ -112,7 +123,7 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
70176 struct fs_struct *fs = kmem_cache_alloc(fs_cachep, GFP_KERNEL);
70177 /* We don't need to lock fs - think why ;-) */
70178 if (fs) {
70179- fs->users = 1;
70180+ atomic_set(&fs->users, 1);
70181 fs->in_exec = 0;
70182 spin_lock_init(&fs->lock);
70183 seqcount_init(&fs->seq);
70184@@ -121,9 +132,13 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
70185 spin_lock(&old->lock);
70186 fs->root = old->root;
70187 path_get(&fs->root);
70188+ /* instead of calling gr_set_chroot_entries here,
70189+ we call it from every caller of this function
70190+ */
70191 fs->pwd = old->pwd;
70192 path_get(&fs->pwd);
70193 spin_unlock(&old->lock);
70194+ gr_inc_chroot_refcnts(fs->root.dentry, fs->root.mnt);
70195 }
70196 return fs;
70197 }
70198@@ -139,8 +154,9 @@ int unshare_fs_struct(void)
70199
70200 task_lock(current);
70201 spin_lock(&fs->lock);
70202- kill = !--fs->users;
70203+ kill = !atomic_dec_return(&fs->users);
70204 current->fs = new_fs;
70205+ gr_set_chroot_entries(current, &new_fs->root);
70206 spin_unlock(&fs->lock);
70207 task_unlock(current);
70208
70209@@ -153,13 +169,13 @@ EXPORT_SYMBOL_GPL(unshare_fs_struct);
70210
70211 int current_umask(void)
70212 {
70213- return current->fs->umask;
70214+ return current->fs->umask | gr_acl_umask();
70215 }
70216 EXPORT_SYMBOL(current_umask);
70217
70218 /* to be mentioned only in INIT_TASK */
70219 struct fs_struct init_fs = {
70220- .users = 1,
70221+ .users = ATOMIC_INIT(1),
70222 .lock = __SPIN_LOCK_UNLOCKED(init_fs.lock),
70223 .seq = SEQCNT_ZERO(init_fs.seq),
70224 .umask = 0022,
70225diff --git a/fs/fscache/cookie.c b/fs/fscache/cookie.c
70226index 89acec7..a575262 100644
70227--- a/fs/fscache/cookie.c
70228+++ b/fs/fscache/cookie.c
70229@@ -19,7 +19,7 @@
70230
70231 struct kmem_cache *fscache_cookie_jar;
70232
70233-static atomic_t fscache_object_debug_id = ATOMIC_INIT(0);
70234+static atomic_unchecked_t fscache_object_debug_id = ATOMIC_INIT(0);
70235
70236 static int fscache_acquire_non_index_cookie(struct fscache_cookie *cookie);
70237 static int fscache_alloc_object(struct fscache_cache *cache,
70238@@ -69,11 +69,11 @@ struct fscache_cookie *__fscache_acquire_cookie(
70239 parent ? (char *) parent->def->name : "<no-parent>",
70240 def->name, netfs_data, enable);
70241
70242- fscache_stat(&fscache_n_acquires);
70243+ fscache_stat_unchecked(&fscache_n_acquires);
70244
70245 /* if there's no parent cookie, then we don't create one here either */
70246 if (!parent) {
70247- fscache_stat(&fscache_n_acquires_null);
70248+ fscache_stat_unchecked(&fscache_n_acquires_null);
70249 _leave(" [no parent]");
70250 return NULL;
70251 }
70252@@ -88,7 +88,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
70253 /* allocate and initialise a cookie */
70254 cookie = kmem_cache_alloc(fscache_cookie_jar, GFP_KERNEL);
70255 if (!cookie) {
70256- fscache_stat(&fscache_n_acquires_oom);
70257+ fscache_stat_unchecked(&fscache_n_acquires_oom);
70258 _leave(" [ENOMEM]");
70259 return NULL;
70260 }
70261@@ -115,13 +115,13 @@ struct fscache_cookie *__fscache_acquire_cookie(
70262
70263 switch (cookie->def->type) {
70264 case FSCACHE_COOKIE_TYPE_INDEX:
70265- fscache_stat(&fscache_n_cookie_index);
70266+ fscache_stat_unchecked(&fscache_n_cookie_index);
70267 break;
70268 case FSCACHE_COOKIE_TYPE_DATAFILE:
70269- fscache_stat(&fscache_n_cookie_data);
70270+ fscache_stat_unchecked(&fscache_n_cookie_data);
70271 break;
70272 default:
70273- fscache_stat(&fscache_n_cookie_special);
70274+ fscache_stat_unchecked(&fscache_n_cookie_special);
70275 break;
70276 }
70277
70278@@ -135,7 +135,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
70279 } else {
70280 atomic_dec(&parent->n_children);
70281 __fscache_cookie_put(cookie);
70282- fscache_stat(&fscache_n_acquires_nobufs);
70283+ fscache_stat_unchecked(&fscache_n_acquires_nobufs);
70284 _leave(" = NULL");
70285 return NULL;
70286 }
70287@@ -144,7 +144,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
70288 }
70289 }
70290
70291- fscache_stat(&fscache_n_acquires_ok);
70292+ fscache_stat_unchecked(&fscache_n_acquires_ok);
70293 _leave(" = %p", cookie);
70294 return cookie;
70295 }
70296@@ -213,7 +213,7 @@ static int fscache_acquire_non_index_cookie(struct fscache_cookie *cookie)
70297 cache = fscache_select_cache_for_object(cookie->parent);
70298 if (!cache) {
70299 up_read(&fscache_addremove_sem);
70300- fscache_stat(&fscache_n_acquires_no_cache);
70301+ fscache_stat_unchecked(&fscache_n_acquires_no_cache);
70302 _leave(" = -ENOMEDIUM [no cache]");
70303 return -ENOMEDIUM;
70304 }
70305@@ -297,14 +297,14 @@ static int fscache_alloc_object(struct fscache_cache *cache,
70306 object = cache->ops->alloc_object(cache, cookie);
70307 fscache_stat_d(&fscache_n_cop_alloc_object);
70308 if (IS_ERR(object)) {
70309- fscache_stat(&fscache_n_object_no_alloc);
70310+ fscache_stat_unchecked(&fscache_n_object_no_alloc);
70311 ret = PTR_ERR(object);
70312 goto error;
70313 }
70314
70315- fscache_stat(&fscache_n_object_alloc);
70316+ fscache_stat_unchecked(&fscache_n_object_alloc);
70317
70318- object->debug_id = atomic_inc_return(&fscache_object_debug_id);
70319+ object->debug_id = atomic_inc_return_unchecked(&fscache_object_debug_id);
70320
70321 _debug("ALLOC OBJ%x: %s {%lx}",
70322 object->debug_id, cookie->def->name, object->events);
70323@@ -418,7 +418,7 @@ void __fscache_invalidate(struct fscache_cookie *cookie)
70324
70325 _enter("{%s}", cookie->def->name);
70326
70327- fscache_stat(&fscache_n_invalidates);
70328+ fscache_stat_unchecked(&fscache_n_invalidates);
70329
70330 /* Only permit invalidation of data files. Invalidating an index will
70331 * require the caller to release all its attachments to the tree rooted
70332@@ -476,10 +476,10 @@ void __fscache_update_cookie(struct fscache_cookie *cookie)
70333 {
70334 struct fscache_object *object;
70335
70336- fscache_stat(&fscache_n_updates);
70337+ fscache_stat_unchecked(&fscache_n_updates);
70338
70339 if (!cookie) {
70340- fscache_stat(&fscache_n_updates_null);
70341+ fscache_stat_unchecked(&fscache_n_updates_null);
70342 _leave(" [no cookie]");
70343 return;
70344 }
70345@@ -580,12 +580,12 @@ EXPORT_SYMBOL(__fscache_disable_cookie);
70346 */
70347 void __fscache_relinquish_cookie(struct fscache_cookie *cookie, bool retire)
70348 {
70349- fscache_stat(&fscache_n_relinquishes);
70350+ fscache_stat_unchecked(&fscache_n_relinquishes);
70351 if (retire)
70352- fscache_stat(&fscache_n_relinquishes_retire);
70353+ fscache_stat_unchecked(&fscache_n_relinquishes_retire);
70354
70355 if (!cookie) {
70356- fscache_stat(&fscache_n_relinquishes_null);
70357+ fscache_stat_unchecked(&fscache_n_relinquishes_null);
70358 _leave(" [no cookie]");
70359 return;
70360 }
70361@@ -686,7 +686,7 @@ int __fscache_check_consistency(struct fscache_cookie *cookie)
70362 if (test_bit(FSCACHE_IOERROR, &object->cache->flags))
70363 goto inconsistent;
70364
70365- op->debug_id = atomic_inc_return(&fscache_op_debug_id);
70366+ op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
70367
70368 __fscache_use_cookie(cookie);
70369 if (fscache_submit_op(object, op) < 0)
70370diff --git a/fs/fscache/internal.h b/fs/fscache/internal.h
70371index 7872a62..d91b19f 100644
70372--- a/fs/fscache/internal.h
70373+++ b/fs/fscache/internal.h
70374@@ -137,8 +137,8 @@ extern void fscache_operation_gc(struct work_struct *);
70375 extern int fscache_wait_for_deferred_lookup(struct fscache_cookie *);
70376 extern int fscache_wait_for_operation_activation(struct fscache_object *,
70377 struct fscache_operation *,
70378- atomic_t *,
70379- atomic_t *,
70380+ atomic_unchecked_t *,
70381+ atomic_unchecked_t *,
70382 void (*)(struct fscache_operation *));
70383 extern void fscache_invalidate_writes(struct fscache_cookie *);
70384
70385@@ -157,101 +157,101 @@ extern void fscache_proc_cleanup(void);
70386 * stats.c
70387 */
70388 #ifdef CONFIG_FSCACHE_STATS
70389-extern atomic_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
70390-extern atomic_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
70391+extern atomic_unchecked_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
70392+extern atomic_unchecked_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
70393
70394-extern atomic_t fscache_n_op_pend;
70395-extern atomic_t fscache_n_op_run;
70396-extern atomic_t fscache_n_op_enqueue;
70397-extern atomic_t fscache_n_op_deferred_release;
70398-extern atomic_t fscache_n_op_release;
70399-extern atomic_t fscache_n_op_gc;
70400-extern atomic_t fscache_n_op_cancelled;
70401-extern atomic_t fscache_n_op_rejected;
70402+extern atomic_unchecked_t fscache_n_op_pend;
70403+extern atomic_unchecked_t fscache_n_op_run;
70404+extern atomic_unchecked_t fscache_n_op_enqueue;
70405+extern atomic_unchecked_t fscache_n_op_deferred_release;
70406+extern atomic_unchecked_t fscache_n_op_release;
70407+extern atomic_unchecked_t fscache_n_op_gc;
70408+extern atomic_unchecked_t fscache_n_op_cancelled;
70409+extern atomic_unchecked_t fscache_n_op_rejected;
70410
70411-extern atomic_t fscache_n_attr_changed;
70412-extern atomic_t fscache_n_attr_changed_ok;
70413-extern atomic_t fscache_n_attr_changed_nobufs;
70414-extern atomic_t fscache_n_attr_changed_nomem;
70415-extern atomic_t fscache_n_attr_changed_calls;
70416+extern atomic_unchecked_t fscache_n_attr_changed;
70417+extern atomic_unchecked_t fscache_n_attr_changed_ok;
70418+extern atomic_unchecked_t fscache_n_attr_changed_nobufs;
70419+extern atomic_unchecked_t fscache_n_attr_changed_nomem;
70420+extern atomic_unchecked_t fscache_n_attr_changed_calls;
70421
70422-extern atomic_t fscache_n_allocs;
70423-extern atomic_t fscache_n_allocs_ok;
70424-extern atomic_t fscache_n_allocs_wait;
70425-extern atomic_t fscache_n_allocs_nobufs;
70426-extern atomic_t fscache_n_allocs_intr;
70427-extern atomic_t fscache_n_allocs_object_dead;
70428-extern atomic_t fscache_n_alloc_ops;
70429-extern atomic_t fscache_n_alloc_op_waits;
70430+extern atomic_unchecked_t fscache_n_allocs;
70431+extern atomic_unchecked_t fscache_n_allocs_ok;
70432+extern atomic_unchecked_t fscache_n_allocs_wait;
70433+extern atomic_unchecked_t fscache_n_allocs_nobufs;
70434+extern atomic_unchecked_t fscache_n_allocs_intr;
70435+extern atomic_unchecked_t fscache_n_allocs_object_dead;
70436+extern atomic_unchecked_t fscache_n_alloc_ops;
70437+extern atomic_unchecked_t fscache_n_alloc_op_waits;
70438
70439-extern atomic_t fscache_n_retrievals;
70440-extern atomic_t fscache_n_retrievals_ok;
70441-extern atomic_t fscache_n_retrievals_wait;
70442-extern atomic_t fscache_n_retrievals_nodata;
70443-extern atomic_t fscache_n_retrievals_nobufs;
70444-extern atomic_t fscache_n_retrievals_intr;
70445-extern atomic_t fscache_n_retrievals_nomem;
70446-extern atomic_t fscache_n_retrievals_object_dead;
70447-extern atomic_t fscache_n_retrieval_ops;
70448-extern atomic_t fscache_n_retrieval_op_waits;
70449+extern atomic_unchecked_t fscache_n_retrievals;
70450+extern atomic_unchecked_t fscache_n_retrievals_ok;
70451+extern atomic_unchecked_t fscache_n_retrievals_wait;
70452+extern atomic_unchecked_t fscache_n_retrievals_nodata;
70453+extern atomic_unchecked_t fscache_n_retrievals_nobufs;
70454+extern atomic_unchecked_t fscache_n_retrievals_intr;
70455+extern atomic_unchecked_t fscache_n_retrievals_nomem;
70456+extern atomic_unchecked_t fscache_n_retrievals_object_dead;
70457+extern atomic_unchecked_t fscache_n_retrieval_ops;
70458+extern atomic_unchecked_t fscache_n_retrieval_op_waits;
70459
70460-extern atomic_t fscache_n_stores;
70461-extern atomic_t fscache_n_stores_ok;
70462-extern atomic_t fscache_n_stores_again;
70463-extern atomic_t fscache_n_stores_nobufs;
70464-extern atomic_t fscache_n_stores_oom;
70465-extern atomic_t fscache_n_store_ops;
70466-extern atomic_t fscache_n_store_calls;
70467-extern atomic_t fscache_n_store_pages;
70468-extern atomic_t fscache_n_store_radix_deletes;
70469-extern atomic_t fscache_n_store_pages_over_limit;
70470+extern atomic_unchecked_t fscache_n_stores;
70471+extern atomic_unchecked_t fscache_n_stores_ok;
70472+extern atomic_unchecked_t fscache_n_stores_again;
70473+extern atomic_unchecked_t fscache_n_stores_nobufs;
70474+extern atomic_unchecked_t fscache_n_stores_oom;
70475+extern atomic_unchecked_t fscache_n_store_ops;
70476+extern atomic_unchecked_t fscache_n_store_calls;
70477+extern atomic_unchecked_t fscache_n_store_pages;
70478+extern atomic_unchecked_t fscache_n_store_radix_deletes;
70479+extern atomic_unchecked_t fscache_n_store_pages_over_limit;
70480
70481-extern atomic_t fscache_n_store_vmscan_not_storing;
70482-extern atomic_t fscache_n_store_vmscan_gone;
70483-extern atomic_t fscache_n_store_vmscan_busy;
70484-extern atomic_t fscache_n_store_vmscan_cancelled;
70485-extern atomic_t fscache_n_store_vmscan_wait;
70486+extern atomic_unchecked_t fscache_n_store_vmscan_not_storing;
70487+extern atomic_unchecked_t fscache_n_store_vmscan_gone;
70488+extern atomic_unchecked_t fscache_n_store_vmscan_busy;
70489+extern atomic_unchecked_t fscache_n_store_vmscan_cancelled;
70490+extern atomic_unchecked_t fscache_n_store_vmscan_wait;
70491
70492-extern atomic_t fscache_n_marks;
70493-extern atomic_t fscache_n_uncaches;
70494+extern atomic_unchecked_t fscache_n_marks;
70495+extern atomic_unchecked_t fscache_n_uncaches;
70496
70497-extern atomic_t fscache_n_acquires;
70498-extern atomic_t fscache_n_acquires_null;
70499-extern atomic_t fscache_n_acquires_no_cache;
70500-extern atomic_t fscache_n_acquires_ok;
70501-extern atomic_t fscache_n_acquires_nobufs;
70502-extern atomic_t fscache_n_acquires_oom;
70503+extern atomic_unchecked_t fscache_n_acquires;
70504+extern atomic_unchecked_t fscache_n_acquires_null;
70505+extern atomic_unchecked_t fscache_n_acquires_no_cache;
70506+extern atomic_unchecked_t fscache_n_acquires_ok;
70507+extern atomic_unchecked_t fscache_n_acquires_nobufs;
70508+extern atomic_unchecked_t fscache_n_acquires_oom;
70509
70510-extern atomic_t fscache_n_invalidates;
70511-extern atomic_t fscache_n_invalidates_run;
70512+extern atomic_unchecked_t fscache_n_invalidates;
70513+extern atomic_unchecked_t fscache_n_invalidates_run;
70514
70515-extern atomic_t fscache_n_updates;
70516-extern atomic_t fscache_n_updates_null;
70517-extern atomic_t fscache_n_updates_run;
70518+extern atomic_unchecked_t fscache_n_updates;
70519+extern atomic_unchecked_t fscache_n_updates_null;
70520+extern atomic_unchecked_t fscache_n_updates_run;
70521
70522-extern atomic_t fscache_n_relinquishes;
70523-extern atomic_t fscache_n_relinquishes_null;
70524-extern atomic_t fscache_n_relinquishes_waitcrt;
70525-extern atomic_t fscache_n_relinquishes_retire;
70526+extern atomic_unchecked_t fscache_n_relinquishes;
70527+extern atomic_unchecked_t fscache_n_relinquishes_null;
70528+extern atomic_unchecked_t fscache_n_relinquishes_waitcrt;
70529+extern atomic_unchecked_t fscache_n_relinquishes_retire;
70530
70531-extern atomic_t fscache_n_cookie_index;
70532-extern atomic_t fscache_n_cookie_data;
70533-extern atomic_t fscache_n_cookie_special;
70534+extern atomic_unchecked_t fscache_n_cookie_index;
70535+extern atomic_unchecked_t fscache_n_cookie_data;
70536+extern atomic_unchecked_t fscache_n_cookie_special;
70537
70538-extern atomic_t fscache_n_object_alloc;
70539-extern atomic_t fscache_n_object_no_alloc;
70540-extern atomic_t fscache_n_object_lookups;
70541-extern atomic_t fscache_n_object_lookups_negative;
70542-extern atomic_t fscache_n_object_lookups_positive;
70543-extern atomic_t fscache_n_object_lookups_timed_out;
70544-extern atomic_t fscache_n_object_created;
70545-extern atomic_t fscache_n_object_avail;
70546-extern atomic_t fscache_n_object_dead;
70547+extern atomic_unchecked_t fscache_n_object_alloc;
70548+extern atomic_unchecked_t fscache_n_object_no_alloc;
70549+extern atomic_unchecked_t fscache_n_object_lookups;
70550+extern atomic_unchecked_t fscache_n_object_lookups_negative;
70551+extern atomic_unchecked_t fscache_n_object_lookups_positive;
70552+extern atomic_unchecked_t fscache_n_object_lookups_timed_out;
70553+extern atomic_unchecked_t fscache_n_object_created;
70554+extern atomic_unchecked_t fscache_n_object_avail;
70555+extern atomic_unchecked_t fscache_n_object_dead;
70556
70557-extern atomic_t fscache_n_checkaux_none;
70558-extern atomic_t fscache_n_checkaux_okay;
70559-extern atomic_t fscache_n_checkaux_update;
70560-extern atomic_t fscache_n_checkaux_obsolete;
70561+extern atomic_unchecked_t fscache_n_checkaux_none;
70562+extern atomic_unchecked_t fscache_n_checkaux_okay;
70563+extern atomic_unchecked_t fscache_n_checkaux_update;
70564+extern atomic_unchecked_t fscache_n_checkaux_obsolete;
70565
70566 extern atomic_t fscache_n_cop_alloc_object;
70567 extern atomic_t fscache_n_cop_lookup_object;
70568@@ -276,6 +276,11 @@ static inline void fscache_stat(atomic_t *stat)
70569 atomic_inc(stat);
70570 }
70571
70572+static inline void fscache_stat_unchecked(atomic_unchecked_t *stat)
70573+{
70574+ atomic_inc_unchecked(stat);
70575+}
70576+
70577 static inline void fscache_stat_d(atomic_t *stat)
70578 {
70579 atomic_dec(stat);
70580@@ -288,6 +293,7 @@ extern const struct file_operations fscache_stats_fops;
70581
70582 #define __fscache_stat(stat) (NULL)
70583 #define fscache_stat(stat) do {} while (0)
70584+#define fscache_stat_unchecked(stat) do {} while (0)
70585 #define fscache_stat_d(stat) do {} while (0)
70586 #endif
70587
70588diff --git a/fs/fscache/object.c b/fs/fscache/object.c
70589index da032da..0076ce7 100644
70590--- a/fs/fscache/object.c
70591+++ b/fs/fscache/object.c
70592@@ -454,7 +454,7 @@ static const struct fscache_state *fscache_look_up_object(struct fscache_object
70593 _debug("LOOKUP \"%s\" in \"%s\"",
70594 cookie->def->name, object->cache->tag->name);
70595
70596- fscache_stat(&fscache_n_object_lookups);
70597+ fscache_stat_unchecked(&fscache_n_object_lookups);
70598 fscache_stat(&fscache_n_cop_lookup_object);
70599 ret = object->cache->ops->lookup_object(object);
70600 fscache_stat_d(&fscache_n_cop_lookup_object);
70601@@ -464,7 +464,7 @@ static const struct fscache_state *fscache_look_up_object(struct fscache_object
70602 if (ret == -ETIMEDOUT) {
70603 /* probably stuck behind another object, so move this one to
70604 * the back of the queue */
70605- fscache_stat(&fscache_n_object_lookups_timed_out);
70606+ fscache_stat_unchecked(&fscache_n_object_lookups_timed_out);
70607 _leave(" [timeout]");
70608 return NO_TRANSIT;
70609 }
70610@@ -492,7 +492,7 @@ void fscache_object_lookup_negative(struct fscache_object *object)
70611 _enter("{OBJ%x,%s}", object->debug_id, object->state->name);
70612
70613 if (!test_and_set_bit(FSCACHE_OBJECT_IS_LOOKED_UP, &object->flags)) {
70614- fscache_stat(&fscache_n_object_lookups_negative);
70615+ fscache_stat_unchecked(&fscache_n_object_lookups_negative);
70616
70617 /* Allow write requests to begin stacking up and read requests to begin
70618 * returning ENODATA.
70619@@ -527,7 +527,7 @@ void fscache_obtained_object(struct fscache_object *object)
70620 /* if we were still looking up, then we must have a positive lookup
70621 * result, in which case there may be data available */
70622 if (!test_and_set_bit(FSCACHE_OBJECT_IS_LOOKED_UP, &object->flags)) {
70623- fscache_stat(&fscache_n_object_lookups_positive);
70624+ fscache_stat_unchecked(&fscache_n_object_lookups_positive);
70625
70626 /* We do (presumably) have data */
70627 clear_bit_unlock(FSCACHE_COOKIE_NO_DATA_YET, &cookie->flags);
70628@@ -539,7 +539,7 @@ void fscache_obtained_object(struct fscache_object *object)
70629 clear_bit_unlock(FSCACHE_COOKIE_LOOKING_UP, &cookie->flags);
70630 wake_up_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP);
70631 } else {
70632- fscache_stat(&fscache_n_object_created);
70633+ fscache_stat_unchecked(&fscache_n_object_created);
70634 }
70635
70636 set_bit(FSCACHE_OBJECT_IS_AVAILABLE, &object->flags);
70637@@ -575,7 +575,7 @@ static const struct fscache_state *fscache_object_available(struct fscache_objec
70638 fscache_stat_d(&fscache_n_cop_lookup_complete);
70639
70640 fscache_hist(fscache_obj_instantiate_histogram, object->lookup_jif);
70641- fscache_stat(&fscache_n_object_avail);
70642+ fscache_stat_unchecked(&fscache_n_object_avail);
70643
70644 _leave("");
70645 return transit_to(JUMPSTART_DEPS);
70646@@ -722,7 +722,7 @@ static const struct fscache_state *fscache_drop_object(struct fscache_object *ob
70647
70648 /* this just shifts the object release to the work processor */
70649 fscache_put_object(object);
70650- fscache_stat(&fscache_n_object_dead);
70651+ fscache_stat_unchecked(&fscache_n_object_dead);
70652
70653 _leave("");
70654 return transit_to(OBJECT_DEAD);
70655@@ -887,7 +887,7 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
70656 enum fscache_checkaux result;
70657
70658 if (!object->cookie->def->check_aux) {
70659- fscache_stat(&fscache_n_checkaux_none);
70660+ fscache_stat_unchecked(&fscache_n_checkaux_none);
70661 return FSCACHE_CHECKAUX_OKAY;
70662 }
70663
70664@@ -896,17 +896,17 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
70665 switch (result) {
70666 /* entry okay as is */
70667 case FSCACHE_CHECKAUX_OKAY:
70668- fscache_stat(&fscache_n_checkaux_okay);
70669+ fscache_stat_unchecked(&fscache_n_checkaux_okay);
70670 break;
70671
70672 /* entry requires update */
70673 case FSCACHE_CHECKAUX_NEEDS_UPDATE:
70674- fscache_stat(&fscache_n_checkaux_update);
70675+ fscache_stat_unchecked(&fscache_n_checkaux_update);
70676 break;
70677
70678 /* entry requires deletion */
70679 case FSCACHE_CHECKAUX_OBSOLETE:
70680- fscache_stat(&fscache_n_checkaux_obsolete);
70681+ fscache_stat_unchecked(&fscache_n_checkaux_obsolete);
70682 break;
70683
70684 default:
70685@@ -993,7 +993,7 @@ static const struct fscache_state *fscache_invalidate_object(struct fscache_obje
70686 {
70687 const struct fscache_state *s;
70688
70689- fscache_stat(&fscache_n_invalidates_run);
70690+ fscache_stat_unchecked(&fscache_n_invalidates_run);
70691 fscache_stat(&fscache_n_cop_invalidate_object);
70692 s = _fscache_invalidate_object(object, event);
70693 fscache_stat_d(&fscache_n_cop_invalidate_object);
70694@@ -1008,7 +1008,7 @@ static const struct fscache_state *fscache_update_object(struct fscache_object *
70695 {
70696 _enter("{OBJ%x},%d", object->debug_id, event);
70697
70698- fscache_stat(&fscache_n_updates_run);
70699+ fscache_stat_unchecked(&fscache_n_updates_run);
70700 fscache_stat(&fscache_n_cop_update_object);
70701 object->cache->ops->update_object(object);
70702 fscache_stat_d(&fscache_n_cop_update_object);
70703diff --git a/fs/fscache/operation.c b/fs/fscache/operation.c
70704index e7b87a0..a85d47a 100644
70705--- a/fs/fscache/operation.c
70706+++ b/fs/fscache/operation.c
70707@@ -17,7 +17,7 @@
70708 #include <linux/slab.h>
70709 #include "internal.h"
70710
70711-atomic_t fscache_op_debug_id;
70712+atomic_unchecked_t fscache_op_debug_id;
70713 EXPORT_SYMBOL(fscache_op_debug_id);
70714
70715 /**
70716@@ -39,7 +39,7 @@ void fscache_enqueue_operation(struct fscache_operation *op)
70717 ASSERTCMP(atomic_read(&op->usage), >, 0);
70718 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_IN_PROGRESS);
70719
70720- fscache_stat(&fscache_n_op_enqueue);
70721+ fscache_stat_unchecked(&fscache_n_op_enqueue);
70722 switch (op->flags & FSCACHE_OP_TYPE) {
70723 case FSCACHE_OP_ASYNC:
70724 _debug("queue async");
70725@@ -72,7 +72,7 @@ static void fscache_run_op(struct fscache_object *object,
70726 wake_up_bit(&op->flags, FSCACHE_OP_WAITING);
70727 if (op->processor)
70728 fscache_enqueue_operation(op);
70729- fscache_stat(&fscache_n_op_run);
70730+ fscache_stat_unchecked(&fscache_n_op_run);
70731 }
70732
70733 /*
70734@@ -104,11 +104,11 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
70735 if (object->n_in_progress > 0) {
70736 atomic_inc(&op->usage);
70737 list_add_tail(&op->pend_link, &object->pending_ops);
70738- fscache_stat(&fscache_n_op_pend);
70739+ fscache_stat_unchecked(&fscache_n_op_pend);
70740 } else if (!list_empty(&object->pending_ops)) {
70741 atomic_inc(&op->usage);
70742 list_add_tail(&op->pend_link, &object->pending_ops);
70743- fscache_stat(&fscache_n_op_pend);
70744+ fscache_stat_unchecked(&fscache_n_op_pend);
70745 fscache_start_operations(object);
70746 } else {
70747 ASSERTCMP(object->n_in_progress, ==, 0);
70748@@ -124,7 +124,7 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
70749 object->n_exclusive++; /* reads and writes must wait */
70750 atomic_inc(&op->usage);
70751 list_add_tail(&op->pend_link, &object->pending_ops);
70752- fscache_stat(&fscache_n_op_pend);
70753+ fscache_stat_unchecked(&fscache_n_op_pend);
70754 ret = 0;
70755 } else {
70756 /* If we're in any other state, there must have been an I/O
70757@@ -211,11 +211,11 @@ int fscache_submit_op(struct fscache_object *object,
70758 if (object->n_exclusive > 0) {
70759 atomic_inc(&op->usage);
70760 list_add_tail(&op->pend_link, &object->pending_ops);
70761- fscache_stat(&fscache_n_op_pend);
70762+ fscache_stat_unchecked(&fscache_n_op_pend);
70763 } else if (!list_empty(&object->pending_ops)) {
70764 atomic_inc(&op->usage);
70765 list_add_tail(&op->pend_link, &object->pending_ops);
70766- fscache_stat(&fscache_n_op_pend);
70767+ fscache_stat_unchecked(&fscache_n_op_pend);
70768 fscache_start_operations(object);
70769 } else {
70770 ASSERTCMP(object->n_exclusive, ==, 0);
70771@@ -227,10 +227,10 @@ int fscache_submit_op(struct fscache_object *object,
70772 object->n_ops++;
70773 atomic_inc(&op->usage);
70774 list_add_tail(&op->pend_link, &object->pending_ops);
70775- fscache_stat(&fscache_n_op_pend);
70776+ fscache_stat_unchecked(&fscache_n_op_pend);
70777 ret = 0;
70778 } else if (fscache_object_is_dying(object)) {
70779- fscache_stat(&fscache_n_op_rejected);
70780+ fscache_stat_unchecked(&fscache_n_op_rejected);
70781 op->state = FSCACHE_OP_ST_CANCELLED;
70782 ret = -ENOBUFS;
70783 } else if (!test_bit(FSCACHE_IOERROR, &object->cache->flags)) {
70784@@ -309,7 +309,7 @@ int fscache_cancel_op(struct fscache_operation *op,
70785 ret = -EBUSY;
70786 if (op->state == FSCACHE_OP_ST_PENDING) {
70787 ASSERT(!list_empty(&op->pend_link));
70788- fscache_stat(&fscache_n_op_cancelled);
70789+ fscache_stat_unchecked(&fscache_n_op_cancelled);
70790 list_del_init(&op->pend_link);
70791 if (do_cancel)
70792 do_cancel(op);
70793@@ -341,7 +341,7 @@ void fscache_cancel_all_ops(struct fscache_object *object)
70794 while (!list_empty(&object->pending_ops)) {
70795 op = list_entry(object->pending_ops.next,
70796 struct fscache_operation, pend_link);
70797- fscache_stat(&fscache_n_op_cancelled);
70798+ fscache_stat_unchecked(&fscache_n_op_cancelled);
70799 list_del_init(&op->pend_link);
70800
70801 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_PENDING);
70802@@ -413,7 +413,7 @@ void fscache_put_operation(struct fscache_operation *op)
70803 op->state, ==, FSCACHE_OP_ST_CANCELLED);
70804 op->state = FSCACHE_OP_ST_DEAD;
70805
70806- fscache_stat(&fscache_n_op_release);
70807+ fscache_stat_unchecked(&fscache_n_op_release);
70808
70809 if (op->release) {
70810 op->release(op);
70811@@ -432,7 +432,7 @@ void fscache_put_operation(struct fscache_operation *op)
70812 * lock, and defer it otherwise */
70813 if (!spin_trylock(&object->lock)) {
70814 _debug("defer put");
70815- fscache_stat(&fscache_n_op_deferred_release);
70816+ fscache_stat_unchecked(&fscache_n_op_deferred_release);
70817
70818 cache = object->cache;
70819 spin_lock(&cache->op_gc_list_lock);
70820@@ -485,7 +485,7 @@ void fscache_operation_gc(struct work_struct *work)
70821
70822 _debug("GC DEFERRED REL OBJ%x OP%x",
70823 object->debug_id, op->debug_id);
70824- fscache_stat(&fscache_n_op_gc);
70825+ fscache_stat_unchecked(&fscache_n_op_gc);
70826
70827 ASSERTCMP(atomic_read(&op->usage), ==, 0);
70828 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_DEAD);
70829diff --git a/fs/fscache/page.c b/fs/fscache/page.c
70830index de33b3f..8be4d29 100644
70831--- a/fs/fscache/page.c
70832+++ b/fs/fscache/page.c
70833@@ -74,7 +74,7 @@ try_again:
70834 val = radix_tree_lookup(&cookie->stores, page->index);
70835 if (!val) {
70836 rcu_read_unlock();
70837- fscache_stat(&fscache_n_store_vmscan_not_storing);
70838+ fscache_stat_unchecked(&fscache_n_store_vmscan_not_storing);
70839 __fscache_uncache_page(cookie, page);
70840 return true;
70841 }
70842@@ -104,11 +104,11 @@ try_again:
70843 spin_unlock(&cookie->stores_lock);
70844
70845 if (xpage) {
70846- fscache_stat(&fscache_n_store_vmscan_cancelled);
70847- fscache_stat(&fscache_n_store_radix_deletes);
70848+ fscache_stat_unchecked(&fscache_n_store_vmscan_cancelled);
70849+ fscache_stat_unchecked(&fscache_n_store_radix_deletes);
70850 ASSERTCMP(xpage, ==, page);
70851 } else {
70852- fscache_stat(&fscache_n_store_vmscan_gone);
70853+ fscache_stat_unchecked(&fscache_n_store_vmscan_gone);
70854 }
70855
70856 wake_up_bit(&cookie->flags, 0);
70857@@ -123,11 +123,11 @@ page_busy:
70858 * sleeping on memory allocation, so we may need to impose a timeout
70859 * too. */
70860 if (!(gfp & __GFP_WAIT) || !(gfp & __GFP_FS)) {
70861- fscache_stat(&fscache_n_store_vmscan_busy);
70862+ fscache_stat_unchecked(&fscache_n_store_vmscan_busy);
70863 return false;
70864 }
70865
70866- fscache_stat(&fscache_n_store_vmscan_wait);
70867+ fscache_stat_unchecked(&fscache_n_store_vmscan_wait);
70868 if (!release_page_wait_timeout(cookie, page))
70869 _debug("fscache writeout timeout page: %p{%lx}",
70870 page, page->index);
70871@@ -156,7 +156,7 @@ static void fscache_end_page_write(struct fscache_object *object,
70872 FSCACHE_COOKIE_STORING_TAG);
70873 if (!radix_tree_tag_get(&cookie->stores, page->index,
70874 FSCACHE_COOKIE_PENDING_TAG)) {
70875- fscache_stat(&fscache_n_store_radix_deletes);
70876+ fscache_stat_unchecked(&fscache_n_store_radix_deletes);
70877 xpage = radix_tree_delete(&cookie->stores, page->index);
70878 }
70879 spin_unlock(&cookie->stores_lock);
70880@@ -177,7 +177,7 @@ static void fscache_attr_changed_op(struct fscache_operation *op)
70881
70882 _enter("{OBJ%x OP%x}", object->debug_id, op->debug_id);
70883
70884- fscache_stat(&fscache_n_attr_changed_calls);
70885+ fscache_stat_unchecked(&fscache_n_attr_changed_calls);
70886
70887 if (fscache_object_is_active(object)) {
70888 fscache_stat(&fscache_n_cop_attr_changed);
70889@@ -204,11 +204,11 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
70890
70891 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
70892
70893- fscache_stat(&fscache_n_attr_changed);
70894+ fscache_stat_unchecked(&fscache_n_attr_changed);
70895
70896 op = kzalloc(sizeof(*op), GFP_KERNEL);
70897 if (!op) {
70898- fscache_stat(&fscache_n_attr_changed_nomem);
70899+ fscache_stat_unchecked(&fscache_n_attr_changed_nomem);
70900 _leave(" = -ENOMEM");
70901 return -ENOMEM;
70902 }
70903@@ -230,7 +230,7 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
70904 if (fscache_submit_exclusive_op(object, op) < 0)
70905 goto nobufs_dec;
70906 spin_unlock(&cookie->lock);
70907- fscache_stat(&fscache_n_attr_changed_ok);
70908+ fscache_stat_unchecked(&fscache_n_attr_changed_ok);
70909 fscache_put_operation(op);
70910 _leave(" = 0");
70911 return 0;
70912@@ -242,7 +242,7 @@ nobufs:
70913 kfree(op);
70914 if (wake_cookie)
70915 __fscache_wake_unused_cookie(cookie);
70916- fscache_stat(&fscache_n_attr_changed_nobufs);
70917+ fscache_stat_unchecked(&fscache_n_attr_changed_nobufs);
70918 _leave(" = %d", -ENOBUFS);
70919 return -ENOBUFS;
70920 }
70921@@ -281,7 +281,7 @@ static struct fscache_retrieval *fscache_alloc_retrieval(
70922 /* allocate a retrieval operation and attempt to submit it */
70923 op = kzalloc(sizeof(*op), GFP_NOIO);
70924 if (!op) {
70925- fscache_stat(&fscache_n_retrievals_nomem);
70926+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
70927 return NULL;
70928 }
70929
70930@@ -311,12 +311,12 @@ int fscache_wait_for_deferred_lookup(struct fscache_cookie *cookie)
70931 return 0;
70932 }
70933
70934- fscache_stat(&fscache_n_retrievals_wait);
70935+ fscache_stat_unchecked(&fscache_n_retrievals_wait);
70936
70937 jif = jiffies;
70938 if (wait_on_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP,
70939 TASK_INTERRUPTIBLE) != 0) {
70940- fscache_stat(&fscache_n_retrievals_intr);
70941+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
70942 _leave(" = -ERESTARTSYS");
70943 return -ERESTARTSYS;
70944 }
70945@@ -345,8 +345,8 @@ static void fscache_do_cancel_retrieval(struct fscache_operation *_op)
70946 */
70947 int fscache_wait_for_operation_activation(struct fscache_object *object,
70948 struct fscache_operation *op,
70949- atomic_t *stat_op_waits,
70950- atomic_t *stat_object_dead,
70951+ atomic_unchecked_t *stat_op_waits,
70952+ atomic_unchecked_t *stat_object_dead,
70953 void (*do_cancel)(struct fscache_operation *))
70954 {
70955 int ret;
70956@@ -356,7 +356,7 @@ int fscache_wait_for_operation_activation(struct fscache_object *object,
70957
70958 _debug(">>> WT");
70959 if (stat_op_waits)
70960- fscache_stat(stat_op_waits);
70961+ fscache_stat_unchecked(stat_op_waits);
70962 if (wait_on_bit(&op->flags, FSCACHE_OP_WAITING,
70963 TASK_INTERRUPTIBLE) != 0) {
70964 ret = fscache_cancel_op(op, do_cancel);
70965@@ -373,7 +373,7 @@ int fscache_wait_for_operation_activation(struct fscache_object *object,
70966 check_if_dead:
70967 if (op->state == FSCACHE_OP_ST_CANCELLED) {
70968 if (stat_object_dead)
70969- fscache_stat(stat_object_dead);
70970+ fscache_stat_unchecked(stat_object_dead);
70971 _leave(" = -ENOBUFS [cancelled]");
70972 return -ENOBUFS;
70973 }
70974@@ -381,7 +381,7 @@ check_if_dead:
70975 pr_err("%s() = -ENOBUFS [obj dead %d]\n", __func__, op->state);
70976 fscache_cancel_op(op, do_cancel);
70977 if (stat_object_dead)
70978- fscache_stat(stat_object_dead);
70979+ fscache_stat_unchecked(stat_object_dead);
70980 return -ENOBUFS;
70981 }
70982 return 0;
70983@@ -409,7 +409,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
70984
70985 _enter("%p,%p,,,", cookie, page);
70986
70987- fscache_stat(&fscache_n_retrievals);
70988+ fscache_stat_unchecked(&fscache_n_retrievals);
70989
70990 if (hlist_empty(&cookie->backing_objects))
70991 goto nobufs;
70992@@ -451,7 +451,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
70993 goto nobufs_unlock_dec;
70994 spin_unlock(&cookie->lock);
70995
70996- fscache_stat(&fscache_n_retrieval_ops);
70997+ fscache_stat_unchecked(&fscache_n_retrieval_ops);
70998
70999 /* pin the netfs read context in case we need to do the actual netfs
71000 * read because we've encountered a cache read failure */
71001@@ -482,15 +482,15 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
71002
71003 error:
71004 if (ret == -ENOMEM)
71005- fscache_stat(&fscache_n_retrievals_nomem);
71006+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
71007 else if (ret == -ERESTARTSYS)
71008- fscache_stat(&fscache_n_retrievals_intr);
71009+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
71010 else if (ret == -ENODATA)
71011- fscache_stat(&fscache_n_retrievals_nodata);
71012+ fscache_stat_unchecked(&fscache_n_retrievals_nodata);
71013 else if (ret < 0)
71014- fscache_stat(&fscache_n_retrievals_nobufs);
71015+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
71016 else
71017- fscache_stat(&fscache_n_retrievals_ok);
71018+ fscache_stat_unchecked(&fscache_n_retrievals_ok);
71019
71020 fscache_put_retrieval(op);
71021 _leave(" = %d", ret);
71022@@ -505,7 +505,7 @@ nobufs_unlock:
71023 __fscache_wake_unused_cookie(cookie);
71024 kfree(op);
71025 nobufs:
71026- fscache_stat(&fscache_n_retrievals_nobufs);
71027+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
71028 _leave(" = -ENOBUFS");
71029 return -ENOBUFS;
71030 }
71031@@ -544,7 +544,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
71032
71033 _enter("%p,,%d,,,", cookie, *nr_pages);
71034
71035- fscache_stat(&fscache_n_retrievals);
71036+ fscache_stat_unchecked(&fscache_n_retrievals);
71037
71038 if (hlist_empty(&cookie->backing_objects))
71039 goto nobufs;
71040@@ -582,7 +582,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
71041 goto nobufs_unlock_dec;
71042 spin_unlock(&cookie->lock);
71043
71044- fscache_stat(&fscache_n_retrieval_ops);
71045+ fscache_stat_unchecked(&fscache_n_retrieval_ops);
71046
71047 /* pin the netfs read context in case we need to do the actual netfs
71048 * read because we've encountered a cache read failure */
71049@@ -613,15 +613,15 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
71050
71051 error:
71052 if (ret == -ENOMEM)
71053- fscache_stat(&fscache_n_retrievals_nomem);
71054+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
71055 else if (ret == -ERESTARTSYS)
71056- fscache_stat(&fscache_n_retrievals_intr);
71057+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
71058 else if (ret == -ENODATA)
71059- fscache_stat(&fscache_n_retrievals_nodata);
71060+ fscache_stat_unchecked(&fscache_n_retrievals_nodata);
71061 else if (ret < 0)
71062- fscache_stat(&fscache_n_retrievals_nobufs);
71063+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
71064 else
71065- fscache_stat(&fscache_n_retrievals_ok);
71066+ fscache_stat_unchecked(&fscache_n_retrievals_ok);
71067
71068 fscache_put_retrieval(op);
71069 _leave(" = %d", ret);
71070@@ -636,7 +636,7 @@ nobufs_unlock:
71071 if (wake_cookie)
71072 __fscache_wake_unused_cookie(cookie);
71073 nobufs:
71074- fscache_stat(&fscache_n_retrievals_nobufs);
71075+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
71076 _leave(" = -ENOBUFS");
71077 return -ENOBUFS;
71078 }
71079@@ -661,7 +661,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
71080
71081 _enter("%p,%p,,,", cookie, page);
71082
71083- fscache_stat(&fscache_n_allocs);
71084+ fscache_stat_unchecked(&fscache_n_allocs);
71085
71086 if (hlist_empty(&cookie->backing_objects))
71087 goto nobufs;
71088@@ -695,7 +695,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
71089 goto nobufs_unlock_dec;
71090 spin_unlock(&cookie->lock);
71091
71092- fscache_stat(&fscache_n_alloc_ops);
71093+ fscache_stat_unchecked(&fscache_n_alloc_ops);
71094
71095 ret = fscache_wait_for_operation_activation(
71096 object, &op->op,
71097@@ -712,11 +712,11 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
71098
71099 error:
71100 if (ret == -ERESTARTSYS)
71101- fscache_stat(&fscache_n_allocs_intr);
71102+ fscache_stat_unchecked(&fscache_n_allocs_intr);
71103 else if (ret < 0)
71104- fscache_stat(&fscache_n_allocs_nobufs);
71105+ fscache_stat_unchecked(&fscache_n_allocs_nobufs);
71106 else
71107- fscache_stat(&fscache_n_allocs_ok);
71108+ fscache_stat_unchecked(&fscache_n_allocs_ok);
71109
71110 fscache_put_retrieval(op);
71111 _leave(" = %d", ret);
71112@@ -730,7 +730,7 @@ nobufs_unlock:
71113 if (wake_cookie)
71114 __fscache_wake_unused_cookie(cookie);
71115 nobufs:
71116- fscache_stat(&fscache_n_allocs_nobufs);
71117+ fscache_stat_unchecked(&fscache_n_allocs_nobufs);
71118 _leave(" = -ENOBUFS");
71119 return -ENOBUFS;
71120 }
71121@@ -806,7 +806,7 @@ static void fscache_write_op(struct fscache_operation *_op)
71122
71123 spin_lock(&cookie->stores_lock);
71124
71125- fscache_stat(&fscache_n_store_calls);
71126+ fscache_stat_unchecked(&fscache_n_store_calls);
71127
71128 /* find a page to store */
71129 page = NULL;
71130@@ -817,7 +817,7 @@ static void fscache_write_op(struct fscache_operation *_op)
71131 page = results[0];
71132 _debug("gang %d [%lx]", n, page->index);
71133 if (page->index > op->store_limit) {
71134- fscache_stat(&fscache_n_store_pages_over_limit);
71135+ fscache_stat_unchecked(&fscache_n_store_pages_over_limit);
71136 goto superseded;
71137 }
71138
71139@@ -829,7 +829,7 @@ static void fscache_write_op(struct fscache_operation *_op)
71140 spin_unlock(&cookie->stores_lock);
71141 spin_unlock(&object->lock);
71142
71143- fscache_stat(&fscache_n_store_pages);
71144+ fscache_stat_unchecked(&fscache_n_store_pages);
71145 fscache_stat(&fscache_n_cop_write_page);
71146 ret = object->cache->ops->write_page(op, page);
71147 fscache_stat_d(&fscache_n_cop_write_page);
71148@@ -933,7 +933,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
71149 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
71150 ASSERT(PageFsCache(page));
71151
71152- fscache_stat(&fscache_n_stores);
71153+ fscache_stat_unchecked(&fscache_n_stores);
71154
71155 if (test_bit(FSCACHE_COOKIE_INVALIDATING, &cookie->flags)) {
71156 _leave(" = -ENOBUFS [invalidating]");
71157@@ -992,7 +992,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
71158 spin_unlock(&cookie->stores_lock);
71159 spin_unlock(&object->lock);
71160
71161- op->op.debug_id = atomic_inc_return(&fscache_op_debug_id);
71162+ op->op.debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
71163 op->store_limit = object->store_limit;
71164
71165 __fscache_use_cookie(cookie);
71166@@ -1001,8 +1001,8 @@ int __fscache_write_page(struct fscache_cookie *cookie,
71167
71168 spin_unlock(&cookie->lock);
71169 radix_tree_preload_end();
71170- fscache_stat(&fscache_n_store_ops);
71171- fscache_stat(&fscache_n_stores_ok);
71172+ fscache_stat_unchecked(&fscache_n_store_ops);
71173+ fscache_stat_unchecked(&fscache_n_stores_ok);
71174
71175 /* the work queue now carries its own ref on the object */
71176 fscache_put_operation(&op->op);
71177@@ -1010,14 +1010,14 @@ int __fscache_write_page(struct fscache_cookie *cookie,
71178 return 0;
71179
71180 already_queued:
71181- fscache_stat(&fscache_n_stores_again);
71182+ fscache_stat_unchecked(&fscache_n_stores_again);
71183 already_pending:
71184 spin_unlock(&cookie->stores_lock);
71185 spin_unlock(&object->lock);
71186 spin_unlock(&cookie->lock);
71187 radix_tree_preload_end();
71188 kfree(op);
71189- fscache_stat(&fscache_n_stores_ok);
71190+ fscache_stat_unchecked(&fscache_n_stores_ok);
71191 _leave(" = 0");
71192 return 0;
71193
71194@@ -1039,14 +1039,14 @@ nobufs:
71195 kfree(op);
71196 if (wake_cookie)
71197 __fscache_wake_unused_cookie(cookie);
71198- fscache_stat(&fscache_n_stores_nobufs);
71199+ fscache_stat_unchecked(&fscache_n_stores_nobufs);
71200 _leave(" = -ENOBUFS");
71201 return -ENOBUFS;
71202
71203 nomem_free:
71204 kfree(op);
71205 nomem:
71206- fscache_stat(&fscache_n_stores_oom);
71207+ fscache_stat_unchecked(&fscache_n_stores_oom);
71208 _leave(" = -ENOMEM");
71209 return -ENOMEM;
71210 }
71211@@ -1064,7 +1064,7 @@ void __fscache_uncache_page(struct fscache_cookie *cookie, struct page *page)
71212 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
71213 ASSERTCMP(page, !=, NULL);
71214
71215- fscache_stat(&fscache_n_uncaches);
71216+ fscache_stat_unchecked(&fscache_n_uncaches);
71217
71218 /* cache withdrawal may beat us to it */
71219 if (!PageFsCache(page))
71220@@ -1115,7 +1115,7 @@ void fscache_mark_page_cached(struct fscache_retrieval *op, struct page *page)
71221 struct fscache_cookie *cookie = op->op.object->cookie;
71222
71223 #ifdef CONFIG_FSCACHE_STATS
71224- atomic_inc(&fscache_n_marks);
71225+ atomic_inc_unchecked(&fscache_n_marks);
71226 #endif
71227
71228 _debug("- mark %p{%lx}", page, page->index);
71229diff --git a/fs/fscache/stats.c b/fs/fscache/stats.c
71230index 40d13c7..ddf52b9 100644
71231--- a/fs/fscache/stats.c
71232+++ b/fs/fscache/stats.c
71233@@ -18,99 +18,99 @@
71234 /*
71235 * operation counters
71236 */
71237-atomic_t fscache_n_op_pend;
71238-atomic_t fscache_n_op_run;
71239-atomic_t fscache_n_op_enqueue;
71240-atomic_t fscache_n_op_requeue;
71241-atomic_t fscache_n_op_deferred_release;
71242-atomic_t fscache_n_op_release;
71243-atomic_t fscache_n_op_gc;
71244-atomic_t fscache_n_op_cancelled;
71245-atomic_t fscache_n_op_rejected;
71246+atomic_unchecked_t fscache_n_op_pend;
71247+atomic_unchecked_t fscache_n_op_run;
71248+atomic_unchecked_t fscache_n_op_enqueue;
71249+atomic_unchecked_t fscache_n_op_requeue;
71250+atomic_unchecked_t fscache_n_op_deferred_release;
71251+atomic_unchecked_t fscache_n_op_release;
71252+atomic_unchecked_t fscache_n_op_gc;
71253+atomic_unchecked_t fscache_n_op_cancelled;
71254+atomic_unchecked_t fscache_n_op_rejected;
71255
71256-atomic_t fscache_n_attr_changed;
71257-atomic_t fscache_n_attr_changed_ok;
71258-atomic_t fscache_n_attr_changed_nobufs;
71259-atomic_t fscache_n_attr_changed_nomem;
71260-atomic_t fscache_n_attr_changed_calls;
71261+atomic_unchecked_t fscache_n_attr_changed;
71262+atomic_unchecked_t fscache_n_attr_changed_ok;
71263+atomic_unchecked_t fscache_n_attr_changed_nobufs;
71264+atomic_unchecked_t fscache_n_attr_changed_nomem;
71265+atomic_unchecked_t fscache_n_attr_changed_calls;
71266
71267-atomic_t fscache_n_allocs;
71268-atomic_t fscache_n_allocs_ok;
71269-atomic_t fscache_n_allocs_wait;
71270-atomic_t fscache_n_allocs_nobufs;
71271-atomic_t fscache_n_allocs_intr;
71272-atomic_t fscache_n_allocs_object_dead;
71273-atomic_t fscache_n_alloc_ops;
71274-atomic_t fscache_n_alloc_op_waits;
71275+atomic_unchecked_t fscache_n_allocs;
71276+atomic_unchecked_t fscache_n_allocs_ok;
71277+atomic_unchecked_t fscache_n_allocs_wait;
71278+atomic_unchecked_t fscache_n_allocs_nobufs;
71279+atomic_unchecked_t fscache_n_allocs_intr;
71280+atomic_unchecked_t fscache_n_allocs_object_dead;
71281+atomic_unchecked_t fscache_n_alloc_ops;
71282+atomic_unchecked_t fscache_n_alloc_op_waits;
71283
71284-atomic_t fscache_n_retrievals;
71285-atomic_t fscache_n_retrievals_ok;
71286-atomic_t fscache_n_retrievals_wait;
71287-atomic_t fscache_n_retrievals_nodata;
71288-atomic_t fscache_n_retrievals_nobufs;
71289-atomic_t fscache_n_retrievals_intr;
71290-atomic_t fscache_n_retrievals_nomem;
71291-atomic_t fscache_n_retrievals_object_dead;
71292-atomic_t fscache_n_retrieval_ops;
71293-atomic_t fscache_n_retrieval_op_waits;
71294+atomic_unchecked_t fscache_n_retrievals;
71295+atomic_unchecked_t fscache_n_retrievals_ok;
71296+atomic_unchecked_t fscache_n_retrievals_wait;
71297+atomic_unchecked_t fscache_n_retrievals_nodata;
71298+atomic_unchecked_t fscache_n_retrievals_nobufs;
71299+atomic_unchecked_t fscache_n_retrievals_intr;
71300+atomic_unchecked_t fscache_n_retrievals_nomem;
71301+atomic_unchecked_t fscache_n_retrievals_object_dead;
71302+atomic_unchecked_t fscache_n_retrieval_ops;
71303+atomic_unchecked_t fscache_n_retrieval_op_waits;
71304
71305-atomic_t fscache_n_stores;
71306-atomic_t fscache_n_stores_ok;
71307-atomic_t fscache_n_stores_again;
71308-atomic_t fscache_n_stores_nobufs;
71309-atomic_t fscache_n_stores_oom;
71310-atomic_t fscache_n_store_ops;
71311-atomic_t fscache_n_store_calls;
71312-atomic_t fscache_n_store_pages;
71313-atomic_t fscache_n_store_radix_deletes;
71314-atomic_t fscache_n_store_pages_over_limit;
71315+atomic_unchecked_t fscache_n_stores;
71316+atomic_unchecked_t fscache_n_stores_ok;
71317+atomic_unchecked_t fscache_n_stores_again;
71318+atomic_unchecked_t fscache_n_stores_nobufs;
71319+atomic_unchecked_t fscache_n_stores_oom;
71320+atomic_unchecked_t fscache_n_store_ops;
71321+atomic_unchecked_t fscache_n_store_calls;
71322+atomic_unchecked_t fscache_n_store_pages;
71323+atomic_unchecked_t fscache_n_store_radix_deletes;
71324+atomic_unchecked_t fscache_n_store_pages_over_limit;
71325
71326-atomic_t fscache_n_store_vmscan_not_storing;
71327-atomic_t fscache_n_store_vmscan_gone;
71328-atomic_t fscache_n_store_vmscan_busy;
71329-atomic_t fscache_n_store_vmscan_cancelled;
71330-atomic_t fscache_n_store_vmscan_wait;
71331+atomic_unchecked_t fscache_n_store_vmscan_not_storing;
71332+atomic_unchecked_t fscache_n_store_vmscan_gone;
71333+atomic_unchecked_t fscache_n_store_vmscan_busy;
71334+atomic_unchecked_t fscache_n_store_vmscan_cancelled;
71335+atomic_unchecked_t fscache_n_store_vmscan_wait;
71336
71337-atomic_t fscache_n_marks;
71338-atomic_t fscache_n_uncaches;
71339+atomic_unchecked_t fscache_n_marks;
71340+atomic_unchecked_t fscache_n_uncaches;
71341
71342-atomic_t fscache_n_acquires;
71343-atomic_t fscache_n_acquires_null;
71344-atomic_t fscache_n_acquires_no_cache;
71345-atomic_t fscache_n_acquires_ok;
71346-atomic_t fscache_n_acquires_nobufs;
71347-atomic_t fscache_n_acquires_oom;
71348+atomic_unchecked_t fscache_n_acquires;
71349+atomic_unchecked_t fscache_n_acquires_null;
71350+atomic_unchecked_t fscache_n_acquires_no_cache;
71351+atomic_unchecked_t fscache_n_acquires_ok;
71352+atomic_unchecked_t fscache_n_acquires_nobufs;
71353+atomic_unchecked_t fscache_n_acquires_oom;
71354
71355-atomic_t fscache_n_invalidates;
71356-atomic_t fscache_n_invalidates_run;
71357+atomic_unchecked_t fscache_n_invalidates;
71358+atomic_unchecked_t fscache_n_invalidates_run;
71359
71360-atomic_t fscache_n_updates;
71361-atomic_t fscache_n_updates_null;
71362-atomic_t fscache_n_updates_run;
71363+atomic_unchecked_t fscache_n_updates;
71364+atomic_unchecked_t fscache_n_updates_null;
71365+atomic_unchecked_t fscache_n_updates_run;
71366
71367-atomic_t fscache_n_relinquishes;
71368-atomic_t fscache_n_relinquishes_null;
71369-atomic_t fscache_n_relinquishes_waitcrt;
71370-atomic_t fscache_n_relinquishes_retire;
71371+atomic_unchecked_t fscache_n_relinquishes;
71372+atomic_unchecked_t fscache_n_relinquishes_null;
71373+atomic_unchecked_t fscache_n_relinquishes_waitcrt;
71374+atomic_unchecked_t fscache_n_relinquishes_retire;
71375
71376-atomic_t fscache_n_cookie_index;
71377-atomic_t fscache_n_cookie_data;
71378-atomic_t fscache_n_cookie_special;
71379+atomic_unchecked_t fscache_n_cookie_index;
71380+atomic_unchecked_t fscache_n_cookie_data;
71381+atomic_unchecked_t fscache_n_cookie_special;
71382
71383-atomic_t fscache_n_object_alloc;
71384-atomic_t fscache_n_object_no_alloc;
71385-atomic_t fscache_n_object_lookups;
71386-atomic_t fscache_n_object_lookups_negative;
71387-atomic_t fscache_n_object_lookups_positive;
71388-atomic_t fscache_n_object_lookups_timed_out;
71389-atomic_t fscache_n_object_created;
71390-atomic_t fscache_n_object_avail;
71391-atomic_t fscache_n_object_dead;
71392+atomic_unchecked_t fscache_n_object_alloc;
71393+atomic_unchecked_t fscache_n_object_no_alloc;
71394+atomic_unchecked_t fscache_n_object_lookups;
71395+atomic_unchecked_t fscache_n_object_lookups_negative;
71396+atomic_unchecked_t fscache_n_object_lookups_positive;
71397+atomic_unchecked_t fscache_n_object_lookups_timed_out;
71398+atomic_unchecked_t fscache_n_object_created;
71399+atomic_unchecked_t fscache_n_object_avail;
71400+atomic_unchecked_t fscache_n_object_dead;
71401
71402-atomic_t fscache_n_checkaux_none;
71403-atomic_t fscache_n_checkaux_okay;
71404-atomic_t fscache_n_checkaux_update;
71405-atomic_t fscache_n_checkaux_obsolete;
71406+atomic_unchecked_t fscache_n_checkaux_none;
71407+atomic_unchecked_t fscache_n_checkaux_okay;
71408+atomic_unchecked_t fscache_n_checkaux_update;
71409+atomic_unchecked_t fscache_n_checkaux_obsolete;
71410
71411 atomic_t fscache_n_cop_alloc_object;
71412 atomic_t fscache_n_cop_lookup_object;
71413@@ -138,118 +138,118 @@ static int fscache_stats_show(struct seq_file *m, void *v)
71414 seq_puts(m, "FS-Cache statistics\n");
71415
71416 seq_printf(m, "Cookies: idx=%u dat=%u spc=%u\n",
71417- atomic_read(&fscache_n_cookie_index),
71418- atomic_read(&fscache_n_cookie_data),
71419- atomic_read(&fscache_n_cookie_special));
71420+ atomic_read_unchecked(&fscache_n_cookie_index),
71421+ atomic_read_unchecked(&fscache_n_cookie_data),
71422+ atomic_read_unchecked(&fscache_n_cookie_special));
71423
71424 seq_printf(m, "Objects: alc=%u nal=%u avl=%u ded=%u\n",
71425- atomic_read(&fscache_n_object_alloc),
71426- atomic_read(&fscache_n_object_no_alloc),
71427- atomic_read(&fscache_n_object_avail),
71428- atomic_read(&fscache_n_object_dead));
71429+ atomic_read_unchecked(&fscache_n_object_alloc),
71430+ atomic_read_unchecked(&fscache_n_object_no_alloc),
71431+ atomic_read_unchecked(&fscache_n_object_avail),
71432+ atomic_read_unchecked(&fscache_n_object_dead));
71433 seq_printf(m, "ChkAux : non=%u ok=%u upd=%u obs=%u\n",
71434- atomic_read(&fscache_n_checkaux_none),
71435- atomic_read(&fscache_n_checkaux_okay),
71436- atomic_read(&fscache_n_checkaux_update),
71437- atomic_read(&fscache_n_checkaux_obsolete));
71438+ atomic_read_unchecked(&fscache_n_checkaux_none),
71439+ atomic_read_unchecked(&fscache_n_checkaux_okay),
71440+ atomic_read_unchecked(&fscache_n_checkaux_update),
71441+ atomic_read_unchecked(&fscache_n_checkaux_obsolete));
71442
71443 seq_printf(m, "Pages : mrk=%u unc=%u\n",
71444- atomic_read(&fscache_n_marks),
71445- atomic_read(&fscache_n_uncaches));
71446+ atomic_read_unchecked(&fscache_n_marks),
71447+ atomic_read_unchecked(&fscache_n_uncaches));
71448
71449 seq_printf(m, "Acquire: n=%u nul=%u noc=%u ok=%u nbf=%u"
71450 " oom=%u\n",
71451- atomic_read(&fscache_n_acquires),
71452- atomic_read(&fscache_n_acquires_null),
71453- atomic_read(&fscache_n_acquires_no_cache),
71454- atomic_read(&fscache_n_acquires_ok),
71455- atomic_read(&fscache_n_acquires_nobufs),
71456- atomic_read(&fscache_n_acquires_oom));
71457+ atomic_read_unchecked(&fscache_n_acquires),
71458+ atomic_read_unchecked(&fscache_n_acquires_null),
71459+ atomic_read_unchecked(&fscache_n_acquires_no_cache),
71460+ atomic_read_unchecked(&fscache_n_acquires_ok),
71461+ atomic_read_unchecked(&fscache_n_acquires_nobufs),
71462+ atomic_read_unchecked(&fscache_n_acquires_oom));
71463
71464 seq_printf(m, "Lookups: n=%u neg=%u pos=%u crt=%u tmo=%u\n",
71465- atomic_read(&fscache_n_object_lookups),
71466- atomic_read(&fscache_n_object_lookups_negative),
71467- atomic_read(&fscache_n_object_lookups_positive),
71468- atomic_read(&fscache_n_object_created),
71469- atomic_read(&fscache_n_object_lookups_timed_out));
71470+ atomic_read_unchecked(&fscache_n_object_lookups),
71471+ atomic_read_unchecked(&fscache_n_object_lookups_negative),
71472+ atomic_read_unchecked(&fscache_n_object_lookups_positive),
71473+ atomic_read_unchecked(&fscache_n_object_created),
71474+ atomic_read_unchecked(&fscache_n_object_lookups_timed_out));
71475
71476 seq_printf(m, "Invals : n=%u run=%u\n",
71477- atomic_read(&fscache_n_invalidates),
71478- atomic_read(&fscache_n_invalidates_run));
71479+ atomic_read_unchecked(&fscache_n_invalidates),
71480+ atomic_read_unchecked(&fscache_n_invalidates_run));
71481
71482 seq_printf(m, "Updates: n=%u nul=%u run=%u\n",
71483- atomic_read(&fscache_n_updates),
71484- atomic_read(&fscache_n_updates_null),
71485- atomic_read(&fscache_n_updates_run));
71486+ atomic_read_unchecked(&fscache_n_updates),
71487+ atomic_read_unchecked(&fscache_n_updates_null),
71488+ atomic_read_unchecked(&fscache_n_updates_run));
71489
71490 seq_printf(m, "Relinqs: n=%u nul=%u wcr=%u rtr=%u\n",
71491- atomic_read(&fscache_n_relinquishes),
71492- atomic_read(&fscache_n_relinquishes_null),
71493- atomic_read(&fscache_n_relinquishes_waitcrt),
71494- atomic_read(&fscache_n_relinquishes_retire));
71495+ atomic_read_unchecked(&fscache_n_relinquishes),
71496+ atomic_read_unchecked(&fscache_n_relinquishes_null),
71497+ atomic_read_unchecked(&fscache_n_relinquishes_waitcrt),
71498+ atomic_read_unchecked(&fscache_n_relinquishes_retire));
71499
71500 seq_printf(m, "AttrChg: n=%u ok=%u nbf=%u oom=%u run=%u\n",
71501- atomic_read(&fscache_n_attr_changed),
71502- atomic_read(&fscache_n_attr_changed_ok),
71503- atomic_read(&fscache_n_attr_changed_nobufs),
71504- atomic_read(&fscache_n_attr_changed_nomem),
71505- atomic_read(&fscache_n_attr_changed_calls));
71506+ atomic_read_unchecked(&fscache_n_attr_changed),
71507+ atomic_read_unchecked(&fscache_n_attr_changed_ok),
71508+ atomic_read_unchecked(&fscache_n_attr_changed_nobufs),
71509+ atomic_read_unchecked(&fscache_n_attr_changed_nomem),
71510+ atomic_read_unchecked(&fscache_n_attr_changed_calls));
71511
71512 seq_printf(m, "Allocs : n=%u ok=%u wt=%u nbf=%u int=%u\n",
71513- atomic_read(&fscache_n_allocs),
71514- atomic_read(&fscache_n_allocs_ok),
71515- atomic_read(&fscache_n_allocs_wait),
71516- atomic_read(&fscache_n_allocs_nobufs),
71517- atomic_read(&fscache_n_allocs_intr));
71518+ atomic_read_unchecked(&fscache_n_allocs),
71519+ atomic_read_unchecked(&fscache_n_allocs_ok),
71520+ atomic_read_unchecked(&fscache_n_allocs_wait),
71521+ atomic_read_unchecked(&fscache_n_allocs_nobufs),
71522+ atomic_read_unchecked(&fscache_n_allocs_intr));
71523 seq_printf(m, "Allocs : ops=%u owt=%u abt=%u\n",
71524- atomic_read(&fscache_n_alloc_ops),
71525- atomic_read(&fscache_n_alloc_op_waits),
71526- atomic_read(&fscache_n_allocs_object_dead));
71527+ atomic_read_unchecked(&fscache_n_alloc_ops),
71528+ atomic_read_unchecked(&fscache_n_alloc_op_waits),
71529+ atomic_read_unchecked(&fscache_n_allocs_object_dead));
71530
71531 seq_printf(m, "Retrvls: n=%u ok=%u wt=%u nod=%u nbf=%u"
71532 " int=%u oom=%u\n",
71533- atomic_read(&fscache_n_retrievals),
71534- atomic_read(&fscache_n_retrievals_ok),
71535- atomic_read(&fscache_n_retrievals_wait),
71536- atomic_read(&fscache_n_retrievals_nodata),
71537- atomic_read(&fscache_n_retrievals_nobufs),
71538- atomic_read(&fscache_n_retrievals_intr),
71539- atomic_read(&fscache_n_retrievals_nomem));
71540+ atomic_read_unchecked(&fscache_n_retrievals),
71541+ atomic_read_unchecked(&fscache_n_retrievals_ok),
71542+ atomic_read_unchecked(&fscache_n_retrievals_wait),
71543+ atomic_read_unchecked(&fscache_n_retrievals_nodata),
71544+ atomic_read_unchecked(&fscache_n_retrievals_nobufs),
71545+ atomic_read_unchecked(&fscache_n_retrievals_intr),
71546+ atomic_read_unchecked(&fscache_n_retrievals_nomem));
71547 seq_printf(m, "Retrvls: ops=%u owt=%u abt=%u\n",
71548- atomic_read(&fscache_n_retrieval_ops),
71549- atomic_read(&fscache_n_retrieval_op_waits),
71550- atomic_read(&fscache_n_retrievals_object_dead));
71551+ atomic_read_unchecked(&fscache_n_retrieval_ops),
71552+ atomic_read_unchecked(&fscache_n_retrieval_op_waits),
71553+ atomic_read_unchecked(&fscache_n_retrievals_object_dead));
71554
71555 seq_printf(m, "Stores : n=%u ok=%u agn=%u nbf=%u oom=%u\n",
71556- atomic_read(&fscache_n_stores),
71557- atomic_read(&fscache_n_stores_ok),
71558- atomic_read(&fscache_n_stores_again),
71559- atomic_read(&fscache_n_stores_nobufs),
71560- atomic_read(&fscache_n_stores_oom));
71561+ atomic_read_unchecked(&fscache_n_stores),
71562+ atomic_read_unchecked(&fscache_n_stores_ok),
71563+ atomic_read_unchecked(&fscache_n_stores_again),
71564+ atomic_read_unchecked(&fscache_n_stores_nobufs),
71565+ atomic_read_unchecked(&fscache_n_stores_oom));
71566 seq_printf(m, "Stores : ops=%u run=%u pgs=%u rxd=%u olm=%u\n",
71567- atomic_read(&fscache_n_store_ops),
71568- atomic_read(&fscache_n_store_calls),
71569- atomic_read(&fscache_n_store_pages),
71570- atomic_read(&fscache_n_store_radix_deletes),
71571- atomic_read(&fscache_n_store_pages_over_limit));
71572+ atomic_read_unchecked(&fscache_n_store_ops),
71573+ atomic_read_unchecked(&fscache_n_store_calls),
71574+ atomic_read_unchecked(&fscache_n_store_pages),
71575+ atomic_read_unchecked(&fscache_n_store_radix_deletes),
71576+ atomic_read_unchecked(&fscache_n_store_pages_over_limit));
71577
71578 seq_printf(m, "VmScan : nos=%u gon=%u bsy=%u can=%u wt=%u\n",
71579- atomic_read(&fscache_n_store_vmscan_not_storing),
71580- atomic_read(&fscache_n_store_vmscan_gone),
71581- atomic_read(&fscache_n_store_vmscan_busy),
71582- atomic_read(&fscache_n_store_vmscan_cancelled),
71583- atomic_read(&fscache_n_store_vmscan_wait));
71584+ atomic_read_unchecked(&fscache_n_store_vmscan_not_storing),
71585+ atomic_read_unchecked(&fscache_n_store_vmscan_gone),
71586+ atomic_read_unchecked(&fscache_n_store_vmscan_busy),
71587+ atomic_read_unchecked(&fscache_n_store_vmscan_cancelled),
71588+ atomic_read_unchecked(&fscache_n_store_vmscan_wait));
71589
71590 seq_printf(m, "Ops : pend=%u run=%u enq=%u can=%u rej=%u\n",
71591- atomic_read(&fscache_n_op_pend),
71592- atomic_read(&fscache_n_op_run),
71593- atomic_read(&fscache_n_op_enqueue),
71594- atomic_read(&fscache_n_op_cancelled),
71595- atomic_read(&fscache_n_op_rejected));
71596+ atomic_read_unchecked(&fscache_n_op_pend),
71597+ atomic_read_unchecked(&fscache_n_op_run),
71598+ atomic_read_unchecked(&fscache_n_op_enqueue),
71599+ atomic_read_unchecked(&fscache_n_op_cancelled),
71600+ atomic_read_unchecked(&fscache_n_op_rejected));
71601 seq_printf(m, "Ops : dfr=%u rel=%u gc=%u\n",
71602- atomic_read(&fscache_n_op_deferred_release),
71603- atomic_read(&fscache_n_op_release),
71604- atomic_read(&fscache_n_op_gc));
71605+ atomic_read_unchecked(&fscache_n_op_deferred_release),
71606+ atomic_read_unchecked(&fscache_n_op_release),
71607+ atomic_read_unchecked(&fscache_n_op_gc));
71608
71609 seq_printf(m, "CacheOp: alo=%d luo=%d luc=%d gro=%d\n",
71610 atomic_read(&fscache_n_cop_alloc_object),
71611diff --git a/fs/fuse/cuse.c b/fs/fuse/cuse.c
71612index 28d0c7a..04816b7 100644
71613--- a/fs/fuse/cuse.c
71614+++ b/fs/fuse/cuse.c
71615@@ -611,10 +611,12 @@ static int __init cuse_init(void)
71616 INIT_LIST_HEAD(&cuse_conntbl[i]);
71617
71618 /* inherit and extend fuse_dev_operations */
71619- cuse_channel_fops = fuse_dev_operations;
71620- cuse_channel_fops.owner = THIS_MODULE;
71621- cuse_channel_fops.open = cuse_channel_open;
71622- cuse_channel_fops.release = cuse_channel_release;
71623+ pax_open_kernel();
71624+ memcpy((void *)&cuse_channel_fops, &fuse_dev_operations, sizeof(fuse_dev_operations));
71625+ *(void **)&cuse_channel_fops.owner = THIS_MODULE;
71626+ *(void **)&cuse_channel_fops.open = cuse_channel_open;
71627+ *(void **)&cuse_channel_fops.release = cuse_channel_release;
71628+ pax_close_kernel();
71629
71630 cuse_class = class_create(THIS_MODULE, "cuse");
71631 if (IS_ERR(cuse_class))
71632diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
71633index 39706c5..a803c71 100644
71634--- a/fs/fuse/dev.c
71635+++ b/fs/fuse/dev.c
71636@@ -1405,7 +1405,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
71637 ret = 0;
71638 pipe_lock(pipe);
71639
71640- if (!pipe->readers) {
71641+ if (!atomic_read(&pipe->readers)) {
71642 send_sig(SIGPIPE, current, 0);
71643 if (!ret)
71644 ret = -EPIPE;
71645@@ -1434,7 +1434,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
71646 page_nr++;
71647 ret += buf->len;
71648
71649- if (pipe->files)
71650+ if (atomic_read(&pipe->files))
71651 do_wakeup = 1;
71652 }
71653
71654diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
71655index 1545b71..7fabe47 100644
71656--- a/fs/fuse/dir.c
71657+++ b/fs/fuse/dir.c
71658@@ -1394,7 +1394,7 @@ static char *read_link(struct dentry *dentry)
71659 return link;
71660 }
71661
71662-static void free_link(char *link)
71663+static void free_link(const char *link)
71664 {
71665 if (!IS_ERR(link))
71666 free_page((unsigned long) link);
71667diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
71668index f42dffb..4a4c435 100644
71669--- a/fs/gfs2/glock.c
71670+++ b/fs/gfs2/glock.c
71671@@ -385,9 +385,9 @@ static void state_change(struct gfs2_glock *gl, unsigned int new_state)
71672 if (held1 != held2) {
71673 GLOCK_BUG_ON(gl, __lockref_is_dead(&gl->gl_lockref));
71674 if (held2)
71675- gl->gl_lockref.count++;
71676+ __lockref_inc(&gl->gl_lockref);
71677 else
71678- gl->gl_lockref.count--;
71679+ __lockref_dec(&gl->gl_lockref);
71680 }
71681 if (held1 && held2 && list_empty(&gl->gl_holders))
71682 clear_bit(GLF_QUEUED, &gl->gl_flags);
71683@@ -614,9 +614,9 @@ out:
71684 out_sched:
71685 clear_bit(GLF_LOCK, &gl->gl_flags);
71686 smp_mb__after_atomic();
71687- gl->gl_lockref.count++;
71688+ __lockref_inc(&gl->gl_lockref);
71689 if (queue_delayed_work(glock_workqueue, &gl->gl_work, 0) == 0)
71690- gl->gl_lockref.count--;
71691+ __lockref_dec(&gl->gl_lockref);
71692 return;
71693
71694 out_unlock:
71695@@ -742,7 +742,7 @@ int gfs2_glock_get(struct gfs2_sbd *sdp, u64 number,
71696 gl->gl_sbd = sdp;
71697 gl->gl_flags = 0;
71698 gl->gl_name = name;
71699- gl->gl_lockref.count = 1;
71700+ __lockref_set(&gl->gl_lockref, 1);
71701 gl->gl_state = LM_ST_UNLOCKED;
71702 gl->gl_target = LM_ST_UNLOCKED;
71703 gl->gl_demote_state = LM_ST_EXCLUSIVE;
71704@@ -1020,9 +1020,9 @@ int gfs2_glock_nq(struct gfs2_holder *gh)
71705 if (unlikely((LM_FLAG_NOEXP & gh->gh_flags) &&
71706 test_and_clear_bit(GLF_FROZEN, &gl->gl_flags))) {
71707 set_bit(GLF_REPLY_PENDING, &gl->gl_flags);
71708- gl->gl_lockref.count++;
71709+ __lockref_inc(&gl->gl_lockref);
71710 if (queue_delayed_work(glock_workqueue, &gl->gl_work, 0) == 0)
71711- gl->gl_lockref.count--;
71712+ __lockref_dec(&gl->gl_lockref);
71713 }
71714 run_queue(gl, 1);
71715 spin_unlock(&gl->gl_spin);
71716@@ -1325,7 +1325,7 @@ void gfs2_glock_complete(struct gfs2_glock *gl, int ret)
71717 }
71718 }
71719
71720- gl->gl_lockref.count++;
71721+ __lockref_inc(&gl->gl_lockref);
71722 set_bit(GLF_REPLY_PENDING, &gl->gl_flags);
71723 spin_unlock(&gl->gl_spin);
71724
71725@@ -1384,12 +1384,12 @@ add_back_to_lru:
71726 goto add_back_to_lru;
71727 }
71728 clear_bit(GLF_LRU, &gl->gl_flags);
71729- gl->gl_lockref.count++;
71730+ __lockref_inc(&gl->gl_lockref);
71731 if (demote_ok(gl))
71732 handle_callback(gl, LM_ST_UNLOCKED, 0, false);
71733 WARN_ON(!test_and_clear_bit(GLF_LOCK, &gl->gl_flags));
71734 if (queue_delayed_work(glock_workqueue, &gl->gl_work, 0) == 0)
71735- gl->gl_lockref.count--;
71736+ __lockref_dec(&gl->gl_lockref);
71737 spin_unlock(&gl->gl_spin);
71738 cond_resched_lock(&lru_lock);
71739 }
71740@@ -1719,7 +1719,7 @@ void gfs2_dump_glock(struct seq_file *seq, const struct gfs2_glock *gl)
71741 state2str(gl->gl_demote_state), dtime,
71742 atomic_read(&gl->gl_ail_count),
71743 atomic_read(&gl->gl_revokes),
71744- (int)gl->gl_lockref.count, gl->gl_hold_time);
71745+ __lockref_read(&gl->gl_lockref), gl->gl_hold_time);
71746
71747 list_for_each_entry(gh, &gl->gl_holders, gh_list)
71748 dump_holder(seq, gh);
71749diff --git a/fs/gfs2/glops.c b/fs/gfs2/glops.c
71750index fe91951..ce38a6e 100644
71751--- a/fs/gfs2/glops.c
71752+++ b/fs/gfs2/glops.c
71753@@ -544,9 +544,9 @@ static void iopen_go_callback(struct gfs2_glock *gl, bool remote)
71754
71755 if (gl->gl_demote_state == LM_ST_UNLOCKED &&
71756 gl->gl_state == LM_ST_SHARED && ip) {
71757- gl->gl_lockref.count++;
71758+ __lockref_inc(&gl->gl_lockref);
71759 if (queue_work(gfs2_delete_workqueue, &gl->gl_delete) == 0)
71760- gl->gl_lockref.count--;
71761+ __lockref_dec(&gl->gl_lockref);
71762 }
71763 }
71764
71765diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c
71766index 3aa17d4..b338075 100644
71767--- a/fs/gfs2/quota.c
71768+++ b/fs/gfs2/quota.c
71769@@ -154,7 +154,7 @@ static enum lru_status gfs2_qd_isolate(struct list_head *item,
71770 if (!spin_trylock(&qd->qd_lockref.lock))
71771 return LRU_SKIP;
71772
71773- if (qd->qd_lockref.count == 0) {
71774+ if (__lockref_read(&qd->qd_lockref) == 0) {
71775 lockref_mark_dead(&qd->qd_lockref);
71776 list_lru_isolate_move(lru, &qd->qd_lru, dispose);
71777 }
71778@@ -221,7 +221,7 @@ static struct gfs2_quota_data *qd_alloc(unsigned hash, struct gfs2_sbd *sdp, str
71779 return NULL;
71780
71781 qd->qd_sbd = sdp;
71782- qd->qd_lockref.count = 1;
71783+ __lockref_set(&qd->qd_lockref, 1);
71784 spin_lock_init(&qd->qd_lockref.lock);
71785 qd->qd_id = qid;
71786 qd->qd_slot = -1;
71787@@ -312,7 +312,7 @@ static void qd_put(struct gfs2_quota_data *qd)
71788 if (lockref_put_or_lock(&qd->qd_lockref))
71789 return;
71790
71791- qd->qd_lockref.count = 0;
71792+ __lockref_set(&qd->qd_lockref, 0);
71793 list_lru_add(&gfs2_qd_lru, &qd->qd_lru);
71794 spin_unlock(&qd->qd_lockref.lock);
71795
71796diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c
71797index fd62cae..3494dfa 100644
71798--- a/fs/hostfs/hostfs_kern.c
71799+++ b/fs/hostfs/hostfs_kern.c
71800@@ -908,7 +908,7 @@ static void *hostfs_follow_link(struct dentry *dentry, struct nameidata *nd)
71801
71802 static void hostfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
71803 {
71804- char *s = nd_get_link(nd);
71805+ const char *s = nd_get_link(nd);
71806 if (!IS_ERR(s))
71807 __putname(s);
71808 }
71809diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
71810index c274aca..772fa5e 100644
71811--- a/fs/hugetlbfs/inode.c
71812+++ b/fs/hugetlbfs/inode.c
71813@@ -148,6 +148,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
71814 struct mm_struct *mm = current->mm;
71815 struct vm_area_struct *vma;
71816 struct hstate *h = hstate_file(file);
71817+ unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
71818 struct vm_unmapped_area_info info;
71819
71820 if (len & ~huge_page_mask(h))
71821@@ -161,17 +162,26 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
71822 return addr;
71823 }
71824
71825+#ifdef CONFIG_PAX_RANDMMAP
71826+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
71827+#endif
71828+
71829 if (addr) {
71830 addr = ALIGN(addr, huge_page_size(h));
71831 vma = find_vma(mm, addr);
71832- if (TASK_SIZE - len >= addr &&
71833- (!vma || addr + len <= vma->vm_start))
71834+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
71835 return addr;
71836 }
71837
71838 info.flags = 0;
71839 info.length = len;
71840 info.low_limit = TASK_UNMAPPED_BASE;
71841+
71842+#ifdef CONFIG_PAX_RANDMMAP
71843+ if (mm->pax_flags & MF_PAX_RANDMMAP)
71844+ info.low_limit += mm->delta_mmap;
71845+#endif
71846+
71847 info.high_limit = TASK_SIZE;
71848 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
71849 info.align_offset = 0;
71850@@ -912,7 +922,7 @@ static struct file_system_type hugetlbfs_fs_type = {
71851 };
71852 MODULE_ALIAS_FS("hugetlbfs");
71853
71854-static struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
71855+struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
71856
71857 static int can_do_hugetlb_shm(void)
71858 {
71859diff --git a/fs/inode.c b/fs/inode.c
71860index f00b16f..b653fea 100644
71861--- a/fs/inode.c
71862+++ b/fs/inode.c
71863@@ -830,16 +830,20 @@ unsigned int get_next_ino(void)
71864 unsigned int *p = &get_cpu_var(last_ino);
71865 unsigned int res = *p;
71866
71867+start:
71868+
71869 #ifdef CONFIG_SMP
71870 if (unlikely((res & (LAST_INO_BATCH-1)) == 0)) {
71871- static atomic_t shared_last_ino;
71872- int next = atomic_add_return(LAST_INO_BATCH, &shared_last_ino);
71873+ static atomic_unchecked_t shared_last_ino;
71874+ int next = atomic_add_return_unchecked(LAST_INO_BATCH, &shared_last_ino);
71875
71876 res = next - LAST_INO_BATCH;
71877 }
71878 #endif
71879
71880- *p = ++res;
71881+ if (unlikely(!++res))
71882+ goto start; /* never zero */
71883+ *p = res;
71884 put_cpu_var(last_ino);
71885 return res;
71886 }
71887diff --git a/fs/jffs2/erase.c b/fs/jffs2/erase.c
71888index 4a6cf28..d3a29d3 100644
71889--- a/fs/jffs2/erase.c
71890+++ b/fs/jffs2/erase.c
71891@@ -452,7 +452,8 @@ static void jffs2_mark_erased_block(struct jffs2_sb_info *c, struct jffs2_eraseb
71892 struct jffs2_unknown_node marker = {
71893 .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK),
71894 .nodetype = cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
71895- .totlen = cpu_to_je32(c->cleanmarker_size)
71896+ .totlen = cpu_to_je32(c->cleanmarker_size),
71897+ .hdr_crc = cpu_to_je32(0)
71898 };
71899
71900 jffs2_prealloc_raw_node_refs(c, jeb, 1);
71901diff --git a/fs/jffs2/wbuf.c b/fs/jffs2/wbuf.c
71902index 09ed551..45684f8 100644
71903--- a/fs/jffs2/wbuf.c
71904+++ b/fs/jffs2/wbuf.c
71905@@ -1023,7 +1023,8 @@ static const struct jffs2_unknown_node oob_cleanmarker =
71906 {
71907 .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
71908 .nodetype = constant_cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
71909- .totlen = constant_cpu_to_je32(8)
71910+ .totlen = constant_cpu_to_je32(8),
71911+ .hdr_crc = constant_cpu_to_je32(0)
71912 };
71913
71914 /*
71915diff --git a/fs/jfs/super.c b/fs/jfs/super.c
71916index 5d30c56..8c45372 100644
71917--- a/fs/jfs/super.c
71918+++ b/fs/jfs/super.c
71919@@ -901,7 +901,7 @@ static int __init init_jfs_fs(void)
71920
71921 jfs_inode_cachep =
71922 kmem_cache_create("jfs_ip", sizeof(struct jfs_inode_info), 0,
71923- SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
71924+ SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD|SLAB_USERCOPY,
71925 init_once);
71926 if (jfs_inode_cachep == NULL)
71927 return -ENOMEM;
71928diff --git a/fs/kernfs/dir.c b/fs/kernfs/dir.c
71929index 345b35f..da7e0da 100644
71930--- a/fs/kernfs/dir.c
71931+++ b/fs/kernfs/dir.c
71932@@ -182,7 +182,7 @@ struct kernfs_node *kernfs_get_parent(struct kernfs_node *kn)
71933 *
71934 * Returns 31 bit hash of ns + name (so it fits in an off_t )
71935 */
71936-static unsigned int kernfs_name_hash(const char *name, const void *ns)
71937+static unsigned int kernfs_name_hash(const unsigned char *name, const void *ns)
71938 {
71939 unsigned long hash = init_name_hash();
71940 unsigned int len = strlen(name);
71941@@ -838,6 +838,12 @@ static int kernfs_iop_mkdir(struct inode *dir, struct dentry *dentry,
71942 ret = scops->mkdir(parent, dentry->d_name.name, mode);
71943
71944 kernfs_put_active(parent);
71945+
71946+ if (!ret) {
71947+ struct dentry *dentry_ret = kernfs_iop_lookup(dir, dentry, 0);
71948+ ret = PTR_ERR_OR_ZERO(dentry_ret);
71949+ }
71950+
71951 return ret;
71952 }
71953
71954diff --git a/fs/kernfs/file.c b/fs/kernfs/file.c
71955index 2bacb99..f745182 100644
71956--- a/fs/kernfs/file.c
71957+++ b/fs/kernfs/file.c
71958@@ -34,7 +34,7 @@ static DEFINE_MUTEX(kernfs_open_file_mutex);
71959
71960 struct kernfs_open_node {
71961 atomic_t refcnt;
71962- atomic_t event;
71963+ atomic_unchecked_t event;
71964 wait_queue_head_t poll;
71965 struct list_head files; /* goes through kernfs_open_file.list */
71966 };
71967@@ -163,7 +163,7 @@ static int kernfs_seq_show(struct seq_file *sf, void *v)
71968 {
71969 struct kernfs_open_file *of = sf->private;
71970
71971- of->event = atomic_read(&of->kn->attr.open->event);
71972+ of->event = atomic_read_unchecked(&of->kn->attr.open->event);
71973
71974 return of->kn->attr.ops->seq_show(sf, v);
71975 }
71976@@ -207,7 +207,7 @@ static ssize_t kernfs_file_direct_read(struct kernfs_open_file *of,
71977 goto out_free;
71978 }
71979
71980- of->event = atomic_read(&of->kn->attr.open->event);
71981+ of->event = atomic_read_unchecked(&of->kn->attr.open->event);
71982 ops = kernfs_ops(of->kn);
71983 if (ops->read)
71984 len = ops->read(of, buf, len, *ppos);
71985@@ -272,7 +272,7 @@ static ssize_t kernfs_fop_write(struct file *file, const char __user *user_buf,
71986 {
71987 struct kernfs_open_file *of = kernfs_of(file);
71988 const struct kernfs_ops *ops;
71989- size_t len;
71990+ ssize_t len;
71991 char *buf;
71992
71993 if (of->atomic_write_len) {
71994@@ -385,12 +385,12 @@ static int kernfs_vma_page_mkwrite(struct vm_area_struct *vma,
71995 return ret;
71996 }
71997
71998-static int kernfs_vma_access(struct vm_area_struct *vma, unsigned long addr,
71999- void *buf, int len, int write)
72000+static ssize_t kernfs_vma_access(struct vm_area_struct *vma, unsigned long addr,
72001+ void *buf, size_t len, int write)
72002 {
72003 struct file *file = vma->vm_file;
72004 struct kernfs_open_file *of = kernfs_of(file);
72005- int ret;
72006+ ssize_t ret;
72007
72008 if (!of->vm_ops)
72009 return -EINVAL;
72010@@ -569,7 +569,7 @@ static int kernfs_get_open_node(struct kernfs_node *kn,
72011 return -ENOMEM;
72012
72013 atomic_set(&new_on->refcnt, 0);
72014- atomic_set(&new_on->event, 1);
72015+ atomic_set_unchecked(&new_on->event, 1);
72016 init_waitqueue_head(&new_on->poll);
72017 INIT_LIST_HEAD(&new_on->files);
72018 goto retry;
72019@@ -793,7 +793,7 @@ static unsigned int kernfs_fop_poll(struct file *filp, poll_table *wait)
72020
72021 kernfs_put_active(kn);
72022
72023- if (of->event != atomic_read(&on->event))
72024+ if (of->event != atomic_read_unchecked(&on->event))
72025 goto trigger;
72026
72027 return DEFAULT_POLLMASK;
72028@@ -824,7 +824,7 @@ repeat:
72029
72030 on = kn->attr.open;
72031 if (on) {
72032- atomic_inc(&on->event);
72033+ atomic_inc_unchecked(&on->event);
72034 wake_up_interruptible(&on->poll);
72035 }
72036
72037diff --git a/fs/kernfs/symlink.c b/fs/kernfs/symlink.c
72038index 8a19889..4c3069a 100644
72039--- a/fs/kernfs/symlink.c
72040+++ b/fs/kernfs/symlink.c
72041@@ -128,7 +128,7 @@ static void *kernfs_iop_follow_link(struct dentry *dentry, struct nameidata *nd)
72042 static void kernfs_iop_put_link(struct dentry *dentry, struct nameidata *nd,
72043 void *cookie)
72044 {
72045- char *page = nd_get_link(nd);
72046+ const char *page = nd_get_link(nd);
72047 if (!IS_ERR(page))
72048 free_page((unsigned long)page);
72049 }
72050diff --git a/fs/libfs.c b/fs/libfs.c
72051index 0ab6512..cd9982d 100644
72052--- a/fs/libfs.c
72053+++ b/fs/libfs.c
72054@@ -160,6 +160,9 @@ int dcache_readdir(struct file *file, struct dir_context *ctx)
72055
72056 for (p = q->next; p != &dentry->d_subdirs; p = p->next) {
72057 struct dentry *next = list_entry(p, struct dentry, d_child);
72058+ char d_name[sizeof(next->d_iname)];
72059+ const unsigned char *name;
72060+
72061 spin_lock_nested(&next->d_lock, DENTRY_D_LOCK_NESTED);
72062 if (!simple_positive(next)) {
72063 spin_unlock(&next->d_lock);
72064@@ -168,7 +171,12 @@ int dcache_readdir(struct file *file, struct dir_context *ctx)
72065
72066 spin_unlock(&next->d_lock);
72067 spin_unlock(&dentry->d_lock);
72068- if (!dir_emit(ctx, next->d_name.name, next->d_name.len,
72069+ name = next->d_name.name;
72070+ if (name == next->d_iname) {
72071+ memcpy(d_name, name, next->d_name.len);
72072+ name = d_name;
72073+ }
72074+ if (!dir_emit(ctx, name, next->d_name.len,
72075 next->d_inode->i_ino, dt_type(next->d_inode)))
72076 return 0;
72077 spin_lock(&dentry->d_lock);
72078@@ -1027,7 +1035,7 @@ EXPORT_SYMBOL(noop_fsync);
72079 void kfree_put_link(struct dentry *dentry, struct nameidata *nd,
72080 void *cookie)
72081 {
72082- char *s = nd_get_link(nd);
72083+ const char *s = nd_get_link(nd);
72084 if (!IS_ERR(s))
72085 kfree(s);
72086 }
72087diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c
72088index acd3947..1f896e2 100644
72089--- a/fs/lockd/clntproc.c
72090+++ b/fs/lockd/clntproc.c
72091@@ -36,11 +36,11 @@ static const struct rpc_call_ops nlmclnt_cancel_ops;
72092 /*
72093 * Cookie counter for NLM requests
72094 */
72095-static atomic_t nlm_cookie = ATOMIC_INIT(0x1234);
72096+static atomic_unchecked_t nlm_cookie = ATOMIC_INIT(0x1234);
72097
72098 void nlmclnt_next_cookie(struct nlm_cookie *c)
72099 {
72100- u32 cookie = atomic_inc_return(&nlm_cookie);
72101+ u32 cookie = atomic_inc_return_unchecked(&nlm_cookie);
72102
72103 memcpy(c->data, &cookie, 4);
72104 c->len=4;
72105diff --git a/fs/mount.h b/fs/mount.h
72106index 6a61c2b..bd79179 100644
72107--- a/fs/mount.h
72108+++ b/fs/mount.h
72109@@ -13,7 +13,7 @@ struct mnt_namespace {
72110 u64 seq; /* Sequence number to prevent loops */
72111 wait_queue_head_t poll;
72112 u64 event;
72113-};
72114+} __randomize_layout;
72115
72116 struct mnt_pcp {
72117 int mnt_count;
72118@@ -65,7 +65,7 @@ struct mount {
72119 struct hlist_head mnt_pins;
72120 struct fs_pin mnt_umount;
72121 struct dentry *mnt_ex_mountpoint;
72122-};
72123+} __randomize_layout;
72124
72125 #define MNT_NS_INTERNAL ERR_PTR(-EINVAL) /* distinct from any mnt_namespace */
72126
72127diff --git a/fs/namei.c b/fs/namei.c
72128index 50a8583..44c470a 100644
72129--- a/fs/namei.c
72130+++ b/fs/namei.c
72131@@ -337,17 +337,32 @@ int generic_permission(struct inode *inode, int mask)
72132 if (ret != -EACCES)
72133 return ret;
72134
72135+#ifdef CONFIG_GRKERNSEC
72136+ /* we'll block if we have to log due to a denied capability use */
72137+ if (mask & MAY_NOT_BLOCK)
72138+ return -ECHILD;
72139+#endif
72140+
72141 if (S_ISDIR(inode->i_mode)) {
72142 /* DACs are overridable for directories */
72143- if (capable_wrt_inode_uidgid(inode, CAP_DAC_OVERRIDE))
72144- return 0;
72145 if (!(mask & MAY_WRITE))
72146- if (capable_wrt_inode_uidgid(inode,
72147- CAP_DAC_READ_SEARCH))
72148+ if (capable_wrt_inode_uidgid_nolog(inode, CAP_DAC_OVERRIDE) ||
72149+ capable_wrt_inode_uidgid(inode, CAP_DAC_READ_SEARCH))
72150 return 0;
72151+ if (capable_wrt_inode_uidgid(inode, CAP_DAC_OVERRIDE))
72152+ return 0;
72153 return -EACCES;
72154 }
72155 /*
72156+ * Searching includes executable on directories, else just read.
72157+ */
72158+ mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
72159+ if (mask == MAY_READ)
72160+ if (capable_wrt_inode_uidgid_nolog(inode, CAP_DAC_OVERRIDE) ||
72161+ capable_wrt_inode_uidgid(inode, CAP_DAC_READ_SEARCH))
72162+ return 0;
72163+
72164+ /*
72165 * Read/write DACs are always overridable.
72166 * Executable DACs are overridable when there is
72167 * at least one exec bit set.
72168@@ -356,14 +371,6 @@ int generic_permission(struct inode *inode, int mask)
72169 if (capable_wrt_inode_uidgid(inode, CAP_DAC_OVERRIDE))
72170 return 0;
72171
72172- /*
72173- * Searching includes executable on directories, else just read.
72174- */
72175- mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
72176- if (mask == MAY_READ)
72177- if (capable_wrt_inode_uidgid(inode, CAP_DAC_READ_SEARCH))
72178- return 0;
72179-
72180 return -EACCES;
72181 }
72182 EXPORT_SYMBOL(generic_permission);
72183@@ -503,7 +510,7 @@ struct nameidata {
72184 int last_type;
72185 unsigned depth;
72186 struct file *base;
72187- char *saved_names[MAX_NESTED_LINKS + 1];
72188+ const char *saved_names[MAX_NESTED_LINKS + 1];
72189 };
72190
72191 /*
72192@@ -714,13 +721,13 @@ void nd_jump_link(struct nameidata *nd, struct path *path)
72193 nd->flags |= LOOKUP_JUMPED;
72194 }
72195
72196-void nd_set_link(struct nameidata *nd, char *path)
72197+void nd_set_link(struct nameidata *nd, const char *path)
72198 {
72199 nd->saved_names[nd->depth] = path;
72200 }
72201 EXPORT_SYMBOL(nd_set_link);
72202
72203-char *nd_get_link(struct nameidata *nd)
72204+const char *nd_get_link(const struct nameidata *nd)
72205 {
72206 return nd->saved_names[nd->depth];
72207 }
72208@@ -855,7 +862,7 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
72209 {
72210 struct dentry *dentry = link->dentry;
72211 int error;
72212- char *s;
72213+ const char *s;
72214
72215 BUG_ON(nd->flags & LOOKUP_RCU);
72216
72217@@ -876,6 +883,12 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
72218 if (error)
72219 goto out_put_nd_path;
72220
72221+ if (gr_handle_follow_link(dentry->d_parent->d_inode,
72222+ dentry->d_inode, dentry, nd->path.mnt)) {
72223+ error = -EACCES;
72224+ goto out_put_nd_path;
72225+ }
72226+
72227 nd->last_type = LAST_BIND;
72228 *p = dentry->d_inode->i_op->follow_link(dentry, nd);
72229 error = PTR_ERR(*p);
72230@@ -1640,6 +1653,8 @@ static inline int nested_symlink(struct path *path, struct nameidata *nd)
72231 if (res)
72232 break;
72233 res = walk_component(nd, path, LOOKUP_FOLLOW);
72234+ if (res >= 0 && gr_handle_symlink_owner(&link, nd->inode))
72235+ res = -EACCES;
72236 put_link(nd, &link, cookie);
72237 } while (res > 0);
72238
72239@@ -1712,7 +1727,7 @@ EXPORT_SYMBOL(full_name_hash);
72240 static inline u64 hash_name(const char *name)
72241 {
72242 unsigned long a, b, adata, bdata, mask, hash, len;
72243- const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
72244+ static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
72245
72246 hash = a = 0;
72247 len = -sizeof(unsigned long);
72248@@ -2007,6 +2022,8 @@ static int path_lookupat(int dfd, const char *name,
72249 if (err)
72250 break;
72251 err = lookup_last(nd, &path);
72252+ if (!err && gr_handle_symlink_owner(&link, nd->inode))
72253+ err = -EACCES;
72254 put_link(nd, &link, cookie);
72255 }
72256 }
72257@@ -2014,6 +2031,13 @@ static int path_lookupat(int dfd, const char *name,
72258 if (!err)
72259 err = complete_walk(nd);
72260
72261+ if (!err && !(nd->flags & LOOKUP_PARENT)) {
72262+ if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
72263+ path_put(&nd->path);
72264+ err = -ENOENT;
72265+ }
72266+ }
72267+
72268 if (!err && nd->flags & LOOKUP_DIRECTORY) {
72269 if (!d_can_lookup(nd->path.dentry)) {
72270 path_put(&nd->path);
72271@@ -2035,8 +2059,15 @@ static int filename_lookup(int dfd, struct filename *name,
72272 retval = path_lookupat(dfd, name->name,
72273 flags | LOOKUP_REVAL, nd);
72274
72275- if (likely(!retval))
72276+ if (likely(!retval)) {
72277 audit_inode(name, nd->path.dentry, flags & LOOKUP_PARENT);
72278+ if (name->name[0] != '/' && nd->path.dentry && nd->inode) {
72279+ if (!gr_chroot_fchdir(nd->path.dentry, nd->path.mnt)) {
72280+ path_put(&nd->path);
72281+ return -ENOENT;
72282+ }
72283+ }
72284+ }
72285 return retval;
72286 }
72287
72288@@ -2615,6 +2646,13 @@ static int may_open(struct path *path, int acc_mode, int flag)
72289 if (flag & O_NOATIME && !inode_owner_or_capable(inode))
72290 return -EPERM;
72291
72292+ if (gr_handle_rofs_blockwrite(dentry, path->mnt, acc_mode))
72293+ return -EPERM;
72294+ if (gr_handle_rawio(inode))
72295+ return -EPERM;
72296+ if (!gr_acl_handle_open(dentry, path->mnt, acc_mode))
72297+ return -EACCES;
72298+
72299 return 0;
72300 }
72301
72302@@ -2846,7 +2884,7 @@ looked_up:
72303 * cleared otherwise prior to returning.
72304 */
72305 static int lookup_open(struct nameidata *nd, struct path *path,
72306- struct file *file,
72307+ struct path *link, struct file *file,
72308 const struct open_flags *op,
72309 bool got_write, int *opened)
72310 {
72311@@ -2881,6 +2919,17 @@ static int lookup_open(struct nameidata *nd, struct path *path,
72312 /* Negative dentry, just create the file */
72313 if (!dentry->d_inode && (op->open_flag & O_CREAT)) {
72314 umode_t mode = op->mode;
72315+
72316+ if (link && gr_handle_symlink_owner(link, dir->d_inode)) {
72317+ error = -EACCES;
72318+ goto out_dput;
72319+ }
72320+
72321+ if (!gr_acl_handle_creat(dentry, dir, nd->path.mnt, op->open_flag, op->acc_mode, mode)) {
72322+ error = -EACCES;
72323+ goto out_dput;
72324+ }
72325+
72326 if (!IS_POSIXACL(dir->d_inode))
72327 mode &= ~current_umask();
72328 /*
72329@@ -2902,6 +2951,8 @@ static int lookup_open(struct nameidata *nd, struct path *path,
72330 nd->flags & LOOKUP_EXCL);
72331 if (error)
72332 goto out_dput;
72333+ else
72334+ gr_handle_create(dentry, nd->path.mnt);
72335 }
72336 out_no_open:
72337 path->dentry = dentry;
72338@@ -2916,7 +2967,7 @@ out_dput:
72339 /*
72340 * Handle the last step of open()
72341 */
72342-static int do_last(struct nameidata *nd, struct path *path,
72343+static int do_last(struct nameidata *nd, struct path *path, struct path *link,
72344 struct file *file, const struct open_flags *op,
72345 int *opened, struct filename *name)
72346 {
72347@@ -2966,6 +3017,15 @@ static int do_last(struct nameidata *nd, struct path *path,
72348 if (error)
72349 return error;
72350
72351+ if (!gr_acl_handle_hidden_file(dir, nd->path.mnt)) {
72352+ error = -ENOENT;
72353+ goto out;
72354+ }
72355+ if (link && gr_handle_symlink_owner(link, nd->inode)) {
72356+ error = -EACCES;
72357+ goto out;
72358+ }
72359+
72360 audit_inode(name, dir, LOOKUP_PARENT);
72361 error = -EISDIR;
72362 /* trailing slashes? */
72363@@ -2985,7 +3045,7 @@ retry_lookup:
72364 */
72365 }
72366 mutex_lock(&dir->d_inode->i_mutex);
72367- error = lookup_open(nd, path, file, op, got_write, opened);
72368+ error = lookup_open(nd, path, link, file, op, got_write, opened);
72369 mutex_unlock(&dir->d_inode->i_mutex);
72370
72371 if (error <= 0) {
72372@@ -3009,11 +3069,28 @@ retry_lookup:
72373 goto finish_open_created;
72374 }
72375
72376+ if (!gr_acl_handle_hidden_file(path->dentry, nd->path.mnt)) {
72377+ error = -ENOENT;
72378+ goto exit_dput;
72379+ }
72380+ if (link && gr_handle_symlink_owner(link, path->dentry->d_inode)) {
72381+ error = -EACCES;
72382+ goto exit_dput;
72383+ }
72384+
72385 /*
72386 * create/update audit record if it already exists.
72387 */
72388- if (d_is_positive(path->dentry))
72389+ if (d_is_positive(path->dentry)) {
72390+ /* only check if O_CREAT is specified, all other checks need to go
72391+ into may_open */
72392+ if (gr_handle_fifo(path->dentry, path->mnt, dir, open_flag, acc_mode)) {
72393+ error = -EACCES;
72394+ goto exit_dput;
72395+ }
72396+
72397 audit_inode(name, path->dentry, 0);
72398+ }
72399
72400 /*
72401 * If atomic_open() acquired write access it is dropped now due to
72402@@ -3055,6 +3132,11 @@ finish_lookup:
72403 }
72404 }
72405 BUG_ON(inode != path->dentry->d_inode);
72406+ /* if we're resolving a symlink to another symlink */
72407+ if (link && gr_handle_symlink_owner(link, inode)) {
72408+ error = -EACCES;
72409+ goto out;
72410+ }
72411 return 1;
72412 }
72413
72414@@ -3074,7 +3156,18 @@ finish_open:
72415 path_put(&save_parent);
72416 return error;
72417 }
72418+
72419+ if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
72420+ error = -ENOENT;
72421+ goto out;
72422+ }
72423+ if (link && gr_handle_symlink_owner(link, nd->inode)) {
72424+ error = -EACCES;
72425+ goto out;
72426+ }
72427+
72428 audit_inode(name, nd->path.dentry, 0);
72429+
72430 error = -EISDIR;
72431 if ((open_flag & O_CREAT) && d_is_dir(nd->path.dentry))
72432 goto out;
72433@@ -3235,7 +3328,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
72434 if (unlikely(error))
72435 goto out;
72436
72437- error = do_last(nd, &path, file, op, &opened, pathname);
72438+ error = do_last(nd, &path, NULL, file, op, &opened, pathname);
72439 while (unlikely(error > 0)) { /* trailing symlink */
72440 struct path link = path;
72441 void *cookie;
72442@@ -3253,7 +3346,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
72443 error = follow_link(&link, nd, &cookie);
72444 if (unlikely(error))
72445 break;
72446- error = do_last(nd, &path, file, op, &opened, pathname);
72447+ error = do_last(nd, &path, &link, file, op, &opened, pathname);
72448 put_link(nd, &link, cookie);
72449 }
72450 out:
72451@@ -3356,9 +3449,11 @@ static struct dentry *filename_create(int dfd, struct filename *name,
72452 goto unlock;
72453
72454 error = -EEXIST;
72455- if (d_is_positive(dentry))
72456+ if (d_is_positive(dentry)) {
72457+ if (!gr_acl_handle_hidden_file(dentry, nd.path.mnt))
72458+ error = -ENOENT;
72459 goto fail;
72460-
72461+ }
72462 /*
72463 * Special case - lookup gave negative, but... we had foo/bar/
72464 * From the vfs_mknod() POV we just have a negative dentry -
72465@@ -3423,6 +3518,20 @@ struct dentry *user_path_create(int dfd, const char __user *pathname,
72466 }
72467 EXPORT_SYMBOL(user_path_create);
72468
72469+static struct dentry *user_path_create_with_name(int dfd, const char __user *pathname, struct path *path, struct filename **to, unsigned int lookup_flags)
72470+{
72471+ struct filename *tmp = getname(pathname);
72472+ struct dentry *res;
72473+ if (IS_ERR(tmp))
72474+ return ERR_CAST(tmp);
72475+ res = kern_path_create(dfd, tmp->name, path, lookup_flags);
72476+ if (IS_ERR(res))
72477+ putname(tmp);
72478+ else
72479+ *to = tmp;
72480+ return res;
72481+}
72482+
72483 int vfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t dev)
72484 {
72485 int error = may_create(dir, dentry);
72486@@ -3486,6 +3595,17 @@ retry:
72487
72488 if (!IS_POSIXACL(path.dentry->d_inode))
72489 mode &= ~current_umask();
72490+
72491+ if (gr_handle_chroot_mknod(dentry, path.mnt, mode)) {
72492+ error = -EPERM;
72493+ goto out;
72494+ }
72495+
72496+ if (!gr_acl_handle_mknod(dentry, path.dentry, path.mnt, mode)) {
72497+ error = -EACCES;
72498+ goto out;
72499+ }
72500+
72501 error = security_path_mknod(&path, dentry, mode, dev);
72502 if (error)
72503 goto out;
72504@@ -3501,6 +3621,8 @@ retry:
72505 error = vfs_mknod(path.dentry->d_inode,dentry,mode,0);
72506 break;
72507 }
72508+ if (!error)
72509+ gr_handle_create(dentry, path.mnt);
72510 out:
72511 done_path_create(&path, dentry);
72512 if (retry_estale(error, lookup_flags)) {
72513@@ -3555,9 +3677,16 @@ retry:
72514
72515 if (!IS_POSIXACL(path.dentry->d_inode))
72516 mode &= ~current_umask();
72517+ if (!gr_acl_handle_mkdir(dentry, path.dentry, path.mnt)) {
72518+ error = -EACCES;
72519+ goto out;
72520+ }
72521 error = security_path_mkdir(&path, dentry, mode);
72522 if (!error)
72523 error = vfs_mkdir(path.dentry->d_inode, dentry, mode);
72524+ if (!error)
72525+ gr_handle_create(dentry, path.mnt);
72526+out:
72527 done_path_create(&path, dentry);
72528 if (retry_estale(error, lookup_flags)) {
72529 lookup_flags |= LOOKUP_REVAL;
72530@@ -3590,7 +3719,7 @@ void dentry_unhash(struct dentry *dentry)
72531 {
72532 shrink_dcache_parent(dentry);
72533 spin_lock(&dentry->d_lock);
72534- if (dentry->d_lockref.count == 1)
72535+ if (__lockref_read(&dentry->d_lockref) == 1)
72536 __d_drop(dentry);
72537 spin_unlock(&dentry->d_lock);
72538 }
72539@@ -3641,6 +3770,8 @@ static long do_rmdir(int dfd, const char __user *pathname)
72540 struct filename *name;
72541 struct dentry *dentry;
72542 struct nameidata nd;
72543+ u64 saved_ino = 0;
72544+ dev_t saved_dev = 0;
72545 unsigned int lookup_flags = 0;
72546 retry:
72547 name = user_path_parent(dfd, pathname, &nd, lookup_flags);
72548@@ -3673,10 +3804,21 @@ retry:
72549 error = -ENOENT;
72550 goto exit3;
72551 }
72552+
72553+ saved_ino = gr_get_ino_from_dentry(dentry);
72554+ saved_dev = gr_get_dev_from_dentry(dentry);
72555+
72556+ if (!gr_acl_handle_rmdir(dentry, nd.path.mnt)) {
72557+ error = -EACCES;
72558+ goto exit3;
72559+ }
72560+
72561 error = security_path_rmdir(&nd.path, dentry);
72562 if (error)
72563 goto exit3;
72564 error = vfs_rmdir(nd.path.dentry->d_inode, dentry);
72565+ if (!error && (saved_dev || saved_ino))
72566+ gr_handle_delete(saved_ino, saved_dev);
72567 exit3:
72568 dput(dentry);
72569 exit2:
72570@@ -3769,6 +3911,8 @@ static long do_unlinkat(int dfd, const char __user *pathname)
72571 struct nameidata nd;
72572 struct inode *inode = NULL;
72573 struct inode *delegated_inode = NULL;
72574+ u64 saved_ino = 0;
72575+ dev_t saved_dev = 0;
72576 unsigned int lookup_flags = 0;
72577 retry:
72578 name = user_path_parent(dfd, pathname, &nd, lookup_flags);
72579@@ -3795,10 +3939,22 @@ retry_deleg:
72580 if (d_is_negative(dentry))
72581 goto slashes;
72582 ihold(inode);
72583+
72584+ if (inode->i_nlink <= 1) {
72585+ saved_ino = gr_get_ino_from_dentry(dentry);
72586+ saved_dev = gr_get_dev_from_dentry(dentry);
72587+ }
72588+ if (!gr_acl_handle_unlink(dentry, nd.path.mnt)) {
72589+ error = -EACCES;
72590+ goto exit2;
72591+ }
72592+
72593 error = security_path_unlink(&nd.path, dentry);
72594 if (error)
72595 goto exit2;
72596 error = vfs_unlink(nd.path.dentry->d_inode, dentry, &delegated_inode);
72597+ if (!error && (saved_ino || saved_dev))
72598+ gr_handle_delete(saved_ino, saved_dev);
72599 exit2:
72600 dput(dentry);
72601 }
72602@@ -3887,9 +4043,17 @@ retry:
72603 if (IS_ERR(dentry))
72604 goto out_putname;
72605
72606+ if (!gr_acl_handle_symlink(dentry, path.dentry, path.mnt, from)) {
72607+ error = -EACCES;
72608+ goto out;
72609+ }
72610+
72611 error = security_path_symlink(&path, dentry, from->name);
72612 if (!error)
72613 error = vfs_symlink(path.dentry->d_inode, dentry, from->name);
72614+ if (!error)
72615+ gr_handle_create(dentry, path.mnt);
72616+out:
72617 done_path_create(&path, dentry);
72618 if (retry_estale(error, lookup_flags)) {
72619 lookup_flags |= LOOKUP_REVAL;
72620@@ -3993,6 +4157,7 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
72621 struct dentry *new_dentry;
72622 struct path old_path, new_path;
72623 struct inode *delegated_inode = NULL;
72624+ struct filename *to = NULL;
72625 int how = 0;
72626 int error;
72627
72628@@ -4016,7 +4181,7 @@ retry:
72629 if (error)
72630 return error;
72631
72632- new_dentry = user_path_create(newdfd, newname, &new_path,
72633+ new_dentry = user_path_create_with_name(newdfd, newname, &new_path, &to,
72634 (how & LOOKUP_REVAL));
72635 error = PTR_ERR(new_dentry);
72636 if (IS_ERR(new_dentry))
72637@@ -4028,11 +4193,28 @@ retry:
72638 error = may_linkat(&old_path);
72639 if (unlikely(error))
72640 goto out_dput;
72641+
72642+ if (gr_handle_hardlink(old_path.dentry, old_path.mnt,
72643+ old_path.dentry->d_inode,
72644+ old_path.dentry->d_inode->i_mode, to)) {
72645+ error = -EACCES;
72646+ goto out_dput;
72647+ }
72648+
72649+ if (!gr_acl_handle_link(new_dentry, new_path.dentry, new_path.mnt,
72650+ old_path.dentry, old_path.mnt, to)) {
72651+ error = -EACCES;
72652+ goto out_dput;
72653+ }
72654+
72655 error = security_path_link(old_path.dentry, &new_path, new_dentry);
72656 if (error)
72657 goto out_dput;
72658 error = vfs_link(old_path.dentry, new_path.dentry->d_inode, new_dentry, &delegated_inode);
72659+ if (!error)
72660+ gr_handle_create(new_dentry, new_path.mnt);
72661 out_dput:
72662+ putname(to);
72663 done_path_create(&new_path, new_dentry);
72664 if (delegated_inode) {
72665 error = break_deleg_wait(&delegated_inode);
72666@@ -4348,6 +4530,20 @@ retry_deleg:
72667 if (new_dentry == trap)
72668 goto exit5;
72669
72670+ if (gr_bad_chroot_rename(old_dentry, oldnd.path.mnt, new_dentry, newnd.path.mnt)) {
72671+ /* use EXDEV error to cause 'mv' to switch to an alternative
72672+ * method for usability
72673+ */
72674+ error = -EXDEV;
72675+ goto exit5;
72676+ }
72677+
72678+ error = gr_acl_handle_rename(new_dentry, new_dir, newnd.path.mnt,
72679+ old_dentry, old_dir->d_inode, oldnd.path.mnt,
72680+ to, flags);
72681+ if (error)
72682+ goto exit5;
72683+
72684 error = security_path_rename(&oldnd.path, old_dentry,
72685 &newnd.path, new_dentry, flags);
72686 if (error)
72687@@ -4355,6 +4551,9 @@ retry_deleg:
72688 error = vfs_rename(old_dir->d_inode, old_dentry,
72689 new_dir->d_inode, new_dentry,
72690 &delegated_inode, flags);
72691+ if (!error)
72692+ gr_handle_rename(old_dir->d_inode, new_dir->d_inode, old_dentry,
72693+ new_dentry, oldnd.path.mnt, new_dentry->d_inode ? 1 : 0, flags);
72694 exit5:
72695 dput(new_dentry);
72696 exit4:
72697@@ -4411,14 +4610,24 @@ EXPORT_SYMBOL(vfs_whiteout);
72698
72699 int readlink_copy(char __user *buffer, int buflen, const char *link)
72700 {
72701+ char tmpbuf[64];
72702+ const char *newlink;
72703 int len = PTR_ERR(link);
72704+
72705 if (IS_ERR(link))
72706 goto out;
72707
72708 len = strlen(link);
72709 if (len > (unsigned) buflen)
72710 len = buflen;
72711- if (copy_to_user(buffer, link, len))
72712+
72713+ if (len < sizeof(tmpbuf)) {
72714+ memcpy(tmpbuf, link, len);
72715+ newlink = tmpbuf;
72716+ } else
72717+ newlink = link;
72718+
72719+ if (copy_to_user(buffer, newlink, len))
72720 len = -EFAULT;
72721 out:
72722 return len;
72723diff --git a/fs/namespace.c b/fs/namespace.c
72724index 13b0f7b..1ee96e7 100644
72725--- a/fs/namespace.c
72726+++ b/fs/namespace.c
72727@@ -1480,6 +1480,9 @@ static int do_umount(struct mount *mnt, int flags)
72728 if (!(sb->s_flags & MS_RDONLY))
72729 retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
72730 up_write(&sb->s_umount);
72731+
72732+ gr_log_remount(mnt->mnt_devname, retval);
72733+
72734 return retval;
72735 }
72736
72737@@ -1502,6 +1505,9 @@ static int do_umount(struct mount *mnt, int flags)
72738 }
72739 unlock_mount_hash();
72740 namespace_unlock();
72741+
72742+ gr_log_unmount(mnt->mnt_devname, retval);
72743+
72744 return retval;
72745 }
72746
72747@@ -1559,7 +1565,7 @@ static inline bool may_mount(void)
72748 * unixes. Our API is identical to OSF/1 to avoid making a mess of AMD
72749 */
72750
72751-SYSCALL_DEFINE2(umount, char __user *, name, int, flags)
72752+SYSCALL_DEFINE2(umount, const char __user *, name, int, flags)
72753 {
72754 struct path path;
72755 struct mount *mnt;
72756@@ -1604,7 +1610,7 @@ out:
72757 /*
72758 * The 2.0 compatible umount. No flags.
72759 */
72760-SYSCALL_DEFINE1(oldumount, char __user *, name)
72761+SYSCALL_DEFINE1(oldumount, const char __user *, name)
72762 {
72763 return sys_umount(name, 0);
72764 }
72765@@ -2673,6 +2679,16 @@ long do_mount(const char *dev_name, const char __user *dir_name,
72766 MS_NOATIME | MS_NODIRATIME | MS_RELATIME| MS_KERNMOUNT |
72767 MS_STRICTATIME);
72768
72769+ if (gr_handle_rofs_mount(path.dentry, path.mnt, mnt_flags)) {
72770+ retval = -EPERM;
72771+ goto dput_out;
72772+ }
72773+
72774+ if (gr_handle_chroot_mount(path.dentry, path.mnt, dev_name)) {
72775+ retval = -EPERM;
72776+ goto dput_out;
72777+ }
72778+
72779 if (flags & MS_REMOUNT)
72780 retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags,
72781 data_page);
72782@@ -2686,7 +2702,10 @@ long do_mount(const char *dev_name, const char __user *dir_name,
72783 retval = do_new_mount(&path, type_page, flags, mnt_flags,
72784 dev_name, data_page);
72785 dput_out:
72786+ gr_log_mount(dev_name, &path, retval);
72787+
72788 path_put(&path);
72789+
72790 return retval;
72791 }
72792
72793@@ -2704,7 +2723,7 @@ static void free_mnt_ns(struct mnt_namespace *ns)
72794 * number incrementing at 10Ghz will take 12,427 years to wrap which
72795 * is effectively never, so we can ignore the possibility.
72796 */
72797-static atomic64_t mnt_ns_seq = ATOMIC64_INIT(1);
72798+static atomic64_unchecked_t mnt_ns_seq = ATOMIC64_INIT(1);
72799
72800 static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
72801 {
72802@@ -2720,7 +2739,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
72803 return ERR_PTR(ret);
72804 }
72805 new_ns->ns.ops = &mntns_operations;
72806- new_ns->seq = atomic64_add_return(1, &mnt_ns_seq);
72807+ new_ns->seq = atomic64_add_return_unchecked(1, &mnt_ns_seq);
72808 atomic_set(&new_ns->count, 1);
72809 new_ns->root = NULL;
72810 INIT_LIST_HEAD(&new_ns->list);
72811@@ -2730,7 +2749,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
72812 return new_ns;
72813 }
72814
72815-struct mnt_namespace *copy_mnt_ns(unsigned long flags, struct mnt_namespace *ns,
72816+__latent_entropy struct mnt_namespace *copy_mnt_ns(unsigned long flags, struct mnt_namespace *ns,
72817 struct user_namespace *user_ns, struct fs_struct *new_fs)
72818 {
72819 struct mnt_namespace *new_ns;
72820@@ -2851,8 +2870,8 @@ struct dentry *mount_subtree(struct vfsmount *mnt, const char *name)
72821 }
72822 EXPORT_SYMBOL(mount_subtree);
72823
72824-SYSCALL_DEFINE5(mount, char __user *, dev_name, char __user *, dir_name,
72825- char __user *, type, unsigned long, flags, void __user *, data)
72826+SYSCALL_DEFINE5(mount, const char __user *, dev_name, const char __user *, dir_name,
72827+ const char __user *, type, unsigned long, flags, void __user *, data)
72828 {
72829 int ret;
72830 char *kernel_type;
72831@@ -2958,6 +2977,11 @@ SYSCALL_DEFINE2(pivot_root, const char __user *, new_root,
72832 if (error)
72833 goto out2;
72834
72835+ if (gr_handle_chroot_pivot()) {
72836+ error = -EPERM;
72837+ goto out2;
72838+ }
72839+
72840 get_fs_root(current->fs, &root);
72841 old_mp = lock_mount(&old);
72842 error = PTR_ERR(old_mp);
72843@@ -3238,7 +3262,7 @@ static int mntns_install(struct nsproxy *nsproxy, struct ns_common *ns)
72844 !ns_capable(current_user_ns(), CAP_SYS_ADMIN))
72845 return -EPERM;
72846
72847- if (fs->users != 1)
72848+ if (atomic_read(&fs->users) != 1)
72849 return -EINVAL;
72850
72851 get_mnt_ns(mnt_ns);
72852diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c
72853index 19ca95c..b28702c 100644
72854--- a/fs/nfs/callback_xdr.c
72855+++ b/fs/nfs/callback_xdr.c
72856@@ -51,7 +51,7 @@ struct callback_op {
72857 callback_decode_arg_t decode_args;
72858 callback_encode_res_t encode_res;
72859 long res_maxsize;
72860-};
72861+} __do_const;
72862
72863 static struct callback_op callback_ops[];
72864
72865diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
72866index d42dff6..ecbdf42 100644
72867--- a/fs/nfs/inode.c
72868+++ b/fs/nfs/inode.c
72869@@ -1270,16 +1270,16 @@ static int nfs_ctime_need_update(const struct inode *inode, const struct nfs_fat
72870 return timespec_compare(&fattr->ctime, &inode->i_ctime) > 0;
72871 }
72872
72873-static atomic_long_t nfs_attr_generation_counter;
72874+static atomic_long_unchecked_t nfs_attr_generation_counter;
72875
72876 static unsigned long nfs_read_attr_generation_counter(void)
72877 {
72878- return atomic_long_read(&nfs_attr_generation_counter);
72879+ return atomic_long_read_unchecked(&nfs_attr_generation_counter);
72880 }
72881
72882 unsigned long nfs_inc_attr_generation_counter(void)
72883 {
72884- return atomic_long_inc_return(&nfs_attr_generation_counter);
72885+ return atomic_long_inc_return_unchecked(&nfs_attr_generation_counter);
72886 }
72887 EXPORT_SYMBOL_GPL(nfs_inc_attr_generation_counter);
72888
72889diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
72890index 5416968..0942042 100644
72891--- a/fs/nfsd/nfs4proc.c
72892+++ b/fs/nfsd/nfs4proc.c
72893@@ -1496,7 +1496,7 @@ struct nfsd4_operation {
72894 nfsd4op_rsize op_rsize_bop;
72895 stateid_getter op_get_currentstateid;
72896 stateid_setter op_set_currentstateid;
72897-};
72898+} __do_const;
72899
72900 static struct nfsd4_operation nfsd4_ops[];
72901
72902diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
72903index 5b33ce1..c2a92aa 100644
72904--- a/fs/nfsd/nfs4xdr.c
72905+++ b/fs/nfsd/nfs4xdr.c
72906@@ -1703,7 +1703,7 @@ nfsd4_decode_notsupp(struct nfsd4_compoundargs *argp, void *p)
72907
72908 typedef __be32(*nfsd4_dec)(struct nfsd4_compoundargs *argp, void *);
72909
72910-static nfsd4_dec nfsd4_dec_ops[] = {
72911+static const nfsd4_dec nfsd4_dec_ops[] = {
72912 [OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
72913 [OP_CLOSE] = (nfsd4_dec)nfsd4_decode_close,
72914 [OP_COMMIT] = (nfsd4_dec)nfsd4_decode_commit,
72915diff --git a/fs/nfsd/nfscache.c b/fs/nfsd/nfscache.c
72916index 46ec934..f384e41 100644
72917--- a/fs/nfsd/nfscache.c
72918+++ b/fs/nfsd/nfscache.c
72919@@ -541,7 +541,7 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
72920 struct kvec *resv = &rqstp->rq_res.head[0], *cachv;
72921 u32 hash;
72922 struct nfsd_drc_bucket *b;
72923- int len;
72924+ long len;
72925 size_t bufsize = 0;
72926
72927 if (!rp)
72928@@ -550,11 +550,14 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
72929 hash = nfsd_cache_hash(rp->c_xid);
72930 b = &drc_hashtbl[hash];
72931
72932- len = resv->iov_len - ((char*)statp - (char*)resv->iov_base);
72933- len >>= 2;
72934+ if (statp) {
72935+ len = (char*)statp - (char*)resv->iov_base;
72936+ len = resv->iov_len - len;
72937+ len >>= 2;
72938+ }
72939
72940 /* Don't cache excessive amounts of data and XDR failures */
72941- if (!statp || len > (256 >> 2)) {
72942+ if (!statp || len > (256 >> 2) || len < 0) {
72943 nfsd_reply_cache_free(b, rp);
72944 return;
72945 }
72946@@ -562,7 +565,7 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
72947 switch (cachetype) {
72948 case RC_REPLSTAT:
72949 if (len != 1)
72950- printk("nfsd: RC_REPLSTAT/reply len %d!\n",len);
72951+ printk("nfsd: RC_REPLSTAT/reply len %ld!\n",len);
72952 rp->c_replstat = *statp;
72953 break;
72954 case RC_REPLBUFF:
72955diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
72956index 3685265..e77261e 100644
72957--- a/fs/nfsd/vfs.c
72958+++ b/fs/nfsd/vfs.c
72959@@ -893,7 +893,7 @@ __be32 nfsd_readv(struct file *file, loff_t offset, struct kvec *vec, int vlen,
72960
72961 oldfs = get_fs();
72962 set_fs(KERNEL_DS);
72963- host_err = vfs_readv(file, (struct iovec __user *)vec, vlen, &offset);
72964+ host_err = vfs_readv(file, (struct iovec __force_user *)vec, vlen, &offset);
72965 set_fs(oldfs);
72966 return nfsd_finish_read(file, count, host_err);
72967 }
72968@@ -980,7 +980,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
72969
72970 /* Write the data. */
72971 oldfs = get_fs(); set_fs(KERNEL_DS);
72972- host_err = vfs_writev(file, (struct iovec __user *)vec, vlen, &pos);
72973+ host_err = vfs_writev(file, (struct iovec __force_user *)vec, vlen, &pos);
72974 set_fs(oldfs);
72975 if (host_err < 0)
72976 goto out_nfserr;
72977@@ -1525,7 +1525,7 @@ nfsd_readlink(struct svc_rqst *rqstp, struct svc_fh *fhp, char *buf, int *lenp)
72978 */
72979
72980 oldfs = get_fs(); set_fs(KERNEL_DS);
72981- host_err = inode->i_op->readlink(path.dentry, (char __user *)buf, *lenp);
72982+ host_err = inode->i_op->readlink(path.dentry, (char __force_user *)buf, *lenp);
72983 set_fs(oldfs);
72984
72985 if (host_err < 0)
72986diff --git a/fs/nls/nls_base.c b/fs/nls/nls_base.c
72987index 52ccd34..7a6b202 100644
72988--- a/fs/nls/nls_base.c
72989+++ b/fs/nls/nls_base.c
72990@@ -234,21 +234,25 @@ EXPORT_SYMBOL(utf16s_to_utf8s);
72991
72992 int __register_nls(struct nls_table *nls, struct module *owner)
72993 {
72994- struct nls_table ** tmp = &tables;
72995+ struct nls_table *tmp = tables;
72996
72997 if (nls->next)
72998 return -EBUSY;
72999
73000- nls->owner = owner;
73001+ pax_open_kernel();
73002+ *(void **)&nls->owner = owner;
73003+ pax_close_kernel();
73004 spin_lock(&nls_lock);
73005- while (*tmp) {
73006- if (nls == *tmp) {
73007+ while (tmp) {
73008+ if (nls == tmp) {
73009 spin_unlock(&nls_lock);
73010 return -EBUSY;
73011 }
73012- tmp = &(*tmp)->next;
73013+ tmp = tmp->next;
73014 }
73015- nls->next = tables;
73016+ pax_open_kernel();
73017+ *(struct nls_table **)&nls->next = tables;
73018+ pax_close_kernel();
73019 tables = nls;
73020 spin_unlock(&nls_lock);
73021 return 0;
73022@@ -257,12 +261,14 @@ EXPORT_SYMBOL(__register_nls);
73023
73024 int unregister_nls(struct nls_table * nls)
73025 {
73026- struct nls_table ** tmp = &tables;
73027+ struct nls_table * const * tmp = &tables;
73028
73029 spin_lock(&nls_lock);
73030 while (*tmp) {
73031 if (nls == *tmp) {
73032- *tmp = nls->next;
73033+ pax_open_kernel();
73034+ *(struct nls_table **)tmp = nls->next;
73035+ pax_close_kernel();
73036 spin_unlock(&nls_lock);
73037 return 0;
73038 }
73039@@ -272,7 +278,7 @@ int unregister_nls(struct nls_table * nls)
73040 return -EINVAL;
73041 }
73042
73043-static struct nls_table *find_nls(char *charset)
73044+static struct nls_table *find_nls(const char *charset)
73045 {
73046 struct nls_table *nls;
73047 spin_lock(&nls_lock);
73048@@ -288,7 +294,7 @@ static struct nls_table *find_nls(char *charset)
73049 return nls;
73050 }
73051
73052-struct nls_table *load_nls(char *charset)
73053+struct nls_table *load_nls(const char *charset)
73054 {
73055 return try_then_request_module(find_nls(charset), "nls_%s", charset);
73056 }
73057diff --git a/fs/nls/nls_euc-jp.c b/fs/nls/nls_euc-jp.c
73058index 162b3f1..6076a7c 100644
73059--- a/fs/nls/nls_euc-jp.c
73060+++ b/fs/nls/nls_euc-jp.c
73061@@ -560,8 +560,10 @@ static int __init init_nls_euc_jp(void)
73062 p_nls = load_nls("cp932");
73063
73064 if (p_nls) {
73065- table.charset2upper = p_nls->charset2upper;
73066- table.charset2lower = p_nls->charset2lower;
73067+ pax_open_kernel();
73068+ *(const unsigned char **)&table.charset2upper = p_nls->charset2upper;
73069+ *(const unsigned char **)&table.charset2lower = p_nls->charset2lower;
73070+ pax_close_kernel();
73071 return register_nls(&table);
73072 }
73073
73074diff --git a/fs/nls/nls_koi8-ru.c b/fs/nls/nls_koi8-ru.c
73075index a80a741..7b96e1b 100644
73076--- a/fs/nls/nls_koi8-ru.c
73077+++ b/fs/nls/nls_koi8-ru.c
73078@@ -62,8 +62,10 @@ static int __init init_nls_koi8_ru(void)
73079 p_nls = load_nls("koi8-u");
73080
73081 if (p_nls) {
73082- table.charset2upper = p_nls->charset2upper;
73083- table.charset2lower = p_nls->charset2lower;
73084+ pax_open_kernel();
73085+ *(const unsigned char **)&table.charset2upper = p_nls->charset2upper;
73086+ *(const unsigned char **)&table.charset2lower = p_nls->charset2lower;
73087+ pax_close_kernel();
73088 return register_nls(&table);
73089 }
73090
73091diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
73092index cf27550..6c70f29d 100644
73093--- a/fs/notify/fanotify/fanotify_user.c
73094+++ b/fs/notify/fanotify/fanotify_user.c
73095@@ -216,8 +216,8 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group,
73096
73097 fd = fanotify_event_metadata.fd;
73098 ret = -EFAULT;
73099- if (copy_to_user(buf, &fanotify_event_metadata,
73100- fanotify_event_metadata.event_len))
73101+ if (fanotify_event_metadata.event_len > sizeof fanotify_event_metadata ||
73102+ copy_to_user(buf, &fanotify_event_metadata, fanotify_event_metadata.event_len))
73103 goto out_close_fd;
73104
73105 #ifdef CONFIG_FANOTIFY_ACCESS_PERMISSIONS
73106diff --git a/fs/notify/notification.c b/fs/notify/notification.c
73107index a95d8e0..a91a5fd 100644
73108--- a/fs/notify/notification.c
73109+++ b/fs/notify/notification.c
73110@@ -48,7 +48,7 @@
73111 #include <linux/fsnotify_backend.h>
73112 #include "fsnotify.h"
73113
73114-static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
73115+static atomic_unchecked_t fsnotify_sync_cookie = ATOMIC_INIT(0);
73116
73117 /**
73118 * fsnotify_get_cookie - return a unique cookie for use in synchronizing events.
73119@@ -56,7 +56,7 @@ static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
73120 */
73121 u32 fsnotify_get_cookie(void)
73122 {
73123- return atomic_inc_return(&fsnotify_sync_cookie);
73124+ return atomic_inc_return_unchecked(&fsnotify_sync_cookie);
73125 }
73126 EXPORT_SYMBOL_GPL(fsnotify_get_cookie);
73127
73128diff --git a/fs/ntfs/dir.c b/fs/ntfs/dir.c
73129index 9e38daf..5727cae 100644
73130--- a/fs/ntfs/dir.c
73131+++ b/fs/ntfs/dir.c
73132@@ -1310,7 +1310,7 @@ find_next_index_buffer:
73133 ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK &
73134 ~(s64)(ndir->itype.index.block_size - 1)));
73135 /* Bounds checks. */
73136- if (unlikely((u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
73137+ if (unlikely(!kaddr || (u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
73138 ntfs_error(sb, "Out of bounds check failed. Corrupt directory "
73139 "inode 0x%lx or driver bug.", vdir->i_ino);
73140 goto err_out;
73141diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c
73142index 1da9b2d..9cca092a 100644
73143--- a/fs/ntfs/file.c
73144+++ b/fs/ntfs/file.c
73145@@ -1281,7 +1281,7 @@ static inline size_t ntfs_copy_from_user(struct page **pages,
73146 char *addr;
73147 size_t total = 0;
73148 unsigned len;
73149- int left;
73150+ unsigned left;
73151
73152 do {
73153 len = PAGE_CACHE_SIZE - ofs;
73154diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c
73155index 9e1e112..241a52a 100644
73156--- a/fs/ntfs/super.c
73157+++ b/fs/ntfs/super.c
73158@@ -688,7 +688,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
73159 if (!silent)
73160 ntfs_error(sb, "Primary boot sector is invalid.");
73161 } else if (!silent)
73162- ntfs_error(sb, read_err_str, "primary");
73163+ ntfs_error(sb, read_err_str, "%s", "primary");
73164 if (!(NTFS_SB(sb)->on_errors & ON_ERRORS_RECOVER)) {
73165 if (bh_primary)
73166 brelse(bh_primary);
73167@@ -704,7 +704,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
73168 goto hotfix_primary_boot_sector;
73169 brelse(bh_backup);
73170 } else if (!silent)
73171- ntfs_error(sb, read_err_str, "backup");
73172+ ntfs_error(sb, read_err_str, "%s", "backup");
73173 /* Try to read NT3.51- backup boot sector. */
73174 if ((bh_backup = sb_bread(sb, nr_blocks >> 1))) {
73175 if (is_boot_sector_ntfs(sb, (NTFS_BOOT_SECTOR*)
73176@@ -715,7 +715,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
73177 "sector.");
73178 brelse(bh_backup);
73179 } else if (!silent)
73180- ntfs_error(sb, read_err_str, "backup");
73181+ ntfs_error(sb, read_err_str, "%s", "backup");
73182 /* We failed. Cleanup and return. */
73183 if (bh_primary)
73184 brelse(bh_primary);
73185diff --git a/fs/ocfs2/localalloc.c b/fs/ocfs2/localalloc.c
73186index 0440134..d52c93a 100644
73187--- a/fs/ocfs2/localalloc.c
73188+++ b/fs/ocfs2/localalloc.c
73189@@ -1320,7 +1320,7 @@ static int ocfs2_local_alloc_slide_window(struct ocfs2_super *osb,
73190 goto bail;
73191 }
73192
73193- atomic_inc(&osb->alloc_stats.moves);
73194+ atomic_inc_unchecked(&osb->alloc_stats.moves);
73195
73196 bail:
73197 if (handle)
73198diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h
73199index 460c6c3..b4ef513 100644
73200--- a/fs/ocfs2/ocfs2.h
73201+++ b/fs/ocfs2/ocfs2.h
73202@@ -247,11 +247,11 @@ enum ocfs2_vol_state
73203
73204 struct ocfs2_alloc_stats
73205 {
73206- atomic_t moves;
73207- atomic_t local_data;
73208- atomic_t bitmap_data;
73209- atomic_t bg_allocs;
73210- atomic_t bg_extends;
73211+ atomic_unchecked_t moves;
73212+ atomic_unchecked_t local_data;
73213+ atomic_unchecked_t bitmap_data;
73214+ atomic_unchecked_t bg_allocs;
73215+ atomic_unchecked_t bg_extends;
73216 };
73217
73218 enum ocfs2_local_alloc_state
73219diff --git a/fs/ocfs2/refcounttree.c b/fs/ocfs2/refcounttree.c
73220index ee541f9..df3a500 100644
73221--- a/fs/ocfs2/refcounttree.c
73222+++ b/fs/ocfs2/refcounttree.c
73223@@ -4276,7 +4276,7 @@ static int ocfs2_reflink(struct dentry *old_dentry, struct inode *dir,
73224 error = posix_acl_create(dir, &mode, &default_acl, &acl);
73225 if (error) {
73226 mlog_errno(error);
73227- goto out;
73228+ return error;
73229 }
73230
73231 error = ocfs2_create_inode_in_orphan(dir, mode,
73232diff --git a/fs/ocfs2/suballoc.c b/fs/ocfs2/suballoc.c
73233index 0cb889a..6a26b24 100644
73234--- a/fs/ocfs2/suballoc.c
73235+++ b/fs/ocfs2/suballoc.c
73236@@ -867,7 +867,7 @@ static int ocfs2_reserve_suballoc_bits(struct ocfs2_super *osb,
73237 mlog_errno(status);
73238 goto bail;
73239 }
73240- atomic_inc(&osb->alloc_stats.bg_extends);
73241+ atomic_inc_unchecked(&osb->alloc_stats.bg_extends);
73242
73243 /* You should never ask for this much metadata */
73244 BUG_ON(bits_wanted >
73245@@ -2014,7 +2014,7 @@ int ocfs2_claim_metadata(handle_t *handle,
73246 mlog_errno(status);
73247 goto bail;
73248 }
73249- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
73250+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
73251
73252 *suballoc_loc = res.sr_bg_blkno;
73253 *suballoc_bit_start = res.sr_bit_offset;
73254@@ -2180,7 +2180,7 @@ int ocfs2_claim_new_inode_at_loc(handle_t *handle,
73255 trace_ocfs2_claim_new_inode_at_loc((unsigned long long)di_blkno,
73256 res->sr_bits);
73257
73258- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
73259+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
73260
73261 BUG_ON(res->sr_bits != 1);
73262
73263@@ -2222,7 +2222,7 @@ int ocfs2_claim_new_inode(handle_t *handle,
73264 mlog_errno(status);
73265 goto bail;
73266 }
73267- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
73268+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
73269
73270 BUG_ON(res.sr_bits != 1);
73271
73272@@ -2326,7 +2326,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
73273 cluster_start,
73274 num_clusters);
73275 if (!status)
73276- atomic_inc(&osb->alloc_stats.local_data);
73277+ atomic_inc_unchecked(&osb->alloc_stats.local_data);
73278 } else {
73279 if (min_clusters > (osb->bitmap_cpg - 1)) {
73280 /* The only paths asking for contiguousness
73281@@ -2352,7 +2352,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
73282 ocfs2_desc_bitmap_to_cluster_off(ac->ac_inode,
73283 res.sr_bg_blkno,
73284 res.sr_bit_offset);
73285- atomic_inc(&osb->alloc_stats.bitmap_data);
73286+ atomic_inc_unchecked(&osb->alloc_stats.bitmap_data);
73287 *num_clusters = res.sr_bits;
73288 }
73289 }
73290diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
73291index 2667518..24bcf79 100644
73292--- a/fs/ocfs2/super.c
73293+++ b/fs/ocfs2/super.c
73294@@ -308,11 +308,11 @@ static int ocfs2_osb_dump(struct ocfs2_super *osb, char *buf, int len)
73295 "%10s => GlobalAllocs: %d LocalAllocs: %d "
73296 "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n",
73297 "Stats",
73298- atomic_read(&osb->alloc_stats.bitmap_data),
73299- atomic_read(&osb->alloc_stats.local_data),
73300- atomic_read(&osb->alloc_stats.bg_allocs),
73301- atomic_read(&osb->alloc_stats.moves),
73302- atomic_read(&osb->alloc_stats.bg_extends));
73303+ atomic_read_unchecked(&osb->alloc_stats.bitmap_data),
73304+ atomic_read_unchecked(&osb->alloc_stats.local_data),
73305+ atomic_read_unchecked(&osb->alloc_stats.bg_allocs),
73306+ atomic_read_unchecked(&osb->alloc_stats.moves),
73307+ atomic_read_unchecked(&osb->alloc_stats.bg_extends));
73308
73309 out += snprintf(buf + out, len - out,
73310 "%10s => State: %u Descriptor: %llu Size: %u bits "
73311@@ -2093,11 +2093,11 @@ static int ocfs2_initialize_super(struct super_block *sb,
73312
73313 mutex_init(&osb->system_file_mutex);
73314
73315- atomic_set(&osb->alloc_stats.moves, 0);
73316- atomic_set(&osb->alloc_stats.local_data, 0);
73317- atomic_set(&osb->alloc_stats.bitmap_data, 0);
73318- atomic_set(&osb->alloc_stats.bg_allocs, 0);
73319- atomic_set(&osb->alloc_stats.bg_extends, 0);
73320+ atomic_set_unchecked(&osb->alloc_stats.moves, 0);
73321+ atomic_set_unchecked(&osb->alloc_stats.local_data, 0);
73322+ atomic_set_unchecked(&osb->alloc_stats.bitmap_data, 0);
73323+ atomic_set_unchecked(&osb->alloc_stats.bg_allocs, 0);
73324+ atomic_set_unchecked(&osb->alloc_stats.bg_extends, 0);
73325
73326 /* Copy the blockcheck stats from the superblock probe */
73327 osb->osb_ecc_stats = *stats;
73328diff --git a/fs/open.c b/fs/open.c
73329index 44a3be1..5e97aa1 100644
73330--- a/fs/open.c
73331+++ b/fs/open.c
73332@@ -32,6 +32,8 @@
73333 #include <linux/dnotify.h>
73334 #include <linux/compat.h>
73335
73336+#define CREATE_TRACE_POINTS
73337+#include <trace/events/fs.h>
73338 #include "internal.h"
73339
73340 int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
73341@@ -103,6 +105,8 @@ long vfs_truncate(struct path *path, loff_t length)
73342 error = locks_verify_truncate(inode, NULL, length);
73343 if (!error)
73344 error = security_path_truncate(path);
73345+ if (!error && !gr_acl_handle_truncate(path->dentry, path->mnt))
73346+ error = -EACCES;
73347 if (!error)
73348 error = do_truncate(path->dentry, length, 0, NULL);
73349
73350@@ -187,6 +191,8 @@ static long do_sys_ftruncate(unsigned int fd, loff_t length, int small)
73351 error = locks_verify_truncate(inode, f.file, length);
73352 if (!error)
73353 error = security_path_truncate(&f.file->f_path);
73354+ if (!error && !gr_acl_handle_truncate(f.file->f_path.dentry, f.file->f_path.mnt))
73355+ error = -EACCES;
73356 if (!error)
73357 error = do_truncate(dentry, length, ATTR_MTIME|ATTR_CTIME, f.file);
73358 sb_end_write(inode->i_sb);
73359@@ -392,6 +398,9 @@ retry:
73360 if (__mnt_is_readonly(path.mnt))
73361 res = -EROFS;
73362
73363+ if (!res && !gr_acl_handle_access(path.dentry, path.mnt, mode))
73364+ res = -EACCES;
73365+
73366 out_path_release:
73367 path_put(&path);
73368 if (retry_estale(res, lookup_flags)) {
73369@@ -423,6 +432,8 @@ retry:
73370 if (error)
73371 goto dput_and_out;
73372
73373+ gr_log_chdir(path.dentry, path.mnt);
73374+
73375 set_fs_pwd(current->fs, &path);
73376
73377 dput_and_out:
73378@@ -452,6 +463,13 @@ SYSCALL_DEFINE1(fchdir, unsigned int, fd)
73379 goto out_putf;
73380
73381 error = inode_permission(inode, MAY_EXEC | MAY_CHDIR);
73382+
73383+ if (!error && !gr_chroot_fchdir(f.file->f_path.dentry, f.file->f_path.mnt))
73384+ error = -EPERM;
73385+
73386+ if (!error)
73387+ gr_log_chdir(f.file->f_path.dentry, f.file->f_path.mnt);
73388+
73389 if (!error)
73390 set_fs_pwd(current->fs, &f.file->f_path);
73391 out_putf:
73392@@ -481,7 +499,13 @@ retry:
73393 if (error)
73394 goto dput_and_out;
73395
73396+ if (gr_handle_chroot_chroot(path.dentry, path.mnt))
73397+ goto dput_and_out;
73398+
73399 set_fs_root(current->fs, &path);
73400+
73401+ gr_handle_chroot_chdir(&path);
73402+
73403 error = 0;
73404 dput_and_out:
73405 path_put(&path);
73406@@ -505,6 +529,16 @@ static int chmod_common(struct path *path, umode_t mode)
73407 return error;
73408 retry_deleg:
73409 mutex_lock(&inode->i_mutex);
73410+
73411+ if (!gr_acl_handle_chmod(path->dentry, path->mnt, &mode)) {
73412+ error = -EACCES;
73413+ goto out_unlock;
73414+ }
73415+ if (gr_handle_chroot_chmod(path->dentry, path->mnt, mode)) {
73416+ error = -EACCES;
73417+ goto out_unlock;
73418+ }
73419+
73420 error = security_path_chmod(path, mode);
73421 if (error)
73422 goto out_unlock;
73423@@ -570,6 +604,9 @@ static int chown_common(struct path *path, uid_t user, gid_t group)
73424 uid = make_kuid(current_user_ns(), user);
73425 gid = make_kgid(current_user_ns(), group);
73426
73427+ if (!gr_acl_handle_chown(path->dentry, path->mnt))
73428+ return -EACCES;
73429+
73430 retry_deleg:
73431 newattrs.ia_valid = ATTR_CTIME;
73432 if (user != (uid_t) -1) {
73433@@ -1017,6 +1054,7 @@ long do_sys_open(int dfd, const char __user *filename, int flags, umode_t mode)
73434 } else {
73435 fsnotify_open(f);
73436 fd_install(fd, f);
73437+ trace_do_sys_open(tmp->name, flags, mode);
73438 }
73439 }
73440 putname(tmp);
73441diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c
73442index bf8537c..c16ef7d 100644
73443--- a/fs/overlayfs/super.c
73444+++ b/fs/overlayfs/super.c
73445@@ -172,7 +172,7 @@ void ovl_path_lower(struct dentry *dentry, struct path *path)
73446 {
73447 struct ovl_entry *oe = dentry->d_fsdata;
73448
73449- *path = oe->numlower ? oe->lowerstack[0] : (struct path) { NULL, NULL };
73450+ *path = oe->numlower ? oe->lowerstack[0] : (struct path) { .dentry = NULL, .mnt = NULL };
73451 }
73452
73453 int ovl_want_write(struct dentry *dentry)
73454@@ -816,8 +816,8 @@ static unsigned int ovl_split_lowerdirs(char *str)
73455
73456 static int ovl_fill_super(struct super_block *sb, void *data, int silent)
73457 {
73458- struct path upperpath = { NULL, NULL };
73459- struct path workpath = { NULL, NULL };
73460+ struct path upperpath = { .dentry = NULL, .mnt = NULL };
73461+ struct path workpath = { .dentry = NULL, .mnt = NULL };
73462 struct dentry *root_dentry;
73463 struct ovl_entry *oe;
73464 struct ovl_fs *ufs;
73465diff --git a/fs/pipe.c b/fs/pipe.c
73466index 21981e5..2c0bffb 100644
73467--- a/fs/pipe.c
73468+++ b/fs/pipe.c
73469@@ -37,7 +37,7 @@ unsigned int pipe_max_size = 1048576;
73470 /*
73471 * Minimum pipe size, as required by POSIX
73472 */
73473-unsigned int pipe_min_size = PAGE_SIZE;
73474+unsigned int pipe_min_size __read_only = PAGE_SIZE;
73475
73476 /*
73477 * We use a start+len construction, which provides full use of the
73478@@ -56,7 +56,7 @@ unsigned int pipe_min_size = PAGE_SIZE;
73479
73480 static void pipe_lock_nested(struct pipe_inode_info *pipe, int subclass)
73481 {
73482- if (pipe->files)
73483+ if (atomic_read(&pipe->files))
73484 mutex_lock_nested(&pipe->mutex, subclass);
73485 }
73486
73487@@ -71,7 +71,7 @@ EXPORT_SYMBOL(pipe_lock);
73488
73489 void pipe_unlock(struct pipe_inode_info *pipe)
73490 {
73491- if (pipe->files)
73492+ if (atomic_read(&pipe->files))
73493 mutex_unlock(&pipe->mutex);
73494 }
73495 EXPORT_SYMBOL(pipe_unlock);
73496@@ -292,9 +292,9 @@ pipe_read(struct kiocb *iocb, struct iov_iter *to)
73497 }
73498 if (bufs) /* More to do? */
73499 continue;
73500- if (!pipe->writers)
73501+ if (!atomic_read(&pipe->writers))
73502 break;
73503- if (!pipe->waiting_writers) {
73504+ if (!atomic_read(&pipe->waiting_writers)) {
73505 /* syscall merging: Usually we must not sleep
73506 * if O_NONBLOCK is set, or if we got some data.
73507 * But if a writer sleeps in kernel space, then
73508@@ -351,7 +351,7 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
73509
73510 __pipe_lock(pipe);
73511
73512- if (!pipe->readers) {
73513+ if (!atomic_read(&pipe->readers)) {
73514 send_sig(SIGPIPE, current, 0);
73515 ret = -EPIPE;
73516 goto out;
73517@@ -387,7 +387,7 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
73518 for (;;) {
73519 int bufs;
73520
73521- if (!pipe->readers) {
73522+ if (!atomic_read(&pipe->readers)) {
73523 send_sig(SIGPIPE, current, 0);
73524 if (!ret)
73525 ret = -EPIPE;
73526@@ -455,9 +455,9 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
73527 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
73528 do_wakeup = 0;
73529 }
73530- pipe->waiting_writers++;
73531+ atomic_inc(&pipe->waiting_writers);
73532 pipe_wait(pipe);
73533- pipe->waiting_writers--;
73534+ atomic_dec(&pipe->waiting_writers);
73535 }
73536 out:
73537 __pipe_unlock(pipe);
73538@@ -512,7 +512,7 @@ pipe_poll(struct file *filp, poll_table *wait)
73539 mask = 0;
73540 if (filp->f_mode & FMODE_READ) {
73541 mask = (nrbufs > 0) ? POLLIN | POLLRDNORM : 0;
73542- if (!pipe->writers && filp->f_version != pipe->w_counter)
73543+ if (!atomic_read(&pipe->writers) && filp->f_version != pipe->w_counter)
73544 mask |= POLLHUP;
73545 }
73546
73547@@ -522,7 +522,7 @@ pipe_poll(struct file *filp, poll_table *wait)
73548 * Most Unices do not set POLLERR for FIFOs but on Linux they
73549 * behave exactly like pipes for poll().
73550 */
73551- if (!pipe->readers)
73552+ if (!atomic_read(&pipe->readers))
73553 mask |= POLLERR;
73554 }
73555
73556@@ -534,7 +534,7 @@ static void put_pipe_info(struct inode *inode, struct pipe_inode_info *pipe)
73557 int kill = 0;
73558
73559 spin_lock(&inode->i_lock);
73560- if (!--pipe->files) {
73561+ if (atomic_dec_and_test(&pipe->files)) {
73562 inode->i_pipe = NULL;
73563 kill = 1;
73564 }
73565@@ -551,11 +551,11 @@ pipe_release(struct inode *inode, struct file *file)
73566
73567 __pipe_lock(pipe);
73568 if (file->f_mode & FMODE_READ)
73569- pipe->readers--;
73570+ atomic_dec(&pipe->readers);
73571 if (file->f_mode & FMODE_WRITE)
73572- pipe->writers--;
73573+ atomic_dec(&pipe->writers);
73574
73575- if (pipe->readers || pipe->writers) {
73576+ if (atomic_read(&pipe->readers) || atomic_read(&pipe->writers)) {
73577 wake_up_interruptible_sync_poll(&pipe->wait, POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM | POLLERR | POLLHUP);
73578 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
73579 kill_fasync(&pipe->fasync_writers, SIGIO, POLL_OUT);
73580@@ -620,7 +620,7 @@ void free_pipe_info(struct pipe_inode_info *pipe)
73581 kfree(pipe);
73582 }
73583
73584-static struct vfsmount *pipe_mnt __read_mostly;
73585+struct vfsmount *pipe_mnt __read_mostly;
73586
73587 /*
73588 * pipefs_dname() is called from d_path().
73589@@ -650,8 +650,9 @@ static struct inode * get_pipe_inode(void)
73590 goto fail_iput;
73591
73592 inode->i_pipe = pipe;
73593- pipe->files = 2;
73594- pipe->readers = pipe->writers = 1;
73595+ atomic_set(&pipe->files, 2);
73596+ atomic_set(&pipe->readers, 1);
73597+ atomic_set(&pipe->writers, 1);
73598 inode->i_fop = &pipefifo_fops;
73599
73600 /*
73601@@ -830,17 +831,17 @@ static int fifo_open(struct inode *inode, struct file *filp)
73602 spin_lock(&inode->i_lock);
73603 if (inode->i_pipe) {
73604 pipe = inode->i_pipe;
73605- pipe->files++;
73606+ atomic_inc(&pipe->files);
73607 spin_unlock(&inode->i_lock);
73608 } else {
73609 spin_unlock(&inode->i_lock);
73610 pipe = alloc_pipe_info();
73611 if (!pipe)
73612 return -ENOMEM;
73613- pipe->files = 1;
73614+ atomic_set(&pipe->files, 1);
73615 spin_lock(&inode->i_lock);
73616 if (unlikely(inode->i_pipe)) {
73617- inode->i_pipe->files++;
73618+ atomic_inc(&inode->i_pipe->files);
73619 spin_unlock(&inode->i_lock);
73620 free_pipe_info(pipe);
73621 pipe = inode->i_pipe;
73622@@ -865,10 +866,10 @@ static int fifo_open(struct inode *inode, struct file *filp)
73623 * opened, even when there is no process writing the FIFO.
73624 */
73625 pipe->r_counter++;
73626- if (pipe->readers++ == 0)
73627+ if (atomic_inc_return(&pipe->readers) == 1)
73628 wake_up_partner(pipe);
73629
73630- if (!is_pipe && !pipe->writers) {
73631+ if (!is_pipe && !atomic_read(&pipe->writers)) {
73632 if ((filp->f_flags & O_NONBLOCK)) {
73633 /* suppress POLLHUP until we have
73634 * seen a writer */
73635@@ -887,14 +888,14 @@ static int fifo_open(struct inode *inode, struct file *filp)
73636 * errno=ENXIO when there is no process reading the FIFO.
73637 */
73638 ret = -ENXIO;
73639- if (!is_pipe && (filp->f_flags & O_NONBLOCK) && !pipe->readers)
73640+ if (!is_pipe && (filp->f_flags & O_NONBLOCK) && !atomic_read(&pipe->readers))
73641 goto err;
73642
73643 pipe->w_counter++;
73644- if (!pipe->writers++)
73645+ if (atomic_inc_return(&pipe->writers) == 1)
73646 wake_up_partner(pipe);
73647
73648- if (!is_pipe && !pipe->readers) {
73649+ if (!is_pipe && !atomic_read(&pipe->readers)) {
73650 if (wait_for_partner(pipe, &pipe->r_counter))
73651 goto err_wr;
73652 }
73653@@ -908,11 +909,11 @@ static int fifo_open(struct inode *inode, struct file *filp)
73654 * the process can at least talk to itself.
73655 */
73656
73657- pipe->readers++;
73658- pipe->writers++;
73659+ atomic_inc(&pipe->readers);
73660+ atomic_inc(&pipe->writers);
73661 pipe->r_counter++;
73662 pipe->w_counter++;
73663- if (pipe->readers == 1 || pipe->writers == 1)
73664+ if (atomic_read(&pipe->readers) == 1 || atomic_read(&pipe->writers) == 1)
73665 wake_up_partner(pipe);
73666 break;
73667
73668@@ -926,13 +927,13 @@ static int fifo_open(struct inode *inode, struct file *filp)
73669 return 0;
73670
73671 err_rd:
73672- if (!--pipe->readers)
73673+ if (atomic_dec_and_test(&pipe->readers))
73674 wake_up_interruptible(&pipe->wait);
73675 ret = -ERESTARTSYS;
73676 goto err;
73677
73678 err_wr:
73679- if (!--pipe->writers)
73680+ if (atomic_dec_and_test(&pipe->writers))
73681 wake_up_interruptible(&pipe->wait);
73682 ret = -ERESTARTSYS;
73683 goto err;
73684@@ -1010,7 +1011,7 @@ static long pipe_set_size(struct pipe_inode_info *pipe, unsigned long nr_pages)
73685 * Currently we rely on the pipe array holding a power-of-2 number
73686 * of pages.
73687 */
73688-static inline unsigned int round_pipe_size(unsigned int size)
73689+static inline unsigned long round_pipe_size(unsigned long size)
73690 {
73691 unsigned long nr_pages;
73692
73693@@ -1058,13 +1059,16 @@ long pipe_fcntl(struct file *file, unsigned int cmd, unsigned long arg)
73694
73695 switch (cmd) {
73696 case F_SETPIPE_SZ: {
73697- unsigned int size, nr_pages;
73698+ unsigned long size, nr_pages;
73699+
73700+ ret = -EINVAL;
73701+ if (arg < pipe_min_size)
73702+ goto out;
73703
73704 size = round_pipe_size(arg);
73705 nr_pages = size >> PAGE_SHIFT;
73706
73707- ret = -EINVAL;
73708- if (!nr_pages)
73709+ if (size < pipe_min_size)
73710 goto out;
73711
73712 if (!capable(CAP_SYS_RESOURCE) && size > pipe_max_size) {
73713diff --git a/fs/posix_acl.c b/fs/posix_acl.c
73714index 3a48bb7..403067b 100644
73715--- a/fs/posix_acl.c
73716+++ b/fs/posix_acl.c
73717@@ -20,6 +20,7 @@
73718 #include <linux/xattr.h>
73719 #include <linux/export.h>
73720 #include <linux/user_namespace.h>
73721+#include <linux/grsecurity.h>
73722
73723 struct posix_acl **acl_by_type(struct inode *inode, int type)
73724 {
73725@@ -277,7 +278,7 @@ posix_acl_equiv_mode(const struct posix_acl *acl, umode_t *mode_p)
73726 }
73727 }
73728 if (mode_p)
73729- *mode_p = (*mode_p & ~S_IRWXUGO) | mode;
73730+ *mode_p = ((*mode_p & ~S_IRWXUGO) | mode) & ~gr_acl_umask();
73731 return not_equiv;
73732 }
73733 EXPORT_SYMBOL(posix_acl_equiv_mode);
73734@@ -427,7 +428,7 @@ static int posix_acl_create_masq(struct posix_acl *acl, umode_t *mode_p)
73735 mode &= (group_obj->e_perm << 3) | ~S_IRWXG;
73736 }
73737
73738- *mode_p = (*mode_p & ~S_IRWXUGO) | mode;
73739+ *mode_p = ((*mode_p & ~S_IRWXUGO) | mode) & ~gr_acl_umask();
73740 return not_equiv;
73741 }
73742
73743@@ -485,6 +486,8 @@ __posix_acl_create(struct posix_acl **acl, gfp_t gfp, umode_t *mode_p)
73744 struct posix_acl *clone = posix_acl_clone(*acl, gfp);
73745 int err = -ENOMEM;
73746 if (clone) {
73747+ *mode_p &= ~gr_acl_umask();
73748+
73749 err = posix_acl_create_masq(clone, mode_p);
73750 if (err < 0) {
73751 posix_acl_release(clone);
73752@@ -663,11 +666,12 @@ struct posix_acl *
73753 posix_acl_from_xattr(struct user_namespace *user_ns,
73754 const void *value, size_t size)
73755 {
73756- posix_acl_xattr_header *header = (posix_acl_xattr_header *)value;
73757- posix_acl_xattr_entry *entry = (posix_acl_xattr_entry *)(header+1), *end;
73758+ const posix_acl_xattr_header *header = (const posix_acl_xattr_header *)value;
73759+ const posix_acl_xattr_entry *entry = (const posix_acl_xattr_entry *)(header+1), *end;
73760 int count;
73761 struct posix_acl *acl;
73762 struct posix_acl_entry *acl_e;
73763+ umode_t umask = gr_acl_umask();
73764
73765 if (!value)
73766 return NULL;
73767@@ -693,12 +697,18 @@ posix_acl_from_xattr(struct user_namespace *user_ns,
73768
73769 switch(acl_e->e_tag) {
73770 case ACL_USER_OBJ:
73771+ acl_e->e_perm &= ~((umask & S_IRWXU) >> 6);
73772+ break;
73773 case ACL_GROUP_OBJ:
73774 case ACL_MASK:
73775+ acl_e->e_perm &= ~((umask & S_IRWXG) >> 3);
73776+ break;
73777 case ACL_OTHER:
73778+ acl_e->e_perm &= ~(umask & S_IRWXO);
73779 break;
73780
73781 case ACL_USER:
73782+ acl_e->e_perm &= ~((umask & S_IRWXU) >> 6);
73783 acl_e->e_uid =
73784 make_kuid(user_ns,
73785 le32_to_cpu(entry->e_id));
73786@@ -706,6 +716,7 @@ posix_acl_from_xattr(struct user_namespace *user_ns,
73787 goto fail;
73788 break;
73789 case ACL_GROUP:
73790+ acl_e->e_perm &= ~((umask & S_IRWXG) >> 3);
73791 acl_e->e_gid =
73792 make_kgid(user_ns,
73793 le32_to_cpu(entry->e_id));
73794diff --git a/fs/proc/Kconfig b/fs/proc/Kconfig
73795index 2183fcf..3c32a98 100644
73796--- a/fs/proc/Kconfig
73797+++ b/fs/proc/Kconfig
73798@@ -30,7 +30,7 @@ config PROC_FS
73799
73800 config PROC_KCORE
73801 bool "/proc/kcore support" if !ARM
73802- depends on PROC_FS && MMU
73803+ depends on PROC_FS && MMU && !GRKERNSEC_PROC_ADD
73804 help
73805 Provides a virtual ELF core file of the live kernel. This can
73806 be read with gdb and other ELF tools. No modifications can be
73807@@ -38,8 +38,8 @@ config PROC_KCORE
73808
73809 config PROC_VMCORE
73810 bool "/proc/vmcore support"
73811- depends on PROC_FS && CRASH_DUMP
73812- default y
73813+ depends on PROC_FS && CRASH_DUMP && !GRKERNSEC
73814+ default n
73815 help
73816 Exports the dump image of crashed kernel in ELF format.
73817
73818@@ -63,8 +63,8 @@ config PROC_SYSCTL
73819 limited in memory.
73820
73821 config PROC_PAGE_MONITOR
73822- default y
73823- depends on PROC_FS && MMU
73824+ default n
73825+ depends on PROC_FS && MMU && !GRKERNSEC
73826 bool "Enable /proc page monitoring" if EXPERT
73827 help
73828 Various /proc files exist to monitor process memory utilization:
73829diff --git a/fs/proc/array.c b/fs/proc/array.c
73830index 1295a00..4c91a6b 100644
73831--- a/fs/proc/array.c
73832+++ b/fs/proc/array.c
73833@@ -60,6 +60,7 @@
73834 #include <linux/tty.h>
73835 #include <linux/string.h>
73836 #include <linux/mman.h>
73837+#include <linux/grsecurity.h>
73838 #include <linux/proc_fs.h>
73839 #include <linux/ioport.h>
73840 #include <linux/uaccess.h>
73841@@ -322,6 +323,21 @@ static void task_cpus_allowed(struct seq_file *m, struct task_struct *task)
73842 cpumask_pr_args(&task->cpus_allowed));
73843 }
73844
73845+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
73846+static inline void task_pax(struct seq_file *m, struct task_struct *p)
73847+{
73848+ if (p->mm)
73849+ seq_printf(m, "PaX:\t%c%c%c%c%c\n",
73850+ p->mm->pax_flags & MF_PAX_PAGEEXEC ? 'P' : 'p',
73851+ p->mm->pax_flags & MF_PAX_EMUTRAMP ? 'E' : 'e',
73852+ p->mm->pax_flags & MF_PAX_MPROTECT ? 'M' : 'm',
73853+ p->mm->pax_flags & MF_PAX_RANDMMAP ? 'R' : 'r',
73854+ p->mm->pax_flags & MF_PAX_SEGMEXEC ? 'S' : 's');
73855+ else
73856+ seq_printf(m, "PaX:\t-----\n");
73857+}
73858+#endif
73859+
73860 int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
73861 struct pid *pid, struct task_struct *task)
73862 {
73863@@ -340,9 +356,24 @@ int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
73864 task_cpus_allowed(m, task);
73865 cpuset_task_status_allowed(m, task);
73866 task_context_switch_counts(m, task);
73867+
73868+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
73869+ task_pax(m, task);
73870+#endif
73871+
73872+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
73873+ task_grsec_rbac(m, task);
73874+#endif
73875+
73876 return 0;
73877 }
73878
73879+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
73880+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
73881+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
73882+ _mm->pax_flags & MF_PAX_SEGMEXEC))
73883+#endif
73884+
73885 static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
73886 struct pid *pid, struct task_struct *task, int whole)
73887 {
73888@@ -364,6 +395,13 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
73889 char tcomm[sizeof(task->comm)];
73890 unsigned long flags;
73891
73892+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
73893+ if (current->exec_id != m->exec_id) {
73894+ gr_log_badprocpid("stat");
73895+ return 0;
73896+ }
73897+#endif
73898+
73899 state = *get_task_state(task);
73900 vsize = eip = esp = 0;
73901 permitted = ptrace_may_access(task, PTRACE_MODE_READ | PTRACE_MODE_NOAUDIT);
73902@@ -434,6 +472,19 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
73903 gtime = task_gtime(task);
73904 }
73905
73906+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
73907+ if (PAX_RAND_FLAGS(mm)) {
73908+ eip = 0;
73909+ esp = 0;
73910+ wchan = 0;
73911+ }
73912+#endif
73913+#ifdef CONFIG_GRKERNSEC_HIDESYM
73914+ wchan = 0;
73915+ eip =0;
73916+ esp =0;
73917+#endif
73918+
73919 /* scale priority and nice values from timeslices to -20..20 */
73920 /* to make it look like a "normal" Unix priority/nice value */
73921 priority = task_prio(task);
73922@@ -465,9 +516,15 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
73923 seq_put_decimal_ull(m, ' ', vsize);
73924 seq_put_decimal_ull(m, ' ', mm ? get_mm_rss(mm) : 0);
73925 seq_put_decimal_ull(m, ' ', rsslim);
73926+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
73927+ seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->start_code : 1) : 0));
73928+ seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->end_code : 1) : 0));
73929+ seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 0 : ((permitted && mm) ? mm->start_stack : 0));
73930+#else
73931 seq_put_decimal_ull(m, ' ', mm ? (permitted ? mm->start_code : 1) : 0);
73932 seq_put_decimal_ull(m, ' ', mm ? (permitted ? mm->end_code : 1) : 0);
73933 seq_put_decimal_ull(m, ' ', (permitted && mm) ? mm->start_stack : 0);
73934+#endif
73935 seq_put_decimal_ull(m, ' ', esp);
73936 seq_put_decimal_ull(m, ' ', eip);
73937 /* The signal information here is obsolete.
73938@@ -489,7 +546,11 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
73939 seq_put_decimal_ull(m, ' ', cputime_to_clock_t(gtime));
73940 seq_put_decimal_ll(m, ' ', cputime_to_clock_t(cgtime));
73941
73942- if (mm && permitted) {
73943+ if (mm && permitted
73944+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
73945+ && !PAX_RAND_FLAGS(mm)
73946+#endif
73947+ ) {
73948 seq_put_decimal_ull(m, ' ', mm->start_data);
73949 seq_put_decimal_ull(m, ' ', mm->end_data);
73950 seq_put_decimal_ull(m, ' ', mm->start_brk);
73951@@ -527,8 +588,15 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
73952 struct pid *pid, struct task_struct *task)
73953 {
73954 unsigned long size = 0, resident = 0, shared = 0, text = 0, data = 0;
73955- struct mm_struct *mm = get_task_mm(task);
73956+ struct mm_struct *mm;
73957
73958+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
73959+ if (current->exec_id != m->exec_id) {
73960+ gr_log_badprocpid("statm");
73961+ return 0;
73962+ }
73963+#endif
73964+ mm = get_task_mm(task);
73965 if (mm) {
73966 size = task_statm(mm, &shared, &text, &data, &resident);
73967 mmput(mm);
73968@@ -551,6 +619,20 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
73969 return 0;
73970 }
73971
73972+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
73973+int proc_pid_ipaddr(struct seq_file *m, struct pid_namespace *ns, struct pid *pid, struct task_struct *task)
73974+{
73975+ unsigned long flags;
73976+ u32 curr_ip = 0;
73977+
73978+ if (lock_task_sighand(task, &flags)) {
73979+ curr_ip = task->signal->curr_ip;
73980+ unlock_task_sighand(task, &flags);
73981+ }
73982+ return seq_printf(m, "%pI4\n", &curr_ip);
73983+}
73984+#endif
73985+
73986 #ifdef CONFIG_CHECKPOINT_RESTORE
73987 static struct pid *
73988 get_children_pid(struct inode *inode, struct pid *pid_prev, loff_t pos)
73989diff --git a/fs/proc/base.c b/fs/proc/base.c
73990index 3f3d7ae..68de109 100644
73991--- a/fs/proc/base.c
73992+++ b/fs/proc/base.c
73993@@ -113,6 +113,14 @@ struct pid_entry {
73994 union proc_op op;
73995 };
73996
73997+struct getdents_callback {
73998+ struct linux_dirent __user * current_dir;
73999+ struct linux_dirent __user * previous;
74000+ struct file * file;
74001+ int count;
74002+ int error;
74003+};
74004+
74005 #define NOD(NAME, MODE, IOP, FOP, OP) { \
74006 .name = (NAME), \
74007 .len = sizeof(NAME) - 1, \
74008@@ -208,12 +216,28 @@ static int proc_pid_cmdline(struct seq_file *m, struct pid_namespace *ns,
74009 return 0;
74010 }
74011
74012+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
74013+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
74014+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
74015+ _mm->pax_flags & MF_PAX_SEGMEXEC))
74016+#endif
74017+
74018 static int proc_pid_auxv(struct seq_file *m, struct pid_namespace *ns,
74019 struct pid *pid, struct task_struct *task)
74020 {
74021 struct mm_struct *mm = mm_access(task, PTRACE_MODE_READ);
74022 if (mm && !IS_ERR(mm)) {
74023 unsigned int nwords = 0;
74024+
74025+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
74026+ /* allow if we're currently ptracing this task */
74027+ if (PAX_RAND_FLAGS(mm) &&
74028+ (!(task->ptrace & PT_PTRACED) || (task->parent != current))) {
74029+ mmput(mm);
74030+ return 0;
74031+ }
74032+#endif
74033+
74034 do {
74035 nwords += 2;
74036 } while (mm->saved_auxv[nwords - 2] != 0); /* AT_NULL */
74037@@ -225,7 +249,7 @@ static int proc_pid_auxv(struct seq_file *m, struct pid_namespace *ns,
74038 }
74039
74040
74041-#ifdef CONFIG_KALLSYMS
74042+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
74043 /*
74044 * Provides a wchan file via kallsyms in a proper one-value-per-file format.
74045 * Returns the resolved symbol. If that fails, simply return the address.
74046@@ -265,7 +289,7 @@ static void unlock_trace(struct task_struct *task)
74047 mutex_unlock(&task->signal->cred_guard_mutex);
74048 }
74049
74050-#ifdef CONFIG_STACKTRACE
74051+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
74052
74053 #define MAX_STACK_TRACE_DEPTH 64
74054
74055@@ -456,7 +480,7 @@ static int proc_pid_limits(struct seq_file *m, struct pid_namespace *ns,
74056 return 0;
74057 }
74058
74059-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
74060+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
74061 static int proc_pid_syscall(struct seq_file *m, struct pid_namespace *ns,
74062 struct pid *pid, struct task_struct *task)
74063 {
74064@@ -486,7 +510,7 @@ static int proc_pid_syscall(struct seq_file *m, struct pid_namespace *ns,
74065 /************************************************************************/
74066
74067 /* permission checks */
74068-static int proc_fd_access_allowed(struct inode *inode)
74069+static int proc_fd_access_allowed(struct inode *inode, unsigned int log)
74070 {
74071 struct task_struct *task;
74072 int allowed = 0;
74073@@ -496,7 +520,10 @@ static int proc_fd_access_allowed(struct inode *inode)
74074 */
74075 task = get_proc_task(inode);
74076 if (task) {
74077- allowed = ptrace_may_access(task, PTRACE_MODE_READ);
74078+ if (log)
74079+ allowed = ptrace_may_access(task, PTRACE_MODE_READ);
74080+ else
74081+ allowed = ptrace_may_access(task, PTRACE_MODE_READ | PTRACE_MODE_NOAUDIT);
74082 put_task_struct(task);
74083 }
74084 return allowed;
74085@@ -527,10 +554,35 @@ static bool has_pid_permissions(struct pid_namespace *pid,
74086 struct task_struct *task,
74087 int hide_pid_min)
74088 {
74089+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
74090+ return false;
74091+
74092+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
74093+ rcu_read_lock();
74094+ {
74095+ const struct cred *tmpcred = current_cred();
74096+ const struct cred *cred = __task_cred(task);
74097+
74098+ if (uid_eq(tmpcred->uid, GLOBAL_ROOT_UID) || uid_eq(tmpcred->uid, cred->uid)
74099+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
74100+ || in_group_p(grsec_proc_gid)
74101+#endif
74102+ ) {
74103+ rcu_read_unlock();
74104+ return true;
74105+ }
74106+ }
74107+ rcu_read_unlock();
74108+
74109+ if (!pid->hide_pid)
74110+ return false;
74111+#endif
74112+
74113 if (pid->hide_pid < hide_pid_min)
74114 return true;
74115 if (in_group_p(pid->pid_gid))
74116 return true;
74117+
74118 return ptrace_may_access(task, PTRACE_MODE_READ);
74119 }
74120
74121@@ -548,7 +600,11 @@ static int proc_pid_permission(struct inode *inode, int mask)
74122 put_task_struct(task);
74123
74124 if (!has_perms) {
74125+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
74126+ {
74127+#else
74128 if (pid->hide_pid == 2) {
74129+#endif
74130 /*
74131 * Let's make getdents(), stat(), and open()
74132 * consistent with each other. If a process
74133@@ -609,6 +665,10 @@ struct mm_struct *proc_mem_open(struct inode *inode, unsigned int mode)
74134
74135 if (task) {
74136 mm = mm_access(task, mode);
74137+ if (!IS_ERR_OR_NULL(mm) && gr_acl_handle_procpidmem(task)) {
74138+ mmput(mm);
74139+ mm = ERR_PTR(-EPERM);
74140+ }
74141 put_task_struct(task);
74142
74143 if (!IS_ERR_OR_NULL(mm)) {
74144@@ -630,6 +690,11 @@ static int __mem_open(struct inode *inode, struct file *file, unsigned int mode)
74145 return PTR_ERR(mm);
74146
74147 file->private_data = mm;
74148+
74149+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
74150+ file->f_version = current->exec_id;
74151+#endif
74152+
74153 return 0;
74154 }
74155
74156@@ -651,6 +716,17 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
74157 ssize_t copied;
74158 char *page;
74159
74160+#ifdef CONFIG_GRKERNSEC
74161+ if (write)
74162+ return -EPERM;
74163+#endif
74164+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
74165+ if (file->f_version != current->exec_id) {
74166+ gr_log_badprocpid("mem");
74167+ return 0;
74168+ }
74169+#endif
74170+
74171 if (!mm)
74172 return 0;
74173
74174@@ -663,7 +739,7 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
74175 goto free;
74176
74177 while (count > 0) {
74178- int this_len = min_t(int, count, PAGE_SIZE);
74179+ ssize_t this_len = min_t(ssize_t, count, PAGE_SIZE);
74180
74181 if (write && copy_from_user(page, buf, this_len)) {
74182 copied = -EFAULT;
74183@@ -755,6 +831,13 @@ static ssize_t environ_read(struct file *file, char __user *buf,
74184 if (!mm)
74185 return 0;
74186
74187+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
74188+ if (file->f_version != current->exec_id) {
74189+ gr_log_badprocpid("environ");
74190+ return 0;
74191+ }
74192+#endif
74193+
74194 page = (char *)__get_free_page(GFP_TEMPORARY);
74195 if (!page)
74196 return -ENOMEM;
74197@@ -764,7 +847,7 @@ static ssize_t environ_read(struct file *file, char __user *buf,
74198 goto free;
74199 while (count > 0) {
74200 size_t this_len, max_len;
74201- int retval;
74202+ ssize_t retval;
74203
74204 if (src >= (mm->env_end - mm->env_start))
74205 break;
74206@@ -1378,7 +1461,7 @@ static void *proc_pid_follow_link(struct dentry *dentry, struct nameidata *nd)
74207 int error = -EACCES;
74208
74209 /* Are we allowed to snoop on the tasks file descriptors? */
74210- if (!proc_fd_access_allowed(inode))
74211+ if (!proc_fd_access_allowed(inode, 0))
74212 goto out;
74213
74214 error = PROC_I(inode)->op.proc_get_link(dentry, &path);
74215@@ -1422,8 +1505,18 @@ static int proc_pid_readlink(struct dentry * dentry, char __user * buffer, int b
74216 struct path path;
74217
74218 /* Are we allowed to snoop on the tasks file descriptors? */
74219- if (!proc_fd_access_allowed(inode))
74220- goto out;
74221+ /* logging this is needed for learning on chromium to work properly,
74222+ but we don't want to flood the logs from 'ps' which does a readlink
74223+ on /proc/fd/2 of tasks in the listing, nor do we want 'ps' to learn
74224+ CAP_SYS_PTRACE as it's not necessary for its basic functionality
74225+ */
74226+ if (dentry->d_name.name[0] == '2' && dentry->d_name.name[1] == '\0') {
74227+ if (!proc_fd_access_allowed(inode,0))
74228+ goto out;
74229+ } else {
74230+ if (!proc_fd_access_allowed(inode,1))
74231+ goto out;
74232+ }
74233
74234 error = PROC_I(inode)->op.proc_get_link(dentry, &path);
74235 if (error)
74236@@ -1473,7 +1566,11 @@ struct inode *proc_pid_make_inode(struct super_block * sb, struct task_struct *t
74237 rcu_read_lock();
74238 cred = __task_cred(task);
74239 inode->i_uid = cred->euid;
74240+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
74241+ inode->i_gid = grsec_proc_gid;
74242+#else
74243 inode->i_gid = cred->egid;
74244+#endif
74245 rcu_read_unlock();
74246 }
74247 security_task_to_inode(task, inode);
74248@@ -1509,10 +1606,19 @@ int pid_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
74249 return -ENOENT;
74250 }
74251 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
74252+#ifdef CONFIG_GRKERNSEC_PROC_USER
74253+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
74254+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
74255+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
74256+#endif
74257 task_dumpable(task)) {
74258 cred = __task_cred(task);
74259 stat->uid = cred->euid;
74260+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
74261+ stat->gid = grsec_proc_gid;
74262+#else
74263 stat->gid = cred->egid;
74264+#endif
74265 }
74266 }
74267 rcu_read_unlock();
74268@@ -1550,11 +1656,20 @@ int pid_revalidate(struct dentry *dentry, unsigned int flags)
74269
74270 if (task) {
74271 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
74272+#ifdef CONFIG_GRKERNSEC_PROC_USER
74273+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
74274+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
74275+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
74276+#endif
74277 task_dumpable(task)) {
74278 rcu_read_lock();
74279 cred = __task_cred(task);
74280 inode->i_uid = cred->euid;
74281+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
74282+ inode->i_gid = grsec_proc_gid;
74283+#else
74284 inode->i_gid = cred->egid;
74285+#endif
74286 rcu_read_unlock();
74287 } else {
74288 inode->i_uid = GLOBAL_ROOT_UID;
74289@@ -2085,6 +2200,9 @@ static struct dentry *proc_pident_lookup(struct inode *dir,
74290 if (!task)
74291 goto out_no_task;
74292
74293+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
74294+ goto out;
74295+
74296 /*
74297 * Yes, it does not scale. And it should not. Don't add
74298 * new entries into /proc/<tgid>/ without very good reasons.
74299@@ -2115,6 +2233,9 @@ static int proc_pident_readdir(struct file *file, struct dir_context *ctx,
74300 if (!task)
74301 return -ENOENT;
74302
74303+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
74304+ goto out;
74305+
74306 if (!dir_emit_dots(file, ctx))
74307 goto out;
74308
74309@@ -2557,7 +2678,7 @@ static const struct pid_entry tgid_base_stuff[] = {
74310 REG("autogroup", S_IRUGO|S_IWUSR, proc_pid_sched_autogroup_operations),
74311 #endif
74312 REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
74313-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
74314+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
74315 ONE("syscall", S_IRUSR, proc_pid_syscall),
74316 #endif
74317 ONE("cmdline", S_IRUGO, proc_pid_cmdline),
74318@@ -2582,10 +2703,10 @@ static const struct pid_entry tgid_base_stuff[] = {
74319 #ifdef CONFIG_SECURITY
74320 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
74321 #endif
74322-#ifdef CONFIG_KALLSYMS
74323+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
74324 ONE("wchan", S_IRUGO, proc_pid_wchan),
74325 #endif
74326-#ifdef CONFIG_STACKTRACE
74327+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
74328 ONE("stack", S_IRUSR, proc_pid_stack),
74329 #endif
74330 #ifdef CONFIG_SCHEDSTATS
74331@@ -2619,6 +2740,9 @@ static const struct pid_entry tgid_base_stuff[] = {
74332 #ifdef CONFIG_HARDWALL
74333 ONE("hardwall", S_IRUGO, proc_pid_hardwall),
74334 #endif
74335+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
74336+ ONE("ipaddr", S_IRUSR, proc_pid_ipaddr),
74337+#endif
74338 #ifdef CONFIG_USER_NS
74339 REG("uid_map", S_IRUGO|S_IWUSR, proc_uid_map_operations),
74340 REG("gid_map", S_IRUGO|S_IWUSR, proc_gid_map_operations),
74341@@ -2751,7 +2875,14 @@ static int proc_pid_instantiate(struct inode *dir,
74342 if (!inode)
74343 goto out;
74344
74345+#ifdef CONFIG_GRKERNSEC_PROC_USER
74346+ inode->i_mode = S_IFDIR|S_IRUSR|S_IXUSR;
74347+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
74348+ inode->i_gid = grsec_proc_gid;
74349+ inode->i_mode = S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP;
74350+#else
74351 inode->i_mode = S_IFDIR|S_IRUGO|S_IXUGO;
74352+#endif
74353 inode->i_op = &proc_tgid_base_inode_operations;
74354 inode->i_fop = &proc_tgid_base_operations;
74355 inode->i_flags|=S_IMMUTABLE;
74356@@ -2789,7 +2920,11 @@ struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, unsign
74357 if (!task)
74358 goto out;
74359
74360+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
74361+ goto out_put_task;
74362+
74363 result = proc_pid_instantiate(dir, dentry, task, NULL);
74364+out_put_task:
74365 put_task_struct(task);
74366 out:
74367 return ERR_PTR(result);
74368@@ -2903,7 +3038,7 @@ static const struct pid_entry tid_base_stuff[] = {
74369 REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations),
74370 #endif
74371 REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
74372-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
74373+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
74374 ONE("syscall", S_IRUSR, proc_pid_syscall),
74375 #endif
74376 ONE("cmdline", S_IRUGO, proc_pid_cmdline),
74377@@ -2930,10 +3065,10 @@ static const struct pid_entry tid_base_stuff[] = {
74378 #ifdef CONFIG_SECURITY
74379 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
74380 #endif
74381-#ifdef CONFIG_KALLSYMS
74382+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
74383 ONE("wchan", S_IRUGO, proc_pid_wchan),
74384 #endif
74385-#ifdef CONFIG_STACKTRACE
74386+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
74387 ONE("stack", S_IRUSR, proc_pid_stack),
74388 #endif
74389 #ifdef CONFIG_SCHEDSTATS
74390diff --git a/fs/proc/cmdline.c b/fs/proc/cmdline.c
74391index cbd82df..c0407d2 100644
74392--- a/fs/proc/cmdline.c
74393+++ b/fs/proc/cmdline.c
74394@@ -23,7 +23,11 @@ static const struct file_operations cmdline_proc_fops = {
74395
74396 static int __init proc_cmdline_init(void)
74397 {
74398+#ifdef CONFIG_GRKERNSEC_PROC_ADD
74399+ proc_create_grsec("cmdline", 0, NULL, &cmdline_proc_fops);
74400+#else
74401 proc_create("cmdline", 0, NULL, &cmdline_proc_fops);
74402+#endif
74403 return 0;
74404 }
74405 fs_initcall(proc_cmdline_init);
74406diff --git a/fs/proc/devices.c b/fs/proc/devices.c
74407index 50493ed..248166b 100644
74408--- a/fs/proc/devices.c
74409+++ b/fs/proc/devices.c
74410@@ -64,7 +64,11 @@ static const struct file_operations proc_devinfo_operations = {
74411
74412 static int __init proc_devices_init(void)
74413 {
74414+#ifdef CONFIG_GRKERNSEC_PROC_ADD
74415+ proc_create_grsec("devices", 0, NULL, &proc_devinfo_operations);
74416+#else
74417 proc_create("devices", 0, NULL, &proc_devinfo_operations);
74418+#endif
74419 return 0;
74420 }
74421 fs_initcall(proc_devices_init);
74422diff --git a/fs/proc/fd.c b/fs/proc/fd.c
74423index 8e5ad83..1f07a8c 100644
74424--- a/fs/proc/fd.c
74425+++ b/fs/proc/fd.c
74426@@ -26,7 +26,8 @@ static int seq_show(struct seq_file *m, void *v)
74427 if (!task)
74428 return -ENOENT;
74429
74430- files = get_files_struct(task);
74431+ if (!gr_acl_handle_procpidmem(task))
74432+ files = get_files_struct(task);
74433 put_task_struct(task);
74434
74435 if (files) {
74436@@ -284,11 +285,21 @@ static struct dentry *proc_lookupfd(struct inode *dir, struct dentry *dentry,
74437 */
74438 int proc_fd_permission(struct inode *inode, int mask)
74439 {
74440+ struct task_struct *task;
74441 int rv = generic_permission(inode, mask);
74442- if (rv == 0)
74443- return 0;
74444+
74445 if (task_tgid(current) == proc_pid(inode))
74446 rv = 0;
74447+
74448+ task = get_proc_task(inode);
74449+ if (task == NULL)
74450+ return rv;
74451+
74452+ if (gr_acl_handle_procpidmem(task))
74453+ rv = -EACCES;
74454+
74455+ put_task_struct(task);
74456+
74457 return rv;
74458 }
74459
74460diff --git a/fs/proc/generic.c b/fs/proc/generic.c
74461index be65b20..2998ba8 100644
74462--- a/fs/proc/generic.c
74463+++ b/fs/proc/generic.c
74464@@ -22,6 +22,7 @@
74465 #include <linux/bitops.h>
74466 #include <linux/spinlock.h>
74467 #include <linux/completion.h>
74468+#include <linux/grsecurity.h>
74469 #include <asm/uaccess.h>
74470
74471 #include "internal.h"
74472@@ -253,6 +254,15 @@ struct dentry *proc_lookup(struct inode *dir, struct dentry *dentry,
74473 return proc_lookup_de(PDE(dir), dir, dentry);
74474 }
74475
74476+struct dentry *proc_lookup_restrict(struct inode *dir, struct dentry *dentry,
74477+ unsigned int flags)
74478+{
74479+ if (gr_proc_is_restricted())
74480+ return ERR_PTR(-EACCES);
74481+
74482+ return proc_lookup_de(PDE(dir), dir, dentry);
74483+}
74484+
74485 /*
74486 * This returns non-zero if at EOF, so that the /proc
74487 * root directory can use this and check if it should
74488@@ -310,6 +320,16 @@ int proc_readdir(struct file *file, struct dir_context *ctx)
74489 return proc_readdir_de(PDE(inode), file, ctx);
74490 }
74491
74492+int proc_readdir_restrict(struct file *file, struct dir_context *ctx)
74493+{
74494+ struct inode *inode = file_inode(file);
74495+
74496+ if (gr_proc_is_restricted())
74497+ return -EACCES;
74498+
74499+ return proc_readdir_de(PDE(inode), file, ctx);
74500+}
74501+
74502 /*
74503 * These are the generic /proc directory operations. They
74504 * use the in-memory "struct proc_dir_entry" tree to parse
74505@@ -321,6 +341,12 @@ static const struct file_operations proc_dir_operations = {
74506 .iterate = proc_readdir,
74507 };
74508
74509+static const struct file_operations proc_dir_restricted_operations = {
74510+ .llseek = generic_file_llseek,
74511+ .read = generic_read_dir,
74512+ .iterate = proc_readdir_restrict,
74513+};
74514+
74515 /*
74516 * proc directories can do almost nothing..
74517 */
74518@@ -330,6 +356,12 @@ static const struct inode_operations proc_dir_inode_operations = {
74519 .setattr = proc_notify_change,
74520 };
74521
74522+static const struct inode_operations proc_dir_restricted_inode_operations = {
74523+ .lookup = proc_lookup_restrict,
74524+ .getattr = proc_getattr,
74525+ .setattr = proc_notify_change,
74526+};
74527+
74528 static int proc_register(struct proc_dir_entry * dir, struct proc_dir_entry * dp)
74529 {
74530 int ret;
74531@@ -441,6 +473,31 @@ struct proc_dir_entry *proc_mkdir_data(const char *name, umode_t mode,
74532 }
74533 EXPORT_SYMBOL_GPL(proc_mkdir_data);
74534
74535+struct proc_dir_entry *proc_mkdir_data_restrict(const char *name, umode_t mode,
74536+ struct proc_dir_entry *parent, void *data)
74537+{
74538+ struct proc_dir_entry *ent;
74539+
74540+ if (mode == 0)
74541+ mode = S_IRUGO | S_IXUGO;
74542+
74543+ ent = __proc_create(&parent, name, S_IFDIR | mode, 2);
74544+ if (ent) {
74545+ ent->data = data;
74546+ ent->restricted = 1;
74547+ ent->proc_fops = &proc_dir_restricted_operations;
74548+ ent->proc_iops = &proc_dir_restricted_inode_operations;
74549+ parent->nlink++;
74550+ if (proc_register(parent, ent) < 0) {
74551+ kfree(ent);
74552+ parent->nlink--;
74553+ ent = NULL;
74554+ }
74555+ }
74556+ return ent;
74557+}
74558+EXPORT_SYMBOL_GPL(proc_mkdir_data_restrict);
74559+
74560 struct proc_dir_entry *proc_mkdir_mode(const char *name, umode_t mode,
74561 struct proc_dir_entry *parent)
74562 {
74563@@ -455,6 +512,13 @@ struct proc_dir_entry *proc_mkdir(const char *name,
74564 }
74565 EXPORT_SYMBOL(proc_mkdir);
74566
74567+struct proc_dir_entry *proc_mkdir_restrict(const char *name,
74568+ struct proc_dir_entry *parent)
74569+{
74570+ return proc_mkdir_data_restrict(name, 0, parent, NULL);
74571+}
74572+EXPORT_SYMBOL(proc_mkdir_restrict);
74573+
74574 struct proc_dir_entry *proc_create_data(const char *name, umode_t mode,
74575 struct proc_dir_entry *parent,
74576 const struct file_operations *proc_fops,
74577diff --git a/fs/proc/inode.c b/fs/proc/inode.c
74578index 7697b66..8d8e541 100644
74579--- a/fs/proc/inode.c
74580+++ b/fs/proc/inode.c
74581@@ -24,11 +24,17 @@
74582 #include <linux/mount.h>
74583 #include <linux/magic.h>
74584 #include <linux/namei.h>
74585+#include <linux/grsecurity.h>
74586
74587 #include <asm/uaccess.h>
74588
74589 #include "internal.h"
74590
74591+#ifdef CONFIG_PROC_SYSCTL
74592+extern const struct inode_operations proc_sys_inode_operations;
74593+extern const struct inode_operations proc_sys_dir_operations;
74594+#endif
74595+
74596 static void proc_evict_inode(struct inode *inode)
74597 {
74598 struct proc_dir_entry *de;
74599@@ -49,6 +55,13 @@ static void proc_evict_inode(struct inode *inode)
74600 RCU_INIT_POINTER(PROC_I(inode)->sysctl, NULL);
74601 sysctl_head_put(head);
74602 }
74603+
74604+#ifdef CONFIG_PROC_SYSCTL
74605+ if (inode->i_op == &proc_sys_inode_operations ||
74606+ inode->i_op == &proc_sys_dir_operations)
74607+ gr_handle_delete(inode->i_ino, inode->i_sb->s_dev);
74608+#endif
74609+
74610 }
74611
74612 static struct kmem_cache * proc_inode_cachep;
74613@@ -426,7 +439,11 @@ struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de)
74614 if (de->mode) {
74615 inode->i_mode = de->mode;
74616 inode->i_uid = de->uid;
74617+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
74618+ inode->i_gid = grsec_proc_gid;
74619+#else
74620 inode->i_gid = de->gid;
74621+#endif
74622 }
74623 if (de->size)
74624 inode->i_size = de->size;
74625diff --git a/fs/proc/internal.h b/fs/proc/internal.h
74626index c835b94..c9e01a3 100644
74627--- a/fs/proc/internal.h
74628+++ b/fs/proc/internal.h
74629@@ -47,9 +47,10 @@ struct proc_dir_entry {
74630 struct completion *pde_unload_completion;
74631 struct list_head pde_openers; /* who did ->open, but not ->release */
74632 spinlock_t pde_unload_lock; /* proc_fops checks and pde_users bumps */
74633+ u8 restricted; /* a directory in /proc/net that should be restricted via GRKERNSEC_PROC */
74634 u8 namelen;
74635 char name[];
74636-};
74637+} __randomize_layout;
74638
74639 union proc_op {
74640 int (*proc_get_link)(struct dentry *, struct path *);
74641@@ -67,7 +68,7 @@ struct proc_inode {
74642 struct ctl_table *sysctl_entry;
74643 const struct proc_ns_operations *ns_ops;
74644 struct inode vfs_inode;
74645-};
74646+} __randomize_layout;
74647
74648 /*
74649 * General functions
74650@@ -155,6 +156,10 @@ extern int proc_pid_status(struct seq_file *, struct pid_namespace *,
74651 struct pid *, struct task_struct *);
74652 extern int proc_pid_statm(struct seq_file *, struct pid_namespace *,
74653 struct pid *, struct task_struct *);
74654+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
74655+extern int proc_pid_ipaddr(struct seq_file *, struct pid_namespace *,
74656+ struct pid *, struct task_struct *);
74657+#endif
74658
74659 /*
74660 * base.c
74661@@ -179,9 +184,11 @@ extern bool proc_fill_cache(struct file *, struct dir_context *, const char *, i
74662 * generic.c
74663 */
74664 extern struct dentry *proc_lookup(struct inode *, struct dentry *, unsigned int);
74665+extern struct dentry *proc_lookup_restrict(struct inode *, struct dentry *, unsigned int);
74666 extern struct dentry *proc_lookup_de(struct proc_dir_entry *, struct inode *,
74667 struct dentry *);
74668 extern int proc_readdir(struct file *, struct dir_context *);
74669+extern int proc_readdir_restrict(struct file *, struct dir_context *);
74670 extern int proc_readdir_de(struct proc_dir_entry *, struct file *, struct dir_context *);
74671
74672 static inline struct proc_dir_entry *pde_get(struct proc_dir_entry *pde)
74673diff --git a/fs/proc/interrupts.c b/fs/proc/interrupts.c
74674index a352d57..cb94a5c 100644
74675--- a/fs/proc/interrupts.c
74676+++ b/fs/proc/interrupts.c
74677@@ -47,7 +47,11 @@ static const struct file_operations proc_interrupts_operations = {
74678
74679 static int __init proc_interrupts_init(void)
74680 {
74681+#ifdef CONFIG_GRKERNSEC_PROC_ADD
74682+ proc_create_grsec("interrupts", 0, NULL, &proc_interrupts_operations);
74683+#else
74684 proc_create("interrupts", 0, NULL, &proc_interrupts_operations);
74685+#endif
74686 return 0;
74687 }
74688 fs_initcall(proc_interrupts_init);
74689diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c
74690index 91a4e64..14bf8fa 100644
74691--- a/fs/proc/kcore.c
74692+++ b/fs/proc/kcore.c
74693@@ -483,9 +483,10 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
74694 * the addresses in the elf_phdr on our list.
74695 */
74696 start = kc_offset_to_vaddr(*fpos - elf_buflen);
74697- if ((tsz = (PAGE_SIZE - (start & ~PAGE_MASK))) > buflen)
74698+ tsz = PAGE_SIZE - (start & ~PAGE_MASK);
74699+ if (tsz > buflen)
74700 tsz = buflen;
74701-
74702+
74703 while (buflen) {
74704 struct kcore_list *m;
74705
74706@@ -515,19 +516,20 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
74707 } else {
74708 if (kern_addr_valid(start)) {
74709 unsigned long n;
74710+ char *elf_buf;
74711+ mm_segment_t oldfs;
74712
74713- n = copy_to_user(buffer, (char *)start, tsz);
74714- /*
74715- * We cannot distinguish between fault on source
74716- * and fault on destination. When this happens
74717- * we clear too and hope it will trigger the
74718- * EFAULT again.
74719- */
74720- if (n) {
74721- if (clear_user(buffer + tsz - n,
74722- n))
74723- return -EFAULT;
74724- }
74725+ elf_buf = kzalloc(tsz, GFP_KERNEL);
74726+ if (!elf_buf)
74727+ return -ENOMEM;
74728+ oldfs = get_fs();
74729+ set_fs(KERNEL_DS);
74730+ n = __copy_from_user(elf_buf, (const void __user *)start, tsz);
74731+ set_fs(oldfs);
74732+ n = copy_to_user(buffer, elf_buf, tsz);
74733+ kfree(elf_buf);
74734+ if (n)
74735+ return -EFAULT;
74736 } else {
74737 if (clear_user(buffer, tsz))
74738 return -EFAULT;
74739@@ -547,6 +549,9 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
74740
74741 static int open_kcore(struct inode *inode, struct file *filp)
74742 {
74743+#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
74744+ return -EPERM;
74745+#endif
74746 if (!capable(CAP_SYS_RAWIO))
74747 return -EPERM;
74748 if (kcore_need_update)
74749@@ -580,7 +585,7 @@ static int __meminit kcore_callback(struct notifier_block *self,
74750 return NOTIFY_OK;
74751 }
74752
74753-static struct notifier_block kcore_callback_nb __meminitdata = {
74754+static struct notifier_block kcore_callback_nb __meminitconst = {
74755 .notifier_call = kcore_callback,
74756 .priority = 0,
74757 };
74758diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c
74759index d3ebf2e..6ad42d1 100644
74760--- a/fs/proc/meminfo.c
74761+++ b/fs/proc/meminfo.c
74762@@ -194,7 +194,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
74763 vmi.used >> 10,
74764 vmi.largest_chunk >> 10
74765 #ifdef CONFIG_MEMORY_FAILURE
74766- , atomic_long_read(&num_poisoned_pages) << (PAGE_SHIFT - 10)
74767+ , atomic_long_read_unchecked(&num_poisoned_pages) << (PAGE_SHIFT - 10)
74768 #endif
74769 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
74770 , K(global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) *
74771diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c
74772index d4a3574..b421ce9 100644
74773--- a/fs/proc/nommu.c
74774+++ b/fs/proc/nommu.c
74775@@ -64,7 +64,7 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region)
74776
74777 if (file) {
74778 seq_pad(m, ' ');
74779- seq_path(m, &file->f_path, "");
74780+ seq_path(m, &file->f_path, "\n\\");
74781 }
74782
74783 seq_putc(m, '\n');
74784diff --git a/fs/proc/proc_net.c b/fs/proc/proc_net.c
74785index 1bde894..22ac7eb 100644
74786--- a/fs/proc/proc_net.c
74787+++ b/fs/proc/proc_net.c
74788@@ -23,9 +23,27 @@
74789 #include <linux/nsproxy.h>
74790 #include <net/net_namespace.h>
74791 #include <linux/seq_file.h>
74792+#include <linux/grsecurity.h>
74793
74794 #include "internal.h"
74795
74796+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
74797+static struct seq_operations *ipv6_seq_ops_addr;
74798+
74799+void register_ipv6_seq_ops_addr(struct seq_operations *addr)
74800+{
74801+ ipv6_seq_ops_addr = addr;
74802+}
74803+
74804+void unregister_ipv6_seq_ops_addr(void)
74805+{
74806+ ipv6_seq_ops_addr = NULL;
74807+}
74808+
74809+EXPORT_SYMBOL_GPL(register_ipv6_seq_ops_addr);
74810+EXPORT_SYMBOL_GPL(unregister_ipv6_seq_ops_addr);
74811+#endif
74812+
74813 static inline struct net *PDE_NET(struct proc_dir_entry *pde)
74814 {
74815 return pde->parent->data;
74816@@ -36,6 +54,8 @@ static struct net *get_proc_net(const struct inode *inode)
74817 return maybe_get_net(PDE_NET(PDE(inode)));
74818 }
74819
74820+extern const struct seq_operations dev_seq_ops;
74821+
74822 int seq_open_net(struct inode *ino, struct file *f,
74823 const struct seq_operations *ops, int size)
74824 {
74825@@ -44,6 +64,14 @@ int seq_open_net(struct inode *ino, struct file *f,
74826
74827 BUG_ON(size < sizeof(*p));
74828
74829+ /* only permit access to /proc/net/dev */
74830+ if (
74831+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
74832+ ops != ipv6_seq_ops_addr &&
74833+#endif
74834+ ops != &dev_seq_ops && gr_proc_is_restricted())
74835+ return -EACCES;
74836+
74837 net = get_proc_net(ino);
74838 if (net == NULL)
74839 return -ENXIO;
74840@@ -66,6 +94,9 @@ int single_open_net(struct inode *inode, struct file *file,
74841 int err;
74842 struct net *net;
74843
74844+ if (gr_proc_is_restricted())
74845+ return -EACCES;
74846+
74847 err = -ENXIO;
74848 net = get_proc_net(inode);
74849 if (net == NULL)
74850diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
74851index f92d5dd..26398ac 100644
74852--- a/fs/proc/proc_sysctl.c
74853+++ b/fs/proc/proc_sysctl.c
74854@@ -11,13 +11,21 @@
74855 #include <linux/namei.h>
74856 #include <linux/mm.h>
74857 #include <linux/module.h>
74858+#include <linux/nsproxy.h>
74859+#ifdef CONFIG_GRKERNSEC
74860+#include <net/net_namespace.h>
74861+#endif
74862 #include "internal.h"
74863
74864+extern int gr_handle_chroot_sysctl(const int op);
74865+extern int gr_handle_sysctl_mod(const char *dirname, const char *name,
74866+ const int op);
74867+
74868 static const struct dentry_operations proc_sys_dentry_operations;
74869 static const struct file_operations proc_sys_file_operations;
74870-static const struct inode_operations proc_sys_inode_operations;
74871+const struct inode_operations proc_sys_inode_operations;
74872 static const struct file_operations proc_sys_dir_file_operations;
74873-static const struct inode_operations proc_sys_dir_operations;
74874+const struct inode_operations proc_sys_dir_operations;
74875
74876 void proc_sys_poll_notify(struct ctl_table_poll *poll)
74877 {
74878@@ -467,6 +475,9 @@ static struct dentry *proc_sys_lookup(struct inode *dir, struct dentry *dentry,
74879
74880 err = NULL;
74881 d_set_d_op(dentry, &proc_sys_dentry_operations);
74882+
74883+ gr_handle_proc_create(dentry, inode);
74884+
74885 d_add(dentry, inode);
74886
74887 out:
74888@@ -482,6 +493,7 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
74889 struct inode *inode = file_inode(filp);
74890 struct ctl_table_header *head = grab_header(inode);
74891 struct ctl_table *table = PROC_I(inode)->sysctl_entry;
74892+ int op = write ? MAY_WRITE : MAY_READ;
74893 ssize_t error;
74894 size_t res;
74895
74896@@ -493,7 +505,7 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
74897 * and won't be until we finish.
74898 */
74899 error = -EPERM;
74900- if (sysctl_perm(head, table, write ? MAY_WRITE : MAY_READ))
74901+ if (sysctl_perm(head, table, op))
74902 goto out;
74903
74904 /* if that can happen at all, it should be -EINVAL, not -EISDIR */
74905@@ -501,6 +513,27 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
74906 if (!table->proc_handler)
74907 goto out;
74908
74909+#ifdef CONFIG_GRKERNSEC
74910+ error = -EPERM;
74911+ if (gr_handle_chroot_sysctl(op))
74912+ goto out;
74913+ dget(filp->f_path.dentry);
74914+ if (gr_handle_sysctl_mod(filp->f_path.dentry->d_parent->d_name.name, table->procname, op)) {
74915+ dput(filp->f_path.dentry);
74916+ goto out;
74917+ }
74918+ dput(filp->f_path.dentry);
74919+ if (!gr_acl_handle_open(filp->f_path.dentry, filp->f_path.mnt, op))
74920+ goto out;
74921+ if (write) {
74922+ if (current->nsproxy->net_ns != table->extra2) {
74923+ if (!capable(CAP_SYS_ADMIN))
74924+ goto out;
74925+ } else if (!ns_capable(current->nsproxy->net_ns->user_ns, CAP_NET_ADMIN))
74926+ goto out;
74927+ }
74928+#endif
74929+
74930 /* careful: calling conventions are nasty here */
74931 res = count;
74932 error = table->proc_handler(table, write, buf, &res, ppos);
74933@@ -598,6 +631,9 @@ static bool proc_sys_fill_cache(struct file *file,
74934 return false;
74935 } else {
74936 d_set_d_op(child, &proc_sys_dentry_operations);
74937+
74938+ gr_handle_proc_create(child, inode);
74939+
74940 d_add(child, inode);
74941 }
74942 } else {
74943@@ -641,6 +677,9 @@ static int scan(struct ctl_table_header *head, struct ctl_table *table,
74944 if ((*pos)++ < ctx->pos)
74945 return true;
74946
74947+ if (!gr_acl_handle_hidden_file(file->f_path.dentry, file->f_path.mnt))
74948+ return 0;
74949+
74950 if (unlikely(S_ISLNK(table->mode)))
74951 res = proc_sys_link_fill_cache(file, ctx, head, table);
74952 else
74953@@ -734,6 +773,9 @@ static int proc_sys_getattr(struct vfsmount *mnt, struct dentry *dentry, struct
74954 if (IS_ERR(head))
74955 return PTR_ERR(head);
74956
74957+ if (table && !gr_acl_handle_hidden_file(dentry, mnt))
74958+ return -ENOENT;
74959+
74960 generic_fillattr(inode, stat);
74961 if (table)
74962 stat->mode = (stat->mode & S_IFMT) | table->mode;
74963@@ -756,13 +798,13 @@ static const struct file_operations proc_sys_dir_file_operations = {
74964 .llseek = generic_file_llseek,
74965 };
74966
74967-static const struct inode_operations proc_sys_inode_operations = {
74968+const struct inode_operations proc_sys_inode_operations = {
74969 .permission = proc_sys_permission,
74970 .setattr = proc_sys_setattr,
74971 .getattr = proc_sys_getattr,
74972 };
74973
74974-static const struct inode_operations proc_sys_dir_operations = {
74975+const struct inode_operations proc_sys_dir_operations = {
74976 .lookup = proc_sys_lookup,
74977 .permission = proc_sys_permission,
74978 .setattr = proc_sys_setattr,
74979@@ -839,7 +881,7 @@ static struct ctl_dir *find_subdir(struct ctl_dir *dir,
74980 static struct ctl_dir *new_dir(struct ctl_table_set *set,
74981 const char *name, int namelen)
74982 {
74983- struct ctl_table *table;
74984+ ctl_table_no_const *table;
74985 struct ctl_dir *new;
74986 struct ctl_node *node;
74987 char *new_name;
74988@@ -851,7 +893,7 @@ static struct ctl_dir *new_dir(struct ctl_table_set *set,
74989 return NULL;
74990
74991 node = (struct ctl_node *)(new + 1);
74992- table = (struct ctl_table *)(node + 1);
74993+ table = (ctl_table_no_const *)(node + 1);
74994 new_name = (char *)(table + 2);
74995 memcpy(new_name, name, namelen);
74996 new_name[namelen] = '\0';
74997@@ -1020,7 +1062,8 @@ static int sysctl_check_table(const char *path, struct ctl_table *table)
74998 static struct ctl_table_header *new_links(struct ctl_dir *dir, struct ctl_table *table,
74999 struct ctl_table_root *link_root)
75000 {
75001- struct ctl_table *link_table, *entry, *link;
75002+ ctl_table_no_const *link_table, *link;
75003+ struct ctl_table *entry;
75004 struct ctl_table_header *links;
75005 struct ctl_node *node;
75006 char *link_name;
75007@@ -1043,7 +1086,7 @@ static struct ctl_table_header *new_links(struct ctl_dir *dir, struct ctl_table
75008 return NULL;
75009
75010 node = (struct ctl_node *)(links + 1);
75011- link_table = (struct ctl_table *)(node + nr_entries);
75012+ link_table = (ctl_table_no_const *)(node + nr_entries);
75013 link_name = (char *)&link_table[nr_entries + 1];
75014
75015 for (link = link_table, entry = table; entry->procname; link++, entry++) {
75016@@ -1291,8 +1334,8 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
75017 struct ctl_table_header ***subheader, struct ctl_table_set *set,
75018 struct ctl_table *table)
75019 {
75020- struct ctl_table *ctl_table_arg = NULL;
75021- struct ctl_table *entry, *files;
75022+ ctl_table_no_const *ctl_table_arg = NULL, *files = NULL;
75023+ struct ctl_table *entry;
75024 int nr_files = 0;
75025 int nr_dirs = 0;
75026 int err = -ENOMEM;
75027@@ -1304,10 +1347,9 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
75028 nr_files++;
75029 }
75030
75031- files = table;
75032 /* If there are mixed files and directories we need a new table */
75033 if (nr_dirs && nr_files) {
75034- struct ctl_table *new;
75035+ ctl_table_no_const *new;
75036 files = kzalloc(sizeof(struct ctl_table) * (nr_files + 1),
75037 GFP_KERNEL);
75038 if (!files)
75039@@ -1325,7 +1367,7 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
75040 /* Register everything except a directory full of subdirectories */
75041 if (nr_files || !nr_dirs) {
75042 struct ctl_table_header *header;
75043- header = __register_sysctl_table(set, path, files);
75044+ header = __register_sysctl_table(set, path, files ? files : table);
75045 if (!header) {
75046 kfree(ctl_table_arg);
75047 goto out;
75048diff --git a/fs/proc/root.c b/fs/proc/root.c
75049index e74ac9f..35e89f4 100644
75050--- a/fs/proc/root.c
75051+++ b/fs/proc/root.c
75052@@ -188,7 +188,15 @@ void __init proc_root_init(void)
75053 proc_mkdir("openprom", NULL);
75054 #endif
75055 proc_tty_init();
75056+#ifdef CONFIG_GRKERNSEC_PROC_ADD
75057+#ifdef CONFIG_GRKERNSEC_PROC_USER
75058+ proc_mkdir_mode("bus", S_IRUSR | S_IXUSR, NULL);
75059+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
75060+ proc_mkdir_mode("bus", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
75061+#endif
75062+#else
75063 proc_mkdir("bus", NULL);
75064+#endif
75065 proc_sys_init();
75066 }
75067
75068diff --git a/fs/proc/stat.c b/fs/proc/stat.c
75069index 510413eb..34d9a8c 100644
75070--- a/fs/proc/stat.c
75071+++ b/fs/proc/stat.c
75072@@ -11,6 +11,7 @@
75073 #include <linux/irqnr.h>
75074 #include <linux/cputime.h>
75075 #include <linux/tick.h>
75076+#include <linux/grsecurity.h>
75077
75078 #ifndef arch_irq_stat_cpu
75079 #define arch_irq_stat_cpu(cpu) 0
75080@@ -87,6 +88,18 @@ static int show_stat(struct seq_file *p, void *v)
75081 u64 sum_softirq = 0;
75082 unsigned int per_softirq_sums[NR_SOFTIRQS] = {0};
75083 struct timespec boottime;
75084+ int unrestricted = 1;
75085+
75086+#ifdef CONFIG_GRKERNSEC_PROC_ADD
75087+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
75088+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)
75089+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
75090+ && !in_group_p(grsec_proc_gid)
75091+#endif
75092+ )
75093+ unrestricted = 0;
75094+#endif
75095+#endif
75096
75097 user = nice = system = idle = iowait =
75098 irq = softirq = steal = 0;
75099@@ -99,23 +112,25 @@ static int show_stat(struct seq_file *p, void *v)
75100 nice += kcpustat_cpu(i).cpustat[CPUTIME_NICE];
75101 system += kcpustat_cpu(i).cpustat[CPUTIME_SYSTEM];
75102 idle += get_idle_time(i);
75103- iowait += get_iowait_time(i);
75104- irq += kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
75105- softirq += kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
75106- steal += kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
75107- guest += kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
75108- guest_nice += kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
75109- sum += kstat_cpu_irqs_sum(i);
75110- sum += arch_irq_stat_cpu(i);
75111+ if (unrestricted) {
75112+ iowait += get_iowait_time(i);
75113+ irq += kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
75114+ softirq += kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
75115+ steal += kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
75116+ guest += kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
75117+ guest_nice += kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
75118+ sum += kstat_cpu_irqs_sum(i);
75119+ sum += arch_irq_stat_cpu(i);
75120+ for (j = 0; j < NR_SOFTIRQS; j++) {
75121+ unsigned int softirq_stat = kstat_softirqs_cpu(j, i);
75122
75123- for (j = 0; j < NR_SOFTIRQS; j++) {
75124- unsigned int softirq_stat = kstat_softirqs_cpu(j, i);
75125-
75126- per_softirq_sums[j] += softirq_stat;
75127- sum_softirq += softirq_stat;
75128+ per_softirq_sums[j] += softirq_stat;
75129+ sum_softirq += softirq_stat;
75130+ }
75131 }
75132 }
75133- sum += arch_irq_stat();
75134+ if (unrestricted)
75135+ sum += arch_irq_stat();
75136
75137 seq_puts(p, "cpu ");
75138 seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(user));
75139@@ -136,12 +151,14 @@ static int show_stat(struct seq_file *p, void *v)
75140 nice = kcpustat_cpu(i).cpustat[CPUTIME_NICE];
75141 system = kcpustat_cpu(i).cpustat[CPUTIME_SYSTEM];
75142 idle = get_idle_time(i);
75143- iowait = get_iowait_time(i);
75144- irq = kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
75145- softirq = kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
75146- steal = kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
75147- guest = kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
75148- guest_nice = kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
75149+ if (unrestricted) {
75150+ iowait = get_iowait_time(i);
75151+ irq = kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
75152+ softirq = kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
75153+ steal = kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
75154+ guest = kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
75155+ guest_nice = kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
75156+ }
75157 seq_printf(p, "cpu%d", i);
75158 seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(user));
75159 seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(nice));
75160@@ -159,7 +176,7 @@ static int show_stat(struct seq_file *p, void *v)
75161
75162 /* sum again ? it could be updated? */
75163 for_each_irq_nr(j)
75164- seq_put_decimal_ull(p, ' ', kstat_irqs_usr(j));
75165+ seq_put_decimal_ull(p, ' ', unrestricted ? kstat_irqs_usr(j) : 0ULL);
75166
75167 seq_printf(p,
75168 "\nctxt %llu\n"
75169@@ -167,11 +184,11 @@ static int show_stat(struct seq_file *p, void *v)
75170 "processes %lu\n"
75171 "procs_running %lu\n"
75172 "procs_blocked %lu\n",
75173- nr_context_switches(),
75174+ unrestricted ? nr_context_switches() : 0ULL,
75175 (unsigned long)jif,
75176- total_forks,
75177- nr_running(),
75178- nr_iowait());
75179+ unrestricted ? total_forks : 0UL,
75180+ unrestricted ? nr_running() : 0UL,
75181+ unrestricted ? nr_iowait() : 0UL);
75182
75183 seq_printf(p, "softirq %llu", (unsigned long long)sum_softirq);
75184
75185diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
75186index 6dee68d..1b4add0 100644
75187--- a/fs/proc/task_mmu.c
75188+++ b/fs/proc/task_mmu.c
75189@@ -13,12 +13,19 @@
75190 #include <linux/swap.h>
75191 #include <linux/swapops.h>
75192 #include <linux/mmu_notifier.h>
75193+#include <linux/grsecurity.h>
75194
75195 #include <asm/elf.h>
75196 #include <asm/uaccess.h>
75197 #include <asm/tlbflush.h>
75198 #include "internal.h"
75199
75200+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
75201+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
75202+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
75203+ _mm->pax_flags & MF_PAX_SEGMEXEC))
75204+#endif
75205+
75206 void task_mem(struct seq_file *m, struct mm_struct *mm)
75207 {
75208 unsigned long data, text, lib, swap, ptes, pmds;
75209@@ -57,8 +64,13 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
75210 "VmLib:\t%8lu kB\n"
75211 "VmPTE:\t%8lu kB\n"
75212 "VmPMD:\t%8lu kB\n"
75213- "VmSwap:\t%8lu kB\n",
75214- hiwater_vm << (PAGE_SHIFT-10),
75215+ "VmSwap:\t%8lu kB\n"
75216+
75217+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
75218+ "CsBase:\t%8lx\nCsLim:\t%8lx\n"
75219+#endif
75220+
75221+ ,hiwater_vm << (PAGE_SHIFT-10),
75222 total_vm << (PAGE_SHIFT-10),
75223 mm->locked_vm << (PAGE_SHIFT-10),
75224 mm->pinned_vm << (PAGE_SHIFT-10),
75225@@ -68,7 +80,19 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
75226 mm->stack_vm << (PAGE_SHIFT-10), text, lib,
75227 ptes >> 10,
75228 pmds >> 10,
75229- swap << (PAGE_SHIFT-10));
75230+ swap << (PAGE_SHIFT-10)
75231+
75232+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
75233+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
75234+ , PAX_RAND_FLAGS(mm) ? 0 : mm->context.user_cs_base
75235+ , PAX_RAND_FLAGS(mm) ? 0 : mm->context.user_cs_limit
75236+#else
75237+ , mm->context.user_cs_base
75238+ , mm->context.user_cs_limit
75239+#endif
75240+#endif
75241+
75242+ );
75243 }
75244
75245 unsigned long task_vsize(struct mm_struct *mm)
75246@@ -285,13 +309,13 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
75247 pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
75248 }
75249
75250- /* We don't show the stack guard page in /proc/maps */
75251+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
75252+ start = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_start;
75253+ end = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_end;
75254+#else
75255 start = vma->vm_start;
75256- if (stack_guard_page_start(vma, start))
75257- start += PAGE_SIZE;
75258 end = vma->vm_end;
75259- if (stack_guard_page_end(vma, end))
75260- end -= PAGE_SIZE;
75261+#endif
75262
75263 seq_setwidth(m, 25 + sizeof(void *) * 6 - 1);
75264 seq_printf(m, "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu ",
75265@@ -301,7 +325,11 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
75266 flags & VM_WRITE ? 'w' : '-',
75267 flags & VM_EXEC ? 'x' : '-',
75268 flags & VM_MAYSHARE ? 's' : 'p',
75269+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
75270+ PAX_RAND_FLAGS(mm) ? 0UL : pgoff,
75271+#else
75272 pgoff,
75273+#endif
75274 MAJOR(dev), MINOR(dev), ino);
75275
75276 /*
75277@@ -310,7 +338,7 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
75278 */
75279 if (file) {
75280 seq_pad(m, ' ');
75281- seq_path(m, &file->f_path, "\n");
75282+ seq_path(m, &file->f_path, "\n\\");
75283 goto done;
75284 }
75285
75286@@ -341,8 +369,9 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
75287 * Thread stack in /proc/PID/task/TID/maps or
75288 * the main process stack.
75289 */
75290- if (!is_pid || (vma->vm_start <= mm->start_stack &&
75291- vma->vm_end >= mm->start_stack)) {
75292+ if (!is_pid || (vma->vm_flags & (VM_GROWSDOWN | VM_GROWSUP)) ||
75293+ (vma->vm_start <= mm->start_stack &&
75294+ vma->vm_end >= mm->start_stack)) {
75295 name = "[stack]";
75296 } else {
75297 /* Thread stack in /proc/PID/maps */
75298@@ -362,6 +391,12 @@ done:
75299
75300 static int show_map(struct seq_file *m, void *v, int is_pid)
75301 {
75302+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
75303+ if (current->exec_id != m->exec_id) {
75304+ gr_log_badprocpid("maps");
75305+ return 0;
75306+ }
75307+#endif
75308 show_map_vma(m, v, is_pid);
75309 m_cache_vma(m, v);
75310 return 0;
75311@@ -620,9 +655,18 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
75312 .private = &mss,
75313 };
75314
75315+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
75316+ if (current->exec_id != m->exec_id) {
75317+ gr_log_badprocpid("smaps");
75318+ return 0;
75319+ }
75320+#endif
75321 memset(&mss, 0, sizeof mss);
75322- /* mmap_sem is held in m_start */
75323- walk_page_vma(vma, &smaps_walk);
75324+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
75325+ if (!PAX_RAND_FLAGS(vma->vm_mm))
75326+#endif
75327+ /* mmap_sem is held in m_start */
75328+ walk_page_vma(vma, &smaps_walk);
75329
75330 show_map_vma(m, vma, is_pid);
75331
75332@@ -641,7 +685,11 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
75333 "KernelPageSize: %8lu kB\n"
75334 "MMUPageSize: %8lu kB\n"
75335 "Locked: %8lu kB\n",
75336+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
75337+ PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : (vma->vm_end - vma->vm_start) >> 10,
75338+#else
75339 (vma->vm_end - vma->vm_start) >> 10,
75340+#endif
75341 mss.resident >> 10,
75342 (unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
75343 mss.shared_clean >> 10,
75344@@ -1491,6 +1539,13 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
75345 char buffer[64];
75346 int nid;
75347
75348+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
75349+ if (current->exec_id != m->exec_id) {
75350+ gr_log_badprocpid("numa_maps");
75351+ return 0;
75352+ }
75353+#endif
75354+
75355 if (!mm)
75356 return 0;
75357
75358@@ -1505,11 +1560,15 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
75359 mpol_to_str(buffer, sizeof(buffer), proc_priv->task_mempolicy);
75360 }
75361
75362+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
75363+ seq_printf(m, "%08lx %s", PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : vma->vm_start, buffer);
75364+#else
75365 seq_printf(m, "%08lx %s", vma->vm_start, buffer);
75366+#endif
75367
75368 if (file) {
75369 seq_puts(m, " file=");
75370- seq_path(m, &file->f_path, "\n\t= ");
75371+ seq_path(m, &file->f_path, "\n\t\\= ");
75372 } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
75373 seq_puts(m, " heap");
75374 } else {
75375diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
75376index 599ec2e..f1413ae 100644
75377--- a/fs/proc/task_nommu.c
75378+++ b/fs/proc/task_nommu.c
75379@@ -51,7 +51,7 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
75380 else
75381 bytes += kobjsize(mm);
75382
75383- if (current->fs && current->fs->users > 1)
75384+ if (current->fs && atomic_read(&current->fs->users) > 1)
75385 sbytes += kobjsize(current->fs);
75386 else
75387 bytes += kobjsize(current->fs);
75388@@ -180,7 +180,7 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma,
75389
75390 if (file) {
75391 seq_pad(m, ' ');
75392- seq_path(m, &file->f_path, "");
75393+ seq_path(m, &file->f_path, "\n\\");
75394 } else if (mm) {
75395 pid_t tid = pid_of_stack(priv, vma, is_pid);
75396
75397diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c
75398index 4e61388..1a2523d 100644
75399--- a/fs/proc/vmcore.c
75400+++ b/fs/proc/vmcore.c
75401@@ -105,9 +105,13 @@ static ssize_t read_from_oldmem(char *buf, size_t count,
75402 nr_bytes = count;
75403
75404 /* If pfn is not ram, return zeros for sparse dump files */
75405- if (pfn_is_ram(pfn) == 0)
75406- memset(buf, 0, nr_bytes);
75407- else {
75408+ if (pfn_is_ram(pfn) == 0) {
75409+ if (userbuf) {
75410+ if (clear_user((char __force_user *)buf, nr_bytes))
75411+ return -EFAULT;
75412+ } else
75413+ memset(buf, 0, nr_bytes);
75414+ } else {
75415 tmp = copy_oldmem_page(pfn, buf, nr_bytes,
75416 offset, userbuf);
75417 if (tmp < 0)
75418@@ -170,7 +174,7 @@ int __weak remap_oldmem_pfn_range(struct vm_area_struct *vma,
75419 static int copy_to(void *target, void *src, size_t size, int userbuf)
75420 {
75421 if (userbuf) {
75422- if (copy_to_user((char __user *) target, src, size))
75423+ if (copy_to_user((char __force_user *) target, src, size))
75424 return -EFAULT;
75425 } else {
75426 memcpy(target, src, size);
75427@@ -233,7 +237,7 @@ static ssize_t __read_vmcore(char *buffer, size_t buflen, loff_t *fpos,
75428 if (*fpos < m->offset + m->size) {
75429 tsz = min_t(size_t, m->offset + m->size - *fpos, buflen);
75430 start = m->paddr + *fpos - m->offset;
75431- tmp = read_from_oldmem(buffer, tsz, &start, userbuf);
75432+ tmp = read_from_oldmem((char __force_kernel *)buffer, tsz, &start, userbuf);
75433 if (tmp < 0)
75434 return tmp;
75435 buflen -= tsz;
75436@@ -253,7 +257,7 @@ static ssize_t __read_vmcore(char *buffer, size_t buflen, loff_t *fpos,
75437 static ssize_t read_vmcore(struct file *file, char __user *buffer,
75438 size_t buflen, loff_t *fpos)
75439 {
75440- return __read_vmcore((__force char *) buffer, buflen, fpos, 1);
75441+ return __read_vmcore((__force_kernel char *) buffer, buflen, fpos, 1);
75442 }
75443
75444 /*
75445diff --git a/fs/qnx6/qnx6.h b/fs/qnx6/qnx6.h
75446index d3fb2b6..43a8140 100644
75447--- a/fs/qnx6/qnx6.h
75448+++ b/fs/qnx6/qnx6.h
75449@@ -74,7 +74,7 @@ enum {
75450 BYTESEX_BE,
75451 };
75452
75453-static inline __u64 fs64_to_cpu(struct qnx6_sb_info *sbi, __fs64 n)
75454+static inline __u64 __intentional_overflow(-1) fs64_to_cpu(struct qnx6_sb_info *sbi, __fs64 n)
75455 {
75456 if (sbi->s_bytesex == BYTESEX_LE)
75457 return le64_to_cpu((__force __le64)n);
75458@@ -90,7 +90,7 @@ static inline __fs64 cpu_to_fs64(struct qnx6_sb_info *sbi, __u64 n)
75459 return (__force __fs64)cpu_to_be64(n);
75460 }
75461
75462-static inline __u32 fs32_to_cpu(struct qnx6_sb_info *sbi, __fs32 n)
75463+static inline __u32 __intentional_overflow(-1) fs32_to_cpu(struct qnx6_sb_info *sbi, __fs32 n)
75464 {
75465 if (sbi->s_bytesex == BYTESEX_LE)
75466 return le32_to_cpu((__force __le32)n);
75467diff --git a/fs/quota/netlink.c b/fs/quota/netlink.c
75468index bb2869f..d34ada8 100644
75469--- a/fs/quota/netlink.c
75470+++ b/fs/quota/netlink.c
75471@@ -44,7 +44,7 @@ static struct genl_family quota_genl_family = {
75472 void quota_send_warning(struct kqid qid, dev_t dev,
75473 const char warntype)
75474 {
75475- static atomic_t seq;
75476+ static atomic_unchecked_t seq;
75477 struct sk_buff *skb;
75478 void *msg_head;
75479 int ret;
75480@@ -60,7 +60,7 @@ void quota_send_warning(struct kqid qid, dev_t dev,
75481 "VFS: Not enough memory to send quota warning.\n");
75482 return;
75483 }
75484- msg_head = genlmsg_put(skb, 0, atomic_add_return(1, &seq),
75485+ msg_head = genlmsg_put(skb, 0, atomic_add_return_unchecked(1, &seq),
75486 &quota_genl_family, 0, QUOTA_NL_C_WARNING);
75487 if (!msg_head) {
75488 printk(KERN_ERR
75489diff --git a/fs/read_write.c b/fs/read_write.c
75490index 8e1b687..bad2eec 100644
75491--- a/fs/read_write.c
75492+++ b/fs/read_write.c
75493@@ -553,7 +553,7 @@ ssize_t __kernel_write(struct file *file, const char *buf, size_t count, loff_t
75494
75495 old_fs = get_fs();
75496 set_fs(get_ds());
75497- p = (__force const char __user *)buf;
75498+ p = (const char __force_user *)buf;
75499 if (count > MAX_RW_COUNT)
75500 count = MAX_RW_COUNT;
75501 if (file->f_op->write)
75502diff --git a/fs/readdir.c b/fs/readdir.c
75503index ced6791..936687b 100644
75504--- a/fs/readdir.c
75505+++ b/fs/readdir.c
75506@@ -18,6 +18,7 @@
75507 #include <linux/security.h>
75508 #include <linux/syscalls.h>
75509 #include <linux/unistd.h>
75510+#include <linux/namei.h>
75511
75512 #include <asm/uaccess.h>
75513
75514@@ -71,6 +72,7 @@ struct old_linux_dirent {
75515 struct readdir_callback {
75516 struct dir_context ctx;
75517 struct old_linux_dirent __user * dirent;
75518+ struct file * file;
75519 int result;
75520 };
75521
75522@@ -89,6 +91,10 @@ static int fillonedir(struct dir_context *ctx, const char *name, int namlen,
75523 buf->result = -EOVERFLOW;
75524 return -EOVERFLOW;
75525 }
75526+
75527+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
75528+ return 0;
75529+
75530 buf->result++;
75531 dirent = buf->dirent;
75532 if (!access_ok(VERIFY_WRITE, dirent,
75533@@ -120,6 +126,7 @@ SYSCALL_DEFINE3(old_readdir, unsigned int, fd,
75534 if (!f.file)
75535 return -EBADF;
75536
75537+ buf.file = f.file;
75538 error = iterate_dir(f.file, &buf.ctx);
75539 if (buf.result)
75540 error = buf.result;
75541@@ -145,6 +152,7 @@ struct getdents_callback {
75542 struct dir_context ctx;
75543 struct linux_dirent __user * current_dir;
75544 struct linux_dirent __user * previous;
75545+ struct file * file;
75546 int count;
75547 int error;
75548 };
75549@@ -167,6 +175,10 @@ static int filldir(struct dir_context *ctx, const char *name, int namlen,
75550 buf->error = -EOVERFLOW;
75551 return -EOVERFLOW;
75552 }
75553+
75554+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
75555+ return 0;
75556+
75557 dirent = buf->previous;
75558 if (dirent) {
75559 if (__put_user(offset, &dirent->d_off))
75560@@ -212,6 +224,7 @@ SYSCALL_DEFINE3(getdents, unsigned int, fd,
75561 if (!f.file)
75562 return -EBADF;
75563
75564+ buf.file = f.file;
75565 error = iterate_dir(f.file, &buf.ctx);
75566 if (error >= 0)
75567 error = buf.error;
75568@@ -230,6 +243,7 @@ struct getdents_callback64 {
75569 struct dir_context ctx;
75570 struct linux_dirent64 __user * current_dir;
75571 struct linux_dirent64 __user * previous;
75572+ struct file *file;
75573 int count;
75574 int error;
75575 };
75576@@ -246,6 +260,10 @@ static int filldir64(struct dir_context *ctx, const char *name, int namlen,
75577 buf->error = -EINVAL; /* only used if we fail.. */
75578 if (reclen > buf->count)
75579 return -EINVAL;
75580+
75581+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
75582+ return 0;
75583+
75584 dirent = buf->previous;
75585 if (dirent) {
75586 if (__put_user(offset, &dirent->d_off))
75587@@ -293,6 +311,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int, fd,
75588 if (!f.file)
75589 return -EBADF;
75590
75591+ buf.file = f.file;
75592 error = iterate_dir(f.file, &buf.ctx);
75593 if (error >= 0)
75594 error = buf.error;
75595diff --git a/fs/reiserfs/do_balan.c b/fs/reiserfs/do_balan.c
75596index 9c02d96..6562c10 100644
75597--- a/fs/reiserfs/do_balan.c
75598+++ b/fs/reiserfs/do_balan.c
75599@@ -1887,7 +1887,7 @@ void do_balance(struct tree_balance *tb, struct item_head *ih,
75600 return;
75601 }
75602
75603- atomic_inc(&fs_generation(tb->tb_sb));
75604+ atomic_inc_unchecked(&fs_generation(tb->tb_sb));
75605 do_balance_starts(tb);
75606
75607 /*
75608diff --git a/fs/reiserfs/item_ops.c b/fs/reiserfs/item_ops.c
75609index aca73dd..e3c558d 100644
75610--- a/fs/reiserfs/item_ops.c
75611+++ b/fs/reiserfs/item_ops.c
75612@@ -724,18 +724,18 @@ static void errcatch_print_vi(struct virtual_item *vi)
75613 }
75614
75615 static struct item_operations errcatch_ops = {
75616- errcatch_bytes_number,
75617- errcatch_decrement_key,
75618- errcatch_is_left_mergeable,
75619- errcatch_print_item,
75620- errcatch_check_item,
75621+ .bytes_number = errcatch_bytes_number,
75622+ .decrement_key = errcatch_decrement_key,
75623+ .is_left_mergeable = errcatch_is_left_mergeable,
75624+ .print_item = errcatch_print_item,
75625+ .check_item = errcatch_check_item,
75626
75627- errcatch_create_vi,
75628- errcatch_check_left,
75629- errcatch_check_right,
75630- errcatch_part_size,
75631- errcatch_unit_num,
75632- errcatch_print_vi
75633+ .create_vi = errcatch_create_vi,
75634+ .check_left = errcatch_check_left,
75635+ .check_right = errcatch_check_right,
75636+ .part_size = errcatch_part_size,
75637+ .unit_num = errcatch_unit_num,
75638+ .print_vi = errcatch_print_vi
75639 };
75640
75641 #if ! (TYPE_STAT_DATA == 0 && TYPE_INDIRECT == 1 && TYPE_DIRECT == 2 && TYPE_DIRENTRY == 3)
75642diff --git a/fs/reiserfs/procfs.c b/fs/reiserfs/procfs.c
75643index 621b9f3..af527fd 100644
75644--- a/fs/reiserfs/procfs.c
75645+++ b/fs/reiserfs/procfs.c
75646@@ -114,7 +114,7 @@ static int show_super(struct seq_file *m, void *unused)
75647 "SMALL_TAILS " : "NO_TAILS ",
75648 replay_only(sb) ? "REPLAY_ONLY " : "",
75649 convert_reiserfs(sb) ? "CONV " : "",
75650- atomic_read(&r->s_generation_counter),
75651+ atomic_read_unchecked(&r->s_generation_counter),
75652 SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes),
75653 SF(s_do_balance), SF(s_unneeded_left_neighbor),
75654 SF(s_good_search_by_key_reada), SF(s_bmaps),
75655diff --git a/fs/reiserfs/reiserfs.h b/fs/reiserfs/reiserfs.h
75656index bb79cdd..fcf49ef 100644
75657--- a/fs/reiserfs/reiserfs.h
75658+++ b/fs/reiserfs/reiserfs.h
75659@@ -580,7 +580,7 @@ struct reiserfs_sb_info {
75660 /* Comment? -Hans */
75661 wait_queue_head_t s_wait;
75662 /* increased by one every time the tree gets re-balanced */
75663- atomic_t s_generation_counter;
75664+ atomic_unchecked_t s_generation_counter;
75665
75666 /* File system properties. Currently holds on-disk FS format */
75667 unsigned long s_properties;
75668@@ -2301,7 +2301,7 @@ static inline loff_t max_reiserfs_offset(struct inode *inode)
75669 #define REISERFS_USER_MEM 1 /* user memory mode */
75670
75671 #define fs_generation(s) (REISERFS_SB(s)->s_generation_counter)
75672-#define get_generation(s) atomic_read (&fs_generation(s))
75673+#define get_generation(s) atomic_read_unchecked (&fs_generation(s))
75674 #define FILESYSTEM_CHANGED_TB(tb) (get_generation((tb)->tb_sb) != (tb)->fs_gen)
75675 #define __fs_changed(gen,s) (gen != get_generation (s))
75676 #define fs_changed(gen,s) \
75677diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
75678index 71fbbe3..eff29ba 100644
75679--- a/fs/reiserfs/super.c
75680+++ b/fs/reiserfs/super.c
75681@@ -1868,6 +1868,10 @@ static int reiserfs_fill_super(struct super_block *s, void *data, int silent)
75682 sbi->s_mount_opt |= (1 << REISERFS_SMALLTAIL);
75683 sbi->s_mount_opt |= (1 << REISERFS_ERROR_RO);
75684 sbi->s_mount_opt |= (1 << REISERFS_BARRIER_FLUSH);
75685+#ifdef CONFIG_REISERFS_FS_XATTR
75686+ /* turn on user xattrs by default */
75687+ sbi->s_mount_opt |= (1 << REISERFS_XATTRS_USER);
75688+#endif
75689 /* no preallocation minimum, be smart in reiserfs_file_write instead */
75690 sbi->s_alloc_options.preallocmin = 0;
75691 /* Preallocate by 16 blocks (17-1) at once */
75692diff --git a/fs/select.c b/fs/select.c
75693index f684c75..4117611 100644
75694--- a/fs/select.c
75695+++ b/fs/select.c
75696@@ -20,6 +20,7 @@
75697 #include <linux/export.h>
75698 #include <linux/slab.h>
75699 #include <linux/poll.h>
75700+#include <linux/security.h>
75701 #include <linux/personality.h> /* for STICKY_TIMEOUTS */
75702 #include <linux/file.h>
75703 #include <linux/fdtable.h>
75704@@ -880,6 +881,7 @@ int do_sys_poll(struct pollfd __user *ufds, unsigned int nfds,
75705 struct poll_list *walk = head;
75706 unsigned long todo = nfds;
75707
75708+ gr_learn_resource(current, RLIMIT_NOFILE, nfds, 1);
75709 if (nfds > rlimit(RLIMIT_NOFILE))
75710 return -EINVAL;
75711
75712diff --git a/fs/seq_file.c b/fs/seq_file.c
75713index 555f821..34684d7 100644
75714--- a/fs/seq_file.c
75715+++ b/fs/seq_file.c
75716@@ -12,6 +12,8 @@
75717 #include <linux/slab.h>
75718 #include <linux/cred.h>
75719 #include <linux/mm.h>
75720+#include <linux/sched.h>
75721+#include <linux/grsecurity.h>
75722
75723 #include <asm/uaccess.h>
75724 #include <asm/page.h>
75725@@ -23,16 +25,7 @@ static void seq_set_overflow(struct seq_file *m)
75726
75727 static void *seq_buf_alloc(unsigned long size)
75728 {
75729- void *buf;
75730-
75731- /*
75732- * __GFP_NORETRY to avoid oom-killings with high-order allocations -
75733- * it's better to fall back to vmalloc() than to kill things.
75734- */
75735- buf = kmalloc(size, GFP_KERNEL | __GFP_NORETRY | __GFP_NOWARN);
75736- if (!buf && size > PAGE_SIZE)
75737- buf = vmalloc(size);
75738- return buf;
75739+ return kmalloc(size, GFP_KERNEL | GFP_USERCOPY);
75740 }
75741
75742 /**
75743@@ -65,6 +58,9 @@ int seq_open(struct file *file, const struct seq_operations *op)
75744 #ifdef CONFIG_USER_NS
75745 p->user_ns = file->f_cred->user_ns;
75746 #endif
75747+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
75748+ p->exec_id = current->exec_id;
75749+#endif
75750
75751 /*
75752 * Wrappers around seq_open(e.g. swaps_open) need to be
75753@@ -87,6 +83,16 @@ int seq_open(struct file *file, const struct seq_operations *op)
75754 }
75755 EXPORT_SYMBOL(seq_open);
75756
75757+
75758+int seq_open_restrict(struct file *file, const struct seq_operations *op)
75759+{
75760+ if (gr_proc_is_restricted())
75761+ return -EACCES;
75762+
75763+ return seq_open(file, op);
75764+}
75765+EXPORT_SYMBOL(seq_open_restrict);
75766+
75767 static int traverse(struct seq_file *m, loff_t offset)
75768 {
75769 loff_t pos = 0, index;
75770@@ -158,7 +164,7 @@ Eoverflow:
75771 ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
75772 {
75773 struct seq_file *m = file->private_data;
75774- size_t copied = 0;
75775+ ssize_t copied = 0;
75776 loff_t pos;
75777 size_t n;
75778 void *p;
75779@@ -557,7 +563,7 @@ static void single_stop(struct seq_file *p, void *v)
75780 int single_open(struct file *file, int (*show)(struct seq_file *, void *),
75781 void *data)
75782 {
75783- struct seq_operations *op = kmalloc(sizeof(*op), GFP_KERNEL);
75784+ seq_operations_no_const *op = kzalloc(sizeof(*op), GFP_KERNEL);
75785 int res = -ENOMEM;
75786
75787 if (op) {
75788@@ -593,6 +599,17 @@ int single_open_size(struct file *file, int (*show)(struct seq_file *, void *),
75789 }
75790 EXPORT_SYMBOL(single_open_size);
75791
75792+int single_open_restrict(struct file *file, int (*show)(struct seq_file *, void *),
75793+ void *data)
75794+{
75795+ if (gr_proc_is_restricted())
75796+ return -EACCES;
75797+
75798+ return single_open(file, show, data);
75799+}
75800+EXPORT_SYMBOL(single_open_restrict);
75801+
75802+
75803 int single_release(struct inode *inode, struct file *file)
75804 {
75805 const struct seq_operations *op = ((struct seq_file *)file->private_data)->op;
75806diff --git a/fs/splice.c b/fs/splice.c
75807index 7968da9..4ce985b 100644
75808--- a/fs/splice.c
75809+++ b/fs/splice.c
75810@@ -193,7 +193,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
75811 pipe_lock(pipe);
75812
75813 for (;;) {
75814- if (!pipe->readers) {
75815+ if (!atomic_read(&pipe->readers)) {
75816 send_sig(SIGPIPE, current, 0);
75817 if (!ret)
75818 ret = -EPIPE;
75819@@ -216,7 +216,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
75820 page_nr++;
75821 ret += buf->len;
75822
75823- if (pipe->files)
75824+ if (atomic_read(&pipe->files))
75825 do_wakeup = 1;
75826
75827 if (!--spd->nr_pages)
75828@@ -247,9 +247,9 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
75829 do_wakeup = 0;
75830 }
75831
75832- pipe->waiting_writers++;
75833+ atomic_inc(&pipe->waiting_writers);
75834 pipe_wait(pipe);
75835- pipe->waiting_writers--;
75836+ atomic_dec(&pipe->waiting_writers);
75837 }
75838
75839 pipe_unlock(pipe);
75840@@ -576,7 +576,7 @@ static ssize_t kernel_readv(struct file *file, const struct iovec *vec,
75841 old_fs = get_fs();
75842 set_fs(get_ds());
75843 /* The cast to a user pointer is valid due to the set_fs() */
75844- res = vfs_readv(file, (const struct iovec __user *)vec, vlen, &pos);
75845+ res = vfs_readv(file, (const struct iovec __force_user *)vec, vlen, &pos);
75846 set_fs(old_fs);
75847
75848 return res;
75849@@ -591,7 +591,7 @@ ssize_t kernel_write(struct file *file, const char *buf, size_t count,
75850 old_fs = get_fs();
75851 set_fs(get_ds());
75852 /* The cast to a user pointer is valid due to the set_fs() */
75853- res = vfs_write(file, (__force const char __user *)buf, count, &pos);
75854+ res = vfs_write(file, (const char __force_user *)buf, count, &pos);
75855 set_fs(old_fs);
75856
75857 return res;
75858@@ -644,7 +644,7 @@ ssize_t default_file_splice_read(struct file *in, loff_t *ppos,
75859 goto err;
75860
75861 this_len = min_t(size_t, len, PAGE_CACHE_SIZE - offset);
75862- vec[i].iov_base = (void __user *) page_address(page);
75863+ vec[i].iov_base = (void __force_user *) page_address(page);
75864 vec[i].iov_len = this_len;
75865 spd.pages[i] = page;
75866 spd.nr_pages++;
75867@@ -783,7 +783,7 @@ static int splice_from_pipe_feed(struct pipe_inode_info *pipe, struct splice_des
75868 ops->release(pipe, buf);
75869 pipe->curbuf = (pipe->curbuf + 1) & (pipe->buffers - 1);
75870 pipe->nrbufs--;
75871- if (pipe->files)
75872+ if (atomic_read(&pipe->files))
75873 sd->need_wakeup = true;
75874 }
75875
75876@@ -807,10 +807,10 @@ static int splice_from_pipe_feed(struct pipe_inode_info *pipe, struct splice_des
75877 static int splice_from_pipe_next(struct pipe_inode_info *pipe, struct splice_desc *sd)
75878 {
75879 while (!pipe->nrbufs) {
75880- if (!pipe->writers)
75881+ if (!atomic_read(&pipe->writers))
75882 return 0;
75883
75884- if (!pipe->waiting_writers && sd->num_spliced)
75885+ if (!atomic_read(&pipe->waiting_writers) && sd->num_spliced)
75886 return 0;
75887
75888 if (sd->flags & SPLICE_F_NONBLOCK)
75889@@ -1025,7 +1025,7 @@ iter_file_splice_write(struct pipe_inode_info *pipe, struct file *out,
75890 ops->release(pipe, buf);
75891 pipe->curbuf = (pipe->curbuf + 1) & (pipe->buffers - 1);
75892 pipe->nrbufs--;
75893- if (pipe->files)
75894+ if (atomic_read(&pipe->files))
75895 sd.need_wakeup = true;
75896 } else {
75897 buf->offset += ret;
75898@@ -1159,7 +1159,7 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
75899 long ret, bytes;
75900 umode_t i_mode;
75901 size_t len;
75902- int i, flags;
75903+ int i, flags, more;
75904
75905 /*
75906 * We require the input being a regular file, as we don't want to
75907@@ -1185,7 +1185,7 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
75908 * out of the pipe right after the splice_to_pipe(). So set
75909 * PIPE_READERS appropriately.
75910 */
75911- pipe->readers = 1;
75912+ atomic_set(&pipe->readers, 1);
75913
75914 current->splice_pipe = pipe;
75915 }
75916@@ -1202,6 +1202,7 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
75917 * Don't block on output, we have to drain the direct pipe.
75918 */
75919 sd->flags &= ~SPLICE_F_NONBLOCK;
75920+ more = sd->flags & SPLICE_F_MORE;
75921
75922 while (len) {
75923 size_t read_len;
75924@@ -1215,6 +1216,15 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
75925 sd->total_len = read_len;
75926
75927 /*
75928+ * If more data is pending, set SPLICE_F_MORE
75929+ * If this is the last data and SPLICE_F_MORE was not set
75930+ * initially, clears it.
75931+ */
75932+ if (read_len < len)
75933+ sd->flags |= SPLICE_F_MORE;
75934+ else if (!more)
75935+ sd->flags &= ~SPLICE_F_MORE;
75936+ /*
75937 * NOTE: nonblocking mode only applies to the input. We
75938 * must not do the output in nonblocking mode as then we
75939 * could get stuck data in the internal pipe:
75940@@ -1482,6 +1492,7 @@ static int get_iovec_page_array(const struct iovec __user *iov,
75941
75942 partial[buffers].offset = off;
75943 partial[buffers].len = plen;
75944+ partial[buffers].private = 0;
75945
75946 off = 0;
75947 len -= plen;
75948@@ -1718,9 +1729,9 @@ static int ipipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
75949 ret = -ERESTARTSYS;
75950 break;
75951 }
75952- if (!pipe->writers)
75953+ if (!atomic_read(&pipe->writers))
75954 break;
75955- if (!pipe->waiting_writers) {
75956+ if (!atomic_read(&pipe->waiting_writers)) {
75957 if (flags & SPLICE_F_NONBLOCK) {
75958 ret = -EAGAIN;
75959 break;
75960@@ -1752,7 +1763,7 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
75961 pipe_lock(pipe);
75962
75963 while (pipe->nrbufs >= pipe->buffers) {
75964- if (!pipe->readers) {
75965+ if (!atomic_read(&pipe->readers)) {
75966 send_sig(SIGPIPE, current, 0);
75967 ret = -EPIPE;
75968 break;
75969@@ -1765,9 +1776,9 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
75970 ret = -ERESTARTSYS;
75971 break;
75972 }
75973- pipe->waiting_writers++;
75974+ atomic_inc(&pipe->waiting_writers);
75975 pipe_wait(pipe);
75976- pipe->waiting_writers--;
75977+ atomic_dec(&pipe->waiting_writers);
75978 }
75979
75980 pipe_unlock(pipe);
75981@@ -1803,14 +1814,14 @@ retry:
75982 pipe_double_lock(ipipe, opipe);
75983
75984 do {
75985- if (!opipe->readers) {
75986+ if (!atomic_read(&opipe->readers)) {
75987 send_sig(SIGPIPE, current, 0);
75988 if (!ret)
75989 ret = -EPIPE;
75990 break;
75991 }
75992
75993- if (!ipipe->nrbufs && !ipipe->writers)
75994+ if (!ipipe->nrbufs && !atomic_read(&ipipe->writers))
75995 break;
75996
75997 /*
75998@@ -1907,7 +1918,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
75999 pipe_double_lock(ipipe, opipe);
76000
76001 do {
76002- if (!opipe->readers) {
76003+ if (!atomic_read(&opipe->readers)) {
76004 send_sig(SIGPIPE, current, 0);
76005 if (!ret)
76006 ret = -EPIPE;
76007@@ -1952,7 +1963,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
76008 * return EAGAIN if we have the potential of some data in the
76009 * future, otherwise just return 0
76010 */
76011- if (!ret && ipipe->waiting_writers && (flags & SPLICE_F_NONBLOCK))
76012+ if (!ret && atomic_read(&ipipe->waiting_writers) && (flags & SPLICE_F_NONBLOCK))
76013 ret = -EAGAIN;
76014
76015 pipe_unlock(ipipe);
76016diff --git a/fs/squashfs/xattr.c b/fs/squashfs/xattr.c
76017index 92fcde7..1687329 100644
76018--- a/fs/squashfs/xattr.c
76019+++ b/fs/squashfs/xattr.c
76020@@ -46,8 +46,8 @@ ssize_t squashfs_listxattr(struct dentry *d, char *buffer,
76021 + msblk->xattr_table;
76022 int offset = SQUASHFS_XATTR_OFFSET(squashfs_i(inode)->xattr);
76023 int count = squashfs_i(inode)->xattr_count;
76024- size_t rest = buffer_size;
76025- int err;
76026+ size_t used = 0;
76027+ ssize_t err;
76028
76029 /* check that the file system has xattrs */
76030 if (msblk->xattr_id_table == NULL)
76031@@ -68,11 +68,11 @@ ssize_t squashfs_listxattr(struct dentry *d, char *buffer,
76032 name_size = le16_to_cpu(entry.size);
76033 handler = squashfs_xattr_handler(le16_to_cpu(entry.type));
76034 if (handler)
76035- prefix_size = handler->list(d, buffer, rest, NULL,
76036+ prefix_size = handler->list(d, buffer, buffer ? buffer_size - used : 0, NULL,
76037 name_size, handler->flags);
76038 if (prefix_size) {
76039 if (buffer) {
76040- if (prefix_size + name_size + 1 > rest) {
76041+ if (prefix_size + name_size + 1 > buffer_size - used) {
76042 err = -ERANGE;
76043 goto failed;
76044 }
76045@@ -86,7 +86,7 @@ ssize_t squashfs_listxattr(struct dentry *d, char *buffer,
76046 buffer[name_size] = '\0';
76047 buffer += name_size + 1;
76048 }
76049- rest -= prefix_size + name_size + 1;
76050+ used += prefix_size + name_size + 1;
76051 } else {
76052 /* no handler or insuffficient privileges, so skip */
76053 err = squashfs_read_metadata(sb, NULL, &start,
76054@@ -107,7 +107,7 @@ ssize_t squashfs_listxattr(struct dentry *d, char *buffer,
76055 if (err < 0)
76056 goto failed;
76057 }
76058- err = buffer_size - rest;
76059+ err = used;
76060
76061 failed:
76062 return err;
76063diff --git a/fs/stat.c b/fs/stat.c
76064index ae0c3ce..9ee641c 100644
76065--- a/fs/stat.c
76066+++ b/fs/stat.c
76067@@ -28,8 +28,13 @@ void generic_fillattr(struct inode *inode, struct kstat *stat)
76068 stat->gid = inode->i_gid;
76069 stat->rdev = inode->i_rdev;
76070 stat->size = i_size_read(inode);
76071- stat->atime = inode->i_atime;
76072- stat->mtime = inode->i_mtime;
76073+ if (is_sidechannel_device(inode) && !capable_nolog(CAP_MKNOD)) {
76074+ stat->atime = inode->i_ctime;
76075+ stat->mtime = inode->i_ctime;
76076+ } else {
76077+ stat->atime = inode->i_atime;
76078+ stat->mtime = inode->i_mtime;
76079+ }
76080 stat->ctime = inode->i_ctime;
76081 stat->blksize = (1 << inode->i_blkbits);
76082 stat->blocks = inode->i_blocks;
76083@@ -52,9 +57,16 @@ EXPORT_SYMBOL(generic_fillattr);
76084 int vfs_getattr_nosec(struct path *path, struct kstat *stat)
76085 {
76086 struct inode *inode = path->dentry->d_inode;
76087+ int retval;
76088
76089- if (inode->i_op->getattr)
76090- return inode->i_op->getattr(path->mnt, path->dentry, stat);
76091+ if (inode->i_op->getattr) {
76092+ retval = inode->i_op->getattr(path->mnt, path->dentry, stat);
76093+ if (!retval && is_sidechannel_device(inode) && !capable_nolog(CAP_MKNOD)) {
76094+ stat->atime = stat->ctime;
76095+ stat->mtime = stat->ctime;
76096+ }
76097+ return retval;
76098+ }
76099
76100 generic_fillattr(inode, stat);
76101 return 0;
76102diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
76103index 0b45ff4..edf9d3a 100644
76104--- a/fs/sysfs/dir.c
76105+++ b/fs/sysfs/dir.c
76106@@ -33,6 +33,10 @@ void sysfs_warn_dup(struct kernfs_node *parent, const char *name)
76107 kfree(buf);
76108 }
76109
76110+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
76111+extern int grsec_enable_sysfs_restrict;
76112+#endif
76113+
76114 /**
76115 * sysfs_create_dir_ns - create a directory for an object with a namespace tag
76116 * @kobj: object we're creating directory for
76117@@ -41,9 +45,16 @@ void sysfs_warn_dup(struct kernfs_node *parent, const char *name)
76118 int sysfs_create_dir_ns(struct kobject *kobj, const void *ns)
76119 {
76120 struct kernfs_node *parent, *kn;
76121+ const char *name;
76122+ umode_t mode = S_IRWXU | S_IRUGO | S_IXUGO;
76123+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
76124+ const char *parent_name;
76125+#endif
76126
76127 BUG_ON(!kobj);
76128
76129+ name = kobject_name(kobj);
76130+
76131 if (kobj->parent)
76132 parent = kobj->parent->sd;
76133 else
76134@@ -52,11 +63,24 @@ int sysfs_create_dir_ns(struct kobject *kobj, const void *ns)
76135 if (!parent)
76136 return -ENOENT;
76137
76138- kn = kernfs_create_dir_ns(parent, kobject_name(kobj),
76139- S_IRWXU | S_IRUGO | S_IXUGO, kobj, ns);
76140+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
76141+ parent_name = parent->name;
76142+ mode = S_IRWXU;
76143+
76144+ if ((!strcmp(parent_name, "") && (!strcmp(name, "devices") || !strcmp(name, "fs"))) ||
76145+ (!strcmp(parent_name, "devices") && !strcmp(name, "system")) ||
76146+ (!strcmp(parent_name, "fs") && (!strcmp(name, "selinux") || !strcmp(name, "fuse") || !strcmp(name, "ecryptfs"))) ||
76147+ (!strcmp(parent_name, "system") && !strcmp(name, "cpu")))
76148+ mode = S_IRWXU | S_IRUGO | S_IXUGO;
76149+ if (!grsec_enable_sysfs_restrict)
76150+ mode = S_IRWXU | S_IRUGO | S_IXUGO;
76151+#endif
76152+
76153+ kn = kernfs_create_dir_ns(parent, name,
76154+ mode, kobj, ns);
76155 if (IS_ERR(kn)) {
76156 if (PTR_ERR(kn) == -EEXIST)
76157- sysfs_warn_dup(parent, kobject_name(kobj));
76158+ sysfs_warn_dup(parent, name);
76159 return PTR_ERR(kn);
76160 }
76161
76162diff --git a/fs/sysv/sysv.h b/fs/sysv/sysv.h
76163index 69d4889..a810bd4 100644
76164--- a/fs/sysv/sysv.h
76165+++ b/fs/sysv/sysv.h
76166@@ -188,7 +188,7 @@ static inline u32 PDP_swab(u32 x)
76167 #endif
76168 }
76169
76170-static inline __u32 fs32_to_cpu(struct sysv_sb_info *sbi, __fs32 n)
76171+static inline __u32 __intentional_overflow(-1) fs32_to_cpu(struct sysv_sb_info *sbi, __fs32 n)
76172 {
76173 if (sbi->s_bytesex == BYTESEX_PDP)
76174 return PDP_swab((__force __u32)n);
76175diff --git a/fs/ubifs/io.c b/fs/ubifs/io.c
76176index fb08b0c..65fcc7e 100644
76177--- a/fs/ubifs/io.c
76178+++ b/fs/ubifs/io.c
76179@@ -155,7 +155,7 @@ int ubifs_leb_change(struct ubifs_info *c, int lnum, const void *buf, int len)
76180 return err;
76181 }
76182
76183-int ubifs_leb_unmap(struct ubifs_info *c, int lnum)
76184+int __intentional_overflow(-1) ubifs_leb_unmap(struct ubifs_info *c, int lnum)
76185 {
76186 int err;
76187
76188diff --git a/fs/udf/misc.c b/fs/udf/misc.c
76189index c175b4d..8f36a16 100644
76190--- a/fs/udf/misc.c
76191+++ b/fs/udf/misc.c
76192@@ -289,7 +289,7 @@ void udf_new_tag(char *data, uint16_t ident, uint16_t version, uint16_t snum,
76193
76194 u8 udf_tag_checksum(const struct tag *t)
76195 {
76196- u8 *data = (u8 *)t;
76197+ const u8 *data = (const u8 *)t;
76198 u8 checksum = 0;
76199 int i;
76200 for (i = 0; i < sizeof(struct tag); ++i)
76201diff --git a/fs/ufs/swab.h b/fs/ufs/swab.h
76202index 8d974c4..b82f6ec 100644
76203--- a/fs/ufs/swab.h
76204+++ b/fs/ufs/swab.h
76205@@ -22,7 +22,7 @@ enum {
76206 BYTESEX_BE
76207 };
76208
76209-static inline u64
76210+static inline u64 __intentional_overflow(-1)
76211 fs64_to_cpu(struct super_block *sbp, __fs64 n)
76212 {
76213 if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
76214@@ -40,7 +40,7 @@ cpu_to_fs64(struct super_block *sbp, u64 n)
76215 return (__force __fs64)cpu_to_be64(n);
76216 }
76217
76218-static inline u32
76219+static inline u32 __intentional_overflow(-1)
76220 fs32_to_cpu(struct super_block *sbp, __fs32 n)
76221 {
76222 if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
76223diff --git a/fs/utimes.c b/fs/utimes.c
76224index aa138d6..5f3a811 100644
76225--- a/fs/utimes.c
76226+++ b/fs/utimes.c
76227@@ -1,6 +1,7 @@
76228 #include <linux/compiler.h>
76229 #include <linux/file.h>
76230 #include <linux/fs.h>
76231+#include <linux/security.h>
76232 #include <linux/linkage.h>
76233 #include <linux/mount.h>
76234 #include <linux/namei.h>
76235@@ -103,6 +104,12 @@ static int utimes_common(struct path *path, struct timespec *times)
76236 }
76237 }
76238 retry_deleg:
76239+
76240+ if (!gr_acl_handle_utime(path->dentry, path->mnt)) {
76241+ error = -EACCES;
76242+ goto mnt_drop_write_and_out;
76243+ }
76244+
76245 mutex_lock(&inode->i_mutex);
76246 error = notify_change(path->dentry, &newattrs, &delegated_inode);
76247 mutex_unlock(&inode->i_mutex);
76248diff --git a/fs/xattr.c b/fs/xattr.c
76249index 4ef6985..a6cd6567 100644
76250--- a/fs/xattr.c
76251+++ b/fs/xattr.c
76252@@ -227,6 +227,27 @@ int vfs_xattr_cmp(struct dentry *dentry, const char *xattr_name,
76253 return rc;
76254 }
76255
76256+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
76257+ssize_t
76258+pax_getxattr(struct dentry *dentry, void *value, size_t size)
76259+{
76260+ struct inode *inode = dentry->d_inode;
76261+ ssize_t error;
76262+
76263+ error = inode_permission(inode, MAY_EXEC);
76264+ if (error)
76265+ return error;
76266+
76267+ if (inode->i_op->getxattr)
76268+ error = inode->i_op->getxattr(dentry, XATTR_NAME_PAX_FLAGS, value, size);
76269+ else
76270+ error = -EOPNOTSUPP;
76271+
76272+ return error;
76273+}
76274+EXPORT_SYMBOL(pax_getxattr);
76275+#endif
76276+
76277 ssize_t
76278 vfs_getxattr(struct dentry *dentry, const char *name, void *value, size_t size)
76279 {
76280@@ -319,7 +340,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
76281 * Extended attribute SET operations
76282 */
76283 static long
76284-setxattr(struct dentry *d, const char __user *name, const void __user *value,
76285+setxattr(struct path *path, const char __user *name, const void __user *value,
76286 size_t size, int flags)
76287 {
76288 int error;
76289@@ -355,7 +376,12 @@ setxattr(struct dentry *d, const char __user *name, const void __user *value,
76290 posix_acl_fix_xattr_from_user(kvalue, size);
76291 }
76292
76293- error = vfs_setxattr(d, kname, kvalue, size, flags);
76294+ if (!gr_acl_handle_setxattr(path->dentry, path->mnt)) {
76295+ error = -EACCES;
76296+ goto out;
76297+ }
76298+
76299+ error = vfs_setxattr(path->dentry, kname, kvalue, size, flags);
76300 out:
76301 if (vvalue)
76302 vfree(vvalue);
76303@@ -376,7 +402,7 @@ retry:
76304 return error;
76305 error = mnt_want_write(path.mnt);
76306 if (!error) {
76307- error = setxattr(path.dentry, name, value, size, flags);
76308+ error = setxattr(&path, name, value, size, flags);
76309 mnt_drop_write(path.mnt);
76310 }
76311 path_put(&path);
76312@@ -412,7 +438,7 @@ SYSCALL_DEFINE5(fsetxattr, int, fd, const char __user *, name,
76313 audit_file(f.file);
76314 error = mnt_want_write_file(f.file);
76315 if (!error) {
76316- error = setxattr(f.file->f_path.dentry, name, value, size, flags);
76317+ error = setxattr(&f.file->f_path, name, value, size, flags);
76318 mnt_drop_write_file(f.file);
76319 }
76320 fdput(f);
76321@@ -598,7 +624,7 @@ SYSCALL_DEFINE3(flistxattr, int, fd, char __user *, list, size_t, size)
76322 * Extended attribute REMOVE operations
76323 */
76324 static long
76325-removexattr(struct dentry *d, const char __user *name)
76326+removexattr(struct path *path, const char __user *name)
76327 {
76328 int error;
76329 char kname[XATTR_NAME_MAX + 1];
76330@@ -609,7 +635,10 @@ removexattr(struct dentry *d, const char __user *name)
76331 if (error < 0)
76332 return error;
76333
76334- return vfs_removexattr(d, kname);
76335+ if (!gr_acl_handle_removexattr(path->dentry, path->mnt))
76336+ return -EACCES;
76337+
76338+ return vfs_removexattr(path->dentry, kname);
76339 }
76340
76341 static int path_removexattr(const char __user *pathname,
76342@@ -623,7 +652,7 @@ retry:
76343 return error;
76344 error = mnt_want_write(path.mnt);
76345 if (!error) {
76346- error = removexattr(path.dentry, name);
76347+ error = removexattr(&path, name);
76348 mnt_drop_write(path.mnt);
76349 }
76350 path_put(&path);
76351@@ -649,14 +678,16 @@ SYSCALL_DEFINE2(lremovexattr, const char __user *, pathname,
76352 SYSCALL_DEFINE2(fremovexattr, int, fd, const char __user *, name)
76353 {
76354 struct fd f = fdget(fd);
76355+ struct path *path;
76356 int error = -EBADF;
76357
76358 if (!f.file)
76359 return error;
76360+ path = &f.file->f_path;
76361 audit_file(f.file);
76362 error = mnt_want_write_file(f.file);
76363 if (!error) {
76364- error = removexattr(f.file->f_path.dentry, name);
76365+ error = removexattr(path, name);
76366 mnt_drop_write_file(f.file);
76367 }
76368 fdput(f);
76369diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
76370index 61ec015..7c18807 100644
76371--- a/fs/xfs/libxfs/xfs_bmap.c
76372+++ b/fs/xfs/libxfs/xfs_bmap.c
76373@@ -580,7 +580,7 @@ xfs_bmap_validate_ret(
76374
76375 #else
76376 #define xfs_bmap_check_leaf_extents(cur, ip, whichfork) do { } while (0)
76377-#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap)
76378+#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap) do { } while (0)
76379 #endif /* DEBUG */
76380
76381 /*
76382diff --git a/fs/xfs/xfs_dir2_readdir.c b/fs/xfs/xfs_dir2_readdir.c
76383index 098cd78..724d3f8 100644
76384--- a/fs/xfs/xfs_dir2_readdir.c
76385+++ b/fs/xfs/xfs_dir2_readdir.c
76386@@ -140,7 +140,12 @@ xfs_dir2_sf_getdents(
76387 ino = dp->d_ops->sf_get_ino(sfp, sfep);
76388 filetype = dp->d_ops->sf_get_ftype(sfep);
76389 ctx->pos = off & 0x7fffffff;
76390- if (!dir_emit(ctx, (char *)sfep->name, sfep->namelen, ino,
76391+ if (dp->i_df.if_u1.if_data == dp->i_df.if_u2.if_inline_data) {
76392+ char name[sfep->namelen];
76393+ memcpy(name, sfep->name, sfep->namelen);
76394+ if (!dir_emit(ctx, name, sfep->namelen, ino, xfs_dir3_get_dtype(dp->i_mount, filetype)))
76395+ return 0;
76396+ } else if (!dir_emit(ctx, (char *)sfep->name, sfep->namelen, ino,
76397 xfs_dir3_get_dtype(dp->i_mount, filetype)))
76398 return 0;
76399 sfep = dp->d_ops->sf_nextentry(sfp, sfep);
76400diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
76401index ac4feae..386d551 100644
76402--- a/fs/xfs/xfs_ioctl.c
76403+++ b/fs/xfs/xfs_ioctl.c
76404@@ -120,7 +120,7 @@ xfs_find_handle(
76405 }
76406
76407 error = -EFAULT;
76408- if (copy_to_user(hreq->ohandle, &handle, hsize) ||
76409+ if (hsize > sizeof handle || copy_to_user(hreq->ohandle, &handle, hsize) ||
76410 copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32)))
76411 goto out_put;
76412
76413diff --git a/fs/xfs/xfs_linux.h b/fs/xfs/xfs_linux.h
76414index c31d2c2..6ec8f62 100644
76415--- a/fs/xfs/xfs_linux.h
76416+++ b/fs/xfs/xfs_linux.h
76417@@ -234,7 +234,7 @@ static inline kgid_t xfs_gid_to_kgid(__uint32_t gid)
76418 * of the compiler which do not like us using do_div in the middle
76419 * of large functions.
76420 */
76421-static inline __u32 xfs_do_div(void *a, __u32 b, int n)
76422+static inline __u32 __intentional_overflow(-1) xfs_do_div(void *a, __u32 b, int n)
76423 {
76424 __u32 mod;
76425
76426@@ -290,7 +290,7 @@ static inline __u32 xfs_do_mod(void *a, __u32 b, int n)
76427 return 0;
76428 }
76429 #else
76430-static inline __u32 xfs_do_div(void *a, __u32 b, int n)
76431+static inline __u32 __intentional_overflow(-1) xfs_do_div(void *a, __u32 b, int n)
76432 {
76433 __u32 mod;
76434
76435diff --git a/grsecurity/Kconfig b/grsecurity/Kconfig
76436new file mode 100644
76437index 0000000..31f8fe4
76438--- /dev/null
76439+++ b/grsecurity/Kconfig
76440@@ -0,0 +1,1182 @@
76441+#
76442+# grecurity configuration
76443+#
76444+menu "Memory Protections"
76445+depends on GRKERNSEC
76446+
76447+config GRKERNSEC_KMEM
76448+ bool "Deny reading/writing to /dev/kmem, /dev/mem, and /dev/port"
76449+ default y if GRKERNSEC_CONFIG_AUTO
76450+ select STRICT_DEVMEM if (X86 || ARM || TILE || S390)
76451+ help
76452+ If you say Y here, /dev/kmem and /dev/mem won't be allowed to
76453+ be written to or read from to modify or leak the contents of the running
76454+ kernel. /dev/port will also not be allowed to be opened, writing to
76455+ /dev/cpu/*/msr will be prevented, and support for kexec will be removed.
76456+ If you have module support disabled, enabling this will close up several
76457+ ways that are currently used to insert malicious code into the running
76458+ kernel.
76459+
76460+ Even with this feature enabled, we still highly recommend that
76461+ you use the RBAC system, as it is still possible for an attacker to
76462+ modify the running kernel through other more obscure methods.
76463+
76464+ It is highly recommended that you say Y here if you meet all the
76465+ conditions above.
76466+
76467+config GRKERNSEC_VM86
76468+ bool "Restrict VM86 mode"
76469+ default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
76470+ depends on X86_32
76471+
76472+ help
76473+ If you say Y here, only processes with CAP_SYS_RAWIO will be able to
76474+ make use of a special execution mode on 32bit x86 processors called
76475+ Virtual 8086 (VM86) mode. XFree86 may need vm86 mode for certain
76476+ video cards and will still work with this option enabled. The purpose
76477+ of the option is to prevent exploitation of emulation errors in
76478+ virtualization of vm86 mode like the one discovered in VMWare in 2009.
76479+ Nearly all users should be able to enable this option.
76480+
76481+config GRKERNSEC_IO
76482+ bool "Disable privileged I/O"
76483+ default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
76484+ depends on X86
76485+ select RTC_CLASS
76486+ select RTC_INTF_DEV
76487+ select RTC_DRV_CMOS
76488+
76489+ help
76490+ If you say Y here, all ioperm and iopl calls will return an error.
76491+ Ioperm and iopl can be used to modify the running kernel.
76492+ Unfortunately, some programs need this access to operate properly,
76493+ the most notable of which are XFree86 and hwclock. hwclock can be
76494+ remedied by having RTC support in the kernel, so real-time
76495+ clock support is enabled if this option is enabled, to ensure
76496+ that hwclock operates correctly. If hwclock still does not work,
76497+ either update udev or symlink /dev/rtc to /dev/rtc0.
76498+
76499+ If you're using XFree86 or a version of Xorg from 2012 or earlier,
76500+ you may not be able to boot into a graphical environment with this
76501+ option enabled. In this case, you should use the RBAC system instead.
76502+
76503+config GRKERNSEC_BPF_HARDEN
76504+ bool "Harden BPF interpreter"
76505+ default y if GRKERNSEC_CONFIG_AUTO
76506+ help
76507+ Unlike previous versions of grsecurity that hardened both the BPF
76508+ interpreted code against corruption at rest as well as the JIT code
76509+ against JIT-spray attacks and attacker-controlled immediate values
76510+ for ROP, this feature will enforce disabling of the new eBPF JIT engine
76511+ and will ensure the interpreted code is read-only at rest. This feature
76512+ may be removed at a later time when eBPF stabilizes to entirely revert
76513+ back to the more secure pre-3.16 BPF interpreter/JIT.
76514+
76515+ If you're using KERNEXEC, it's recommended that you enable this option
76516+ to supplement the hardening of the kernel.
76517+
76518+config GRKERNSEC_PERF_HARDEN
76519+ bool "Disable unprivileged PERF_EVENTS usage by default"
76520+ default y if GRKERNSEC_CONFIG_AUTO
76521+ depends on PERF_EVENTS
76522+ help
76523+ If you say Y here, the range of acceptable values for the
76524+ /proc/sys/kernel/perf_event_paranoid sysctl will be expanded to allow and
76525+ default to a new value: 3. When the sysctl is set to this value, no
76526+ unprivileged use of the PERF_EVENTS syscall interface will be permitted.
76527+
76528+ Though PERF_EVENTS can be used legitimately for performance monitoring
76529+ and low-level application profiling, it is forced on regardless of
76530+ configuration, has been at fault for several vulnerabilities, and
76531+ creates new opportunities for side channels and other information leaks.
76532+
76533+ This feature puts PERF_EVENTS into a secure default state and permits
76534+ the administrator to change out of it temporarily if unprivileged
76535+ application profiling is needed.
76536+
76537+config GRKERNSEC_RAND_THREADSTACK
76538+ bool "Insert random gaps between thread stacks"
76539+ default y if GRKERNSEC_CONFIG_AUTO
76540+ depends on PAX_RANDMMAP && !PPC
76541+ help
76542+ If you say Y here, a random-sized gap will be enforced between allocated
76543+ thread stacks. Glibc's NPTL and other threading libraries that
76544+ pass MAP_STACK to the kernel for thread stack allocation are supported.
76545+ The implementation currently provides 8 bits of entropy for the gap.
76546+
76547+ Many distributions do not compile threaded remote services with the
76548+ -fstack-check argument to GCC, causing the variable-sized stack-based
76549+ allocator, alloca(), to not probe the stack on allocation. This
76550+ permits an unbounded alloca() to skip over any guard page and potentially
76551+ modify another thread's stack reliably. An enforced random gap
76552+ reduces the reliability of such an attack and increases the chance
76553+ that such a read/write to another thread's stack instead lands in
76554+ an unmapped area, causing a crash and triggering grsecurity's
76555+ anti-bruteforcing logic.
76556+
76557+config GRKERNSEC_PROC_MEMMAP
76558+ bool "Harden ASLR against information leaks and entropy reduction"
76559+ default y if (GRKERNSEC_CONFIG_AUTO || PAX_NOEXEC || PAX_ASLR)
76560+ depends on PAX_NOEXEC || PAX_ASLR
76561+ help
76562+ If you say Y here, the /proc/<pid>/maps and /proc/<pid>/stat files will
76563+ give no information about the addresses of its mappings if
76564+ PaX features that rely on random addresses are enabled on the task.
76565+ In addition to sanitizing this information and disabling other
76566+ dangerous sources of information, this option causes reads of sensitive
76567+ /proc/<pid> entries where the file descriptor was opened in a different
76568+ task than the one performing the read. Such attempts are logged.
76569+ This option also limits argv/env strings for suid/sgid binaries
76570+ to 512KB to prevent a complete exhaustion of the stack entropy provided
76571+ by ASLR. Finally, it places an 8MB stack resource limit on suid/sgid
76572+ binaries to prevent alternative mmap layouts from being abused.
76573+
76574+ If you use PaX it is essential that you say Y here as it closes up
76575+ several holes that make full ASLR useless locally.
76576+
76577+
76578+config GRKERNSEC_KSTACKOVERFLOW
76579+ bool "Prevent kernel stack overflows"
76580+ default y if GRKERNSEC_CONFIG_AUTO
76581+ depends on !IA64 && 64BIT
76582+ help
76583+ If you say Y here, the kernel's process stacks will be allocated
76584+ with vmalloc instead of the kernel's default allocator. This
76585+ introduces guard pages that in combination with the alloca checking
76586+ of the STACKLEAK feature prevents all forms of kernel process stack
76587+ overflow abuse. Note that this is different from kernel stack
76588+ buffer overflows.
76589+
76590+config GRKERNSEC_BRUTE
76591+ bool "Deter exploit bruteforcing"
76592+ default y if GRKERNSEC_CONFIG_AUTO
76593+ help
76594+ If you say Y here, attempts to bruteforce exploits against forking
76595+ daemons such as apache or sshd, as well as against suid/sgid binaries
76596+ will be deterred. When a child of a forking daemon is killed by PaX
76597+ or crashes due to an illegal instruction or other suspicious signal,
76598+ the parent process will be delayed 30 seconds upon every subsequent
76599+ fork until the administrator is able to assess the situation and
76600+ restart the daemon.
76601+ In the suid/sgid case, the attempt is logged, the user has all their
76602+ existing instances of the suid/sgid binary terminated and will
76603+ be unable to execute any suid/sgid binaries for 15 minutes.
76604+
76605+ It is recommended that you also enable signal logging in the auditing
76606+ section so that logs are generated when a process triggers a suspicious
76607+ signal.
76608+ If the sysctl option is enabled, a sysctl option with name
76609+ "deter_bruteforce" is created.
76610+
76611+config GRKERNSEC_MODHARDEN
76612+ bool "Harden module auto-loading"
76613+ default y if GRKERNSEC_CONFIG_AUTO
76614+ depends on MODULES
76615+ help
76616+ If you say Y here, module auto-loading in response to use of some
76617+ feature implemented by an unloaded module will be restricted to
76618+ root users. Enabling this option helps defend against attacks
76619+ by unprivileged users who abuse the auto-loading behavior to
76620+ cause a vulnerable module to load that is then exploited.
76621+
76622+ If this option prevents a legitimate use of auto-loading for a
76623+ non-root user, the administrator can execute modprobe manually
76624+ with the exact name of the module mentioned in the alert log.
76625+ Alternatively, the administrator can add the module to the list
76626+ of modules loaded at boot by modifying init scripts.
76627+
76628+ Modification of init scripts will most likely be needed on
76629+ Ubuntu servers with encrypted home directory support enabled,
76630+ as the first non-root user logging in will cause the ecb(aes),
76631+ ecb(aes)-all, cbc(aes), and cbc(aes)-all modules to be loaded.
76632+
76633+config GRKERNSEC_HIDESYM
76634+ bool "Hide kernel symbols"
76635+ default y if GRKERNSEC_CONFIG_AUTO
76636+ select PAX_USERCOPY_SLABS
76637+ help
76638+ If you say Y here, getting information on loaded modules, and
76639+ displaying all kernel symbols through a syscall will be restricted
76640+ to users with CAP_SYS_MODULE. For software compatibility reasons,
76641+ /proc/kallsyms will be restricted to the root user. The RBAC
76642+ system can hide that entry even from root.
76643+
76644+ This option also prevents leaking of kernel addresses through
76645+ several /proc entries.
76646+
76647+ Note that this option is only effective provided the following
76648+ conditions are met:
76649+ 1) The kernel using grsecurity is not precompiled by some distribution
76650+ 2) You have also enabled GRKERNSEC_DMESG
76651+ 3) You are using the RBAC system and hiding other files such as your
76652+ kernel image and System.map. Alternatively, enabling this option
76653+ causes the permissions on /boot, /lib/modules, and the kernel
76654+ source directory to change at compile time to prevent
76655+ reading by non-root users.
76656+ If the above conditions are met, this option will aid in providing a
76657+ useful protection against local kernel exploitation of overflows
76658+ and arbitrary read/write vulnerabilities.
76659+
76660+ It is highly recommended that you enable GRKERNSEC_PERF_HARDEN
76661+ in addition to this feature.
76662+
76663+config GRKERNSEC_RANDSTRUCT
76664+ bool "Randomize layout of sensitive kernel structures"
76665+ default y if GRKERNSEC_CONFIG_AUTO
76666+ select GRKERNSEC_HIDESYM
76667+ select MODVERSIONS if MODULES
76668+ help
76669+ If you say Y here, the layouts of a number of sensitive kernel
76670+ structures (task, fs, cred, etc) and all structures composed entirely
76671+ of function pointers (aka "ops" structs) will be randomized at compile-time.
76672+ This can introduce the requirement of an additional infoleak
76673+ vulnerability for exploits targeting these structure types.
76674+
76675+ Enabling this feature will introduce some performance impact, slightly
76676+ increase memory usage, and prevent the use of forensic tools like
76677+ Volatility against the system (unless the kernel source tree isn't
76678+ cleaned after kernel installation).
76679+
76680+ The seed used for compilation is located at tools/gcc/randomize_layout_seed.h.
76681+ It remains after a make clean to allow for external modules to be compiled
76682+ with the existing seed and will be removed by a make mrproper or
76683+ make distclean.
76684+
76685+ Note that the implementation requires gcc 4.6.4. or newer. You may need
76686+ to install the supporting headers explicitly in addition to the normal
76687+ gcc package.
76688+
76689+config GRKERNSEC_RANDSTRUCT_PERFORMANCE
76690+ bool "Use cacheline-aware structure randomization"
76691+ depends on GRKERNSEC_RANDSTRUCT
76692+ default y if GRKERNSEC_CONFIG_PRIORITY_PERF
76693+ help
76694+ If you say Y here, the RANDSTRUCT randomization will make a best effort
76695+ at restricting randomization to cacheline-sized groups of elements. It
76696+ will further not randomize bitfields in structures. This reduces the
76697+ performance hit of RANDSTRUCT at the cost of weakened randomization.
76698+
76699+config GRKERNSEC_KERN_LOCKOUT
76700+ bool "Active kernel exploit response"
76701+ default y if GRKERNSEC_CONFIG_AUTO
76702+ depends on X86 || ARM || PPC || SPARC
76703+ help
76704+ If you say Y here, when a PaX alert is triggered due to suspicious
76705+ activity in the kernel (from KERNEXEC/UDEREF/USERCOPY)
76706+ or an OOPS occurs due to bad memory accesses, instead of just
76707+ terminating the offending process (and potentially allowing
76708+ a subsequent exploit from the same user), we will take one of two
76709+ actions:
76710+ If the user was root, we will panic the system
76711+ If the user was non-root, we will log the attempt, terminate
76712+ all processes owned by the user, then prevent them from creating
76713+ any new processes until the system is restarted
76714+ This deters repeated kernel exploitation/bruteforcing attempts
76715+ and is useful for later forensics.
76716+
76717+config GRKERNSEC_OLD_ARM_USERLAND
76718+ bool "Old ARM userland compatibility"
76719+ depends on ARM && (CPU_V6 || CPU_V6K || CPU_V7)
76720+ help
76721+ If you say Y here, stubs of executable code to perform such operations
76722+ as "compare-exchange" will be placed at fixed locations in the ARM vector
76723+ table. This is unfortunately needed for old ARM userland meant to run
76724+ across a wide range of processors. Without this option enabled,
76725+ the get_tls and data memory barrier stubs will be emulated by the kernel,
76726+ which is enough for Linaro userlands or other userlands designed for v6
76727+ and newer ARM CPUs. It's recommended that you try without this option enabled
76728+ first, and only enable it if your userland does not boot (it will likely fail
76729+ at init time).
76730+
76731+endmenu
76732+menu "Role Based Access Control Options"
76733+depends on GRKERNSEC
76734+
76735+config GRKERNSEC_RBAC_DEBUG
76736+ bool
76737+
76738+config GRKERNSEC_NO_RBAC
76739+ bool "Disable RBAC system"
76740+ help
76741+ If you say Y here, the /dev/grsec device will be removed from the kernel,
76742+ preventing the RBAC system from being enabled. You should only say Y
76743+ here if you have no intention of using the RBAC system, so as to prevent
76744+ an attacker with root access from misusing the RBAC system to hide files
76745+ and processes when loadable module support and /dev/[k]mem have been
76746+ locked down.
76747+
76748+config GRKERNSEC_ACL_HIDEKERN
76749+ bool "Hide kernel processes"
76750+ help
76751+ If you say Y here, all kernel threads will be hidden to all
76752+ processes but those whose subject has the "view hidden processes"
76753+ flag.
76754+
76755+config GRKERNSEC_ACL_MAXTRIES
76756+ int "Maximum tries before password lockout"
76757+ default 3
76758+ help
76759+ This option enforces the maximum number of times a user can attempt
76760+ to authorize themselves with the grsecurity RBAC system before being
76761+ denied the ability to attempt authorization again for a specified time.
76762+ The lower the number, the harder it will be to brute-force a password.
76763+
76764+config GRKERNSEC_ACL_TIMEOUT
76765+ int "Time to wait after max password tries, in seconds"
76766+ default 30
76767+ help
76768+ This option specifies the time the user must wait after attempting to
76769+ authorize to the RBAC system with the maximum number of invalid
76770+ passwords. The higher the number, the harder it will be to brute-force
76771+ a password.
76772+
76773+endmenu
76774+menu "Filesystem Protections"
76775+depends on GRKERNSEC
76776+
76777+config GRKERNSEC_PROC
76778+ bool "Proc restrictions"
76779+ default y if GRKERNSEC_CONFIG_AUTO
76780+ help
76781+ If you say Y here, the permissions of the /proc filesystem
76782+ will be altered to enhance system security and privacy. You MUST
76783+ choose either a user only restriction or a user and group restriction.
76784+ Depending upon the option you choose, you can either restrict users to
76785+ see only the processes they themselves run, or choose a group that can
76786+ view all processes and files normally restricted to root if you choose
76787+ the "restrict to user only" option. NOTE: If you're running identd or
76788+ ntpd as a non-root user, you will have to run it as the group you
76789+ specify here.
76790+
76791+config GRKERNSEC_PROC_USER
76792+ bool "Restrict /proc to user only"
76793+ depends on GRKERNSEC_PROC
76794+ help
76795+ If you say Y here, non-root users will only be able to view their own
76796+ processes, and restricts them from viewing network-related information,
76797+ and viewing kernel symbol and module information.
76798+
76799+config GRKERNSEC_PROC_USERGROUP
76800+ bool "Allow special group"
76801+ default y if GRKERNSEC_CONFIG_AUTO
76802+ depends on GRKERNSEC_PROC && !GRKERNSEC_PROC_USER
76803+ help
76804+ If you say Y here, you will be able to select a group that will be
76805+ able to view all processes and network-related information. If you've
76806+ enabled GRKERNSEC_HIDESYM, kernel and symbol information may still
76807+ remain hidden. This option is useful if you want to run identd as
76808+ a non-root user. The group you select may also be chosen at boot time
76809+ via "grsec_proc_gid=" on the kernel commandline.
76810+
76811+config GRKERNSEC_PROC_GID
76812+ int "GID for special group"
76813+ depends on GRKERNSEC_PROC_USERGROUP
76814+ default 1001
76815+
76816+config GRKERNSEC_PROC_ADD
76817+ bool "Additional restrictions"
76818+ default y if GRKERNSEC_CONFIG_AUTO
76819+ depends on GRKERNSEC_PROC_USER || GRKERNSEC_PROC_USERGROUP
76820+ help
76821+ If you say Y here, additional restrictions will be placed on
76822+ /proc that keep normal users from viewing device information and
76823+ slabinfo information that could be useful for exploits.
76824+
76825+config GRKERNSEC_LINK
76826+ bool "Linking restrictions"
76827+ default y if GRKERNSEC_CONFIG_AUTO
76828+ help
76829+ If you say Y here, /tmp race exploits will be prevented, since users
76830+ will no longer be able to follow symlinks owned by other users in
76831+ world-writable +t directories (e.g. /tmp), unless the owner of the
76832+ symlink is the owner of the directory. users will also not be
76833+ able to hardlink to files they do not own. If the sysctl option is
76834+ enabled, a sysctl option with name "linking_restrictions" is created.
76835+
76836+config GRKERNSEC_SYMLINKOWN
76837+ bool "Kernel-enforced SymlinksIfOwnerMatch"
76838+ default y if GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER
76839+ help
76840+ Apache's SymlinksIfOwnerMatch option has an inherent race condition
76841+ that prevents it from being used as a security feature. As Apache
76842+ verifies the symlink by performing a stat() against the target of
76843+ the symlink before it is followed, an attacker can setup a symlink
76844+ to point to a same-owned file, then replace the symlink with one
76845+ that targets another user's file just after Apache "validates" the
76846+ symlink -- a classic TOCTOU race. If you say Y here, a complete,
76847+ race-free replacement for Apache's "SymlinksIfOwnerMatch" option
76848+ will be in place for the group you specify. If the sysctl option
76849+ is enabled, a sysctl option with name "enforce_symlinksifowner" is
76850+ created.
76851+
76852+config GRKERNSEC_SYMLINKOWN_GID
76853+ int "GID for users with kernel-enforced SymlinksIfOwnerMatch"
76854+ depends on GRKERNSEC_SYMLINKOWN
76855+ default 1006
76856+ help
76857+ Setting this GID determines what group kernel-enforced
76858+ SymlinksIfOwnerMatch will be enabled for. If the sysctl option
76859+ is enabled, a sysctl option with name "symlinkown_gid" is created.
76860+
76861+config GRKERNSEC_FIFO
76862+ bool "FIFO restrictions"
76863+ default y if GRKERNSEC_CONFIG_AUTO
76864+ help
76865+ If you say Y here, users will not be able to write to FIFOs they don't
76866+ own in world-writable +t directories (e.g. /tmp), unless the owner of
76867+ the FIFO is the same owner of the directory it's held in. If the sysctl
76868+ option is enabled, a sysctl option with name "fifo_restrictions" is
76869+ created.
76870+
76871+config GRKERNSEC_SYSFS_RESTRICT
76872+ bool "Sysfs/debugfs restriction"
76873+ default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
76874+ depends on SYSFS
76875+ help
76876+ If you say Y here, sysfs (the pseudo-filesystem mounted at /sys) and
76877+ any filesystem normally mounted under it (e.g. debugfs) will be
76878+ mostly accessible only by root. These filesystems generally provide access
76879+ to hardware and debug information that isn't appropriate for unprivileged
76880+ users of the system. Sysfs and debugfs have also become a large source
76881+ of new vulnerabilities, ranging from infoleaks to local compromise.
76882+ There has been very little oversight with an eye toward security involved
76883+ in adding new exporters of information to these filesystems, so their
76884+ use is discouraged.
76885+ For reasons of compatibility, a few directories have been whitelisted
76886+ for access by non-root users:
76887+ /sys/fs/selinux
76888+ /sys/fs/fuse
76889+ /sys/devices/system/cpu
76890+
76891+config GRKERNSEC_ROFS
76892+ bool "Runtime read-only mount protection"
76893+ depends on SYSCTL
76894+ help
76895+ If you say Y here, a sysctl option with name "romount_protect" will
76896+ be created. By setting this option to 1 at runtime, filesystems
76897+ will be protected in the following ways:
76898+ * No new writable mounts will be allowed
76899+ * Existing read-only mounts won't be able to be remounted read/write
76900+ * Write operations will be denied on all block devices
76901+ This option acts independently of grsec_lock: once it is set to 1,
76902+ it cannot be turned off. Therefore, please be mindful of the resulting
76903+ behavior if this option is enabled in an init script on a read-only
76904+ filesystem.
76905+ Also be aware that as with other root-focused features, GRKERNSEC_KMEM
76906+ and GRKERNSEC_IO should be enabled and module loading disabled via
76907+ config or at runtime.
76908+ This feature is mainly intended for secure embedded systems.
76909+
76910+
76911+config GRKERNSEC_DEVICE_SIDECHANNEL
76912+ bool "Eliminate stat/notify-based device sidechannels"
76913+ default y if GRKERNSEC_CONFIG_AUTO
76914+ help
76915+ If you say Y here, timing analyses on block or character
76916+ devices like /dev/ptmx using stat or inotify/dnotify/fanotify
76917+ will be thwarted for unprivileged users. If a process without
76918+ CAP_MKNOD stats such a device, the last access and last modify times
76919+ will match the device's create time. No access or modify events
76920+ will be triggered through inotify/dnotify/fanotify for such devices.
76921+ This feature will prevent attacks that may at a minimum
76922+ allow an attacker to determine the administrator's password length.
76923+
76924+config GRKERNSEC_CHROOT
76925+ bool "Chroot jail restrictions"
76926+ default y if GRKERNSEC_CONFIG_AUTO
76927+ help
76928+ If you say Y here, you will be able to choose several options that will
76929+ make breaking out of a chrooted jail much more difficult. If you
76930+ encounter no software incompatibilities with the following options, it
76931+ is recommended that you enable each one.
76932+
76933+ Note that the chroot restrictions are not intended to apply to "chroots"
76934+ to directories that are simple bind mounts of the global root filesystem.
76935+ For several other reasons, a user shouldn't expect any significant
76936+ security by performing such a chroot.
76937+
76938+config GRKERNSEC_CHROOT_MOUNT
76939+ bool "Deny mounts"
76940+ default y if GRKERNSEC_CONFIG_AUTO
76941+ depends on GRKERNSEC_CHROOT
76942+ help
76943+ If you say Y here, processes inside a chroot will not be able to
76944+ mount or remount filesystems. If the sysctl option is enabled, a
76945+ sysctl option with name "chroot_deny_mount" is created.
76946+
76947+config GRKERNSEC_CHROOT_DOUBLE
76948+ bool "Deny double-chroots"
76949+ default y if GRKERNSEC_CONFIG_AUTO
76950+ depends on GRKERNSEC_CHROOT
76951+ help
76952+ If you say Y here, processes inside a chroot will not be able to chroot
76953+ again outside the chroot. This is a widely used method of breaking
76954+ out of a chroot jail and should not be allowed. If the sysctl
76955+ option is enabled, a sysctl option with name
76956+ "chroot_deny_chroot" is created.
76957+
76958+config GRKERNSEC_CHROOT_PIVOT
76959+ bool "Deny pivot_root in chroot"
76960+ default y if GRKERNSEC_CONFIG_AUTO
76961+ depends on GRKERNSEC_CHROOT
76962+ help
76963+ If you say Y here, processes inside a chroot will not be able to use
76964+ a function called pivot_root() that was introduced in Linux 2.3.41. It
76965+ works similar to chroot in that it changes the root filesystem. This
76966+ function could be misused in a chrooted process to attempt to break out
76967+ of the chroot, and therefore should not be allowed. If the sysctl
76968+ option is enabled, a sysctl option with name "chroot_deny_pivot" is
76969+ created.
76970+
76971+config GRKERNSEC_CHROOT_CHDIR
76972+ bool "Enforce chdir(\"/\") on all chroots"
76973+ default y if GRKERNSEC_CONFIG_AUTO
76974+ depends on GRKERNSEC_CHROOT
76975+ help
76976+ If you say Y here, the current working directory of all newly-chrooted
76977+ applications will be set to the the root directory of the chroot.
76978+ The man page on chroot(2) states:
76979+ Note that this call does not change the current working
76980+ directory, so that `.' can be outside the tree rooted at
76981+ `/'. In particular, the super-user can escape from a
76982+ `chroot jail' by doing `mkdir foo; chroot foo; cd ..'.
76983+
76984+ It is recommended that you say Y here, since it's not known to break
76985+ any software. If the sysctl option is enabled, a sysctl option with
76986+ name "chroot_enforce_chdir" is created.
76987+
76988+config GRKERNSEC_CHROOT_CHMOD
76989+ bool "Deny (f)chmod +s"
76990+ default y if GRKERNSEC_CONFIG_AUTO
76991+ depends on GRKERNSEC_CHROOT
76992+ help
76993+ If you say Y here, processes inside a chroot will not be able to chmod
76994+ or fchmod files to make them have suid or sgid bits. This protects
76995+ against another published method of breaking a chroot. If the sysctl
76996+ option is enabled, a sysctl option with name "chroot_deny_chmod" is
76997+ created.
76998+
76999+config GRKERNSEC_CHROOT_FCHDIR
77000+ bool "Deny fchdir and fhandle out of chroot"
77001+ default y if GRKERNSEC_CONFIG_AUTO
77002+ depends on GRKERNSEC_CHROOT
77003+ help
77004+ If you say Y here, a well-known method of breaking chroots by fchdir'ing
77005+ to a file descriptor of the chrooting process that points to a directory
77006+ outside the filesystem will be stopped. Additionally, this option prevents
77007+ use of the recently-created syscall for opening files by a guessable "file
77008+ handle" inside a chroot. If the sysctl option is enabled, a sysctl option
77009+ with name "chroot_deny_fchdir" is created.
77010+
77011+config GRKERNSEC_CHROOT_MKNOD
77012+ bool "Deny mknod"
77013+ default y if GRKERNSEC_CONFIG_AUTO
77014+ depends on GRKERNSEC_CHROOT
77015+ help
77016+ If you say Y here, processes inside a chroot will not be allowed to
77017+ mknod. The problem with using mknod inside a chroot is that it
77018+ would allow an attacker to create a device entry that is the same
77019+ as one on the physical root of your system, which could range from
77020+ anything from the console device to a device for your harddrive (which
77021+ they could then use to wipe the drive or steal data). It is recommended
77022+ that you say Y here, unless you run into software incompatibilities.
77023+ If the sysctl option is enabled, a sysctl option with name
77024+ "chroot_deny_mknod" is created.
77025+
77026+config GRKERNSEC_CHROOT_SHMAT
77027+ bool "Deny shmat() out of chroot"
77028+ default y if GRKERNSEC_CONFIG_AUTO
77029+ depends on GRKERNSEC_CHROOT
77030+ help
77031+ If you say Y here, processes inside a chroot will not be able to attach
77032+ to shared memory segments that were created outside of the chroot jail.
77033+ It is recommended that you say Y here. If the sysctl option is enabled,
77034+ a sysctl option with name "chroot_deny_shmat" is created.
77035+
77036+config GRKERNSEC_CHROOT_UNIX
77037+ bool "Deny access to abstract AF_UNIX sockets out of chroot"
77038+ default y if GRKERNSEC_CONFIG_AUTO
77039+ depends on GRKERNSEC_CHROOT
77040+ help
77041+ If you say Y here, processes inside a chroot will not be able to
77042+ connect to abstract (meaning not belonging to a filesystem) Unix
77043+ domain sockets that were bound outside of a chroot. It is recommended
77044+ that you say Y here. If the sysctl option is enabled, a sysctl option
77045+ with name "chroot_deny_unix" is created.
77046+
77047+config GRKERNSEC_CHROOT_FINDTASK
77048+ bool "Protect outside processes"
77049+ default y if GRKERNSEC_CONFIG_AUTO
77050+ depends on GRKERNSEC_CHROOT
77051+ help
77052+ If you say Y here, processes inside a chroot will not be able to
77053+ kill, send signals with fcntl, ptrace, capget, getpgid, setpgid,
77054+ getsid, or view any process outside of the chroot. If the sysctl
77055+ option is enabled, a sysctl option with name "chroot_findtask" is
77056+ created.
77057+
77058+config GRKERNSEC_CHROOT_NICE
77059+ bool "Restrict priority changes"
77060+ default y if GRKERNSEC_CONFIG_AUTO
77061+ depends on GRKERNSEC_CHROOT
77062+ help
77063+ If you say Y here, processes inside a chroot will not be able to raise
77064+ the priority of processes in the chroot, or alter the priority of
77065+ processes outside the chroot. This provides more security than simply
77066+ removing CAP_SYS_NICE from the process' capability set. If the
77067+ sysctl option is enabled, a sysctl option with name "chroot_restrict_nice"
77068+ is created.
77069+
77070+config GRKERNSEC_CHROOT_SYSCTL
77071+ bool "Deny sysctl writes"
77072+ default y if GRKERNSEC_CONFIG_AUTO
77073+ depends on GRKERNSEC_CHROOT
77074+ help
77075+ If you say Y here, an attacker in a chroot will not be able to
77076+ write to sysctl entries, either by sysctl(2) or through a /proc
77077+ interface. It is strongly recommended that you say Y here. If the
77078+ sysctl option is enabled, a sysctl option with name
77079+ "chroot_deny_sysctl" is created.
77080+
77081+config GRKERNSEC_CHROOT_RENAME
77082+ bool "Deny bad renames"
77083+ default y if GRKERNSEC_CONFIG_AUTO
77084+ depends on GRKERNSEC_CHROOT
77085+ help
77086+ If you say Y here, an attacker in a chroot will not be able to
77087+ abuse the ability to create double chroots to break out of the
77088+ chroot by exploiting a race condition between a rename of a directory
77089+ within a chroot against an open of a symlink with relative path
77090+ components. This feature will likewise prevent an accomplice outside
77091+ a chroot from enabling a user inside the chroot to break out and make
77092+ use of their credentials on the global filesystem. Enabling this
77093+ feature is essential to prevent root users from breaking out of a
77094+ chroot. If the sysctl option is enabled, a sysctl option with name
77095+ "chroot_deny_bad_rename" is created.
77096+
77097+config GRKERNSEC_CHROOT_CAPS
77098+ bool "Capability restrictions"
77099+ default y if GRKERNSEC_CONFIG_AUTO
77100+ depends on GRKERNSEC_CHROOT
77101+ help
77102+ If you say Y here, the capabilities on all processes within a
77103+ chroot jail will be lowered to stop module insertion, raw i/o,
77104+ system and net admin tasks, rebooting the system, modifying immutable
77105+ files, modifying IPC owned by another, and changing the system time.
77106+ This is left an option because it can break some apps. Disable this
77107+ if your chrooted apps are having problems performing those kinds of
77108+ tasks. If the sysctl option is enabled, a sysctl option with
77109+ name "chroot_caps" is created.
77110+
77111+config GRKERNSEC_CHROOT_INITRD
77112+ bool "Exempt initrd tasks from restrictions"
77113+ default y if GRKERNSEC_CONFIG_AUTO
77114+ depends on GRKERNSEC_CHROOT && BLK_DEV_INITRD
77115+ help
77116+ If you say Y here, tasks started prior to init will be exempted from
77117+ grsecurity's chroot restrictions. This option is mainly meant to
77118+ resolve Plymouth's performing privileged operations unnecessarily
77119+ in a chroot.
77120+
77121+endmenu
77122+menu "Kernel Auditing"
77123+depends on GRKERNSEC
77124+
77125+config GRKERNSEC_AUDIT_GROUP
77126+ bool "Single group for auditing"
77127+ help
77128+ If you say Y here, the exec and chdir logging features will only operate
77129+ on a group you specify. This option is recommended if you only want to
77130+ watch certain users instead of having a large amount of logs from the
77131+ entire system. If the sysctl option is enabled, a sysctl option with
77132+ name "audit_group" is created.
77133+
77134+config GRKERNSEC_AUDIT_GID
77135+ int "GID for auditing"
77136+ depends on GRKERNSEC_AUDIT_GROUP
77137+ default 1007
77138+
77139+config GRKERNSEC_EXECLOG
77140+ bool "Exec logging"
77141+ help
77142+ If you say Y here, all execve() calls will be logged (since the
77143+ other exec*() calls are frontends to execve(), all execution
77144+ will be logged). Useful for shell-servers that like to keep track
77145+ of their users. If the sysctl option is enabled, a sysctl option with
77146+ name "exec_logging" is created.
77147+ WARNING: This option when enabled will produce a LOT of logs, especially
77148+ on an active system.
77149+
77150+config GRKERNSEC_RESLOG
77151+ bool "Resource logging"
77152+ default y if GRKERNSEC_CONFIG_AUTO
77153+ help
77154+ If you say Y here, all attempts to overstep resource limits will
77155+ be logged with the resource name, the requested size, and the current
77156+ limit. It is highly recommended that you say Y here. If the sysctl
77157+ option is enabled, a sysctl option with name "resource_logging" is
77158+ created. If the RBAC system is enabled, the sysctl value is ignored.
77159+
77160+config GRKERNSEC_CHROOT_EXECLOG
77161+ bool "Log execs within chroot"
77162+ help
77163+ If you say Y here, all executions inside a chroot jail will be logged
77164+ to syslog. This can cause a large amount of logs if certain
77165+ applications (eg. djb's daemontools) are installed on the system, and
77166+ is therefore left as an option. If the sysctl option is enabled, a
77167+ sysctl option with name "chroot_execlog" is created.
77168+
77169+config GRKERNSEC_AUDIT_PTRACE
77170+ bool "Ptrace logging"
77171+ help
77172+ If you say Y here, all attempts to attach to a process via ptrace
77173+ will be logged. If the sysctl option is enabled, a sysctl option
77174+ with name "audit_ptrace" is created.
77175+
77176+config GRKERNSEC_AUDIT_CHDIR
77177+ bool "Chdir logging"
77178+ help
77179+ If you say Y here, all chdir() calls will be logged. If the sysctl
77180+ option is enabled, a sysctl option with name "audit_chdir" is created.
77181+
77182+config GRKERNSEC_AUDIT_MOUNT
77183+ bool "(Un)Mount logging"
77184+ help
77185+ If you say Y here, all mounts and unmounts will be logged. If the
77186+ sysctl option is enabled, a sysctl option with name "audit_mount" is
77187+ created.
77188+
77189+config GRKERNSEC_SIGNAL
77190+ bool "Signal logging"
77191+ default y if GRKERNSEC_CONFIG_AUTO
77192+ help
77193+ If you say Y here, certain important signals will be logged, such as
77194+ SIGSEGV, which will as a result inform you of when a error in a program
77195+ occurred, which in some cases could mean a possible exploit attempt.
77196+ If the sysctl option is enabled, a sysctl option with name
77197+ "signal_logging" is created.
77198+
77199+config GRKERNSEC_FORKFAIL
77200+ bool "Fork failure logging"
77201+ help
77202+ If you say Y here, all failed fork() attempts will be logged.
77203+ This could suggest a fork bomb, or someone attempting to overstep
77204+ their process limit. If the sysctl option is enabled, a sysctl option
77205+ with name "forkfail_logging" is created.
77206+
77207+config GRKERNSEC_TIME
77208+ bool "Time change logging"
77209+ default y if GRKERNSEC_CONFIG_AUTO
77210+ help
77211+ If you say Y here, any changes of the system clock will be logged.
77212+ If the sysctl option is enabled, a sysctl option with name
77213+ "timechange_logging" is created.
77214+
77215+config GRKERNSEC_PROC_IPADDR
77216+ bool "/proc/<pid>/ipaddr support"
77217+ default y if GRKERNSEC_CONFIG_AUTO
77218+ help
77219+ If you say Y here, a new entry will be added to each /proc/<pid>
77220+ directory that contains the IP address of the person using the task.
77221+ The IP is carried across local TCP and AF_UNIX stream sockets.
77222+ This information can be useful for IDS/IPSes to perform remote response
77223+ to a local attack. The entry is readable by only the owner of the
77224+ process (and root if he has CAP_DAC_OVERRIDE, which can be removed via
77225+ the RBAC system), and thus does not create privacy concerns.
77226+
77227+config GRKERNSEC_RWXMAP_LOG
77228+ bool 'Denied RWX mmap/mprotect logging'
77229+ default y if GRKERNSEC_CONFIG_AUTO
77230+ depends on PAX_MPROTECT && !PAX_EMUPLT && !PAX_EMUSIGRT
77231+ help
77232+ If you say Y here, calls to mmap() and mprotect() with explicit
77233+ usage of PROT_WRITE and PROT_EXEC together will be logged when
77234+ denied by the PAX_MPROTECT feature. This feature will also
77235+ log other problematic scenarios that can occur when PAX_MPROTECT
77236+ is enabled on a binary, like textrels and PT_GNU_STACK. If the
77237+ sysctl option is enabled, a sysctl option with name "rwxmap_logging"
77238+ is created.
77239+
77240+endmenu
77241+
77242+menu "Executable Protections"
77243+depends on GRKERNSEC
77244+
77245+config GRKERNSEC_DMESG
77246+ bool "Dmesg(8) restriction"
77247+ default y if GRKERNSEC_CONFIG_AUTO
77248+ help
77249+ If you say Y here, non-root users will not be able to use dmesg(8)
77250+ to view the contents of the kernel's circular log buffer.
77251+ The kernel's log buffer often contains kernel addresses and other
77252+ identifying information useful to an attacker in fingerprinting a
77253+ system for a targeted exploit.
77254+ If the sysctl option is enabled, a sysctl option with name "dmesg" is
77255+ created.
77256+
77257+config GRKERNSEC_HARDEN_PTRACE
77258+ bool "Deter ptrace-based process snooping"
77259+ default y if GRKERNSEC_CONFIG_AUTO
77260+ help
77261+ If you say Y here, TTY sniffers and other malicious monitoring
77262+ programs implemented through ptrace will be defeated. If you
77263+ have been using the RBAC system, this option has already been
77264+ enabled for several years for all users, with the ability to make
77265+ fine-grained exceptions.
77266+
77267+ This option only affects the ability of non-root users to ptrace
77268+ processes that are not a descendent of the ptracing process.
77269+ This means that strace ./binary and gdb ./binary will still work,
77270+ but attaching to arbitrary processes will not. If the sysctl
77271+ option is enabled, a sysctl option with name "harden_ptrace" is
77272+ created.
77273+
77274+config GRKERNSEC_PTRACE_READEXEC
77275+ bool "Require read access to ptrace sensitive binaries"
77276+ default y if GRKERNSEC_CONFIG_AUTO
77277+ help
77278+ If you say Y here, unprivileged users will not be able to ptrace unreadable
77279+ binaries. This option is useful in environments that
77280+ remove the read bits (e.g. file mode 4711) from suid binaries to
77281+ prevent infoleaking of their contents. This option adds
77282+ consistency to the use of that file mode, as the binary could normally
77283+ be read out when run without privileges while ptracing.
77284+
77285+ If the sysctl option is enabled, a sysctl option with name "ptrace_readexec"
77286+ is created.
77287+
77288+config GRKERNSEC_SETXID
77289+ bool "Enforce consistent multithreaded privileges"
77290+ default y if GRKERNSEC_CONFIG_AUTO
77291+ depends on (X86 || SPARC64 || PPC || ARM || MIPS)
77292+ help
77293+ If you say Y here, a change from a root uid to a non-root uid
77294+ in a multithreaded application will cause the resulting uids,
77295+ gids, supplementary groups, and capabilities in that thread
77296+ to be propagated to the other threads of the process. In most
77297+ cases this is unnecessary, as glibc will emulate this behavior
77298+ on behalf of the application. Other libcs do not act in the
77299+ same way, allowing the other threads of the process to continue
77300+ running with root privileges. If the sysctl option is enabled,
77301+ a sysctl option with name "consistent_setxid" is created.
77302+
77303+config GRKERNSEC_HARDEN_IPC
77304+ bool "Disallow access to overly-permissive IPC objects"
77305+ default y if GRKERNSEC_CONFIG_AUTO
77306+ depends on SYSVIPC
77307+ help
77308+ If you say Y here, access to overly-permissive IPC objects (shared
77309+ memory, message queues, and semaphores) will be denied for processes
77310+ given the following criteria beyond normal permission checks:
77311+ 1) If the IPC object is world-accessible and the euid doesn't match
77312+ that of the creator or current uid for the IPC object
77313+ 2) If the IPC object is group-accessible and the egid doesn't
77314+ match that of the creator or current gid for the IPC object
77315+ It's a common error to grant too much permission to these objects,
77316+ with impact ranging from denial of service and information leaking to
77317+ privilege escalation. This feature was developed in response to
77318+ research by Tim Brown:
77319+ http://labs.portcullis.co.uk/whitepapers/memory-squatting-attacks-on-system-v-shared-memory/
77320+ who found hundreds of such insecure usages. Processes with
77321+ CAP_IPC_OWNER are still permitted to access these IPC objects.
77322+ If the sysctl option is enabled, a sysctl option with name
77323+ "harden_ipc" is created.
77324+
77325+config GRKERNSEC_TPE
77326+ bool "Trusted Path Execution (TPE)"
77327+ default y if GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER
77328+ help
77329+ If you say Y here, you will be able to choose a gid to add to the
77330+ supplementary groups of users you want to mark as "untrusted."
77331+ These users will not be able to execute any files that are not in
77332+ root-owned directories writable only by root. If the sysctl option
77333+ is enabled, a sysctl option with name "tpe" is created.
77334+
77335+config GRKERNSEC_TPE_ALL
77336+ bool "Partially restrict all non-root users"
77337+ depends on GRKERNSEC_TPE
77338+ help
77339+ If you say Y here, all non-root users will be covered under
77340+ a weaker TPE restriction. This is separate from, and in addition to,
77341+ the main TPE options that you have selected elsewhere. Thus, if a
77342+ "trusted" GID is chosen, this restriction applies to even that GID.
77343+ Under this restriction, all non-root users will only be allowed to
77344+ execute files in directories they own that are not group or
77345+ world-writable, or in directories owned by root and writable only by
77346+ root. If the sysctl option is enabled, a sysctl option with name
77347+ "tpe_restrict_all" is created.
77348+
77349+config GRKERNSEC_TPE_INVERT
77350+ bool "Invert GID option"
77351+ depends on GRKERNSEC_TPE
77352+ help
77353+ If you say Y here, the group you specify in the TPE configuration will
77354+ decide what group TPE restrictions will be *disabled* for. This
77355+ option is useful if you want TPE restrictions to be applied to most
77356+ users on the system. If the sysctl option is enabled, a sysctl option
77357+ with name "tpe_invert" is created. Unlike other sysctl options, this
77358+ entry will default to on for backward-compatibility.
77359+
77360+config GRKERNSEC_TPE_GID
77361+ int
77362+ default GRKERNSEC_TPE_UNTRUSTED_GID if (GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT)
77363+ default GRKERNSEC_TPE_TRUSTED_GID if (GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT)
77364+
77365+config GRKERNSEC_TPE_UNTRUSTED_GID
77366+ int "GID for TPE-untrusted users"
77367+ depends on GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT
77368+ default 1005
77369+ help
77370+ Setting this GID determines what group TPE restrictions will be
77371+ *enabled* for. If the sysctl option is enabled, a sysctl option
77372+ with name "tpe_gid" is created.
77373+
77374+config GRKERNSEC_TPE_TRUSTED_GID
77375+ int "GID for TPE-trusted users"
77376+ depends on GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT
77377+ default 1005
77378+ help
77379+ Setting this GID determines what group TPE restrictions will be
77380+ *disabled* for. If the sysctl option is enabled, a sysctl option
77381+ with name "tpe_gid" is created.
77382+
77383+endmenu
77384+menu "Network Protections"
77385+depends on GRKERNSEC
77386+
77387+config GRKERNSEC_BLACKHOLE
77388+ bool "TCP/UDP blackhole and LAST_ACK DoS prevention"
77389+ default y if GRKERNSEC_CONFIG_AUTO
77390+ depends on NET
77391+ help
77392+ If you say Y here, neither TCP resets nor ICMP
77393+ destination-unreachable packets will be sent in response to packets
77394+ sent to ports for which no associated listening process exists.
77395+ It will also prevent the sending of ICMP protocol unreachable packets
77396+ in response to packets with unknown protocols.
77397+ This feature supports both IPV4 and IPV6 and exempts the
77398+ loopback interface from blackholing. Enabling this feature
77399+ makes a host more resilient to DoS attacks and reduces network
77400+ visibility against scanners.
77401+
77402+ The blackhole feature as-implemented is equivalent to the FreeBSD
77403+ blackhole feature, as it prevents RST responses to all packets, not
77404+ just SYNs. Under most application behavior this causes no
77405+ problems, but applications (like haproxy) may not close certain
77406+ connections in a way that cleanly terminates them on the remote
77407+ end, leaving the remote host in LAST_ACK state. Because of this
77408+ side-effect and to prevent intentional LAST_ACK DoSes, this
77409+ feature also adds automatic mitigation against such attacks.
77410+ The mitigation drastically reduces the amount of time a socket
77411+ can spend in LAST_ACK state. If you're using haproxy and not
77412+ all servers it connects to have this option enabled, consider
77413+ disabling this feature on the haproxy host.
77414+
77415+ If the sysctl option is enabled, two sysctl options with names
77416+ "ip_blackhole" and "lastack_retries" will be created.
77417+ While "ip_blackhole" takes the standard zero/non-zero on/off
77418+ toggle, "lastack_retries" uses the same kinds of values as
77419+ "tcp_retries1" and "tcp_retries2". The default value of 4
77420+ prevents a socket from lasting more than 45 seconds in LAST_ACK
77421+ state.
77422+
77423+config GRKERNSEC_NO_SIMULT_CONNECT
77424+ bool "Disable TCP Simultaneous Connect"
77425+ default y if GRKERNSEC_CONFIG_AUTO
77426+ depends on NET
77427+ help
77428+ If you say Y here, a feature by Willy Tarreau will be enabled that
77429+ removes a weakness in Linux's strict implementation of TCP that
77430+ allows two clients to connect to each other without either entering
77431+ a listening state. The weakness allows an attacker to easily prevent
77432+ a client from connecting to a known server provided the source port
77433+ for the connection is guessed correctly.
77434+
77435+ As the weakness could be used to prevent an antivirus or IPS from
77436+ fetching updates, or prevent an SSL gateway from fetching a CRL,
77437+ it should be eliminated by enabling this option. Though Linux is
77438+ one of few operating systems supporting simultaneous connect, it
77439+ has no legitimate use in practice and is rarely supported by firewalls.
77440+
77441+config GRKERNSEC_SOCKET
77442+ bool "Socket restrictions"
77443+ depends on NET
77444+ help
77445+ If you say Y here, you will be able to choose from several options.
77446+ If you assign a GID on your system and add it to the supplementary
77447+ groups of users you want to restrict socket access to, this patch
77448+ will perform up to three things, based on the option(s) you choose.
77449+
77450+config GRKERNSEC_SOCKET_ALL
77451+ bool "Deny any sockets to group"
77452+ depends on GRKERNSEC_SOCKET
77453+ help
77454+ If you say Y here, you will be able to choose a GID of whose users will
77455+ be unable to connect to other hosts from your machine or run server
77456+ applications from your machine. If the sysctl option is enabled, a
77457+ sysctl option with name "socket_all" is created.
77458+
77459+config GRKERNSEC_SOCKET_ALL_GID
77460+ int "GID to deny all sockets for"
77461+ depends on GRKERNSEC_SOCKET_ALL
77462+ default 1004
77463+ help
77464+ Here you can choose the GID to disable socket access for. Remember to
77465+ add the users you want socket access disabled for to the GID
77466+ specified here. If the sysctl option is enabled, a sysctl option
77467+ with name "socket_all_gid" is created.
77468+
77469+config GRKERNSEC_SOCKET_CLIENT
77470+ bool "Deny client sockets to group"
77471+ depends on GRKERNSEC_SOCKET
77472+ help
77473+ If you say Y here, you will be able to choose a GID of whose users will
77474+ be unable to connect to other hosts from your machine, but will be
77475+ able to run servers. If this option is enabled, all users in the group
77476+ you specify will have to use passive mode when initiating ftp transfers
77477+ from the shell on your machine. If the sysctl option is enabled, a
77478+ sysctl option with name "socket_client" is created.
77479+
77480+config GRKERNSEC_SOCKET_CLIENT_GID
77481+ int "GID to deny client sockets for"
77482+ depends on GRKERNSEC_SOCKET_CLIENT
77483+ default 1003
77484+ help
77485+ Here you can choose the GID to disable client socket access for.
77486+ Remember to add the users you want client socket access disabled for to
77487+ the GID specified here. If the sysctl option is enabled, a sysctl
77488+ option with name "socket_client_gid" is created.
77489+
77490+config GRKERNSEC_SOCKET_SERVER
77491+ bool "Deny server sockets to group"
77492+ depends on GRKERNSEC_SOCKET
77493+ help
77494+ If you say Y here, you will be able to choose a GID of whose users will
77495+ be unable to run server applications from your machine. If the sysctl
77496+ option is enabled, a sysctl option with name "socket_server" is created.
77497+
77498+config GRKERNSEC_SOCKET_SERVER_GID
77499+ int "GID to deny server sockets for"
77500+ depends on GRKERNSEC_SOCKET_SERVER
77501+ default 1002
77502+ help
77503+ Here you can choose the GID to disable server socket access for.
77504+ Remember to add the users you want server socket access disabled for to
77505+ the GID specified here. If the sysctl option is enabled, a sysctl
77506+ option with name "socket_server_gid" is created.
77507+
77508+endmenu
77509+
77510+menu "Physical Protections"
77511+depends on GRKERNSEC
77512+
77513+config GRKERNSEC_DENYUSB
77514+ bool "Deny new USB connections after toggle"
77515+ default y if GRKERNSEC_CONFIG_AUTO
77516+ depends on SYSCTL && USB_SUPPORT
77517+ help
77518+ If you say Y here, a new sysctl option with name "deny_new_usb"
77519+ will be created. Setting its value to 1 will prevent any new
77520+ USB devices from being recognized by the OS. Any attempted USB
77521+ device insertion will be logged. This option is intended to be
77522+ used against custom USB devices designed to exploit vulnerabilities
77523+ in various USB device drivers.
77524+
77525+ For greatest effectiveness, this sysctl should be set after any
77526+ relevant init scripts. This option is safe to enable in distros
77527+ as each user can choose whether or not to toggle the sysctl.
77528+
77529+config GRKERNSEC_DENYUSB_FORCE
77530+ bool "Reject all USB devices not connected at boot"
77531+ select USB
77532+ depends on GRKERNSEC_DENYUSB
77533+ help
77534+ If you say Y here, a variant of GRKERNSEC_DENYUSB will be enabled
77535+ that doesn't involve a sysctl entry. This option should only be
77536+ enabled if you're sure you want to deny all new USB connections
77537+ at runtime and don't want to modify init scripts. This should not
77538+ be enabled by distros. It forces the core USB code to be built
77539+ into the kernel image so that all devices connected at boot time
77540+ can be recognized and new USB device connections can be prevented
77541+ prior to init running.
77542+
77543+endmenu
77544+
77545+menu "Sysctl Support"
77546+depends on GRKERNSEC && SYSCTL
77547+
77548+config GRKERNSEC_SYSCTL
77549+ bool "Sysctl support"
77550+ default y if GRKERNSEC_CONFIG_AUTO
77551+ help
77552+ If you say Y here, you will be able to change the options that
77553+ grsecurity runs with at bootup, without having to recompile your
77554+ kernel. You can echo values to files in /proc/sys/kernel/grsecurity
77555+ to enable (1) or disable (0) various features. All the sysctl entries
77556+ are mutable until the "grsec_lock" entry is set to a non-zero value.
77557+ All features enabled in the kernel configuration are disabled at boot
77558+ if you do not say Y to the "Turn on features by default" option.
77559+ All options should be set at startup, and the grsec_lock entry should
77560+ be set to a non-zero value after all the options are set.
77561+ *THIS IS EXTREMELY IMPORTANT*
77562+
77563+config GRKERNSEC_SYSCTL_DISTRO
77564+ bool "Extra sysctl support for distro makers (READ HELP)"
77565+ depends on GRKERNSEC_SYSCTL && GRKERNSEC_IO
77566+ help
77567+ If you say Y here, additional sysctl options will be created
77568+ for features that affect processes running as root. Therefore,
77569+ it is critical when using this option that the grsec_lock entry be
77570+ enabled after boot. Only distros with prebuilt kernel packages
77571+ with this option enabled that can ensure grsec_lock is enabled
77572+ after boot should use this option.
77573+ *Failure to set grsec_lock after boot makes all grsec features
77574+ this option covers useless*
77575+
77576+ Currently this option creates the following sysctl entries:
77577+ "Disable Privileged I/O": "disable_priv_io"
77578+
77579+config GRKERNSEC_SYSCTL_ON
77580+ bool "Turn on features by default"
77581+ default y if GRKERNSEC_CONFIG_AUTO
77582+ depends on GRKERNSEC_SYSCTL
77583+ help
77584+ If you say Y here, instead of having all features enabled in the
77585+ kernel configuration disabled at boot time, the features will be
77586+ enabled at boot time. It is recommended you say Y here unless
77587+ there is some reason you would want all sysctl-tunable features to
77588+ be disabled by default. As mentioned elsewhere, it is important
77589+ to enable the grsec_lock entry once you have finished modifying
77590+ the sysctl entries.
77591+
77592+endmenu
77593+menu "Logging Options"
77594+depends on GRKERNSEC
77595+
77596+config GRKERNSEC_FLOODTIME
77597+ int "Seconds in between log messages (minimum)"
77598+ default 10
77599+ help
77600+ This option allows you to enforce the number of seconds between
77601+ grsecurity log messages. The default should be suitable for most
77602+ people, however, if you choose to change it, choose a value small enough
77603+ to allow informative logs to be produced, but large enough to
77604+ prevent flooding.
77605+
77606+ Setting both this value and GRKERNSEC_FLOODBURST to 0 will disable
77607+ any rate limiting on grsecurity log messages.
77608+
77609+config GRKERNSEC_FLOODBURST
77610+ int "Number of messages in a burst (maximum)"
77611+ default 6
77612+ help
77613+ This option allows you to choose the maximum number of messages allowed
77614+ within the flood time interval you chose in a separate option. The
77615+ default should be suitable for most people, however if you find that
77616+ many of your logs are being interpreted as flooding, you may want to
77617+ raise this value.
77618+
77619+ Setting both this value and GRKERNSEC_FLOODTIME to 0 will disable
77620+ any rate limiting on grsecurity log messages.
77621+
77622+endmenu
77623diff --git a/grsecurity/Makefile b/grsecurity/Makefile
77624new file mode 100644
77625index 0000000..30ababb
77626--- /dev/null
77627+++ b/grsecurity/Makefile
77628@@ -0,0 +1,54 @@
77629+# grsecurity – access control and security hardening for Linux
77630+# All code in this directory and various hooks located throughout the Linux kernel are
77631+# Copyright (C) 2001-2014 Bradley Spengler, Open Source Security, Inc.
77632+# http://www.grsecurity.net spender@grsecurity.net
77633+#
77634+# This program is free software; you can redistribute it and/or
77635+# modify it under the terms of the GNU General Public License version 2
77636+# as published by the Free Software Foundation.
77637+#
77638+# This program is distributed in the hope that it will be useful,
77639+# but WITHOUT ANY WARRANTY; without even the implied warranty of
77640+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
77641+# GNU General Public License for more details.
77642+#
77643+# You should have received a copy of the GNU General Public License
77644+# along with this program; if not, write to the Free Software
77645+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
77646+
77647+KBUILD_CFLAGS += -Werror
77648+
77649+obj-y = grsec_chdir.o grsec_chroot.o grsec_exec.o grsec_fifo.o grsec_fork.o \
77650+ grsec_mount.o grsec_sig.o grsec_sysctl.o \
77651+ grsec_time.o grsec_tpe.o grsec_link.o grsec_pax.o grsec_ptrace.o \
77652+ grsec_usb.o grsec_ipc.o grsec_proc.o
77653+
77654+obj-$(CONFIG_GRKERNSEC) += grsec_init.o grsum.o gracl.o gracl_segv.o \
77655+ gracl_cap.o gracl_alloc.o gracl_shm.o grsec_mem.o gracl_fs.o \
77656+ gracl_learn.o grsec_log.o gracl_policy.o
77657+ifdef CONFIG_COMPAT
77658+obj-$(CONFIG_GRKERNSEC) += gracl_compat.o
77659+endif
77660+
77661+obj-$(CONFIG_GRKERNSEC_RESLOG) += gracl_res.o
77662+
77663+ifdef CONFIG_NET
77664+obj-y += grsec_sock.o
77665+obj-$(CONFIG_GRKERNSEC) += gracl_ip.o
77666+endif
77667+
77668+ifndef CONFIG_GRKERNSEC
77669+obj-y += grsec_disabled.o
77670+endif
77671+
77672+ifdef CONFIG_GRKERNSEC_HIDESYM
77673+extra-y := grsec_hidesym.o
77674+$(obj)/grsec_hidesym.o:
77675+ @-chmod -f 500 /boot
77676+ @-chmod -f 500 /lib/modules
77677+ @-chmod -f 500 /lib64/modules
77678+ @-chmod -f 500 /lib32/modules
77679+ @-chmod -f 700 .
77680+ @-chmod -f 700 $(objtree)
77681+ @echo ' grsec: protected kernel image paths'
77682+endif
77683diff --git a/grsecurity/gracl.c b/grsecurity/gracl.c
77684new file mode 100644
77685index 0000000..811af1f
77686--- /dev/null
77687+++ b/grsecurity/gracl.c
77688@@ -0,0 +1,2749 @@
77689+#include <linux/kernel.h>
77690+#include <linux/module.h>
77691+#include <linux/sched.h>
77692+#include <linux/mm.h>
77693+#include <linux/file.h>
77694+#include <linux/fs.h>
77695+#include <linux/namei.h>
77696+#include <linux/mount.h>
77697+#include <linux/tty.h>
77698+#include <linux/proc_fs.h>
77699+#include <linux/lglock.h>
77700+#include <linux/slab.h>
77701+#include <linux/vmalloc.h>
77702+#include <linux/types.h>
77703+#include <linux/sysctl.h>
77704+#include <linux/netdevice.h>
77705+#include <linux/ptrace.h>
77706+#include <linux/gracl.h>
77707+#include <linux/gralloc.h>
77708+#include <linux/security.h>
77709+#include <linux/grinternal.h>
77710+#include <linux/pid_namespace.h>
77711+#include <linux/stop_machine.h>
77712+#include <linux/fdtable.h>
77713+#include <linux/percpu.h>
77714+#include <linux/lglock.h>
77715+#include <linux/hugetlb.h>
77716+#include <linux/posix-timers.h>
77717+#include <linux/prefetch.h>
77718+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
77719+#include <linux/magic.h>
77720+#include <linux/pagemap.h>
77721+#include "../fs/btrfs/async-thread.h"
77722+#include "../fs/btrfs/ctree.h"
77723+#include "../fs/btrfs/btrfs_inode.h"
77724+#endif
77725+#include "../fs/mount.h"
77726+
77727+#include <asm/uaccess.h>
77728+#include <asm/errno.h>
77729+#include <asm/mman.h>
77730+
77731+#define FOR_EACH_ROLE_START(role) \
77732+ role = running_polstate.role_list; \
77733+ while (role) {
77734+
77735+#define FOR_EACH_ROLE_END(role) \
77736+ role = role->prev; \
77737+ }
77738+
77739+extern struct path gr_real_root;
77740+
77741+static struct gr_policy_state running_polstate;
77742+struct gr_policy_state *polstate = &running_polstate;
77743+extern struct gr_alloc_state *current_alloc_state;
77744+
77745+extern char *gr_shared_page[4];
77746+DEFINE_RWLOCK(gr_inode_lock);
77747+
77748+static unsigned int gr_status __read_only = GR_STATUS_INIT;
77749+
77750+#ifdef CONFIG_NET
77751+extern struct vfsmount *sock_mnt;
77752+#endif
77753+
77754+extern struct vfsmount *pipe_mnt;
77755+extern struct vfsmount *shm_mnt;
77756+
77757+#ifdef CONFIG_HUGETLBFS
77758+extern struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
77759+#endif
77760+
77761+extern u16 acl_sp_role_value;
77762+extern struct acl_object_label *fakefs_obj_rw;
77763+extern struct acl_object_label *fakefs_obj_rwx;
77764+
77765+int gr_acl_is_enabled(void)
77766+{
77767+ return (gr_status & GR_READY);
77768+}
77769+
77770+void gr_enable_rbac_system(void)
77771+{
77772+ pax_open_kernel();
77773+ gr_status |= GR_READY;
77774+ pax_close_kernel();
77775+}
77776+
77777+int gr_rbac_disable(void *unused)
77778+{
77779+ pax_open_kernel();
77780+ gr_status &= ~GR_READY;
77781+ pax_close_kernel();
77782+
77783+ return 0;
77784+}
77785+
77786+static inline dev_t __get_dev(const struct dentry *dentry)
77787+{
77788+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
77789+ if (dentry->d_sb->s_magic == BTRFS_SUPER_MAGIC)
77790+ return BTRFS_I(dentry->d_inode)->root->anon_dev;
77791+ else
77792+#endif
77793+ return dentry->d_sb->s_dev;
77794+}
77795+
77796+static inline u64 __get_ino(const struct dentry *dentry)
77797+{
77798+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
77799+ if (dentry->d_sb->s_magic == BTRFS_SUPER_MAGIC)
77800+ return btrfs_ino(dentry->d_inode);
77801+ else
77802+#endif
77803+ return dentry->d_inode->i_ino;
77804+}
77805+
77806+dev_t gr_get_dev_from_dentry(struct dentry *dentry)
77807+{
77808+ return __get_dev(dentry);
77809+}
77810+
77811+u64 gr_get_ino_from_dentry(struct dentry *dentry)
77812+{
77813+ return __get_ino(dentry);
77814+}
77815+
77816+static char gr_task_roletype_to_char(struct task_struct *task)
77817+{
77818+ switch (task->role->roletype &
77819+ (GR_ROLE_DEFAULT | GR_ROLE_USER | GR_ROLE_GROUP |
77820+ GR_ROLE_SPECIAL)) {
77821+ case GR_ROLE_DEFAULT:
77822+ return 'D';
77823+ case GR_ROLE_USER:
77824+ return 'U';
77825+ case GR_ROLE_GROUP:
77826+ return 'G';
77827+ case GR_ROLE_SPECIAL:
77828+ return 'S';
77829+ }
77830+
77831+ return 'X';
77832+}
77833+
77834+char gr_roletype_to_char(void)
77835+{
77836+ return gr_task_roletype_to_char(current);
77837+}
77838+
77839+int
77840+gr_acl_tpe_check(void)
77841+{
77842+ if (unlikely(!(gr_status & GR_READY)))
77843+ return 0;
77844+ if (current->role->roletype & GR_ROLE_TPE)
77845+ return 1;
77846+ else
77847+ return 0;
77848+}
77849+
77850+int
77851+gr_handle_rawio(const struct inode *inode)
77852+{
77853+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
77854+ if (inode && (S_ISBLK(inode->i_mode) || (S_ISCHR(inode->i_mode) && imajor(inode) == RAW_MAJOR)) &&
77855+ grsec_enable_chroot_caps && proc_is_chrooted(current) &&
77856+ !capable(CAP_SYS_RAWIO))
77857+ return 1;
77858+#endif
77859+ return 0;
77860+}
77861+
77862+int
77863+gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb)
77864+{
77865+ if (likely(lena != lenb))
77866+ return 0;
77867+
77868+ return !memcmp(a, b, lena);
77869+}
77870+
77871+static int prepend(char **buffer, int *buflen, const char *str, int namelen)
77872+{
77873+ *buflen -= namelen;
77874+ if (*buflen < 0)
77875+ return -ENAMETOOLONG;
77876+ *buffer -= namelen;
77877+ memcpy(*buffer, str, namelen);
77878+ return 0;
77879+}
77880+
77881+static int prepend_name(char **buffer, int *buflen, struct qstr *name)
77882+{
77883+ return prepend(buffer, buflen, name->name, name->len);
77884+}
77885+
77886+static int prepend_path(const struct path *path, struct path *root,
77887+ char **buffer, int *buflen)
77888+{
77889+ struct dentry *dentry = path->dentry;
77890+ struct vfsmount *vfsmnt = path->mnt;
77891+ struct mount *mnt = real_mount(vfsmnt);
77892+ bool slash = false;
77893+ int error = 0;
77894+
77895+ while (dentry != root->dentry || vfsmnt != root->mnt) {
77896+ struct dentry * parent;
77897+
77898+ if (dentry == vfsmnt->mnt_root || IS_ROOT(dentry)) {
77899+ /* Global root? */
77900+ if (!mnt_has_parent(mnt)) {
77901+ goto out;
77902+ }
77903+ dentry = mnt->mnt_mountpoint;
77904+ mnt = mnt->mnt_parent;
77905+ vfsmnt = &mnt->mnt;
77906+ continue;
77907+ }
77908+ parent = dentry->d_parent;
77909+ prefetch(parent);
77910+ spin_lock(&dentry->d_lock);
77911+ error = prepend_name(buffer, buflen, &dentry->d_name);
77912+ spin_unlock(&dentry->d_lock);
77913+ if (!error)
77914+ error = prepend(buffer, buflen, "/", 1);
77915+ if (error)
77916+ break;
77917+
77918+ slash = true;
77919+ dentry = parent;
77920+ }
77921+
77922+out:
77923+ if (!error && !slash)
77924+ error = prepend(buffer, buflen, "/", 1);
77925+
77926+ return error;
77927+}
77928+
77929+/* this must be called with mount_lock and rename_lock held */
77930+
77931+static char *__our_d_path(const struct path *path, struct path *root,
77932+ char *buf, int buflen)
77933+{
77934+ char *res = buf + buflen;
77935+ int error;
77936+
77937+ prepend(&res, &buflen, "\0", 1);
77938+ error = prepend_path(path, root, &res, &buflen);
77939+ if (error)
77940+ return ERR_PTR(error);
77941+
77942+ return res;
77943+}
77944+
77945+static char *
77946+gen_full_path(struct path *path, struct path *root, char *buf, int buflen)
77947+{
77948+ char *retval;
77949+
77950+ retval = __our_d_path(path, root, buf, buflen);
77951+ if (unlikely(IS_ERR(retval)))
77952+ retval = strcpy(buf, "<path too long>");
77953+ else if (unlikely(retval[1] == '/' && retval[2] == '\0'))
77954+ retval[1] = '\0';
77955+
77956+ return retval;
77957+}
77958+
77959+static char *
77960+__d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
77961+ char *buf, int buflen)
77962+{
77963+ struct path path;
77964+ char *res;
77965+
77966+ path.dentry = (struct dentry *)dentry;
77967+ path.mnt = (struct vfsmount *)vfsmnt;
77968+
77969+ /* we can use gr_real_root.dentry, gr_real_root.mnt, because this is only called
77970+ by the RBAC system */
77971+ res = gen_full_path(&path, &gr_real_root, buf, buflen);
77972+
77973+ return res;
77974+}
77975+
77976+static char *
77977+d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
77978+ char *buf, int buflen)
77979+{
77980+ char *res;
77981+ struct path path;
77982+ struct path root;
77983+ struct task_struct *reaper = init_pid_ns.child_reaper;
77984+
77985+ path.dentry = (struct dentry *)dentry;
77986+ path.mnt = (struct vfsmount *)vfsmnt;
77987+
77988+ /* we can't use gr_real_root.dentry, gr_real_root.mnt, because they belong only to the RBAC system */
77989+ get_fs_root(reaper->fs, &root);
77990+
77991+ read_seqlock_excl(&mount_lock);
77992+ write_seqlock(&rename_lock);
77993+ res = gen_full_path(&path, &root, buf, buflen);
77994+ write_sequnlock(&rename_lock);
77995+ read_sequnlock_excl(&mount_lock);
77996+
77997+ path_put(&root);
77998+ return res;
77999+}
78000+
78001+char *
78002+gr_to_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
78003+{
78004+ char *ret;
78005+ read_seqlock_excl(&mount_lock);
78006+ write_seqlock(&rename_lock);
78007+ ret = __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
78008+ PAGE_SIZE);
78009+ write_sequnlock(&rename_lock);
78010+ read_sequnlock_excl(&mount_lock);
78011+ return ret;
78012+}
78013+
78014+static char *
78015+gr_to_proc_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
78016+{
78017+ char *ret;
78018+ char *buf;
78019+ int buflen;
78020+
78021+ read_seqlock_excl(&mount_lock);
78022+ write_seqlock(&rename_lock);
78023+ buf = per_cpu_ptr(gr_shared_page[0], smp_processor_id());
78024+ ret = __d_real_path(dentry, mnt, buf, PAGE_SIZE - 6);
78025+ buflen = (int)(ret - buf);
78026+ if (buflen >= 5)
78027+ prepend(&ret, &buflen, "/proc", 5);
78028+ else
78029+ ret = strcpy(buf, "<path too long>");
78030+ write_sequnlock(&rename_lock);
78031+ read_sequnlock_excl(&mount_lock);
78032+ return ret;
78033+}
78034+
78035+char *
78036+gr_to_filename_nolock(const struct dentry *dentry, const struct vfsmount *mnt)
78037+{
78038+ return __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
78039+ PAGE_SIZE);
78040+}
78041+
78042+char *
78043+gr_to_filename(const struct dentry *dentry, const struct vfsmount *mnt)
78044+{
78045+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
78046+ PAGE_SIZE);
78047+}
78048+
78049+char *
78050+gr_to_filename1(const struct dentry *dentry, const struct vfsmount *mnt)
78051+{
78052+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[1], smp_processor_id()),
78053+ PAGE_SIZE);
78054+}
78055+
78056+char *
78057+gr_to_filename2(const struct dentry *dentry, const struct vfsmount *mnt)
78058+{
78059+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[2], smp_processor_id()),
78060+ PAGE_SIZE);
78061+}
78062+
78063+char *
78064+gr_to_filename3(const struct dentry *dentry, const struct vfsmount *mnt)
78065+{
78066+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[3], smp_processor_id()),
78067+ PAGE_SIZE);
78068+}
78069+
78070+__u32
78071+to_gr_audit(const __u32 reqmode)
78072+{
78073+ /* masks off auditable permission flags, then shifts them to create
78074+ auditing flags, and adds the special case of append auditing if
78075+ we're requesting write */
78076+ return (((reqmode & ~GR_AUDITS) << 10) | ((reqmode & GR_WRITE) ? GR_AUDIT_APPEND : 0));
78077+}
78078+
78079+struct acl_role_label *
78080+__lookup_acl_role_label(const struct gr_policy_state *state, const struct task_struct *task, const uid_t uid,
78081+ const gid_t gid)
78082+{
78083+ unsigned int index = gr_rhash(uid, GR_ROLE_USER, state->acl_role_set.r_size);
78084+ struct acl_role_label *match;
78085+ struct role_allowed_ip *ipp;
78086+ unsigned int x;
78087+ u32 curr_ip = task->signal->saved_ip;
78088+
78089+ match = state->acl_role_set.r_hash[index];
78090+
78091+ while (match) {
78092+ if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_USER)) == (GR_ROLE_DOMAIN | GR_ROLE_USER)) {
78093+ for (x = 0; x < match->domain_child_num; x++) {
78094+ if (match->domain_children[x] == uid)
78095+ goto found;
78096+ }
78097+ } else if (match->uidgid == uid && match->roletype & GR_ROLE_USER)
78098+ break;
78099+ match = match->next;
78100+ }
78101+found:
78102+ if (match == NULL) {
78103+ try_group:
78104+ index = gr_rhash(gid, GR_ROLE_GROUP, state->acl_role_set.r_size);
78105+ match = state->acl_role_set.r_hash[index];
78106+
78107+ while (match) {
78108+ if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) == (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) {
78109+ for (x = 0; x < match->domain_child_num; x++) {
78110+ if (match->domain_children[x] == gid)
78111+ goto found2;
78112+ }
78113+ } else if (match->uidgid == gid && match->roletype & GR_ROLE_GROUP)
78114+ break;
78115+ match = match->next;
78116+ }
78117+found2:
78118+ if (match == NULL)
78119+ match = state->default_role;
78120+ if (match->allowed_ips == NULL)
78121+ return match;
78122+ else {
78123+ for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
78124+ if (likely
78125+ ((ntohl(curr_ip) & ipp->netmask) ==
78126+ (ntohl(ipp->addr) & ipp->netmask)))
78127+ return match;
78128+ }
78129+ match = state->default_role;
78130+ }
78131+ } else if (match->allowed_ips == NULL) {
78132+ return match;
78133+ } else {
78134+ for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
78135+ if (likely
78136+ ((ntohl(curr_ip) & ipp->netmask) ==
78137+ (ntohl(ipp->addr) & ipp->netmask)))
78138+ return match;
78139+ }
78140+ goto try_group;
78141+ }
78142+
78143+ return match;
78144+}
78145+
78146+static struct acl_role_label *
78147+lookup_acl_role_label(const struct task_struct *task, const uid_t uid,
78148+ const gid_t gid)
78149+{
78150+ return __lookup_acl_role_label(&running_polstate, task, uid, gid);
78151+}
78152+
78153+struct acl_subject_label *
78154+lookup_acl_subj_label(const u64 ino, const dev_t dev,
78155+ const struct acl_role_label *role)
78156+{
78157+ unsigned int index = gr_fhash(ino, dev, role->subj_hash_size);
78158+ struct acl_subject_label *match;
78159+
78160+ match = role->subj_hash[index];
78161+
78162+ while (match && (match->inode != ino || match->device != dev ||
78163+ (match->mode & GR_DELETED))) {
78164+ match = match->next;
78165+ }
78166+
78167+ if (match && !(match->mode & GR_DELETED))
78168+ return match;
78169+ else
78170+ return NULL;
78171+}
78172+
78173+struct acl_subject_label *
78174+lookup_acl_subj_label_deleted(const u64 ino, const dev_t dev,
78175+ const struct acl_role_label *role)
78176+{
78177+ unsigned int index = gr_fhash(ino, dev, role->subj_hash_size);
78178+ struct acl_subject_label *match;
78179+
78180+ match = role->subj_hash[index];
78181+
78182+ while (match && (match->inode != ino || match->device != dev ||
78183+ !(match->mode & GR_DELETED))) {
78184+ match = match->next;
78185+ }
78186+
78187+ if (match && (match->mode & GR_DELETED))
78188+ return match;
78189+ else
78190+ return NULL;
78191+}
78192+
78193+static struct acl_object_label *
78194+lookup_acl_obj_label(const u64 ino, const dev_t dev,
78195+ const struct acl_subject_label *subj)
78196+{
78197+ unsigned int index = gr_fhash(ino, dev, subj->obj_hash_size);
78198+ struct acl_object_label *match;
78199+
78200+ match = subj->obj_hash[index];
78201+
78202+ while (match && (match->inode != ino || match->device != dev ||
78203+ (match->mode & GR_DELETED))) {
78204+ match = match->next;
78205+ }
78206+
78207+ if (match && !(match->mode & GR_DELETED))
78208+ return match;
78209+ else
78210+ return NULL;
78211+}
78212+
78213+static struct acl_object_label *
78214+lookup_acl_obj_label_create(const u64 ino, const dev_t dev,
78215+ const struct acl_subject_label *subj)
78216+{
78217+ unsigned int index = gr_fhash(ino, dev, subj->obj_hash_size);
78218+ struct acl_object_label *match;
78219+
78220+ match = subj->obj_hash[index];
78221+
78222+ while (match && (match->inode != ino || match->device != dev ||
78223+ !(match->mode & GR_DELETED))) {
78224+ match = match->next;
78225+ }
78226+
78227+ if (match && (match->mode & GR_DELETED))
78228+ return match;
78229+
78230+ match = subj->obj_hash[index];
78231+
78232+ while (match && (match->inode != ino || match->device != dev ||
78233+ (match->mode & GR_DELETED))) {
78234+ match = match->next;
78235+ }
78236+
78237+ if (match && !(match->mode & GR_DELETED))
78238+ return match;
78239+ else
78240+ return NULL;
78241+}
78242+
78243+struct name_entry *
78244+__lookup_name_entry(const struct gr_policy_state *state, const char *name)
78245+{
78246+ unsigned int len = strlen(name);
78247+ unsigned int key = full_name_hash(name, len);
78248+ unsigned int index = key % state->name_set.n_size;
78249+ struct name_entry *match;
78250+
78251+ match = state->name_set.n_hash[index];
78252+
78253+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len)))
78254+ match = match->next;
78255+
78256+ return match;
78257+}
78258+
78259+static struct name_entry *
78260+lookup_name_entry(const char *name)
78261+{
78262+ return __lookup_name_entry(&running_polstate, name);
78263+}
78264+
78265+static struct name_entry *
78266+lookup_name_entry_create(const char *name)
78267+{
78268+ unsigned int len = strlen(name);
78269+ unsigned int key = full_name_hash(name, len);
78270+ unsigned int index = key % running_polstate.name_set.n_size;
78271+ struct name_entry *match;
78272+
78273+ match = running_polstate.name_set.n_hash[index];
78274+
78275+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
78276+ !match->deleted))
78277+ match = match->next;
78278+
78279+ if (match && match->deleted)
78280+ return match;
78281+
78282+ match = running_polstate.name_set.n_hash[index];
78283+
78284+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
78285+ match->deleted))
78286+ match = match->next;
78287+
78288+ if (match && !match->deleted)
78289+ return match;
78290+ else
78291+ return NULL;
78292+}
78293+
78294+static struct inodev_entry *
78295+lookup_inodev_entry(const u64 ino, const dev_t dev)
78296+{
78297+ unsigned int index = gr_fhash(ino, dev, running_polstate.inodev_set.i_size);
78298+ struct inodev_entry *match;
78299+
78300+ match = running_polstate.inodev_set.i_hash[index];
78301+
78302+ while (match && (match->nentry->inode != ino || match->nentry->device != dev))
78303+ match = match->next;
78304+
78305+ return match;
78306+}
78307+
78308+void
78309+__insert_inodev_entry(const struct gr_policy_state *state, struct inodev_entry *entry)
78310+{
78311+ unsigned int index = gr_fhash(entry->nentry->inode, entry->nentry->device,
78312+ state->inodev_set.i_size);
78313+ struct inodev_entry **curr;
78314+
78315+ entry->prev = NULL;
78316+
78317+ curr = &state->inodev_set.i_hash[index];
78318+ if (*curr != NULL)
78319+ (*curr)->prev = entry;
78320+
78321+ entry->next = *curr;
78322+ *curr = entry;
78323+
78324+ return;
78325+}
78326+
78327+static void
78328+insert_inodev_entry(struct inodev_entry *entry)
78329+{
78330+ __insert_inodev_entry(&running_polstate, entry);
78331+}
78332+
78333+void
78334+insert_acl_obj_label(struct acl_object_label *obj,
78335+ struct acl_subject_label *subj)
78336+{
78337+ unsigned int index =
78338+ gr_fhash(obj->inode, obj->device, subj->obj_hash_size);
78339+ struct acl_object_label **curr;
78340+
78341+ obj->prev = NULL;
78342+
78343+ curr = &subj->obj_hash[index];
78344+ if (*curr != NULL)
78345+ (*curr)->prev = obj;
78346+
78347+ obj->next = *curr;
78348+ *curr = obj;
78349+
78350+ return;
78351+}
78352+
78353+void
78354+insert_acl_subj_label(struct acl_subject_label *obj,
78355+ struct acl_role_label *role)
78356+{
78357+ unsigned int index = gr_fhash(obj->inode, obj->device, role->subj_hash_size);
78358+ struct acl_subject_label **curr;
78359+
78360+ obj->prev = NULL;
78361+
78362+ curr = &role->subj_hash[index];
78363+ if (*curr != NULL)
78364+ (*curr)->prev = obj;
78365+
78366+ obj->next = *curr;
78367+ *curr = obj;
78368+
78369+ return;
78370+}
78371+
78372+/* derived from glibc fnmatch() 0: match, 1: no match*/
78373+
78374+static int
78375+glob_match(const char *p, const char *n)
78376+{
78377+ char c;
78378+
78379+ while ((c = *p++) != '\0') {
78380+ switch (c) {
78381+ case '?':
78382+ if (*n == '\0')
78383+ return 1;
78384+ else if (*n == '/')
78385+ return 1;
78386+ break;
78387+ case '\\':
78388+ if (*n != c)
78389+ return 1;
78390+ break;
78391+ case '*':
78392+ for (c = *p++; c == '?' || c == '*'; c = *p++) {
78393+ if (*n == '/')
78394+ return 1;
78395+ else if (c == '?') {
78396+ if (*n == '\0')
78397+ return 1;
78398+ else
78399+ ++n;
78400+ }
78401+ }
78402+ if (c == '\0') {
78403+ return 0;
78404+ } else {
78405+ const char *endp;
78406+
78407+ if ((endp = strchr(n, '/')) == NULL)
78408+ endp = n + strlen(n);
78409+
78410+ if (c == '[') {
78411+ for (--p; n < endp; ++n)
78412+ if (!glob_match(p, n))
78413+ return 0;
78414+ } else if (c == '/') {
78415+ while (*n != '\0' && *n != '/')
78416+ ++n;
78417+ if (*n == '/' && !glob_match(p, n + 1))
78418+ return 0;
78419+ } else {
78420+ for (--p; n < endp; ++n)
78421+ if (*n == c && !glob_match(p, n))
78422+ return 0;
78423+ }
78424+
78425+ return 1;
78426+ }
78427+ case '[':
78428+ {
78429+ int not;
78430+ char cold;
78431+
78432+ if (*n == '\0' || *n == '/')
78433+ return 1;
78434+
78435+ not = (*p == '!' || *p == '^');
78436+ if (not)
78437+ ++p;
78438+
78439+ c = *p++;
78440+ for (;;) {
78441+ unsigned char fn = (unsigned char)*n;
78442+
78443+ if (c == '\0')
78444+ return 1;
78445+ else {
78446+ if (c == fn)
78447+ goto matched;
78448+ cold = c;
78449+ c = *p++;
78450+
78451+ if (c == '-' && *p != ']') {
78452+ unsigned char cend = *p++;
78453+
78454+ if (cend == '\0')
78455+ return 1;
78456+
78457+ if (cold <= fn && fn <= cend)
78458+ goto matched;
78459+
78460+ c = *p++;
78461+ }
78462+ }
78463+
78464+ if (c == ']')
78465+ break;
78466+ }
78467+ if (!not)
78468+ return 1;
78469+ break;
78470+ matched:
78471+ while (c != ']') {
78472+ if (c == '\0')
78473+ return 1;
78474+
78475+ c = *p++;
78476+ }
78477+ if (not)
78478+ return 1;
78479+ }
78480+ break;
78481+ default:
78482+ if (c != *n)
78483+ return 1;
78484+ }
78485+
78486+ ++n;
78487+ }
78488+
78489+ if (*n == '\0')
78490+ return 0;
78491+
78492+ if (*n == '/')
78493+ return 0;
78494+
78495+ return 1;
78496+}
78497+
78498+static struct acl_object_label *
78499+chk_glob_label(struct acl_object_label *globbed,
78500+ const struct dentry *dentry, const struct vfsmount *mnt, char **path)
78501+{
78502+ struct acl_object_label *tmp;
78503+
78504+ if (*path == NULL)
78505+ *path = gr_to_filename_nolock(dentry, mnt);
78506+
78507+ tmp = globbed;
78508+
78509+ while (tmp) {
78510+ if (!glob_match(tmp->filename, *path))
78511+ return tmp;
78512+ tmp = tmp->next;
78513+ }
78514+
78515+ return NULL;
78516+}
78517+
78518+static struct acl_object_label *
78519+__full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
78520+ const u64 curr_ino, const dev_t curr_dev,
78521+ const struct acl_subject_label *subj, char **path, const int checkglob)
78522+{
78523+ struct acl_subject_label *tmpsubj;
78524+ struct acl_object_label *retval;
78525+ struct acl_object_label *retval2;
78526+
78527+ tmpsubj = (struct acl_subject_label *) subj;
78528+ read_lock(&gr_inode_lock);
78529+ do {
78530+ retval = lookup_acl_obj_label(curr_ino, curr_dev, tmpsubj);
78531+ if (retval) {
78532+ if (checkglob && retval->globbed) {
78533+ retval2 = chk_glob_label(retval->globbed, orig_dentry, orig_mnt, path);
78534+ if (retval2)
78535+ retval = retval2;
78536+ }
78537+ break;
78538+ }
78539+ } while ((tmpsubj = tmpsubj->parent_subject));
78540+ read_unlock(&gr_inode_lock);
78541+
78542+ return retval;
78543+}
78544+
78545+static struct acl_object_label *
78546+full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
78547+ struct dentry *curr_dentry,
78548+ const struct acl_subject_label *subj, char **path, const int checkglob)
78549+{
78550+ int newglob = checkglob;
78551+ u64 inode;
78552+ dev_t device;
78553+
78554+ /* if we aren't checking a subdirectory of the original path yet, don't do glob checking
78555+ as we don't want a / * rule to match instead of the / object
78556+ don't do this for create lookups that call this function though, since they're looking up
78557+ on the parent and thus need globbing checks on all paths
78558+ */
78559+ if (orig_dentry == curr_dentry && newglob != GR_CREATE_GLOB)
78560+ newglob = GR_NO_GLOB;
78561+
78562+ spin_lock(&curr_dentry->d_lock);
78563+ inode = __get_ino(curr_dentry);
78564+ device = __get_dev(curr_dentry);
78565+ spin_unlock(&curr_dentry->d_lock);
78566+
78567+ return __full_lookup(orig_dentry, orig_mnt, inode, device, subj, path, newglob);
78568+}
78569+
78570+#ifdef CONFIG_HUGETLBFS
78571+static inline bool
78572+is_hugetlbfs_mnt(const struct vfsmount *mnt)
78573+{
78574+ int i;
78575+ for (i = 0; i < HUGE_MAX_HSTATE; i++) {
78576+ if (unlikely(hugetlbfs_vfsmount[i] == mnt))
78577+ return true;
78578+ }
78579+
78580+ return false;
78581+}
78582+#endif
78583+
78584+static struct acl_object_label *
78585+__chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
78586+ const struct acl_subject_label *subj, char *path, const int checkglob)
78587+{
78588+ struct dentry *dentry = (struct dentry *) l_dentry;
78589+ struct vfsmount *mnt = (struct vfsmount *) l_mnt;
78590+ struct mount *real_mnt = real_mount(mnt);
78591+ struct acl_object_label *retval;
78592+ struct dentry *parent;
78593+
78594+ read_seqlock_excl(&mount_lock);
78595+ write_seqlock(&rename_lock);
78596+
78597+ if (unlikely((mnt == shm_mnt && dentry->d_inode->i_nlink == 0) || mnt == pipe_mnt ||
78598+#ifdef CONFIG_NET
78599+ mnt == sock_mnt ||
78600+#endif
78601+#ifdef CONFIG_HUGETLBFS
78602+ (is_hugetlbfs_mnt(mnt) && dentry->d_inode->i_nlink == 0) ||
78603+#endif
78604+ /* ignore Eric Biederman */
78605+ IS_PRIVATE(l_dentry->d_inode))) {
78606+ retval = (subj->mode & GR_SHMEXEC) ? fakefs_obj_rwx : fakefs_obj_rw;
78607+ goto out;
78608+ }
78609+
78610+ for (;;) {
78611+ if (dentry == gr_real_root.dentry && mnt == gr_real_root.mnt)
78612+ break;
78613+
78614+ if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
78615+ if (!mnt_has_parent(real_mnt))
78616+ break;
78617+
78618+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
78619+ if (retval != NULL)
78620+ goto out;
78621+
78622+ dentry = real_mnt->mnt_mountpoint;
78623+ real_mnt = real_mnt->mnt_parent;
78624+ mnt = &real_mnt->mnt;
78625+ continue;
78626+ }
78627+
78628+ parent = dentry->d_parent;
78629+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
78630+ if (retval != NULL)
78631+ goto out;
78632+
78633+ dentry = parent;
78634+ }
78635+
78636+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
78637+
78638+ /* gr_real_root is pinned so we don't have to hold a reference */
78639+ if (retval == NULL)
78640+ retval = full_lookup(l_dentry, l_mnt, gr_real_root.dentry, subj, &path, checkglob);
78641+out:
78642+ write_sequnlock(&rename_lock);
78643+ read_sequnlock_excl(&mount_lock);
78644+
78645+ BUG_ON(retval == NULL);
78646+
78647+ return retval;
78648+}
78649+
78650+static struct acl_object_label *
78651+chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
78652+ const struct acl_subject_label *subj)
78653+{
78654+ char *path = NULL;
78655+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_REG_GLOB);
78656+}
78657+
78658+static struct acl_object_label *
78659+chk_obj_label_noglob(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
78660+ const struct acl_subject_label *subj)
78661+{
78662+ char *path = NULL;
78663+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_NO_GLOB);
78664+}
78665+
78666+static struct acl_object_label *
78667+chk_obj_create_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
78668+ const struct acl_subject_label *subj, char *path)
78669+{
78670+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_CREATE_GLOB);
78671+}
78672+
78673+struct acl_subject_label *
78674+chk_subj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
78675+ const struct acl_role_label *role)
78676+{
78677+ struct dentry *dentry = (struct dentry *) l_dentry;
78678+ struct vfsmount *mnt = (struct vfsmount *) l_mnt;
78679+ struct mount *real_mnt = real_mount(mnt);
78680+ struct acl_subject_label *retval;
78681+ struct dentry *parent;
78682+
78683+ read_seqlock_excl(&mount_lock);
78684+ write_seqlock(&rename_lock);
78685+
78686+ for (;;) {
78687+ if (dentry == gr_real_root.dentry && mnt == gr_real_root.mnt)
78688+ break;
78689+ if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
78690+ if (!mnt_has_parent(real_mnt))
78691+ break;
78692+
78693+ spin_lock(&dentry->d_lock);
78694+ read_lock(&gr_inode_lock);
78695+ retval =
78696+ lookup_acl_subj_label(__get_ino(dentry),
78697+ __get_dev(dentry), role);
78698+ read_unlock(&gr_inode_lock);
78699+ spin_unlock(&dentry->d_lock);
78700+ if (retval != NULL)
78701+ goto out;
78702+
78703+ dentry = real_mnt->mnt_mountpoint;
78704+ real_mnt = real_mnt->mnt_parent;
78705+ mnt = &real_mnt->mnt;
78706+ continue;
78707+ }
78708+
78709+ spin_lock(&dentry->d_lock);
78710+ read_lock(&gr_inode_lock);
78711+ retval = lookup_acl_subj_label(__get_ino(dentry),
78712+ __get_dev(dentry), role);
78713+ read_unlock(&gr_inode_lock);
78714+ parent = dentry->d_parent;
78715+ spin_unlock(&dentry->d_lock);
78716+
78717+ if (retval != NULL)
78718+ goto out;
78719+
78720+ dentry = parent;
78721+ }
78722+
78723+ spin_lock(&dentry->d_lock);
78724+ read_lock(&gr_inode_lock);
78725+ retval = lookup_acl_subj_label(__get_ino(dentry),
78726+ __get_dev(dentry), role);
78727+ read_unlock(&gr_inode_lock);
78728+ spin_unlock(&dentry->d_lock);
78729+
78730+ if (unlikely(retval == NULL)) {
78731+ /* gr_real_root is pinned, we don't need to hold a reference */
78732+ read_lock(&gr_inode_lock);
78733+ retval = lookup_acl_subj_label(__get_ino(gr_real_root.dentry),
78734+ __get_dev(gr_real_root.dentry), role);
78735+ read_unlock(&gr_inode_lock);
78736+ }
78737+out:
78738+ write_sequnlock(&rename_lock);
78739+ read_sequnlock_excl(&mount_lock);
78740+
78741+ BUG_ON(retval == NULL);
78742+
78743+ return retval;
78744+}
78745+
78746+void
78747+assign_special_role(const char *rolename)
78748+{
78749+ struct acl_object_label *obj;
78750+ struct acl_role_label *r;
78751+ struct acl_role_label *assigned = NULL;
78752+ struct task_struct *tsk;
78753+ struct file *filp;
78754+
78755+ FOR_EACH_ROLE_START(r)
78756+ if (!strcmp(rolename, r->rolename) &&
78757+ (r->roletype & GR_ROLE_SPECIAL)) {
78758+ assigned = r;
78759+ break;
78760+ }
78761+ FOR_EACH_ROLE_END(r)
78762+
78763+ if (!assigned)
78764+ return;
78765+
78766+ read_lock(&tasklist_lock);
78767+ read_lock(&grsec_exec_file_lock);
78768+
78769+ tsk = current->real_parent;
78770+ if (tsk == NULL)
78771+ goto out_unlock;
78772+
78773+ filp = tsk->exec_file;
78774+ if (filp == NULL)
78775+ goto out_unlock;
78776+
78777+ tsk->is_writable = 0;
78778+ tsk->inherited = 0;
78779+
78780+ tsk->acl_sp_role = 1;
78781+ tsk->acl_role_id = ++acl_sp_role_value;
78782+ tsk->role = assigned;
78783+ tsk->acl = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role);
78784+
78785+ /* ignore additional mmap checks for processes that are writable
78786+ by the default ACL */
78787+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
78788+ if (unlikely(obj->mode & GR_WRITE))
78789+ tsk->is_writable = 1;
78790+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role->root_label);
78791+ if (unlikely(obj->mode & GR_WRITE))
78792+ tsk->is_writable = 1;
78793+
78794+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
78795+ printk(KERN_ALERT "Assigning special role:%s subject:%s to process (%s:%d)\n", tsk->role->rolename,
78796+ tsk->acl->filename, tsk->comm, task_pid_nr(tsk));
78797+#endif
78798+
78799+out_unlock:
78800+ read_unlock(&grsec_exec_file_lock);
78801+ read_unlock(&tasklist_lock);
78802+ return;
78803+}
78804+
78805+
78806+static void
78807+gr_log_learn(const struct dentry *dentry, const struct vfsmount *mnt, const __u32 mode)
78808+{
78809+ struct task_struct *task = current;
78810+ const struct cred *cred = current_cred();
78811+
78812+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename, task->role->roletype,
78813+ GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
78814+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
78815+ 1UL, 1UL, gr_to_filename(dentry, mnt), (unsigned long) mode, &task->signal->saved_ip);
78816+
78817+ return;
78818+}
78819+
78820+static void
78821+gr_log_learn_uid_change(const kuid_t real, const kuid_t effective, const kuid_t fs)
78822+{
78823+ struct task_struct *task = current;
78824+ const struct cred *cred = current_cred();
78825+
78826+ security_learn(GR_ID_LEARN_MSG, task->role->rolename, task->role->roletype,
78827+ GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
78828+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
78829+ 'u', GR_GLOBAL_UID(real), GR_GLOBAL_UID(effective), GR_GLOBAL_UID(fs), &task->signal->saved_ip);
78830+
78831+ return;
78832+}
78833+
78834+static void
78835+gr_log_learn_gid_change(const kgid_t real, const kgid_t effective, const kgid_t fs)
78836+{
78837+ struct task_struct *task = current;
78838+ const struct cred *cred = current_cred();
78839+
78840+ security_learn(GR_ID_LEARN_MSG, task->role->rolename, task->role->roletype,
78841+ GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
78842+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
78843+ 'g', GR_GLOBAL_GID(real), GR_GLOBAL_GID(effective), GR_GLOBAL_GID(fs), &task->signal->saved_ip);
78844+
78845+ return;
78846+}
78847+
78848+static void
78849+gr_set_proc_res(struct task_struct *task)
78850+{
78851+ struct acl_subject_label *proc;
78852+ unsigned short i;
78853+
78854+ proc = task->acl;
78855+
78856+ if (proc->mode & (GR_LEARN | GR_INHERITLEARN))
78857+ return;
78858+
78859+ for (i = 0; i < RLIM_NLIMITS; i++) {
78860+ unsigned long rlim_cur, rlim_max;
78861+
78862+ if (!(proc->resmask & (1U << i)))
78863+ continue;
78864+
78865+ rlim_cur = proc->res[i].rlim_cur;
78866+ rlim_max = proc->res[i].rlim_max;
78867+
78868+ if (i == RLIMIT_NOFILE) {
78869+ unsigned long saved_sysctl_nr_open = sysctl_nr_open;
78870+ if (rlim_cur > saved_sysctl_nr_open)
78871+ rlim_cur = saved_sysctl_nr_open;
78872+ if (rlim_max > saved_sysctl_nr_open)
78873+ rlim_max = saved_sysctl_nr_open;
78874+ }
78875+
78876+ task->signal->rlim[i].rlim_cur = rlim_cur;
78877+ task->signal->rlim[i].rlim_max = rlim_max;
78878+
78879+ if (i == RLIMIT_CPU)
78880+ update_rlimit_cpu(task, rlim_cur);
78881+ }
78882+
78883+ return;
78884+}
78885+
78886+/* both of the below must be called with
78887+ rcu_read_lock();
78888+ read_lock(&tasklist_lock);
78889+ read_lock(&grsec_exec_file_lock);
78890+ except in the case of gr_set_role_label() (for __gr_get_subject_for_task)
78891+*/
78892+
78893+struct acl_subject_label *__gr_get_subject_for_task(const struct gr_policy_state *state, struct task_struct *task, const char *filename, int fallback)
78894+{
78895+ char *tmpname;
78896+ struct acl_subject_label *tmpsubj;
78897+ struct file *filp;
78898+ struct name_entry *nmatch;
78899+
78900+ filp = task->exec_file;
78901+ if (filp == NULL)
78902+ return NULL;
78903+
78904+ /* the following is to apply the correct subject
78905+ on binaries running when the RBAC system
78906+ is enabled, when the binaries have been
78907+ replaced or deleted since their execution
78908+ -----
78909+ when the RBAC system starts, the inode/dev
78910+ from exec_file will be one the RBAC system
78911+ is unaware of. It only knows the inode/dev
78912+ of the present file on disk, or the absence
78913+ of it.
78914+ */
78915+
78916+ if (filename)
78917+ nmatch = __lookup_name_entry(state, filename);
78918+ else {
78919+ preempt_disable();
78920+ tmpname = gr_to_filename_rbac(filp->f_path.dentry, filp->f_path.mnt);
78921+
78922+ nmatch = __lookup_name_entry(state, tmpname);
78923+ preempt_enable();
78924+ }
78925+ tmpsubj = NULL;
78926+ if (nmatch) {
78927+ if (nmatch->deleted)
78928+ tmpsubj = lookup_acl_subj_label_deleted(nmatch->inode, nmatch->device, task->role);
78929+ else
78930+ tmpsubj = lookup_acl_subj_label(nmatch->inode, nmatch->device, task->role);
78931+ }
78932+ /* this also works for the reload case -- if we don't match a potentially inherited subject
78933+ then we fall back to a normal lookup based on the binary's ino/dev
78934+ */
78935+ if (tmpsubj == NULL && fallback)
78936+ tmpsubj = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, task->role);
78937+
78938+ return tmpsubj;
78939+}
78940+
78941+static struct acl_subject_label *gr_get_subject_for_task(struct task_struct *task, const char *filename, int fallback)
78942+{
78943+ return __gr_get_subject_for_task(&running_polstate, task, filename, fallback);
78944+}
78945+
78946+void __gr_apply_subject_to_task(const struct gr_policy_state *state, struct task_struct *task, struct acl_subject_label *subj)
78947+{
78948+ struct acl_object_label *obj;
78949+ struct file *filp;
78950+
78951+ filp = task->exec_file;
78952+
78953+ task->acl = subj;
78954+ task->is_writable = 0;
78955+ /* ignore additional mmap checks for processes that are writable
78956+ by the default ACL */
78957+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, state->default_role->root_label);
78958+ if (unlikely(obj->mode & GR_WRITE))
78959+ task->is_writable = 1;
78960+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
78961+ if (unlikely(obj->mode & GR_WRITE))
78962+ task->is_writable = 1;
78963+
78964+ gr_set_proc_res(task);
78965+
78966+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
78967+ 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);
78968+#endif
78969+}
78970+
78971+static void gr_apply_subject_to_task(struct task_struct *task, struct acl_subject_label *subj)
78972+{
78973+ __gr_apply_subject_to_task(&running_polstate, task, subj);
78974+}
78975+
78976+__u32
78977+gr_search_file(const struct dentry * dentry, const __u32 mode,
78978+ const struct vfsmount * mnt)
78979+{
78980+ __u32 retval = mode;
78981+ struct acl_subject_label *curracl;
78982+ struct acl_object_label *currobj;
78983+
78984+ if (unlikely(!(gr_status & GR_READY)))
78985+ return (mode & ~GR_AUDITS);
78986+
78987+ curracl = current->acl;
78988+
78989+ currobj = chk_obj_label(dentry, mnt, curracl);
78990+ retval = currobj->mode & mode;
78991+
78992+ /* if we're opening a specified transfer file for writing
78993+ (e.g. /dev/initctl), then transfer our role to init
78994+ */
78995+ if (unlikely(currobj->mode & GR_INIT_TRANSFER && retval & GR_WRITE &&
78996+ current->role->roletype & GR_ROLE_PERSIST)) {
78997+ struct task_struct *task = init_pid_ns.child_reaper;
78998+
78999+ if (task->role != current->role) {
79000+ struct acl_subject_label *subj;
79001+
79002+ task->acl_sp_role = 0;
79003+ task->acl_role_id = current->acl_role_id;
79004+ task->role = current->role;
79005+ rcu_read_lock();
79006+ read_lock(&grsec_exec_file_lock);
79007+ subj = gr_get_subject_for_task(task, NULL, 1);
79008+ gr_apply_subject_to_task(task, subj);
79009+ read_unlock(&grsec_exec_file_lock);
79010+ rcu_read_unlock();
79011+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_INIT_TRANSFER_MSG);
79012+ }
79013+ }
79014+
79015+ if (unlikely
79016+ ((curracl->mode & (GR_LEARN | GR_INHERITLEARN)) && !(mode & GR_NOPTRACE)
79017+ && (retval != (mode & ~(GR_AUDITS | GR_SUPPRESS))))) {
79018+ __u32 new_mode = mode;
79019+
79020+ new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
79021+
79022+ retval = new_mode;
79023+
79024+ if (new_mode & GR_EXEC && curracl->mode & GR_INHERITLEARN)
79025+ new_mode |= GR_INHERIT;
79026+
79027+ if (!(mode & GR_NOLEARN))
79028+ gr_log_learn(dentry, mnt, new_mode);
79029+ }
79030+
79031+ return retval;
79032+}
79033+
79034+struct acl_object_label *gr_get_create_object(const struct dentry *new_dentry,
79035+ const struct dentry *parent,
79036+ const struct vfsmount *mnt)
79037+{
79038+ struct name_entry *match;
79039+ struct acl_object_label *matchpo;
79040+ struct acl_subject_label *curracl;
79041+ char *path;
79042+
79043+ if (unlikely(!(gr_status & GR_READY)))
79044+ return NULL;
79045+
79046+ preempt_disable();
79047+ path = gr_to_filename_rbac(new_dentry, mnt);
79048+ match = lookup_name_entry_create(path);
79049+
79050+ curracl = current->acl;
79051+
79052+ if (match) {
79053+ read_lock(&gr_inode_lock);
79054+ matchpo = lookup_acl_obj_label_create(match->inode, match->device, curracl);
79055+ read_unlock(&gr_inode_lock);
79056+
79057+ if (matchpo) {
79058+ preempt_enable();
79059+ return matchpo;
79060+ }
79061+ }
79062+
79063+ // lookup parent
79064+
79065+ matchpo = chk_obj_create_label(parent, mnt, curracl, path);
79066+
79067+ preempt_enable();
79068+ return matchpo;
79069+}
79070+
79071+__u32
79072+gr_check_create(const struct dentry * new_dentry, const struct dentry * parent,
79073+ const struct vfsmount * mnt, const __u32 mode)
79074+{
79075+ struct acl_object_label *matchpo;
79076+ __u32 retval;
79077+
79078+ if (unlikely(!(gr_status & GR_READY)))
79079+ return (mode & ~GR_AUDITS);
79080+
79081+ matchpo = gr_get_create_object(new_dentry, parent, mnt);
79082+
79083+ retval = matchpo->mode & mode;
79084+
79085+ if ((retval != (mode & ~(GR_AUDITS | GR_SUPPRESS)))
79086+ && (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
79087+ __u32 new_mode = mode;
79088+
79089+ new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
79090+
79091+ gr_log_learn(new_dentry, mnt, new_mode);
79092+ return new_mode;
79093+ }
79094+
79095+ return retval;
79096+}
79097+
79098+__u32
79099+gr_check_link(const struct dentry * new_dentry,
79100+ const struct dentry * parent_dentry,
79101+ const struct vfsmount * parent_mnt,
79102+ const struct dentry * old_dentry, const struct vfsmount * old_mnt)
79103+{
79104+ struct acl_object_label *obj;
79105+ __u32 oldmode, newmode;
79106+ __u32 needmode;
79107+ __u32 checkmodes = GR_FIND | GR_APPEND | GR_WRITE | GR_EXEC | GR_SETID | GR_READ |
79108+ GR_DELETE | GR_INHERIT;
79109+
79110+ if (unlikely(!(gr_status & GR_READY)))
79111+ return (GR_CREATE | GR_LINK);
79112+
79113+ obj = chk_obj_label(old_dentry, old_mnt, current->acl);
79114+ oldmode = obj->mode;
79115+
79116+ obj = gr_get_create_object(new_dentry, parent_dentry, parent_mnt);
79117+ newmode = obj->mode;
79118+
79119+ needmode = newmode & checkmodes;
79120+
79121+ // old name for hardlink must have at least the permissions of the new name
79122+ if ((oldmode & needmode) != needmode)
79123+ goto bad;
79124+
79125+ // if old name had restrictions/auditing, make sure the new name does as well
79126+ needmode = oldmode & (GR_NOPTRACE | GR_PTRACERD | GR_INHERIT | GR_AUDITS);
79127+
79128+ // don't allow hardlinking of suid/sgid/fcapped files without permission
79129+ if (is_privileged_binary(old_dentry))
79130+ needmode |= GR_SETID;
79131+
79132+ if ((newmode & needmode) != needmode)
79133+ goto bad;
79134+
79135+ // enforce minimum permissions
79136+ if ((newmode & (GR_CREATE | GR_LINK)) == (GR_CREATE | GR_LINK))
79137+ return newmode;
79138+bad:
79139+ needmode = oldmode;
79140+ if (is_privileged_binary(old_dentry))
79141+ needmode |= GR_SETID;
79142+
79143+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN)) {
79144+ gr_log_learn(old_dentry, old_mnt, needmode | GR_CREATE | GR_LINK);
79145+ return (GR_CREATE | GR_LINK);
79146+ } else if (newmode & GR_SUPPRESS)
79147+ return GR_SUPPRESS;
79148+ else
79149+ return 0;
79150+}
79151+
79152+int
79153+gr_check_hidden_task(const struct task_struct *task)
79154+{
79155+ if (unlikely(!(gr_status & GR_READY)))
79156+ return 0;
79157+
79158+ if (!(task->acl->mode & GR_PROCFIND) && !(current->acl->mode & GR_VIEW))
79159+ return 1;
79160+
79161+ return 0;
79162+}
79163+
79164+int
79165+gr_check_protected_task(const struct task_struct *task)
79166+{
79167+ if (unlikely(!(gr_status & GR_READY) || !task))
79168+ return 0;
79169+
79170+ if ((task->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
79171+ task->acl != current->acl)
79172+ return 1;
79173+
79174+ return 0;
79175+}
79176+
79177+int
79178+gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
79179+{
79180+ struct task_struct *p;
79181+ int ret = 0;
79182+
79183+ if (unlikely(!(gr_status & GR_READY) || !pid))
79184+ return ret;
79185+
79186+ read_lock(&tasklist_lock);
79187+ do_each_pid_task(pid, type, p) {
79188+ if ((p->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
79189+ p->acl != current->acl) {
79190+ ret = 1;
79191+ goto out;
79192+ }
79193+ } while_each_pid_task(pid, type, p);
79194+out:
79195+ read_unlock(&tasklist_lock);
79196+
79197+ return ret;
79198+}
79199+
79200+void
79201+gr_copy_label(struct task_struct *tsk)
79202+{
79203+ struct task_struct *p = current;
79204+
79205+ tsk->inherited = p->inherited;
79206+ tsk->acl_sp_role = 0;
79207+ tsk->acl_role_id = p->acl_role_id;
79208+ tsk->acl = p->acl;
79209+ tsk->role = p->role;
79210+ tsk->signal->used_accept = 0;
79211+ tsk->signal->curr_ip = p->signal->curr_ip;
79212+ tsk->signal->saved_ip = p->signal->saved_ip;
79213+ if (p->exec_file)
79214+ get_file(p->exec_file);
79215+ tsk->exec_file = p->exec_file;
79216+ tsk->is_writable = p->is_writable;
79217+ if (unlikely(p->signal->used_accept)) {
79218+ p->signal->curr_ip = 0;
79219+ p->signal->saved_ip = 0;
79220+ }
79221+
79222+ return;
79223+}
79224+
79225+extern int gr_process_kernel_setuid_ban(struct user_struct *user);
79226+
79227+int
79228+gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs)
79229+{
79230+ unsigned int i;
79231+ __u16 num;
79232+ uid_t *uidlist;
79233+ uid_t curuid;
79234+ int realok = 0;
79235+ int effectiveok = 0;
79236+ int fsok = 0;
79237+ uid_t globalreal, globaleffective, globalfs;
79238+
79239+#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT)
79240+ struct user_struct *user;
79241+
79242+ if (!uid_valid(real))
79243+ goto skipit;
79244+
79245+ /* find user based on global namespace */
79246+
79247+ globalreal = GR_GLOBAL_UID(real);
79248+
79249+ user = find_user(make_kuid(&init_user_ns, globalreal));
79250+ if (user == NULL)
79251+ goto skipit;
79252+
79253+ if (gr_process_kernel_setuid_ban(user)) {
79254+ /* for find_user */
79255+ free_uid(user);
79256+ return 1;
79257+ }
79258+
79259+ /* for find_user */
79260+ free_uid(user);
79261+
79262+skipit:
79263+#endif
79264+
79265+ if (unlikely(!(gr_status & GR_READY)))
79266+ return 0;
79267+
79268+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
79269+ gr_log_learn_uid_change(real, effective, fs);
79270+
79271+ num = current->acl->user_trans_num;
79272+ uidlist = current->acl->user_transitions;
79273+
79274+ if (uidlist == NULL)
79275+ return 0;
79276+
79277+ if (!uid_valid(real)) {
79278+ realok = 1;
79279+ globalreal = (uid_t)-1;
79280+ } else {
79281+ globalreal = GR_GLOBAL_UID(real);
79282+ }
79283+ if (!uid_valid(effective)) {
79284+ effectiveok = 1;
79285+ globaleffective = (uid_t)-1;
79286+ } else {
79287+ globaleffective = GR_GLOBAL_UID(effective);
79288+ }
79289+ if (!uid_valid(fs)) {
79290+ fsok = 1;
79291+ globalfs = (uid_t)-1;
79292+ } else {
79293+ globalfs = GR_GLOBAL_UID(fs);
79294+ }
79295+
79296+ if (current->acl->user_trans_type & GR_ID_ALLOW) {
79297+ for (i = 0; i < num; i++) {
79298+ curuid = uidlist[i];
79299+ if (globalreal == curuid)
79300+ realok = 1;
79301+ if (globaleffective == curuid)
79302+ effectiveok = 1;
79303+ if (globalfs == curuid)
79304+ fsok = 1;
79305+ }
79306+ } else if (current->acl->user_trans_type & GR_ID_DENY) {
79307+ for (i = 0; i < num; i++) {
79308+ curuid = uidlist[i];
79309+ if (globalreal == curuid)
79310+ break;
79311+ if (globaleffective == curuid)
79312+ break;
79313+ if (globalfs == curuid)
79314+ break;
79315+ }
79316+ /* not in deny list */
79317+ if (i == num) {
79318+ realok = 1;
79319+ effectiveok = 1;
79320+ fsok = 1;
79321+ }
79322+ }
79323+
79324+ if (realok && effectiveok && fsok)
79325+ return 0;
79326+ else {
79327+ gr_log_int(GR_DONT_AUDIT, GR_USRCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : globalfs) : globaleffective) : globalreal);
79328+ return 1;
79329+ }
79330+}
79331+
79332+int
79333+gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs)
79334+{
79335+ unsigned int i;
79336+ __u16 num;
79337+ gid_t *gidlist;
79338+ gid_t curgid;
79339+ int realok = 0;
79340+ int effectiveok = 0;
79341+ int fsok = 0;
79342+ gid_t globalreal, globaleffective, globalfs;
79343+
79344+ if (unlikely(!(gr_status & GR_READY)))
79345+ return 0;
79346+
79347+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
79348+ gr_log_learn_gid_change(real, effective, fs);
79349+
79350+ num = current->acl->group_trans_num;
79351+ gidlist = current->acl->group_transitions;
79352+
79353+ if (gidlist == NULL)
79354+ return 0;
79355+
79356+ if (!gid_valid(real)) {
79357+ realok = 1;
79358+ globalreal = (gid_t)-1;
79359+ } else {
79360+ globalreal = GR_GLOBAL_GID(real);
79361+ }
79362+ if (!gid_valid(effective)) {
79363+ effectiveok = 1;
79364+ globaleffective = (gid_t)-1;
79365+ } else {
79366+ globaleffective = GR_GLOBAL_GID(effective);
79367+ }
79368+ if (!gid_valid(fs)) {
79369+ fsok = 1;
79370+ globalfs = (gid_t)-1;
79371+ } else {
79372+ globalfs = GR_GLOBAL_GID(fs);
79373+ }
79374+
79375+ if (current->acl->group_trans_type & GR_ID_ALLOW) {
79376+ for (i = 0; i < num; i++) {
79377+ curgid = gidlist[i];
79378+ if (globalreal == curgid)
79379+ realok = 1;
79380+ if (globaleffective == curgid)
79381+ effectiveok = 1;
79382+ if (globalfs == curgid)
79383+ fsok = 1;
79384+ }
79385+ } else if (current->acl->group_trans_type & GR_ID_DENY) {
79386+ for (i = 0; i < num; i++) {
79387+ curgid = gidlist[i];
79388+ if (globalreal == curgid)
79389+ break;
79390+ if (globaleffective == curgid)
79391+ break;
79392+ if (globalfs == curgid)
79393+ break;
79394+ }
79395+ /* not in deny list */
79396+ if (i == num) {
79397+ realok = 1;
79398+ effectiveok = 1;
79399+ fsok = 1;
79400+ }
79401+ }
79402+
79403+ if (realok && effectiveok && fsok)
79404+ return 0;
79405+ else {
79406+ gr_log_int(GR_DONT_AUDIT, GR_GRPCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : globalfs) : globaleffective) : globalreal);
79407+ return 1;
79408+ }
79409+}
79410+
79411+extern int gr_acl_is_capable(const int cap);
79412+
79413+void
79414+gr_set_role_label(struct task_struct *task, const kuid_t kuid, const kgid_t kgid)
79415+{
79416+ struct acl_role_label *role = task->role;
79417+ struct acl_role_label *origrole = role;
79418+ struct acl_subject_label *subj = NULL;
79419+ struct acl_object_label *obj;
79420+ struct file *filp;
79421+ uid_t uid;
79422+ gid_t gid;
79423+
79424+ if (unlikely(!(gr_status & GR_READY)))
79425+ return;
79426+
79427+ uid = GR_GLOBAL_UID(kuid);
79428+ gid = GR_GLOBAL_GID(kgid);
79429+
79430+ filp = task->exec_file;
79431+
79432+ /* kernel process, we'll give them the kernel role */
79433+ if (unlikely(!filp)) {
79434+ task->role = running_polstate.kernel_role;
79435+ task->acl = running_polstate.kernel_role->root_label;
79436+ return;
79437+ } else if (!task->role || !(task->role->roletype & GR_ROLE_SPECIAL)) {
79438+ /* save the current ip at time of role lookup so that the proper
79439+ IP will be learned for role_allowed_ip */
79440+ task->signal->saved_ip = task->signal->curr_ip;
79441+ role = lookup_acl_role_label(task, uid, gid);
79442+ }
79443+
79444+ /* don't change the role if we're not a privileged process */
79445+ if (role && task->role != role &&
79446+ (((role->roletype & GR_ROLE_USER) && !gr_acl_is_capable(CAP_SETUID)) ||
79447+ ((role->roletype & GR_ROLE_GROUP) && !gr_acl_is_capable(CAP_SETGID))))
79448+ return;
79449+
79450+ task->role = role;
79451+
79452+ if (task->inherited) {
79453+ /* if we reached our subject through inheritance, then first see
79454+ if there's a subject of the same name in the new role that has
79455+ an object that would result in the same inherited subject
79456+ */
79457+ subj = gr_get_subject_for_task(task, task->acl->filename, 0);
79458+ if (subj) {
79459+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, subj);
79460+ if (!(obj->mode & GR_INHERIT))
79461+ subj = NULL;
79462+ }
79463+
79464+ }
79465+ if (subj == NULL) {
79466+ /* otherwise:
79467+ perform subject lookup in possibly new role
79468+ we can use this result below in the case where role == task->role
79469+ */
79470+ subj = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, role);
79471+ }
79472+
79473+ /* if we changed uid/gid, but result in the same role
79474+ and are using inheritance, don't lose the inherited subject
79475+ if current subject is other than what normal lookup
79476+ would result in, we arrived via inheritance, don't
79477+ lose subject
79478+ */
79479+ if (role != origrole || (!(task->acl->mode & GR_INHERITLEARN) &&
79480+ (subj == task->acl)))
79481+ task->acl = subj;
79482+
79483+ /* leave task->inherited unaffected */
79484+
79485+ task->is_writable = 0;
79486+
79487+ /* ignore additional mmap checks for processes that are writable
79488+ by the default ACL */
79489+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
79490+ if (unlikely(obj->mode & GR_WRITE))
79491+ task->is_writable = 1;
79492+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
79493+ if (unlikely(obj->mode & GR_WRITE))
79494+ task->is_writable = 1;
79495+
79496+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
79497+ 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);
79498+#endif
79499+
79500+ gr_set_proc_res(task);
79501+
79502+ return;
79503+}
79504+
79505+int
79506+gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
79507+ const int unsafe_flags)
79508+{
79509+ struct task_struct *task = current;
79510+ struct acl_subject_label *newacl;
79511+ struct acl_object_label *obj;
79512+ __u32 retmode;
79513+
79514+ if (unlikely(!(gr_status & GR_READY)))
79515+ return 0;
79516+
79517+ newacl = chk_subj_label(dentry, mnt, task->role);
79518+
79519+ /* special handling for if we did an strace -f -p <pid> from an admin role, where pid then
79520+ did an exec
79521+ */
79522+ rcu_read_lock();
79523+ read_lock(&tasklist_lock);
79524+ if (task->ptrace && task->parent && ((task->parent->role->roletype & GR_ROLE_GOD) ||
79525+ (task->parent->acl->mode & GR_POVERRIDE))) {
79526+ read_unlock(&tasklist_lock);
79527+ rcu_read_unlock();
79528+ goto skip_check;
79529+ }
79530+ read_unlock(&tasklist_lock);
79531+ rcu_read_unlock();
79532+
79533+ if (unsafe_flags && !(task->acl->mode & GR_POVERRIDE) && (task->acl != newacl) &&
79534+ !(task->role->roletype & GR_ROLE_GOD) &&
79535+ !gr_search_file(dentry, GR_PTRACERD, mnt) &&
79536+ !(task->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
79537+ if (unsafe_flags & LSM_UNSAFE_SHARE)
79538+ gr_log_fs_generic(GR_DONT_AUDIT, GR_UNSAFESHARE_EXEC_ACL_MSG, dentry, mnt);
79539+ else
79540+ gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_EXEC_ACL_MSG, dentry, mnt);
79541+ return -EACCES;
79542+ }
79543+
79544+skip_check:
79545+
79546+ obj = chk_obj_label(dentry, mnt, task->acl);
79547+ retmode = obj->mode & (GR_INHERIT | GR_AUDIT_INHERIT);
79548+
79549+ if (!(task->acl->mode & GR_INHERITLEARN) &&
79550+ ((newacl->mode & GR_LEARN) || !(retmode & GR_INHERIT))) {
79551+ if (obj->nested)
79552+ task->acl = obj->nested;
79553+ else
79554+ task->acl = newacl;
79555+ task->inherited = 0;
79556+ } else {
79557+ task->inherited = 1;
79558+ if (retmode & GR_INHERIT && retmode & GR_AUDIT_INHERIT)
79559+ gr_log_str_fs(GR_DO_AUDIT, GR_INHERIT_ACL_MSG, task->acl->filename, dentry, mnt);
79560+ }
79561+
79562+ task->is_writable = 0;
79563+
79564+ /* ignore additional mmap checks for processes that are writable
79565+ by the default ACL */
79566+ obj = chk_obj_label(dentry, mnt, running_polstate.default_role->root_label);
79567+ if (unlikely(obj->mode & GR_WRITE))
79568+ task->is_writable = 1;
79569+ obj = chk_obj_label(dentry, mnt, task->role->root_label);
79570+ if (unlikely(obj->mode & GR_WRITE))
79571+ task->is_writable = 1;
79572+
79573+ gr_set_proc_res(task);
79574+
79575+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
79576+ 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);
79577+#endif
79578+ return 0;
79579+}
79580+
79581+/* always called with valid inodev ptr */
79582+static void
79583+do_handle_delete(struct inodev_entry *inodev, const u64 ino, const dev_t dev)
79584+{
79585+ struct acl_object_label *matchpo;
79586+ struct acl_subject_label *matchps;
79587+ struct acl_subject_label *subj;
79588+ struct acl_role_label *role;
79589+ unsigned int x;
79590+
79591+ FOR_EACH_ROLE_START(role)
79592+ FOR_EACH_SUBJECT_START(role, subj, x)
79593+ if ((matchpo = lookup_acl_obj_label(ino, dev, subj)) != NULL)
79594+ matchpo->mode |= GR_DELETED;
79595+ FOR_EACH_SUBJECT_END(subj,x)
79596+ FOR_EACH_NESTED_SUBJECT_START(role, subj)
79597+ /* nested subjects aren't in the role's subj_hash table */
79598+ if ((matchpo = lookup_acl_obj_label(ino, dev, subj)) != NULL)
79599+ matchpo->mode |= GR_DELETED;
79600+ FOR_EACH_NESTED_SUBJECT_END(subj)
79601+ if ((matchps = lookup_acl_subj_label(ino, dev, role)) != NULL)
79602+ matchps->mode |= GR_DELETED;
79603+ FOR_EACH_ROLE_END(role)
79604+
79605+ inodev->nentry->deleted = 1;
79606+
79607+ return;
79608+}
79609+
79610+void
79611+gr_handle_delete(const u64 ino, const dev_t dev)
79612+{
79613+ struct inodev_entry *inodev;
79614+
79615+ if (unlikely(!(gr_status & GR_READY)))
79616+ return;
79617+
79618+ write_lock(&gr_inode_lock);
79619+ inodev = lookup_inodev_entry(ino, dev);
79620+ if (inodev != NULL)
79621+ do_handle_delete(inodev, ino, dev);
79622+ write_unlock(&gr_inode_lock);
79623+
79624+ return;
79625+}
79626+
79627+static void
79628+update_acl_obj_label(const u64 oldinode, const dev_t olddevice,
79629+ const u64 newinode, const dev_t newdevice,
79630+ struct acl_subject_label *subj)
79631+{
79632+ unsigned int index = gr_fhash(oldinode, olddevice, subj->obj_hash_size);
79633+ struct acl_object_label *match;
79634+
79635+ match = subj->obj_hash[index];
79636+
79637+ while (match && (match->inode != oldinode ||
79638+ match->device != olddevice ||
79639+ !(match->mode & GR_DELETED)))
79640+ match = match->next;
79641+
79642+ if (match && (match->inode == oldinode)
79643+ && (match->device == olddevice)
79644+ && (match->mode & GR_DELETED)) {
79645+ if (match->prev == NULL) {
79646+ subj->obj_hash[index] = match->next;
79647+ if (match->next != NULL)
79648+ match->next->prev = NULL;
79649+ } else {
79650+ match->prev->next = match->next;
79651+ if (match->next != NULL)
79652+ match->next->prev = match->prev;
79653+ }
79654+ match->prev = NULL;
79655+ match->next = NULL;
79656+ match->inode = newinode;
79657+ match->device = newdevice;
79658+ match->mode &= ~GR_DELETED;
79659+
79660+ insert_acl_obj_label(match, subj);
79661+ }
79662+
79663+ return;
79664+}
79665+
79666+static void
79667+update_acl_subj_label(const u64 oldinode, const dev_t olddevice,
79668+ const u64 newinode, const dev_t newdevice,
79669+ struct acl_role_label *role)
79670+{
79671+ unsigned int index = gr_fhash(oldinode, olddevice, role->subj_hash_size);
79672+ struct acl_subject_label *match;
79673+
79674+ match = role->subj_hash[index];
79675+
79676+ while (match && (match->inode != oldinode ||
79677+ match->device != olddevice ||
79678+ !(match->mode & GR_DELETED)))
79679+ match = match->next;
79680+
79681+ if (match && (match->inode == oldinode)
79682+ && (match->device == olddevice)
79683+ && (match->mode & GR_DELETED)) {
79684+ if (match->prev == NULL) {
79685+ role->subj_hash[index] = match->next;
79686+ if (match->next != NULL)
79687+ match->next->prev = NULL;
79688+ } else {
79689+ match->prev->next = match->next;
79690+ if (match->next != NULL)
79691+ match->next->prev = match->prev;
79692+ }
79693+ match->prev = NULL;
79694+ match->next = NULL;
79695+ match->inode = newinode;
79696+ match->device = newdevice;
79697+ match->mode &= ~GR_DELETED;
79698+
79699+ insert_acl_subj_label(match, role);
79700+ }
79701+
79702+ return;
79703+}
79704+
79705+static void
79706+update_inodev_entry(const u64 oldinode, const dev_t olddevice,
79707+ const u64 newinode, const dev_t newdevice)
79708+{
79709+ unsigned int index = gr_fhash(oldinode, olddevice, running_polstate.inodev_set.i_size);
79710+ struct inodev_entry *match;
79711+
79712+ match = running_polstate.inodev_set.i_hash[index];
79713+
79714+ while (match && (match->nentry->inode != oldinode ||
79715+ match->nentry->device != olddevice || !match->nentry->deleted))
79716+ match = match->next;
79717+
79718+ if (match && (match->nentry->inode == oldinode)
79719+ && (match->nentry->device == olddevice) &&
79720+ match->nentry->deleted) {
79721+ if (match->prev == NULL) {
79722+ running_polstate.inodev_set.i_hash[index] = match->next;
79723+ if (match->next != NULL)
79724+ match->next->prev = NULL;
79725+ } else {
79726+ match->prev->next = match->next;
79727+ if (match->next != NULL)
79728+ match->next->prev = match->prev;
79729+ }
79730+ match->prev = NULL;
79731+ match->next = NULL;
79732+ match->nentry->inode = newinode;
79733+ match->nentry->device = newdevice;
79734+ match->nentry->deleted = 0;
79735+
79736+ insert_inodev_entry(match);
79737+ }
79738+
79739+ return;
79740+}
79741+
79742+static void
79743+__do_handle_create(const struct name_entry *matchn, u64 ino, dev_t dev)
79744+{
79745+ struct acl_subject_label *subj;
79746+ struct acl_role_label *role;
79747+ unsigned int x;
79748+
79749+ FOR_EACH_ROLE_START(role)
79750+ update_acl_subj_label(matchn->inode, matchn->device, ino, dev, role);
79751+
79752+ FOR_EACH_NESTED_SUBJECT_START(role, subj)
79753+ if ((subj->inode == ino) && (subj->device == dev)) {
79754+ subj->inode = ino;
79755+ subj->device = dev;
79756+ }
79757+ /* nested subjects aren't in the role's subj_hash table */
79758+ update_acl_obj_label(matchn->inode, matchn->device,
79759+ ino, dev, subj);
79760+ FOR_EACH_NESTED_SUBJECT_END(subj)
79761+ FOR_EACH_SUBJECT_START(role, subj, x)
79762+ update_acl_obj_label(matchn->inode, matchn->device,
79763+ ino, dev, subj);
79764+ FOR_EACH_SUBJECT_END(subj,x)
79765+ FOR_EACH_ROLE_END(role)
79766+
79767+ update_inodev_entry(matchn->inode, matchn->device, ino, dev);
79768+
79769+ return;
79770+}
79771+
79772+static void
79773+do_handle_create(const struct name_entry *matchn, const struct dentry *dentry,
79774+ const struct vfsmount *mnt)
79775+{
79776+ u64 ino = __get_ino(dentry);
79777+ dev_t dev = __get_dev(dentry);
79778+
79779+ __do_handle_create(matchn, ino, dev);
79780+
79781+ return;
79782+}
79783+
79784+void
79785+gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
79786+{
79787+ struct name_entry *matchn;
79788+
79789+ if (unlikely(!(gr_status & GR_READY)))
79790+ return;
79791+
79792+ preempt_disable();
79793+ matchn = lookup_name_entry(gr_to_filename_rbac(dentry, mnt));
79794+
79795+ if (unlikely((unsigned long)matchn)) {
79796+ write_lock(&gr_inode_lock);
79797+ do_handle_create(matchn, dentry, mnt);
79798+ write_unlock(&gr_inode_lock);
79799+ }
79800+ preempt_enable();
79801+
79802+ return;
79803+}
79804+
79805+void
79806+gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
79807+{
79808+ struct name_entry *matchn;
79809+
79810+ if (unlikely(!(gr_status & GR_READY)))
79811+ return;
79812+
79813+ preempt_disable();
79814+ matchn = lookup_name_entry(gr_to_proc_filename_rbac(dentry, init_pid_ns.proc_mnt));
79815+
79816+ if (unlikely((unsigned long)matchn)) {
79817+ write_lock(&gr_inode_lock);
79818+ __do_handle_create(matchn, inode->i_ino, inode->i_sb->s_dev);
79819+ write_unlock(&gr_inode_lock);
79820+ }
79821+ preempt_enable();
79822+
79823+ return;
79824+}
79825+
79826+void
79827+gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
79828+ struct dentry *old_dentry,
79829+ struct dentry *new_dentry,
79830+ struct vfsmount *mnt, const __u8 replace, unsigned int flags)
79831+{
79832+ struct name_entry *matchn;
79833+ struct name_entry *matchn2 = NULL;
79834+ struct inodev_entry *inodev;
79835+ struct inode *inode = new_dentry->d_inode;
79836+ u64 old_ino = __get_ino(old_dentry);
79837+ dev_t old_dev = __get_dev(old_dentry);
79838+ unsigned int exchange = flags & RENAME_EXCHANGE;
79839+
79840+ /* vfs_rename swaps the name and parent link for old_dentry and
79841+ new_dentry
79842+ at this point, old_dentry has the new name, parent link, and inode
79843+ for the renamed file
79844+ if a file is being replaced by a rename, new_dentry has the inode
79845+ and name for the replaced file
79846+ */
79847+
79848+ if (unlikely(!(gr_status & GR_READY)))
79849+ return;
79850+
79851+ preempt_disable();
79852+ matchn = lookup_name_entry(gr_to_filename_rbac(old_dentry, mnt));
79853+
79854+ /* exchange cases:
79855+ a filename exists for the source, but not dest
79856+ do a recreate on source
79857+ a filename exists for the dest, but not source
79858+ do a recreate on dest
79859+ a filename exists for both source and dest
79860+ delete source and dest, then create source and dest
79861+ a filename exists for neither source nor dest
79862+ no updates needed
79863+
79864+ the name entry lookups get us the old inode/dev associated with
79865+ each name, so do the deletes first (if possible) so that when
79866+ we do the create, we pick up on the right entries
79867+ */
79868+
79869+ if (exchange)
79870+ matchn2 = lookup_name_entry(gr_to_filename_rbac(new_dentry, mnt));
79871+
79872+ /* we wouldn't have to check d_inode if it weren't for
79873+ NFS silly-renaming
79874+ */
79875+
79876+ write_lock(&gr_inode_lock);
79877+ if (unlikely((replace || exchange) && inode)) {
79878+ u64 new_ino = __get_ino(new_dentry);
79879+ dev_t new_dev = __get_dev(new_dentry);
79880+
79881+ inodev = lookup_inodev_entry(new_ino, new_dev);
79882+ if (inodev != NULL && ((inode->i_nlink <= 1) || S_ISDIR(inode->i_mode)))
79883+ do_handle_delete(inodev, new_ino, new_dev);
79884+ }
79885+
79886+ inodev = lookup_inodev_entry(old_ino, old_dev);
79887+ if (inodev != NULL && ((old_dentry->d_inode->i_nlink <= 1) || S_ISDIR(old_dentry->d_inode->i_mode)))
79888+ do_handle_delete(inodev, old_ino, old_dev);
79889+
79890+ if (unlikely(matchn != NULL))
79891+ do_handle_create(matchn, old_dentry, mnt);
79892+
79893+ if (unlikely(matchn2 != NULL))
79894+ do_handle_create(matchn2, new_dentry, mnt);
79895+
79896+ write_unlock(&gr_inode_lock);
79897+ preempt_enable();
79898+
79899+ return;
79900+}
79901+
79902+#if defined(CONFIG_GRKERNSEC_RESLOG) || !defined(CONFIG_GRKERNSEC_NO_RBAC)
79903+static const unsigned long res_learn_bumps[GR_NLIMITS] = {
79904+ [RLIMIT_CPU] = GR_RLIM_CPU_BUMP,
79905+ [RLIMIT_FSIZE] = GR_RLIM_FSIZE_BUMP,
79906+ [RLIMIT_DATA] = GR_RLIM_DATA_BUMP,
79907+ [RLIMIT_STACK] = GR_RLIM_STACK_BUMP,
79908+ [RLIMIT_CORE] = GR_RLIM_CORE_BUMP,
79909+ [RLIMIT_RSS] = GR_RLIM_RSS_BUMP,
79910+ [RLIMIT_NPROC] = GR_RLIM_NPROC_BUMP,
79911+ [RLIMIT_NOFILE] = GR_RLIM_NOFILE_BUMP,
79912+ [RLIMIT_MEMLOCK] = GR_RLIM_MEMLOCK_BUMP,
79913+ [RLIMIT_AS] = GR_RLIM_AS_BUMP,
79914+ [RLIMIT_LOCKS] = GR_RLIM_LOCKS_BUMP,
79915+ [RLIMIT_SIGPENDING] = GR_RLIM_SIGPENDING_BUMP,
79916+ [RLIMIT_MSGQUEUE] = GR_RLIM_MSGQUEUE_BUMP,
79917+ [RLIMIT_NICE] = GR_RLIM_NICE_BUMP,
79918+ [RLIMIT_RTPRIO] = GR_RLIM_RTPRIO_BUMP,
79919+ [RLIMIT_RTTIME] = GR_RLIM_RTTIME_BUMP
79920+};
79921+
79922+void
79923+gr_learn_resource(const struct task_struct *task,
79924+ const int res, const unsigned long wanted, const int gt)
79925+{
79926+ struct acl_subject_label *acl;
79927+ const struct cred *cred;
79928+
79929+ if (unlikely((gr_status & GR_READY) &&
79930+ task->acl && (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))))
79931+ goto skip_reslog;
79932+
79933+ gr_log_resource(task, res, wanted, gt);
79934+skip_reslog:
79935+
79936+ if (unlikely(!(gr_status & GR_READY) || !wanted || res >= GR_NLIMITS))
79937+ return;
79938+
79939+ acl = task->acl;
79940+
79941+ if (likely(!acl || !(acl->mode & (GR_LEARN | GR_INHERITLEARN)) ||
79942+ !(acl->resmask & (1U << (unsigned short) res))))
79943+ return;
79944+
79945+ if (wanted >= acl->res[res].rlim_cur) {
79946+ unsigned long res_add;
79947+
79948+ res_add = wanted + res_learn_bumps[res];
79949+
79950+ acl->res[res].rlim_cur = res_add;
79951+
79952+ if (wanted > acl->res[res].rlim_max)
79953+ acl->res[res].rlim_max = res_add;
79954+
79955+ /* only log the subject filename, since resource logging is supported for
79956+ single-subject learning only */
79957+ rcu_read_lock();
79958+ cred = __task_cred(task);
79959+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
79960+ task->role->roletype, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), acl->filename,
79961+ acl->filename, acl->res[res].rlim_cur, acl->res[res].rlim_max,
79962+ "", (unsigned long) res, &task->signal->saved_ip);
79963+ rcu_read_unlock();
79964+ }
79965+
79966+ return;
79967+}
79968+EXPORT_SYMBOL_GPL(gr_learn_resource);
79969+#endif
79970+
79971+#if defined(CONFIG_PAX_HAVE_ACL_FLAGS) && (defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR))
79972+void
79973+pax_set_initial_flags(struct linux_binprm *bprm)
79974+{
79975+ struct task_struct *task = current;
79976+ struct acl_subject_label *proc;
79977+ unsigned long flags;
79978+
79979+ if (unlikely(!(gr_status & GR_READY)))
79980+ return;
79981+
79982+ flags = pax_get_flags(task);
79983+
79984+ proc = task->acl;
79985+
79986+ if (proc->pax_flags & GR_PAX_DISABLE_PAGEEXEC)
79987+ flags &= ~MF_PAX_PAGEEXEC;
79988+ if (proc->pax_flags & GR_PAX_DISABLE_SEGMEXEC)
79989+ flags &= ~MF_PAX_SEGMEXEC;
79990+ if (proc->pax_flags & GR_PAX_DISABLE_RANDMMAP)
79991+ flags &= ~MF_PAX_RANDMMAP;
79992+ if (proc->pax_flags & GR_PAX_DISABLE_EMUTRAMP)
79993+ flags &= ~MF_PAX_EMUTRAMP;
79994+ if (proc->pax_flags & GR_PAX_DISABLE_MPROTECT)
79995+ flags &= ~MF_PAX_MPROTECT;
79996+
79997+ if (proc->pax_flags & GR_PAX_ENABLE_PAGEEXEC)
79998+ flags |= MF_PAX_PAGEEXEC;
79999+ if (proc->pax_flags & GR_PAX_ENABLE_SEGMEXEC)
80000+ flags |= MF_PAX_SEGMEXEC;
80001+ if (proc->pax_flags & GR_PAX_ENABLE_RANDMMAP)
80002+ flags |= MF_PAX_RANDMMAP;
80003+ if (proc->pax_flags & GR_PAX_ENABLE_EMUTRAMP)
80004+ flags |= MF_PAX_EMUTRAMP;
80005+ if (proc->pax_flags & GR_PAX_ENABLE_MPROTECT)
80006+ flags |= MF_PAX_MPROTECT;
80007+
80008+ pax_set_flags(task, flags);
80009+
80010+ return;
80011+}
80012+#endif
80013+
80014+int
80015+gr_handle_proc_ptrace(struct task_struct *task)
80016+{
80017+ struct file *filp;
80018+ struct task_struct *tmp = task;
80019+ struct task_struct *curtemp = current;
80020+ __u32 retmode;
80021+
80022+#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
80023+ if (unlikely(!(gr_status & GR_READY)))
80024+ return 0;
80025+#endif
80026+
80027+ read_lock(&tasklist_lock);
80028+ read_lock(&grsec_exec_file_lock);
80029+ filp = task->exec_file;
80030+
80031+ while (task_pid_nr(tmp) > 0) {
80032+ if (tmp == curtemp)
80033+ break;
80034+ tmp = tmp->real_parent;
80035+ }
80036+
80037+ if (!filp || (task_pid_nr(tmp) == 0 && ((grsec_enable_harden_ptrace && gr_is_global_nonroot(current_uid()) && !(gr_status & GR_READY)) ||
80038+ ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE))))) {
80039+ read_unlock(&grsec_exec_file_lock);
80040+ read_unlock(&tasklist_lock);
80041+ return 1;
80042+ }
80043+
80044+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
80045+ if (!(gr_status & GR_READY)) {
80046+ read_unlock(&grsec_exec_file_lock);
80047+ read_unlock(&tasklist_lock);
80048+ return 0;
80049+ }
80050+#endif
80051+
80052+ retmode = gr_search_file(filp->f_path.dentry, GR_NOPTRACE, filp->f_path.mnt);
80053+ read_unlock(&grsec_exec_file_lock);
80054+ read_unlock(&tasklist_lock);
80055+
80056+ if (retmode & GR_NOPTRACE)
80057+ return 1;
80058+
80059+ if (!(current->acl->mode & GR_POVERRIDE) && !(current->role->roletype & GR_ROLE_GOD)
80060+ && (current->acl != task->acl || (current->acl != current->role->root_label
80061+ && task_pid_nr(current) != task_pid_nr(task))))
80062+ return 1;
80063+
80064+ return 0;
80065+}
80066+
80067+void task_grsec_rbac(struct seq_file *m, struct task_struct *p)
80068+{
80069+ if (unlikely(!(gr_status & GR_READY)))
80070+ return;
80071+
80072+ if (!(current->role->roletype & GR_ROLE_GOD))
80073+ return;
80074+
80075+ seq_printf(m, "RBAC:\t%.64s:%c:%.950s\n",
80076+ p->role->rolename, gr_task_roletype_to_char(p),
80077+ p->acl->filename);
80078+}
80079+
80080+int
80081+gr_handle_ptrace(struct task_struct *task, const long request)
80082+{
80083+ struct task_struct *tmp = task;
80084+ struct task_struct *curtemp = current;
80085+ __u32 retmode;
80086+
80087+#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
80088+ if (unlikely(!(gr_status & GR_READY)))
80089+ return 0;
80090+#endif
80091+ if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
80092+ read_lock(&tasklist_lock);
80093+ while (task_pid_nr(tmp) > 0) {
80094+ if (tmp == curtemp)
80095+ break;
80096+ tmp = tmp->real_parent;
80097+ }
80098+
80099+ if (task_pid_nr(tmp) == 0 && ((grsec_enable_harden_ptrace && gr_is_global_nonroot(current_uid()) && !(gr_status & GR_READY)) ||
80100+ ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE)))) {
80101+ read_unlock(&tasklist_lock);
80102+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
80103+ return 1;
80104+ }
80105+ read_unlock(&tasklist_lock);
80106+ }
80107+
80108+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
80109+ if (!(gr_status & GR_READY))
80110+ return 0;
80111+#endif
80112+
80113+ read_lock(&grsec_exec_file_lock);
80114+ if (unlikely(!task->exec_file)) {
80115+ read_unlock(&grsec_exec_file_lock);
80116+ return 0;
80117+ }
80118+
80119+ retmode = gr_search_file(task->exec_file->f_path.dentry, GR_PTRACERD | GR_NOPTRACE, task->exec_file->f_path.mnt);
80120+ read_unlock(&grsec_exec_file_lock);
80121+
80122+ if (retmode & GR_NOPTRACE) {
80123+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
80124+ return 1;
80125+ }
80126+
80127+ if (retmode & GR_PTRACERD) {
80128+ switch (request) {
80129+ case PTRACE_SEIZE:
80130+ case PTRACE_POKETEXT:
80131+ case PTRACE_POKEDATA:
80132+ case PTRACE_POKEUSR:
80133+#if !defined(CONFIG_PPC32) && !defined(CONFIG_PPC64) && !defined(CONFIG_PARISC) && !defined(CONFIG_ALPHA) && !defined(CONFIG_IA64)
80134+ case PTRACE_SETREGS:
80135+ case PTRACE_SETFPREGS:
80136+#endif
80137+#ifdef CONFIG_X86
80138+ case PTRACE_SETFPXREGS:
80139+#endif
80140+#ifdef CONFIG_ALTIVEC
80141+ case PTRACE_SETVRREGS:
80142+#endif
80143+ return 1;
80144+ default:
80145+ return 0;
80146+ }
80147+ } else if (!(current->acl->mode & GR_POVERRIDE) &&
80148+ !(current->role->roletype & GR_ROLE_GOD) &&
80149+ (current->acl != task->acl)) {
80150+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
80151+ return 1;
80152+ }
80153+
80154+ return 0;
80155+}
80156+
80157+static int is_writable_mmap(const struct file *filp)
80158+{
80159+ struct task_struct *task = current;
80160+ struct acl_object_label *obj, *obj2;
80161+
80162+ if (gr_status & GR_READY && !(task->acl->mode & GR_OVERRIDE) &&
80163+ !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))) {
80164+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
80165+ obj2 = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt,
80166+ task->role->root_label);
80167+ if (unlikely((obj->mode & GR_WRITE) || (obj2->mode & GR_WRITE))) {
80168+ gr_log_fs_generic(GR_DONT_AUDIT, GR_WRITLIB_ACL_MSG, filp->f_path.dentry, filp->f_path.mnt);
80169+ return 1;
80170+ }
80171+ }
80172+ return 0;
80173+}
80174+
80175+int
80176+gr_acl_handle_mmap(const struct file *file, const unsigned long prot)
80177+{
80178+ __u32 mode;
80179+
80180+ if (unlikely(!file || !(prot & PROT_EXEC)))
80181+ return 1;
80182+
80183+ if (is_writable_mmap(file))
80184+ return 0;
80185+
80186+ mode =
80187+ gr_search_file(file->f_path.dentry,
80188+ GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
80189+ file->f_path.mnt);
80190+
80191+ if (!gr_tpe_allow(file))
80192+ return 0;
80193+
80194+ if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
80195+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
80196+ return 0;
80197+ } else if (unlikely(!(mode & GR_EXEC))) {
80198+ return 0;
80199+ } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
80200+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
80201+ return 1;
80202+ }
80203+
80204+ return 1;
80205+}
80206+
80207+int
80208+gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
80209+{
80210+ __u32 mode;
80211+
80212+ if (unlikely(!file || !(prot & PROT_EXEC)))
80213+ return 1;
80214+
80215+ if (is_writable_mmap(file))
80216+ return 0;
80217+
80218+ mode =
80219+ gr_search_file(file->f_path.dentry,
80220+ GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
80221+ file->f_path.mnt);
80222+
80223+ if (!gr_tpe_allow(file))
80224+ return 0;
80225+
80226+ if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
80227+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
80228+ return 0;
80229+ } else if (unlikely(!(mode & GR_EXEC))) {
80230+ return 0;
80231+ } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
80232+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
80233+ return 1;
80234+ }
80235+
80236+ return 1;
80237+}
80238+
80239+void
80240+gr_acl_handle_psacct(struct task_struct *task, const long code)
80241+{
80242+ unsigned long runtime, cputime;
80243+ cputime_t utime, stime;
80244+ unsigned int wday, cday;
80245+ __u8 whr, chr;
80246+ __u8 wmin, cmin;
80247+ __u8 wsec, csec;
80248+ struct timespec curtime, starttime;
80249+
80250+ if (unlikely(!(gr_status & GR_READY) || !task->acl ||
80251+ !(task->acl->mode & GR_PROCACCT)))
80252+ return;
80253+
80254+ curtime = ns_to_timespec(ktime_get_ns());
80255+ starttime = ns_to_timespec(task->start_time);
80256+ runtime = curtime.tv_sec - starttime.tv_sec;
80257+ wday = runtime / (60 * 60 * 24);
80258+ runtime -= wday * (60 * 60 * 24);
80259+ whr = runtime / (60 * 60);
80260+ runtime -= whr * (60 * 60);
80261+ wmin = runtime / 60;
80262+ runtime -= wmin * 60;
80263+ wsec = runtime;
80264+
80265+ task_cputime(task, &utime, &stime);
80266+ cputime = cputime_to_secs(utime + stime);
80267+ cday = cputime / (60 * 60 * 24);
80268+ cputime -= cday * (60 * 60 * 24);
80269+ chr = cputime / (60 * 60);
80270+ cputime -= chr * (60 * 60);
80271+ cmin = cputime / 60;
80272+ cputime -= cmin * 60;
80273+ csec = cputime;
80274+
80275+ gr_log_procacct(GR_DO_AUDIT, GR_ACL_PROCACCT_MSG, task, wday, whr, wmin, wsec, cday, chr, cmin, csec, code);
80276+
80277+ return;
80278+}
80279+
80280+#ifdef CONFIG_TASKSTATS
80281+int gr_is_taskstats_denied(int pid)
80282+{
80283+ struct task_struct *task;
80284+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
80285+ const struct cred *cred;
80286+#endif
80287+ int ret = 0;
80288+
80289+ /* restrict taskstats viewing to un-chrooted root users
80290+ who have the 'view' subject flag if the RBAC system is enabled
80291+ */
80292+
80293+ rcu_read_lock();
80294+ read_lock(&tasklist_lock);
80295+ task = find_task_by_vpid(pid);
80296+ if (task) {
80297+#ifdef CONFIG_GRKERNSEC_CHROOT
80298+ if (proc_is_chrooted(task))
80299+ ret = -EACCES;
80300+#endif
80301+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
80302+ cred = __task_cred(task);
80303+#ifdef CONFIG_GRKERNSEC_PROC_USER
80304+ if (gr_is_global_nonroot(cred->uid))
80305+ ret = -EACCES;
80306+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
80307+ if (gr_is_global_nonroot(cred->uid) && !groups_search(cred->group_info, grsec_proc_gid))
80308+ ret = -EACCES;
80309+#endif
80310+#endif
80311+ if (gr_status & GR_READY) {
80312+ if (!(task->acl->mode & GR_VIEW))
80313+ ret = -EACCES;
80314+ }
80315+ } else
80316+ ret = -ENOENT;
80317+
80318+ read_unlock(&tasklist_lock);
80319+ rcu_read_unlock();
80320+
80321+ return ret;
80322+}
80323+#endif
80324+
80325+/* AUXV entries are filled via a descendant of search_binary_handler
80326+ after we've already applied the subject for the target
80327+*/
80328+int gr_acl_enable_at_secure(void)
80329+{
80330+ if (unlikely(!(gr_status & GR_READY)))
80331+ return 0;
80332+
80333+ if (current->acl->mode & GR_ATSECURE)
80334+ return 1;
80335+
80336+ return 0;
80337+}
80338+
80339+int gr_acl_handle_filldir(const struct file *file, const char *name, const unsigned int namelen, const u64 ino)
80340+{
80341+ struct task_struct *task = current;
80342+ struct dentry *dentry = file->f_path.dentry;
80343+ struct vfsmount *mnt = file->f_path.mnt;
80344+ struct acl_object_label *obj, *tmp;
80345+ struct acl_subject_label *subj;
80346+ unsigned int bufsize;
80347+ int is_not_root;
80348+ char *path;
80349+ dev_t dev = __get_dev(dentry);
80350+
80351+ if (unlikely(!(gr_status & GR_READY)))
80352+ return 1;
80353+
80354+ if (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))
80355+ return 1;
80356+
80357+ /* ignore Eric Biederman */
80358+ if (IS_PRIVATE(dentry->d_inode))
80359+ return 1;
80360+
80361+ subj = task->acl;
80362+ read_lock(&gr_inode_lock);
80363+ do {
80364+ obj = lookup_acl_obj_label(ino, dev, subj);
80365+ if (obj != NULL) {
80366+ read_unlock(&gr_inode_lock);
80367+ return (obj->mode & GR_FIND) ? 1 : 0;
80368+ }
80369+ } while ((subj = subj->parent_subject));
80370+ read_unlock(&gr_inode_lock);
80371+
80372+ /* this is purely an optimization since we're looking for an object
80373+ for the directory we're doing a readdir on
80374+ if it's possible for any globbed object to match the entry we're
80375+ filling into the directory, then the object we find here will be
80376+ an anchor point with attached globbed objects
80377+ */
80378+ obj = chk_obj_label_noglob(dentry, mnt, task->acl);
80379+ if (obj->globbed == NULL)
80380+ return (obj->mode & GR_FIND) ? 1 : 0;
80381+
80382+ is_not_root = ((obj->filename[0] == '/') &&
80383+ (obj->filename[1] == '\0')) ? 0 : 1;
80384+ bufsize = PAGE_SIZE - namelen - is_not_root;
80385+
80386+ /* check bufsize > PAGE_SIZE || bufsize == 0 */
80387+ if (unlikely((bufsize - 1) > (PAGE_SIZE - 1)))
80388+ return 1;
80389+
80390+ preempt_disable();
80391+ path = d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
80392+ bufsize);
80393+
80394+ bufsize = strlen(path);
80395+
80396+ /* if base is "/", don't append an additional slash */
80397+ if (is_not_root)
80398+ *(path + bufsize) = '/';
80399+ memcpy(path + bufsize + is_not_root, name, namelen);
80400+ *(path + bufsize + namelen + is_not_root) = '\0';
80401+
80402+ tmp = obj->globbed;
80403+ while (tmp) {
80404+ if (!glob_match(tmp->filename, path)) {
80405+ preempt_enable();
80406+ return (tmp->mode & GR_FIND) ? 1 : 0;
80407+ }
80408+ tmp = tmp->next;
80409+ }
80410+ preempt_enable();
80411+ return (obj->mode & GR_FIND) ? 1 : 0;
80412+}
80413+
80414+void gr_put_exec_file(struct task_struct *task)
80415+{
80416+ struct file *filp;
80417+
80418+ write_lock(&grsec_exec_file_lock);
80419+ filp = task->exec_file;
80420+ task->exec_file = NULL;
80421+ write_unlock(&grsec_exec_file_lock);
80422+
80423+ if (filp)
80424+ fput(filp);
80425+
80426+ return;
80427+}
80428+
80429+
80430+#ifdef CONFIG_NETFILTER_XT_MATCH_GRADM_MODULE
80431+EXPORT_SYMBOL_GPL(gr_acl_is_enabled);
80432+#endif
80433+#ifdef CONFIG_SECURITY
80434+EXPORT_SYMBOL_GPL(gr_check_user_change);
80435+EXPORT_SYMBOL_GPL(gr_check_group_change);
80436+#endif
80437+
80438diff --git a/grsecurity/gracl_alloc.c b/grsecurity/gracl_alloc.c
80439new file mode 100644
80440index 0000000..9adc75c
80441--- /dev/null
80442+++ b/grsecurity/gracl_alloc.c
80443@@ -0,0 +1,105 @@
80444+#include <linux/kernel.h>
80445+#include <linux/mm.h>
80446+#include <linux/slab.h>
80447+#include <linux/vmalloc.h>
80448+#include <linux/gracl.h>
80449+#include <linux/grsecurity.h>
80450+
80451+static struct gr_alloc_state __current_alloc_state = { 1, 1, NULL };
80452+struct gr_alloc_state *current_alloc_state = &__current_alloc_state;
80453+
80454+static int
80455+alloc_pop(void)
80456+{
80457+ if (current_alloc_state->alloc_stack_next == 1)
80458+ return 0;
80459+
80460+ kfree(current_alloc_state->alloc_stack[current_alloc_state->alloc_stack_next - 2]);
80461+
80462+ current_alloc_state->alloc_stack_next--;
80463+
80464+ return 1;
80465+}
80466+
80467+static int
80468+alloc_push(void *buf)
80469+{
80470+ if (current_alloc_state->alloc_stack_next >= current_alloc_state->alloc_stack_size)
80471+ return 1;
80472+
80473+ current_alloc_state->alloc_stack[current_alloc_state->alloc_stack_next - 1] = buf;
80474+
80475+ current_alloc_state->alloc_stack_next++;
80476+
80477+ return 0;
80478+}
80479+
80480+void *
80481+acl_alloc(unsigned long len)
80482+{
80483+ void *ret = NULL;
80484+
80485+ if (!len || len > PAGE_SIZE)
80486+ goto out;
80487+
80488+ ret = kmalloc(len, GFP_KERNEL);
80489+
80490+ if (ret) {
80491+ if (alloc_push(ret)) {
80492+ kfree(ret);
80493+ ret = NULL;
80494+ }
80495+ }
80496+
80497+out:
80498+ return ret;
80499+}
80500+
80501+void *
80502+acl_alloc_num(unsigned long num, unsigned long len)
80503+{
80504+ if (!len || (num > (PAGE_SIZE / len)))
80505+ return NULL;
80506+
80507+ return acl_alloc(num * len);
80508+}
80509+
80510+void
80511+acl_free_all(void)
80512+{
80513+ if (!current_alloc_state->alloc_stack)
80514+ return;
80515+
80516+ while (alloc_pop()) ;
80517+
80518+ if (current_alloc_state->alloc_stack) {
80519+ if ((current_alloc_state->alloc_stack_size * sizeof (void *)) <= PAGE_SIZE)
80520+ kfree(current_alloc_state->alloc_stack);
80521+ else
80522+ vfree(current_alloc_state->alloc_stack);
80523+ }
80524+
80525+ current_alloc_state->alloc_stack = NULL;
80526+ current_alloc_state->alloc_stack_size = 1;
80527+ current_alloc_state->alloc_stack_next = 1;
80528+
80529+ return;
80530+}
80531+
80532+int
80533+acl_alloc_stack_init(unsigned long size)
80534+{
80535+ if ((size * sizeof (void *)) <= PAGE_SIZE)
80536+ current_alloc_state->alloc_stack =
80537+ (void **) kmalloc(size * sizeof (void *), GFP_KERNEL);
80538+ else
80539+ current_alloc_state->alloc_stack = (void **) vmalloc(size * sizeof (void *));
80540+
80541+ current_alloc_state->alloc_stack_size = size;
80542+ current_alloc_state->alloc_stack_next = 1;
80543+
80544+ if (!current_alloc_state->alloc_stack)
80545+ return 0;
80546+ else
80547+ return 1;
80548+}
80549diff --git a/grsecurity/gracl_cap.c b/grsecurity/gracl_cap.c
80550new file mode 100644
80551index 0000000..1a94c11
80552--- /dev/null
80553+++ b/grsecurity/gracl_cap.c
80554@@ -0,0 +1,127 @@
80555+#include <linux/kernel.h>
80556+#include <linux/module.h>
80557+#include <linux/sched.h>
80558+#include <linux/gracl.h>
80559+#include <linux/grsecurity.h>
80560+#include <linux/grinternal.h>
80561+
80562+extern const char *captab_log[];
80563+extern int captab_log_entries;
80564+
80565+int gr_learn_cap(const struct task_struct *task, const struct cred *cred, const int cap)
80566+{
80567+ struct acl_subject_label *curracl;
80568+
80569+ if (!gr_acl_is_enabled())
80570+ return 1;
80571+
80572+ curracl = task->acl;
80573+
80574+ if (curracl->mode & (GR_LEARN | GR_INHERITLEARN)) {
80575+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
80576+ task->role->roletype, GR_GLOBAL_UID(cred->uid),
80577+ GR_GLOBAL_GID(cred->gid), task->exec_file ?
80578+ gr_to_filename(task->exec_file->f_path.dentry,
80579+ task->exec_file->f_path.mnt) : curracl->filename,
80580+ curracl->filename, 0UL,
80581+ 0UL, "", (unsigned long) cap, &task->signal->saved_ip);
80582+ return 1;
80583+ }
80584+
80585+ return 0;
80586+}
80587+
80588+int gr_task_acl_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
80589+{
80590+ struct acl_subject_label *curracl;
80591+ kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
80592+ kernel_cap_t cap_audit = __cap_empty_set;
80593+
80594+ if (!gr_acl_is_enabled())
80595+ return 1;
80596+
80597+ curracl = task->acl;
80598+
80599+ cap_drop = curracl->cap_lower;
80600+ cap_mask = curracl->cap_mask;
80601+ cap_audit = curracl->cap_invert_audit;
80602+
80603+ while ((curracl = curracl->parent_subject)) {
80604+ /* if the cap isn't specified in the current computed mask but is specified in the
80605+ current level subject, and is lowered in the current level subject, then add
80606+ it to the set of dropped capabilities
80607+ otherwise, add the current level subject's mask to the current computed mask
80608+ */
80609+ if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
80610+ cap_raise(cap_mask, cap);
80611+ if (cap_raised(curracl->cap_lower, cap))
80612+ cap_raise(cap_drop, cap);
80613+ if (cap_raised(curracl->cap_invert_audit, cap))
80614+ cap_raise(cap_audit, cap);
80615+ }
80616+ }
80617+
80618+ if (!cap_raised(cap_drop, cap)) {
80619+ if (cap_raised(cap_audit, cap))
80620+ gr_log_cap(GR_DO_AUDIT, GR_CAP_ACL_MSG2, task, captab_log[cap]);
80621+ return 1;
80622+ }
80623+
80624+ /* only learn the capability use if the process has the capability in the
80625+ general case, the two uses in sys.c of gr_learn_cap are an exception
80626+ to this rule to ensure any role transition involves what the full-learned
80627+ policy believes in a privileged process
80628+ */
80629+ if (cap_raised(cred->cap_effective, cap) && gr_learn_cap(task, cred, cap))
80630+ return 1;
80631+
80632+ if ((cap >= 0) && (cap < captab_log_entries) && cap_raised(cred->cap_effective, cap) && !cap_raised(cap_audit, cap))
80633+ gr_log_cap(GR_DONT_AUDIT, GR_CAP_ACL_MSG, task, captab_log[cap]);
80634+
80635+ return 0;
80636+}
80637+
80638+int
80639+gr_acl_is_capable(const int cap)
80640+{
80641+ return gr_task_acl_is_capable(current, current_cred(), cap);
80642+}
80643+
80644+int gr_task_acl_is_capable_nolog(const struct task_struct *task, const int cap)
80645+{
80646+ struct acl_subject_label *curracl;
80647+ kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
80648+
80649+ if (!gr_acl_is_enabled())
80650+ return 1;
80651+
80652+ curracl = task->acl;
80653+
80654+ cap_drop = curracl->cap_lower;
80655+ cap_mask = curracl->cap_mask;
80656+
80657+ while ((curracl = curracl->parent_subject)) {
80658+ /* if the cap isn't specified in the current computed mask but is specified in the
80659+ current level subject, and is lowered in the current level subject, then add
80660+ it to the set of dropped capabilities
80661+ otherwise, add the current level subject's mask to the current computed mask
80662+ */
80663+ if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
80664+ cap_raise(cap_mask, cap);
80665+ if (cap_raised(curracl->cap_lower, cap))
80666+ cap_raise(cap_drop, cap);
80667+ }
80668+ }
80669+
80670+ if (!cap_raised(cap_drop, cap))
80671+ return 1;
80672+
80673+ return 0;
80674+}
80675+
80676+int
80677+gr_acl_is_capable_nolog(const int cap)
80678+{
80679+ return gr_task_acl_is_capable_nolog(current, cap);
80680+}
80681+
80682diff --git a/grsecurity/gracl_compat.c b/grsecurity/gracl_compat.c
80683new file mode 100644
80684index 0000000..a43dd06
80685--- /dev/null
80686+++ b/grsecurity/gracl_compat.c
80687@@ -0,0 +1,269 @@
80688+#include <linux/kernel.h>
80689+#include <linux/gracl.h>
80690+#include <linux/compat.h>
80691+#include <linux/gracl_compat.h>
80692+
80693+#include <asm/uaccess.h>
80694+
80695+int copy_gr_arg_wrapper_compat(const char *buf, struct gr_arg_wrapper *uwrap)
80696+{
80697+ struct gr_arg_wrapper_compat uwrapcompat;
80698+
80699+ if (copy_from_user(&uwrapcompat, buf, sizeof(uwrapcompat)))
80700+ return -EFAULT;
80701+
80702+ if ((uwrapcompat.version != GRSECURITY_VERSION) ||
80703+ (uwrapcompat.size != sizeof(struct gr_arg_compat)))
80704+ return -EINVAL;
80705+
80706+ uwrap->arg = compat_ptr(uwrapcompat.arg);
80707+ uwrap->version = uwrapcompat.version;
80708+ uwrap->size = sizeof(struct gr_arg);
80709+
80710+ return 0;
80711+}
80712+
80713+int copy_gr_arg_compat(const struct gr_arg __user *buf, struct gr_arg *arg)
80714+{
80715+ struct gr_arg_compat argcompat;
80716+
80717+ if (copy_from_user(&argcompat, buf, sizeof(argcompat)))
80718+ return -EFAULT;
80719+
80720+ arg->role_db.r_table = compat_ptr(argcompat.role_db.r_table);
80721+ arg->role_db.num_pointers = argcompat.role_db.num_pointers;
80722+ arg->role_db.num_roles = argcompat.role_db.num_roles;
80723+ arg->role_db.num_domain_children = argcompat.role_db.num_domain_children;
80724+ arg->role_db.num_subjects = argcompat.role_db.num_subjects;
80725+ arg->role_db.num_objects = argcompat.role_db.num_objects;
80726+
80727+ memcpy(&arg->pw, &argcompat.pw, sizeof(arg->pw));
80728+ memcpy(&arg->salt, &argcompat.salt, sizeof(arg->salt));
80729+ memcpy(&arg->sum, &argcompat.sum, sizeof(arg->sum));
80730+ memcpy(&arg->sp_role, &argcompat.sp_role, sizeof(arg->sp_role));
80731+ arg->sprole_pws = compat_ptr(argcompat.sprole_pws);
80732+ arg->segv_device = argcompat.segv_device;
80733+ arg->segv_inode = argcompat.segv_inode;
80734+ arg->segv_uid = argcompat.segv_uid;
80735+ arg->num_sprole_pws = argcompat.num_sprole_pws;
80736+ arg->mode = argcompat.mode;
80737+
80738+ return 0;
80739+}
80740+
80741+int copy_acl_object_label_compat(struct acl_object_label *obj, const struct acl_object_label *userp)
80742+{
80743+ struct acl_object_label_compat objcompat;
80744+
80745+ if (copy_from_user(&objcompat, userp, sizeof(objcompat)))
80746+ return -EFAULT;
80747+
80748+ obj->filename = compat_ptr(objcompat.filename);
80749+ obj->inode = objcompat.inode;
80750+ obj->device = objcompat.device;
80751+ obj->mode = objcompat.mode;
80752+
80753+ obj->nested = compat_ptr(objcompat.nested);
80754+ obj->globbed = compat_ptr(objcompat.globbed);
80755+
80756+ obj->prev = compat_ptr(objcompat.prev);
80757+ obj->next = compat_ptr(objcompat.next);
80758+
80759+ return 0;
80760+}
80761+
80762+int copy_acl_subject_label_compat(struct acl_subject_label *subj, const struct acl_subject_label *userp)
80763+{
80764+ unsigned int i;
80765+ struct acl_subject_label_compat subjcompat;
80766+
80767+ if (copy_from_user(&subjcompat, userp, sizeof(subjcompat)))
80768+ return -EFAULT;
80769+
80770+ subj->filename = compat_ptr(subjcompat.filename);
80771+ subj->inode = subjcompat.inode;
80772+ subj->device = subjcompat.device;
80773+ subj->mode = subjcompat.mode;
80774+ subj->cap_mask = subjcompat.cap_mask;
80775+ subj->cap_lower = subjcompat.cap_lower;
80776+ subj->cap_invert_audit = subjcompat.cap_invert_audit;
80777+
80778+ for (i = 0; i < GR_NLIMITS; i++) {
80779+ if (subjcompat.res[i].rlim_cur == COMPAT_RLIM_INFINITY)
80780+ subj->res[i].rlim_cur = RLIM_INFINITY;
80781+ else
80782+ subj->res[i].rlim_cur = subjcompat.res[i].rlim_cur;
80783+ if (subjcompat.res[i].rlim_max == COMPAT_RLIM_INFINITY)
80784+ subj->res[i].rlim_max = RLIM_INFINITY;
80785+ else
80786+ subj->res[i].rlim_max = subjcompat.res[i].rlim_max;
80787+ }
80788+ subj->resmask = subjcompat.resmask;
80789+
80790+ subj->user_trans_type = subjcompat.user_trans_type;
80791+ subj->group_trans_type = subjcompat.group_trans_type;
80792+ subj->user_transitions = compat_ptr(subjcompat.user_transitions);
80793+ subj->group_transitions = compat_ptr(subjcompat.group_transitions);
80794+ subj->user_trans_num = subjcompat.user_trans_num;
80795+ subj->group_trans_num = subjcompat.group_trans_num;
80796+
80797+ memcpy(&subj->sock_families, &subjcompat.sock_families, sizeof(subj->sock_families));
80798+ memcpy(&subj->ip_proto, &subjcompat.ip_proto, sizeof(subj->ip_proto));
80799+ subj->ip_type = subjcompat.ip_type;
80800+ subj->ips = compat_ptr(subjcompat.ips);
80801+ subj->ip_num = subjcompat.ip_num;
80802+ subj->inaddr_any_override = subjcompat.inaddr_any_override;
80803+
80804+ subj->crashes = subjcompat.crashes;
80805+ subj->expires = subjcompat.expires;
80806+
80807+ subj->parent_subject = compat_ptr(subjcompat.parent_subject);
80808+ subj->hash = compat_ptr(subjcompat.hash);
80809+ subj->prev = compat_ptr(subjcompat.prev);
80810+ subj->next = compat_ptr(subjcompat.next);
80811+
80812+ subj->obj_hash = compat_ptr(subjcompat.obj_hash);
80813+ subj->obj_hash_size = subjcompat.obj_hash_size;
80814+ subj->pax_flags = subjcompat.pax_flags;
80815+
80816+ return 0;
80817+}
80818+
80819+int copy_acl_role_label_compat(struct acl_role_label *role, const struct acl_role_label *userp)
80820+{
80821+ struct acl_role_label_compat rolecompat;
80822+
80823+ if (copy_from_user(&rolecompat, userp, sizeof(rolecompat)))
80824+ return -EFAULT;
80825+
80826+ role->rolename = compat_ptr(rolecompat.rolename);
80827+ role->uidgid = rolecompat.uidgid;
80828+ role->roletype = rolecompat.roletype;
80829+
80830+ role->auth_attempts = rolecompat.auth_attempts;
80831+ role->expires = rolecompat.expires;
80832+
80833+ role->root_label = compat_ptr(rolecompat.root_label);
80834+ role->hash = compat_ptr(rolecompat.hash);
80835+
80836+ role->prev = compat_ptr(rolecompat.prev);
80837+ role->next = compat_ptr(rolecompat.next);
80838+
80839+ role->transitions = compat_ptr(rolecompat.transitions);
80840+ role->allowed_ips = compat_ptr(rolecompat.allowed_ips);
80841+ role->domain_children = compat_ptr(rolecompat.domain_children);
80842+ role->domain_child_num = rolecompat.domain_child_num;
80843+
80844+ role->umask = rolecompat.umask;
80845+
80846+ role->subj_hash = compat_ptr(rolecompat.subj_hash);
80847+ role->subj_hash_size = rolecompat.subj_hash_size;
80848+
80849+ return 0;
80850+}
80851+
80852+int copy_role_allowed_ip_compat(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp)
80853+{
80854+ struct role_allowed_ip_compat roleip_compat;
80855+
80856+ if (copy_from_user(&roleip_compat, userp, sizeof(roleip_compat)))
80857+ return -EFAULT;
80858+
80859+ roleip->addr = roleip_compat.addr;
80860+ roleip->netmask = roleip_compat.netmask;
80861+
80862+ roleip->prev = compat_ptr(roleip_compat.prev);
80863+ roleip->next = compat_ptr(roleip_compat.next);
80864+
80865+ return 0;
80866+}
80867+
80868+int copy_role_transition_compat(struct role_transition *trans, const struct role_transition *userp)
80869+{
80870+ struct role_transition_compat trans_compat;
80871+
80872+ if (copy_from_user(&trans_compat, userp, sizeof(trans_compat)))
80873+ return -EFAULT;
80874+
80875+ trans->rolename = compat_ptr(trans_compat.rolename);
80876+
80877+ trans->prev = compat_ptr(trans_compat.prev);
80878+ trans->next = compat_ptr(trans_compat.next);
80879+
80880+ return 0;
80881+
80882+}
80883+
80884+int copy_gr_hash_struct_compat(struct gr_hash_struct *hash, const struct gr_hash_struct *userp)
80885+{
80886+ struct gr_hash_struct_compat hash_compat;
80887+
80888+ if (copy_from_user(&hash_compat, userp, sizeof(hash_compat)))
80889+ return -EFAULT;
80890+
80891+ hash->table = compat_ptr(hash_compat.table);
80892+ hash->nametable = compat_ptr(hash_compat.nametable);
80893+ hash->first = compat_ptr(hash_compat.first);
80894+
80895+ hash->table_size = hash_compat.table_size;
80896+ hash->used_size = hash_compat.used_size;
80897+
80898+ hash->type = hash_compat.type;
80899+
80900+ return 0;
80901+}
80902+
80903+int copy_pointer_from_array_compat(void *ptr, unsigned long idx, const void *userp)
80904+{
80905+ compat_uptr_t ptrcompat;
80906+
80907+ if (copy_from_user(&ptrcompat, userp + (idx * sizeof(ptrcompat)), sizeof(ptrcompat)))
80908+ return -EFAULT;
80909+
80910+ *(void **)ptr = compat_ptr(ptrcompat);
80911+
80912+ return 0;
80913+}
80914+
80915+int copy_acl_ip_label_compat(struct acl_ip_label *ip, const struct acl_ip_label *userp)
80916+{
80917+ struct acl_ip_label_compat ip_compat;
80918+
80919+ if (copy_from_user(&ip_compat, userp, sizeof(ip_compat)))
80920+ return -EFAULT;
80921+
80922+ ip->iface = compat_ptr(ip_compat.iface);
80923+ ip->addr = ip_compat.addr;
80924+ ip->netmask = ip_compat.netmask;
80925+ ip->low = ip_compat.low;
80926+ ip->high = ip_compat.high;
80927+ ip->mode = ip_compat.mode;
80928+ ip->type = ip_compat.type;
80929+
80930+ memcpy(&ip->proto, &ip_compat.proto, sizeof(ip->proto));
80931+
80932+ ip->prev = compat_ptr(ip_compat.prev);
80933+ ip->next = compat_ptr(ip_compat.next);
80934+
80935+ return 0;
80936+}
80937+
80938+int copy_sprole_pw_compat(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp)
80939+{
80940+ struct sprole_pw_compat pw_compat;
80941+
80942+ if (copy_from_user(&pw_compat, (const void *)userp + (sizeof(pw_compat) * idx), sizeof(pw_compat)))
80943+ return -EFAULT;
80944+
80945+ pw->rolename = compat_ptr(pw_compat.rolename);
80946+ memcpy(&pw->salt, pw_compat.salt, sizeof(pw->salt));
80947+ memcpy(&pw->sum, pw_compat.sum, sizeof(pw->sum));
80948+
80949+ return 0;
80950+}
80951+
80952+size_t get_gr_arg_wrapper_size_compat(void)
80953+{
80954+ return sizeof(struct gr_arg_wrapper_compat);
80955+}
80956+
80957diff --git a/grsecurity/gracl_fs.c b/grsecurity/gracl_fs.c
80958new file mode 100644
80959index 0000000..8ee8e4f
80960--- /dev/null
80961+++ b/grsecurity/gracl_fs.c
80962@@ -0,0 +1,447 @@
80963+#include <linux/kernel.h>
80964+#include <linux/sched.h>
80965+#include <linux/types.h>
80966+#include <linux/fs.h>
80967+#include <linux/file.h>
80968+#include <linux/stat.h>
80969+#include <linux/grsecurity.h>
80970+#include <linux/grinternal.h>
80971+#include <linux/gracl.h>
80972+
80973+umode_t
80974+gr_acl_umask(void)
80975+{
80976+ if (unlikely(!gr_acl_is_enabled()))
80977+ return 0;
80978+
80979+ return current->role->umask;
80980+}
80981+
80982+__u32
80983+gr_acl_handle_hidden_file(const struct dentry * dentry,
80984+ const struct vfsmount * mnt)
80985+{
80986+ __u32 mode;
80987+
80988+ if (unlikely(d_is_negative(dentry)))
80989+ return GR_FIND;
80990+
80991+ mode =
80992+ gr_search_file(dentry, GR_FIND | GR_AUDIT_FIND | GR_SUPPRESS, mnt);
80993+
80994+ if (unlikely(mode & GR_FIND && mode & GR_AUDIT_FIND)) {
80995+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
80996+ return mode;
80997+ } else if (unlikely(!(mode & GR_FIND) && !(mode & GR_SUPPRESS))) {
80998+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
80999+ return 0;
81000+ } else if (unlikely(!(mode & GR_FIND)))
81001+ return 0;
81002+
81003+ return GR_FIND;
81004+}
81005+
81006+__u32
81007+gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
81008+ int acc_mode)
81009+{
81010+ __u32 reqmode = GR_FIND;
81011+ __u32 mode;
81012+
81013+ if (unlikely(d_is_negative(dentry)))
81014+ return reqmode;
81015+
81016+ if (acc_mode & MAY_APPEND)
81017+ reqmode |= GR_APPEND;
81018+ else if (acc_mode & MAY_WRITE)
81019+ reqmode |= GR_WRITE;
81020+ if ((acc_mode & MAY_READ) && !S_ISDIR(dentry->d_inode->i_mode))
81021+ reqmode |= GR_READ;
81022+
81023+ mode =
81024+ gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
81025+ mnt);
81026+
81027+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
81028+ gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
81029+ reqmode & GR_READ ? " reading" : "",
81030+ reqmode & GR_WRITE ? " writing" : reqmode &
81031+ GR_APPEND ? " appending" : "");
81032+ return reqmode;
81033+ } else
81034+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
81035+ {
81036+ gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
81037+ reqmode & GR_READ ? " reading" : "",
81038+ reqmode & GR_WRITE ? " writing" : reqmode &
81039+ GR_APPEND ? " appending" : "");
81040+ return 0;
81041+ } else if (unlikely((mode & reqmode) != reqmode))
81042+ return 0;
81043+
81044+ return reqmode;
81045+}
81046+
81047+__u32
81048+gr_acl_handle_creat(const struct dentry * dentry,
81049+ const struct dentry * p_dentry,
81050+ const struct vfsmount * p_mnt, int open_flags, int acc_mode,
81051+ const int imode)
81052+{
81053+ __u32 reqmode = GR_WRITE | GR_CREATE;
81054+ __u32 mode;
81055+
81056+ if (acc_mode & MAY_APPEND)
81057+ reqmode |= GR_APPEND;
81058+ // if a directory was required or the directory already exists, then
81059+ // don't count this open as a read
81060+ if ((acc_mode & MAY_READ) &&
81061+ !((open_flags & O_DIRECTORY) || (dentry->d_inode && S_ISDIR(dentry->d_inode->i_mode))))
81062+ reqmode |= GR_READ;
81063+ if ((open_flags & O_CREAT) &&
81064+ ((imode & S_ISUID) || ((imode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))
81065+ reqmode |= GR_SETID;
81066+
81067+ mode =
81068+ gr_check_create(dentry, p_dentry, p_mnt,
81069+ reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
81070+
81071+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
81072+ gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
81073+ reqmode & GR_READ ? " reading" : "",
81074+ reqmode & GR_WRITE ? " writing" : reqmode &
81075+ GR_APPEND ? " appending" : "");
81076+ return reqmode;
81077+ } else
81078+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
81079+ {
81080+ gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
81081+ reqmode & GR_READ ? " reading" : "",
81082+ reqmode & GR_WRITE ? " writing" : reqmode &
81083+ GR_APPEND ? " appending" : "");
81084+ return 0;
81085+ } else if (unlikely((mode & reqmode) != reqmode))
81086+ return 0;
81087+
81088+ return reqmode;
81089+}
81090+
81091+__u32
81092+gr_acl_handle_access(const struct dentry * dentry, const struct vfsmount * mnt,
81093+ const int fmode)
81094+{
81095+ __u32 mode, reqmode = GR_FIND;
81096+
81097+ if ((fmode & S_IXOTH) && !S_ISDIR(dentry->d_inode->i_mode))
81098+ reqmode |= GR_EXEC;
81099+ if (fmode & S_IWOTH)
81100+ reqmode |= GR_WRITE;
81101+ if (fmode & S_IROTH)
81102+ reqmode |= GR_READ;
81103+
81104+ mode =
81105+ gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
81106+ mnt);
81107+
81108+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
81109+ gr_log_fs_rbac_mode3(GR_DO_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
81110+ reqmode & GR_READ ? " reading" : "",
81111+ reqmode & GR_WRITE ? " writing" : "",
81112+ reqmode & GR_EXEC ? " executing" : "");
81113+ return reqmode;
81114+ } else
81115+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
81116+ {
81117+ gr_log_fs_rbac_mode3(GR_DONT_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
81118+ reqmode & GR_READ ? " reading" : "",
81119+ reqmode & GR_WRITE ? " writing" : "",
81120+ reqmode & GR_EXEC ? " executing" : "");
81121+ return 0;
81122+ } else if (unlikely((mode & reqmode) != reqmode))
81123+ return 0;
81124+
81125+ return reqmode;
81126+}
81127+
81128+static __u32 generic_fs_handler(const struct dentry *dentry, const struct vfsmount *mnt, __u32 reqmode, const char *fmt)
81129+{
81130+ __u32 mode;
81131+
81132+ mode = gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS, mnt);
81133+
81134+ if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
81135+ gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, dentry, mnt);
81136+ return mode;
81137+ } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
81138+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, dentry, mnt);
81139+ return 0;
81140+ } else if (unlikely((mode & (reqmode)) != (reqmode)))
81141+ return 0;
81142+
81143+ return (reqmode);
81144+}
81145+
81146+__u32
81147+gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
81148+{
81149+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_RMDIR_ACL_MSG);
81150+}
81151+
81152+__u32
81153+gr_acl_handle_unlink(const struct dentry *dentry, const struct vfsmount *mnt)
81154+{
81155+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_UNLINK_ACL_MSG);
81156+}
81157+
81158+__u32
81159+gr_acl_handle_truncate(const struct dentry *dentry, const struct vfsmount *mnt)
81160+{
81161+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_TRUNCATE_ACL_MSG);
81162+}
81163+
81164+__u32
81165+gr_acl_handle_utime(const struct dentry *dentry, const struct vfsmount *mnt)
81166+{
81167+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_ATIME_ACL_MSG);
81168+}
81169+
81170+__u32
81171+gr_acl_handle_chmod(const struct dentry *dentry, const struct vfsmount *mnt,
81172+ umode_t *modeptr)
81173+{
81174+ umode_t mode;
81175+
81176+ *modeptr &= ~gr_acl_umask();
81177+ mode = *modeptr;
81178+
81179+ if (unlikely(dentry->d_inode && S_ISSOCK(dentry->d_inode->i_mode)))
81180+ return 1;
81181+
81182+ if (unlikely(dentry->d_inode && !S_ISDIR(dentry->d_inode->i_mode) &&
81183+ ((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))) {
81184+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_SETID,
81185+ GR_CHMOD_ACL_MSG);
81186+ } else {
81187+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHMOD_ACL_MSG);
81188+ }
81189+}
81190+
81191+__u32
81192+gr_acl_handle_chown(const struct dentry *dentry, const struct vfsmount *mnt)
81193+{
81194+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHOWN_ACL_MSG);
81195+}
81196+
81197+__u32
81198+gr_acl_handle_setxattr(const struct dentry *dentry, const struct vfsmount *mnt)
81199+{
81200+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_SETXATTR_ACL_MSG);
81201+}
81202+
81203+__u32
81204+gr_acl_handle_removexattr(const struct dentry *dentry, const struct vfsmount *mnt)
81205+{
81206+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_REMOVEXATTR_ACL_MSG);
81207+}
81208+
81209+__u32
81210+gr_acl_handle_execve(const struct dentry *dentry, const struct vfsmount *mnt)
81211+{
81212+ return generic_fs_handler(dentry, mnt, GR_EXEC, GR_EXEC_ACL_MSG);
81213+}
81214+
81215+__u32
81216+gr_acl_handle_unix(const struct dentry *dentry, const struct vfsmount *mnt)
81217+{
81218+ return generic_fs_handler(dentry, mnt, GR_READ | GR_WRITE,
81219+ GR_UNIXCONNECT_ACL_MSG);
81220+}
81221+
81222+/* hardlinks require at minimum create and link permission,
81223+ any additional privilege required is based on the
81224+ privilege of the file being linked to
81225+*/
81226+__u32
81227+gr_acl_handle_link(const struct dentry * new_dentry,
81228+ const struct dentry * parent_dentry,
81229+ const struct vfsmount * parent_mnt,
81230+ const struct dentry * old_dentry,
81231+ const struct vfsmount * old_mnt, const struct filename *to)
81232+{
81233+ __u32 mode;
81234+ __u32 needmode = GR_CREATE | GR_LINK;
81235+ __u32 needaudit = GR_AUDIT_CREATE | GR_AUDIT_LINK;
81236+
81237+ mode =
81238+ gr_check_link(new_dentry, parent_dentry, parent_mnt, old_dentry,
81239+ old_mnt);
81240+
81241+ if (unlikely(((mode & needmode) == needmode) && (mode & needaudit))) {
81242+ gr_log_fs_rbac_str(GR_DO_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to->name);
81243+ return mode;
81244+ } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
81245+ gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to->name);
81246+ return 0;
81247+ } else if (unlikely((mode & needmode) != needmode))
81248+ return 0;
81249+
81250+ return 1;
81251+}
81252+
81253+__u32
81254+gr_acl_handle_symlink(const struct dentry * new_dentry,
81255+ const struct dentry * parent_dentry,
81256+ const struct vfsmount * parent_mnt, const struct filename *from)
81257+{
81258+ __u32 needmode = GR_WRITE | GR_CREATE;
81259+ __u32 mode;
81260+
81261+ mode =
81262+ gr_check_create(new_dentry, parent_dentry, parent_mnt,
81263+ GR_CREATE | GR_AUDIT_CREATE |
81264+ GR_WRITE | GR_AUDIT_WRITE | GR_SUPPRESS);
81265+
81266+ if (unlikely(mode & GR_WRITE && mode & GR_AUDITS)) {
81267+ gr_log_fs_str_rbac(GR_DO_AUDIT, GR_SYMLINK_ACL_MSG, from->name, new_dentry, parent_mnt);
81268+ return mode;
81269+ } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
81270+ gr_log_fs_str_rbac(GR_DONT_AUDIT, GR_SYMLINK_ACL_MSG, from->name, new_dentry, parent_mnt);
81271+ return 0;
81272+ } else if (unlikely((mode & needmode) != needmode))
81273+ return 0;
81274+
81275+ return (GR_WRITE | GR_CREATE);
81276+}
81277+
81278+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)
81279+{
81280+ __u32 mode;
81281+
81282+ mode = gr_check_create(new_dentry, parent_dentry, parent_mnt, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
81283+
81284+ if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
81285+ gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, new_dentry, parent_mnt);
81286+ return mode;
81287+ } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
81288+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, new_dentry, parent_mnt);
81289+ return 0;
81290+ } else if (unlikely((mode & (reqmode)) != (reqmode)))
81291+ return 0;
81292+
81293+ return (reqmode);
81294+}
81295+
81296+__u32
81297+gr_acl_handle_mknod(const struct dentry * new_dentry,
81298+ const struct dentry * parent_dentry,
81299+ const struct vfsmount * parent_mnt,
81300+ const int mode)
81301+{
81302+ __u32 reqmode = GR_WRITE | GR_CREATE;
81303+ if (unlikely((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))
81304+ reqmode |= GR_SETID;
81305+
81306+ return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
81307+ reqmode, GR_MKNOD_ACL_MSG);
81308+}
81309+
81310+__u32
81311+gr_acl_handle_mkdir(const struct dentry *new_dentry,
81312+ const struct dentry *parent_dentry,
81313+ const struct vfsmount *parent_mnt)
81314+{
81315+ return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
81316+ GR_WRITE | GR_CREATE, GR_MKDIR_ACL_MSG);
81317+}
81318+
81319+#define RENAME_CHECK_SUCCESS(old, new) \
81320+ (((old & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)) && \
81321+ ((new & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)))
81322+
81323+int
81324+gr_acl_handle_rename(struct dentry *new_dentry,
81325+ struct dentry *parent_dentry,
81326+ const struct vfsmount *parent_mnt,
81327+ struct dentry *old_dentry,
81328+ struct inode *old_parent_inode,
81329+ struct vfsmount *old_mnt, const struct filename *newname, unsigned int flags)
81330+{
81331+ __u32 comp1, comp2;
81332+ int error = 0;
81333+
81334+ if (unlikely(!gr_acl_is_enabled()))
81335+ return 0;
81336+
81337+ if (flags & RENAME_EXCHANGE) {
81338+ comp1 = gr_search_file(new_dentry, GR_READ | GR_WRITE |
81339+ GR_AUDIT_READ | GR_AUDIT_WRITE |
81340+ GR_SUPPRESS, parent_mnt);
81341+ comp2 =
81342+ gr_search_file(old_dentry,
81343+ GR_READ | GR_WRITE | GR_AUDIT_READ |
81344+ GR_AUDIT_WRITE | GR_SUPPRESS, old_mnt);
81345+ } else if (d_is_negative(new_dentry)) {
81346+ comp1 = gr_check_create(new_dentry, parent_dentry, parent_mnt,
81347+ GR_READ | GR_WRITE | GR_CREATE | GR_AUDIT_READ |
81348+ GR_AUDIT_WRITE | GR_AUDIT_CREATE | GR_SUPPRESS);
81349+ comp2 = gr_search_file(old_dentry, GR_READ | GR_WRITE |
81350+ GR_DELETE | GR_AUDIT_DELETE |
81351+ GR_AUDIT_READ | GR_AUDIT_WRITE |
81352+ GR_SUPPRESS, old_mnt);
81353+ } else {
81354+ comp1 = gr_search_file(new_dentry, GR_READ | GR_WRITE |
81355+ GR_CREATE | GR_DELETE |
81356+ GR_AUDIT_CREATE | GR_AUDIT_DELETE |
81357+ GR_AUDIT_READ | GR_AUDIT_WRITE |
81358+ GR_SUPPRESS, parent_mnt);
81359+ comp2 =
81360+ gr_search_file(old_dentry,
81361+ GR_READ | GR_WRITE | GR_AUDIT_READ |
81362+ GR_DELETE | GR_AUDIT_DELETE |
81363+ GR_AUDIT_WRITE | GR_SUPPRESS, old_mnt);
81364+ }
81365+
81366+ if (RENAME_CHECK_SUCCESS(comp1, comp2) &&
81367+ ((comp1 & GR_AUDITS) || (comp2 & GR_AUDITS)))
81368+ gr_log_fs_rbac_str(GR_DO_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname->name);
81369+ else if (!RENAME_CHECK_SUCCESS(comp1, comp2) && !(comp1 & GR_SUPPRESS)
81370+ && !(comp2 & GR_SUPPRESS)) {
81371+ gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname->name);
81372+ error = -EACCES;
81373+ } else if (unlikely(!RENAME_CHECK_SUCCESS(comp1, comp2)))
81374+ error = -EACCES;
81375+
81376+ return error;
81377+}
81378+
81379+void
81380+gr_acl_handle_exit(void)
81381+{
81382+ u16 id;
81383+ char *rolename;
81384+
81385+ if (unlikely(current->acl_sp_role && gr_acl_is_enabled() &&
81386+ !(current->role->roletype & GR_ROLE_PERSIST))) {
81387+ id = current->acl_role_id;
81388+ rolename = current->role->rolename;
81389+ gr_set_acls(1);
81390+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLEL_ACL_MSG, rolename, id);
81391+ }
81392+
81393+ gr_put_exec_file(current);
81394+ return;
81395+}
81396+
81397+int
81398+gr_acl_handle_procpidmem(const struct task_struct *task)
81399+{
81400+ if (unlikely(!gr_acl_is_enabled()))
81401+ return 0;
81402+
81403+ if (task != current && (task->acl->mode & GR_PROTPROCFD) &&
81404+ !(current->acl->mode & GR_POVERRIDE) &&
81405+ !(current->role->roletype & GR_ROLE_GOD))
81406+ return -EACCES;
81407+
81408+ return 0;
81409+}
81410diff --git a/grsecurity/gracl_ip.c b/grsecurity/gracl_ip.c
81411new file mode 100644
81412index 0000000..f056b81
81413--- /dev/null
81414+++ b/grsecurity/gracl_ip.c
81415@@ -0,0 +1,386 @@
81416+#include <linux/kernel.h>
81417+#include <asm/uaccess.h>
81418+#include <asm/errno.h>
81419+#include <net/sock.h>
81420+#include <linux/file.h>
81421+#include <linux/fs.h>
81422+#include <linux/net.h>
81423+#include <linux/in.h>
81424+#include <linux/skbuff.h>
81425+#include <linux/ip.h>
81426+#include <linux/udp.h>
81427+#include <linux/types.h>
81428+#include <linux/sched.h>
81429+#include <linux/netdevice.h>
81430+#include <linux/inetdevice.h>
81431+#include <linux/gracl.h>
81432+#include <linux/grsecurity.h>
81433+#include <linux/grinternal.h>
81434+
81435+#define GR_BIND 0x01
81436+#define GR_CONNECT 0x02
81437+#define GR_INVERT 0x04
81438+#define GR_BINDOVERRIDE 0x08
81439+#define GR_CONNECTOVERRIDE 0x10
81440+#define GR_SOCK_FAMILY 0x20
81441+
81442+static const char * gr_protocols[IPPROTO_MAX] = {
81443+ "ip", "icmp", "igmp", "ggp", "ipencap", "st", "tcp", "cbt",
81444+ "egp", "igp", "bbn-rcc", "nvp", "pup", "argus", "emcon", "xnet",
81445+ "chaos", "udp", "mux", "dcn", "hmp", "prm", "xns-idp", "trunk-1",
81446+ "trunk-2", "leaf-1", "leaf-2", "rdp", "irtp", "iso-tp4", "netblt", "mfe-nsp",
81447+ "merit-inp", "sep", "3pc", "idpr", "xtp", "ddp", "idpr-cmtp", "tp++",
81448+ "il", "ipv6", "sdrp", "ipv6-route", "ipv6-frag", "idrp", "rsvp", "gre",
81449+ "mhrp", "bna", "ipv6-crypt", "ipv6-auth", "i-nlsp", "swipe", "narp", "mobile",
81450+ "tlsp", "skip", "ipv6-icmp", "ipv6-nonxt", "ipv6-opts", "unknown:61", "cftp", "unknown:63",
81451+ "sat-expak", "kryptolan", "rvd", "ippc", "unknown:68", "sat-mon", "visa", "ipcv",
81452+ "cpnx", "cphb", "wsn", "pvp", "br-sat-mon", "sun-nd", "wb-mon", "wb-expak",
81453+ "iso-ip", "vmtp", "secure-vmtp", "vines", "ttp", "nfsnet-igp", "dgp", "tcf",
81454+ "eigrp", "ospf", "sprite-rpc", "larp", "mtp", "ax.25", "ipip", "micp",
81455+ "scc-sp", "etherip", "encap", "unknown:99", "gmtp", "ifmp", "pnni", "pim",
81456+ "aris", "scps", "qnx", "a/n", "ipcomp", "snp", "compaq-peer", "ipx-in-ip",
81457+ "vrrp", "pgm", "unknown:114", "l2tp", "ddx", "iatp", "stp", "srp",
81458+ "uti", "smp", "sm", "ptp", "isis", "fire", "crtp", "crdup",
81459+ "sscopmce", "iplt", "sps", "pipe", "sctp", "fc", "unkown:134", "unknown:135",
81460+ "unknown:136", "unknown:137", "unknown:138", "unknown:139", "unknown:140", "unknown:141", "unknown:142", "unknown:143",
81461+ "unknown:144", "unknown:145", "unknown:146", "unknown:147", "unknown:148", "unknown:149", "unknown:150", "unknown:151",
81462+ "unknown:152", "unknown:153", "unknown:154", "unknown:155", "unknown:156", "unknown:157", "unknown:158", "unknown:159",
81463+ "unknown:160", "unknown:161", "unknown:162", "unknown:163", "unknown:164", "unknown:165", "unknown:166", "unknown:167",
81464+ "unknown:168", "unknown:169", "unknown:170", "unknown:171", "unknown:172", "unknown:173", "unknown:174", "unknown:175",
81465+ "unknown:176", "unknown:177", "unknown:178", "unknown:179", "unknown:180", "unknown:181", "unknown:182", "unknown:183",
81466+ "unknown:184", "unknown:185", "unknown:186", "unknown:187", "unknown:188", "unknown:189", "unknown:190", "unknown:191",
81467+ "unknown:192", "unknown:193", "unknown:194", "unknown:195", "unknown:196", "unknown:197", "unknown:198", "unknown:199",
81468+ "unknown:200", "unknown:201", "unknown:202", "unknown:203", "unknown:204", "unknown:205", "unknown:206", "unknown:207",
81469+ "unknown:208", "unknown:209", "unknown:210", "unknown:211", "unknown:212", "unknown:213", "unknown:214", "unknown:215",
81470+ "unknown:216", "unknown:217", "unknown:218", "unknown:219", "unknown:220", "unknown:221", "unknown:222", "unknown:223",
81471+ "unknown:224", "unknown:225", "unknown:226", "unknown:227", "unknown:228", "unknown:229", "unknown:230", "unknown:231",
81472+ "unknown:232", "unknown:233", "unknown:234", "unknown:235", "unknown:236", "unknown:237", "unknown:238", "unknown:239",
81473+ "unknown:240", "unknown:241", "unknown:242", "unknown:243", "unknown:244", "unknown:245", "unknown:246", "unknown:247",
81474+ "unknown:248", "unknown:249", "unknown:250", "unknown:251", "unknown:252", "unknown:253", "unknown:254", "unknown:255",
81475+ };
81476+
81477+static const char * gr_socktypes[SOCK_MAX] = {
81478+ "unknown:0", "stream", "dgram", "raw", "rdm", "seqpacket", "unknown:6",
81479+ "unknown:7", "unknown:8", "unknown:9", "packet"
81480+ };
81481+
81482+static const char * gr_sockfamilies[AF_MAX+1] = {
81483+ "unspec", "unix", "inet", "ax25", "ipx", "appletalk", "netrom", "bridge", "atmpvc", "x25",
81484+ "inet6", "rose", "decnet", "netbeui", "security", "key", "netlink", "packet", "ash",
81485+ "econet", "atmsvc", "rds", "sna", "irda", "ppox", "wanpipe", "llc", "fam_27", "fam_28",
81486+ "tipc", "bluetooth", "iucv", "rxrpc", "isdn", "phonet", "ieee802154", "ciaf"
81487+ };
81488+
81489+const char *
81490+gr_proto_to_name(unsigned char proto)
81491+{
81492+ return gr_protocols[proto];
81493+}
81494+
81495+const char *
81496+gr_socktype_to_name(unsigned char type)
81497+{
81498+ return gr_socktypes[type];
81499+}
81500+
81501+const char *
81502+gr_sockfamily_to_name(unsigned char family)
81503+{
81504+ return gr_sockfamilies[family];
81505+}
81506+
81507+extern const struct net_proto_family __rcu *net_families[NPROTO] __read_mostly;
81508+
81509+int
81510+gr_search_socket(const int domain, const int type, const int protocol)
81511+{
81512+ struct acl_subject_label *curr;
81513+ const struct cred *cred = current_cred();
81514+
81515+ if (unlikely(!gr_acl_is_enabled()))
81516+ goto exit;
81517+
81518+ if ((domain < 0) || (type < 0) || (protocol < 0) ||
81519+ (domain >= AF_MAX) || (type >= SOCK_MAX) || (protocol >= IPPROTO_MAX))
81520+ goto exit; // let the kernel handle it
81521+
81522+ curr = current->acl;
81523+
81524+ if (curr->sock_families[domain / 32] & (1U << (domain % 32))) {
81525+ /* the family is allowed, if this is PF_INET allow it only if
81526+ the extra sock type/protocol checks pass */
81527+ if (domain == PF_INET)
81528+ goto inet_check;
81529+ goto exit;
81530+ } else {
81531+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
81532+ __u32 fakeip = 0;
81533+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
81534+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
81535+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
81536+ gr_to_filename(current->exec_file->f_path.dentry,
81537+ current->exec_file->f_path.mnt) :
81538+ curr->filename, curr->filename,
81539+ &fakeip, domain, 0, 0, GR_SOCK_FAMILY,
81540+ &current->signal->saved_ip);
81541+ goto exit;
81542+ }
81543+ goto exit_fail;
81544+ }
81545+
81546+inet_check:
81547+ /* the rest of this checking is for IPv4 only */
81548+ if (!curr->ips)
81549+ goto exit;
81550+
81551+ if ((curr->ip_type & (1U << type)) &&
81552+ (curr->ip_proto[protocol / 32] & (1U << (protocol % 32))))
81553+ goto exit;
81554+
81555+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
81556+ /* we don't place acls on raw sockets , and sometimes
81557+ dgram/ip sockets are opened for ioctl and not
81558+ bind/connect, so we'll fake a bind learn log */
81559+ if (type == SOCK_RAW || type == SOCK_PACKET) {
81560+ __u32 fakeip = 0;
81561+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
81562+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
81563+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
81564+ gr_to_filename(current->exec_file->f_path.dentry,
81565+ current->exec_file->f_path.mnt) :
81566+ curr->filename, curr->filename,
81567+ &fakeip, 0, type,
81568+ protocol, GR_CONNECT, &current->signal->saved_ip);
81569+ } else if ((type == SOCK_DGRAM) && (protocol == IPPROTO_IP)) {
81570+ __u32 fakeip = 0;
81571+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
81572+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
81573+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
81574+ gr_to_filename(current->exec_file->f_path.dentry,
81575+ current->exec_file->f_path.mnt) :
81576+ curr->filename, curr->filename,
81577+ &fakeip, 0, type,
81578+ protocol, GR_BIND, &current->signal->saved_ip);
81579+ }
81580+ /* we'll log when they use connect or bind */
81581+ goto exit;
81582+ }
81583+
81584+exit_fail:
81585+ if (domain == PF_INET)
81586+ gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(domain),
81587+ gr_socktype_to_name(type), gr_proto_to_name(protocol));
81588+ else if (rcu_access_pointer(net_families[domain]) != NULL)
81589+ gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(domain),
81590+ gr_socktype_to_name(type), protocol);
81591+
81592+ return 0;
81593+exit:
81594+ return 1;
81595+}
81596+
81597+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)
81598+{
81599+ if ((ip->mode & mode) &&
81600+ (ip_port >= ip->low) &&
81601+ (ip_port <= ip->high) &&
81602+ ((ntohl(ip_addr) & our_netmask) ==
81603+ (ntohl(our_addr) & our_netmask))
81604+ && (ip->proto[protocol / 32] & (1U << (protocol % 32)))
81605+ && (ip->type & (1U << type))) {
81606+ if (ip->mode & GR_INVERT)
81607+ return 2; // specifically denied
81608+ else
81609+ return 1; // allowed
81610+ }
81611+
81612+ return 0; // not specifically allowed, may continue parsing
81613+}
81614+
81615+static int
81616+gr_search_connectbind(const int full_mode, struct sock *sk,
81617+ struct sockaddr_in *addr, const int type)
81618+{
81619+ char iface[IFNAMSIZ] = {0};
81620+ struct acl_subject_label *curr;
81621+ struct acl_ip_label *ip;
81622+ struct inet_sock *isk;
81623+ struct net_device *dev;
81624+ struct in_device *idev;
81625+ unsigned long i;
81626+ int ret;
81627+ int mode = full_mode & (GR_BIND | GR_CONNECT);
81628+ __u32 ip_addr = 0;
81629+ __u32 our_addr;
81630+ __u32 our_netmask;
81631+ char *p;
81632+ __u16 ip_port = 0;
81633+ const struct cred *cred = current_cred();
81634+
81635+ if (unlikely(!gr_acl_is_enabled() || sk->sk_family != PF_INET))
81636+ return 0;
81637+
81638+ curr = current->acl;
81639+ isk = inet_sk(sk);
81640+
81641+ /* INADDR_ANY overriding for binds, inaddr_any_override is already in network order */
81642+ if ((full_mode & GR_BINDOVERRIDE) && addr->sin_addr.s_addr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0)
81643+ addr->sin_addr.s_addr = curr->inaddr_any_override;
81644+ if ((full_mode & GR_CONNECT) && isk->inet_saddr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0) {
81645+ struct sockaddr_in saddr;
81646+ int err;
81647+
81648+ saddr.sin_family = AF_INET;
81649+ saddr.sin_addr.s_addr = curr->inaddr_any_override;
81650+ saddr.sin_port = isk->inet_sport;
81651+
81652+ err = security_socket_bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
81653+ if (err)
81654+ return err;
81655+
81656+ err = sk->sk_socket->ops->bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
81657+ if (err)
81658+ return err;
81659+ }
81660+
81661+ if (!curr->ips)
81662+ return 0;
81663+
81664+ ip_addr = addr->sin_addr.s_addr;
81665+ ip_port = ntohs(addr->sin_port);
81666+
81667+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
81668+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
81669+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
81670+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
81671+ gr_to_filename(current->exec_file->f_path.dentry,
81672+ current->exec_file->f_path.mnt) :
81673+ curr->filename, curr->filename,
81674+ &ip_addr, ip_port, type,
81675+ sk->sk_protocol, mode, &current->signal->saved_ip);
81676+ return 0;
81677+ }
81678+
81679+ for (i = 0; i < curr->ip_num; i++) {
81680+ ip = *(curr->ips + i);
81681+ if (ip->iface != NULL) {
81682+ strncpy(iface, ip->iface, IFNAMSIZ - 1);
81683+ p = strchr(iface, ':');
81684+ if (p != NULL)
81685+ *p = '\0';
81686+ dev = dev_get_by_name(sock_net(sk), iface);
81687+ if (dev == NULL)
81688+ continue;
81689+ idev = in_dev_get(dev);
81690+ if (idev == NULL) {
81691+ dev_put(dev);
81692+ continue;
81693+ }
81694+ rcu_read_lock();
81695+ for_ifa(idev) {
81696+ if (!strcmp(ip->iface, ifa->ifa_label)) {
81697+ our_addr = ifa->ifa_address;
81698+ our_netmask = 0xffffffff;
81699+ ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
81700+ if (ret == 1) {
81701+ rcu_read_unlock();
81702+ in_dev_put(idev);
81703+ dev_put(dev);
81704+ return 0;
81705+ } else if (ret == 2) {
81706+ rcu_read_unlock();
81707+ in_dev_put(idev);
81708+ dev_put(dev);
81709+ goto denied;
81710+ }
81711+ }
81712+ } endfor_ifa(idev);
81713+ rcu_read_unlock();
81714+ in_dev_put(idev);
81715+ dev_put(dev);
81716+ } else {
81717+ our_addr = ip->addr;
81718+ our_netmask = ip->netmask;
81719+ ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
81720+ if (ret == 1)
81721+ return 0;
81722+ else if (ret == 2)
81723+ goto denied;
81724+ }
81725+ }
81726+
81727+denied:
81728+ if (mode == GR_BIND)
81729+ 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));
81730+ else if (mode == GR_CONNECT)
81731+ 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));
81732+
81733+ return -EACCES;
81734+}
81735+
81736+int
81737+gr_search_connect(struct socket *sock, struct sockaddr_in *addr)
81738+{
81739+ /* always allow disconnection of dgram sockets with connect */
81740+ if (addr->sin_family == AF_UNSPEC)
81741+ return 0;
81742+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sock->sk, addr, sock->type);
81743+}
81744+
81745+int
81746+gr_search_bind(struct socket *sock, struct sockaddr_in *addr)
81747+{
81748+ return gr_search_connectbind(GR_BIND | GR_BINDOVERRIDE, sock->sk, addr, sock->type);
81749+}
81750+
81751+int gr_search_listen(struct socket *sock)
81752+{
81753+ struct sock *sk = sock->sk;
81754+ struct sockaddr_in addr;
81755+
81756+ addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr;
81757+ addr.sin_port = inet_sk(sk)->inet_sport;
81758+
81759+ return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
81760+}
81761+
81762+int gr_search_accept(struct socket *sock)
81763+{
81764+ struct sock *sk = sock->sk;
81765+ struct sockaddr_in addr;
81766+
81767+ addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr;
81768+ addr.sin_port = inet_sk(sk)->inet_sport;
81769+
81770+ return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
81771+}
81772+
81773+int
81774+gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr)
81775+{
81776+ if (addr)
81777+ return gr_search_connectbind(GR_CONNECT, sk, addr, SOCK_DGRAM);
81778+ else {
81779+ struct sockaddr_in sin;
81780+ const struct inet_sock *inet = inet_sk(sk);
81781+
81782+ sin.sin_addr.s_addr = inet->inet_daddr;
81783+ sin.sin_port = inet->inet_dport;
81784+
81785+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
81786+ }
81787+}
81788+
81789+int
81790+gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb)
81791+{
81792+ struct sockaddr_in sin;
81793+
81794+ if (unlikely(skb->len < sizeof (struct udphdr)))
81795+ return 0; // skip this packet
81796+
81797+ sin.sin_addr.s_addr = ip_hdr(skb)->saddr;
81798+ sin.sin_port = udp_hdr(skb)->source;
81799+
81800+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
81801+}
81802diff --git a/grsecurity/gracl_learn.c b/grsecurity/gracl_learn.c
81803new file mode 100644
81804index 0000000..25f54ef
81805--- /dev/null
81806+++ b/grsecurity/gracl_learn.c
81807@@ -0,0 +1,207 @@
81808+#include <linux/kernel.h>
81809+#include <linux/mm.h>
81810+#include <linux/sched.h>
81811+#include <linux/poll.h>
81812+#include <linux/string.h>
81813+#include <linux/file.h>
81814+#include <linux/types.h>
81815+#include <linux/vmalloc.h>
81816+#include <linux/grinternal.h>
81817+
81818+extern ssize_t write_grsec_handler(struct file * file, const char __user * buf,
81819+ size_t count, loff_t *ppos);
81820+extern int gr_acl_is_enabled(void);
81821+
81822+static DECLARE_WAIT_QUEUE_HEAD(learn_wait);
81823+static int gr_learn_attached;
81824+
81825+/* use a 512k buffer */
81826+#define LEARN_BUFFER_SIZE (512 * 1024)
81827+
81828+static DEFINE_SPINLOCK(gr_learn_lock);
81829+static DEFINE_MUTEX(gr_learn_user_mutex);
81830+
81831+/* we need to maintain two buffers, so that the kernel context of grlearn
81832+ uses a semaphore around the userspace copying, and the other kernel contexts
81833+ use a spinlock when copying into the buffer, since they cannot sleep
81834+*/
81835+static char *learn_buffer;
81836+static char *learn_buffer_user;
81837+static int learn_buffer_len;
81838+static int learn_buffer_user_len;
81839+
81840+static ssize_t
81841+read_learn(struct file *file, char __user * buf, size_t count, loff_t * ppos)
81842+{
81843+ DECLARE_WAITQUEUE(wait, current);
81844+ ssize_t retval = 0;
81845+
81846+ add_wait_queue(&learn_wait, &wait);
81847+ set_current_state(TASK_INTERRUPTIBLE);
81848+ do {
81849+ mutex_lock(&gr_learn_user_mutex);
81850+ spin_lock(&gr_learn_lock);
81851+ if (learn_buffer_len)
81852+ break;
81853+ spin_unlock(&gr_learn_lock);
81854+ mutex_unlock(&gr_learn_user_mutex);
81855+ if (file->f_flags & O_NONBLOCK) {
81856+ retval = -EAGAIN;
81857+ goto out;
81858+ }
81859+ if (signal_pending(current)) {
81860+ retval = -ERESTARTSYS;
81861+ goto out;
81862+ }
81863+
81864+ schedule();
81865+ } while (1);
81866+
81867+ memcpy(learn_buffer_user, learn_buffer, learn_buffer_len);
81868+ learn_buffer_user_len = learn_buffer_len;
81869+ retval = learn_buffer_len;
81870+ learn_buffer_len = 0;
81871+
81872+ spin_unlock(&gr_learn_lock);
81873+
81874+ if (copy_to_user(buf, learn_buffer_user, learn_buffer_user_len))
81875+ retval = -EFAULT;
81876+
81877+ mutex_unlock(&gr_learn_user_mutex);
81878+out:
81879+ set_current_state(TASK_RUNNING);
81880+ remove_wait_queue(&learn_wait, &wait);
81881+ return retval;
81882+}
81883+
81884+static unsigned int
81885+poll_learn(struct file * file, poll_table * wait)
81886+{
81887+ poll_wait(file, &learn_wait, wait);
81888+
81889+ if (learn_buffer_len)
81890+ return (POLLIN | POLLRDNORM);
81891+
81892+ return 0;
81893+}
81894+
81895+void
81896+gr_clear_learn_entries(void)
81897+{
81898+ char *tmp;
81899+
81900+ mutex_lock(&gr_learn_user_mutex);
81901+ spin_lock(&gr_learn_lock);
81902+ tmp = learn_buffer;
81903+ learn_buffer = NULL;
81904+ spin_unlock(&gr_learn_lock);
81905+ if (tmp)
81906+ vfree(tmp);
81907+ if (learn_buffer_user != NULL) {
81908+ vfree(learn_buffer_user);
81909+ learn_buffer_user = NULL;
81910+ }
81911+ learn_buffer_len = 0;
81912+ mutex_unlock(&gr_learn_user_mutex);
81913+
81914+ return;
81915+}
81916+
81917+void
81918+gr_add_learn_entry(const char *fmt, ...)
81919+{
81920+ va_list args;
81921+ unsigned int len;
81922+
81923+ if (!gr_learn_attached)
81924+ return;
81925+
81926+ spin_lock(&gr_learn_lock);
81927+
81928+ /* leave a gap at the end so we know when it's "full" but don't have to
81929+ compute the exact length of the string we're trying to append
81930+ */
81931+ if (learn_buffer_len > LEARN_BUFFER_SIZE - 16384) {
81932+ spin_unlock(&gr_learn_lock);
81933+ wake_up_interruptible(&learn_wait);
81934+ return;
81935+ }
81936+ if (learn_buffer == NULL) {
81937+ spin_unlock(&gr_learn_lock);
81938+ return;
81939+ }
81940+
81941+ va_start(args, fmt);
81942+ len = vsnprintf(learn_buffer + learn_buffer_len, LEARN_BUFFER_SIZE - learn_buffer_len, fmt, args);
81943+ va_end(args);
81944+
81945+ learn_buffer_len += len + 1;
81946+
81947+ spin_unlock(&gr_learn_lock);
81948+ wake_up_interruptible(&learn_wait);
81949+
81950+ return;
81951+}
81952+
81953+static int
81954+open_learn(struct inode *inode, struct file *file)
81955+{
81956+ if (file->f_mode & FMODE_READ && gr_learn_attached)
81957+ return -EBUSY;
81958+ if (file->f_mode & FMODE_READ) {
81959+ int retval = 0;
81960+ mutex_lock(&gr_learn_user_mutex);
81961+ if (learn_buffer == NULL)
81962+ learn_buffer = vmalloc(LEARN_BUFFER_SIZE);
81963+ if (learn_buffer_user == NULL)
81964+ learn_buffer_user = vmalloc(LEARN_BUFFER_SIZE);
81965+ if (learn_buffer == NULL) {
81966+ retval = -ENOMEM;
81967+ goto out_error;
81968+ }
81969+ if (learn_buffer_user == NULL) {
81970+ retval = -ENOMEM;
81971+ goto out_error;
81972+ }
81973+ learn_buffer_len = 0;
81974+ learn_buffer_user_len = 0;
81975+ gr_learn_attached = 1;
81976+out_error:
81977+ mutex_unlock(&gr_learn_user_mutex);
81978+ return retval;
81979+ }
81980+ return 0;
81981+}
81982+
81983+static int
81984+close_learn(struct inode *inode, struct file *file)
81985+{
81986+ if (file->f_mode & FMODE_READ) {
81987+ char *tmp = NULL;
81988+ mutex_lock(&gr_learn_user_mutex);
81989+ spin_lock(&gr_learn_lock);
81990+ tmp = learn_buffer;
81991+ learn_buffer = NULL;
81992+ spin_unlock(&gr_learn_lock);
81993+ if (tmp)
81994+ vfree(tmp);
81995+ if (learn_buffer_user != NULL) {
81996+ vfree(learn_buffer_user);
81997+ learn_buffer_user = NULL;
81998+ }
81999+ learn_buffer_len = 0;
82000+ learn_buffer_user_len = 0;
82001+ gr_learn_attached = 0;
82002+ mutex_unlock(&gr_learn_user_mutex);
82003+ }
82004+
82005+ return 0;
82006+}
82007+
82008+const struct file_operations grsec_fops = {
82009+ .read = read_learn,
82010+ .write = write_grsec_handler,
82011+ .open = open_learn,
82012+ .release = close_learn,
82013+ .poll = poll_learn,
82014+};
82015diff --git a/grsecurity/gracl_policy.c b/grsecurity/gracl_policy.c
82016new file mode 100644
82017index 0000000..fd26052
82018--- /dev/null
82019+++ b/grsecurity/gracl_policy.c
82020@@ -0,0 +1,1781 @@
82021+#include <linux/kernel.h>
82022+#include <linux/module.h>
82023+#include <linux/sched.h>
82024+#include <linux/mm.h>
82025+#include <linux/file.h>
82026+#include <linux/fs.h>
82027+#include <linux/namei.h>
82028+#include <linux/mount.h>
82029+#include <linux/tty.h>
82030+#include <linux/proc_fs.h>
82031+#include <linux/lglock.h>
82032+#include <linux/slab.h>
82033+#include <linux/vmalloc.h>
82034+#include <linux/types.h>
82035+#include <linux/sysctl.h>
82036+#include <linux/netdevice.h>
82037+#include <linux/ptrace.h>
82038+#include <linux/gracl.h>
82039+#include <linux/gralloc.h>
82040+#include <linux/security.h>
82041+#include <linux/grinternal.h>
82042+#include <linux/pid_namespace.h>
82043+#include <linux/stop_machine.h>
82044+#include <linux/fdtable.h>
82045+#include <linux/percpu.h>
82046+#include <linux/lglock.h>
82047+#include <linux/hugetlb.h>
82048+#include <linux/posix-timers.h>
82049+#include "../fs/mount.h"
82050+
82051+#include <asm/uaccess.h>
82052+#include <asm/errno.h>
82053+#include <asm/mman.h>
82054+
82055+extern struct gr_policy_state *polstate;
82056+
82057+#define FOR_EACH_ROLE_START(role) \
82058+ role = polstate->role_list; \
82059+ while (role) {
82060+
82061+#define FOR_EACH_ROLE_END(role) \
82062+ role = role->prev; \
82063+ }
82064+
82065+struct path gr_real_root;
82066+
82067+extern struct gr_alloc_state *current_alloc_state;
82068+
82069+u16 acl_sp_role_value;
82070+
82071+static DEFINE_MUTEX(gr_dev_mutex);
82072+
82073+extern int chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum);
82074+extern void gr_clear_learn_entries(void);
82075+
82076+struct gr_arg *gr_usermode __read_only;
82077+unsigned char *gr_system_salt __read_only;
82078+unsigned char *gr_system_sum __read_only;
82079+
82080+static unsigned int gr_auth_attempts = 0;
82081+static unsigned long gr_auth_expires = 0UL;
82082+
82083+struct acl_object_label *fakefs_obj_rw;
82084+struct acl_object_label *fakefs_obj_rwx;
82085+
82086+extern int gr_init_uidset(void);
82087+extern void gr_free_uidset(void);
82088+extern void gr_remove_uid(uid_t uid);
82089+extern int gr_find_uid(uid_t uid);
82090+
82091+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);
82092+extern void __gr_apply_subject_to_task(struct gr_policy_state *state, struct task_struct *task, struct acl_subject_label *subj);
82093+extern int gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb);
82094+extern void __insert_inodev_entry(const struct gr_policy_state *state, struct inodev_entry *entry);
82095+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);
82096+extern void insert_acl_obj_label(struct acl_object_label *obj, struct acl_subject_label *subj);
82097+extern void insert_acl_subj_label(struct acl_subject_label *obj, struct acl_role_label *role);
82098+extern struct name_entry * __lookup_name_entry(const struct gr_policy_state *state, const char *name);
82099+extern char *gr_to_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt);
82100+extern struct acl_subject_label *lookup_acl_subj_label(const u64 ino, const dev_t dev, const struct acl_role_label *role);
82101+extern struct acl_subject_label *lookup_acl_subj_label_deleted(const u64 ino, const dev_t dev, const struct acl_role_label *role);
82102+extern void assign_special_role(const char *rolename);
82103+extern struct acl_subject_label *chk_subj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt, const struct acl_role_label *role);
82104+extern int gr_rbac_disable(void *unused);
82105+extern void gr_enable_rbac_system(void);
82106+
82107+static int copy_acl_object_label_normal(struct acl_object_label *obj, const struct acl_object_label *userp)
82108+{
82109+ if (copy_from_user(obj, userp, sizeof(struct acl_object_label)))
82110+ return -EFAULT;
82111+
82112+ return 0;
82113+}
82114+
82115+static int copy_acl_ip_label_normal(struct acl_ip_label *ip, const struct acl_ip_label *userp)
82116+{
82117+ if (copy_from_user(ip, userp, sizeof(struct acl_ip_label)))
82118+ return -EFAULT;
82119+
82120+ return 0;
82121+}
82122+
82123+static int copy_acl_subject_label_normal(struct acl_subject_label *subj, const struct acl_subject_label *userp)
82124+{
82125+ if (copy_from_user(subj, userp, sizeof(struct acl_subject_label)))
82126+ return -EFAULT;
82127+
82128+ return 0;
82129+}
82130+
82131+static int copy_acl_role_label_normal(struct acl_role_label *role, const struct acl_role_label *userp)
82132+{
82133+ if (copy_from_user(role, userp, sizeof(struct acl_role_label)))
82134+ return -EFAULT;
82135+
82136+ return 0;
82137+}
82138+
82139+static int copy_role_allowed_ip_normal(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp)
82140+{
82141+ if (copy_from_user(roleip, userp, sizeof(struct role_allowed_ip)))
82142+ return -EFAULT;
82143+
82144+ return 0;
82145+}
82146+
82147+static int copy_sprole_pw_normal(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp)
82148+{
82149+ if (copy_from_user(pw, userp + idx, sizeof(struct sprole_pw)))
82150+ return -EFAULT;
82151+
82152+ return 0;
82153+}
82154+
82155+static int copy_gr_hash_struct_normal(struct gr_hash_struct *hash, const struct gr_hash_struct *userp)
82156+{
82157+ if (copy_from_user(hash, userp, sizeof(struct gr_hash_struct)))
82158+ return -EFAULT;
82159+
82160+ return 0;
82161+}
82162+
82163+static int copy_role_transition_normal(struct role_transition *trans, const struct role_transition *userp)
82164+{
82165+ if (copy_from_user(trans, userp, sizeof(struct role_transition)))
82166+ return -EFAULT;
82167+
82168+ return 0;
82169+}
82170+
82171+int copy_pointer_from_array_normal(void *ptr, unsigned long idx, const void *userp)
82172+{
82173+ if (copy_from_user(ptr, userp + (idx * sizeof(void *)), sizeof(void *)))
82174+ return -EFAULT;
82175+
82176+ return 0;
82177+}
82178+
82179+static int copy_gr_arg_wrapper_normal(const char __user *buf, struct gr_arg_wrapper *uwrap)
82180+{
82181+ if (copy_from_user(uwrap, buf, sizeof (struct gr_arg_wrapper)))
82182+ return -EFAULT;
82183+
82184+ if ((uwrap->version != GRSECURITY_VERSION) ||
82185+ (uwrap->size != sizeof(struct gr_arg)))
82186+ return -EINVAL;
82187+
82188+ return 0;
82189+}
82190+
82191+static int copy_gr_arg_normal(const struct gr_arg __user *buf, struct gr_arg *arg)
82192+{
82193+ if (copy_from_user(arg, buf, sizeof (struct gr_arg)))
82194+ return -EFAULT;
82195+
82196+ return 0;
82197+}
82198+
82199+static size_t get_gr_arg_wrapper_size_normal(void)
82200+{
82201+ return sizeof(struct gr_arg_wrapper);
82202+}
82203+
82204+#ifdef CONFIG_COMPAT
82205+extern int copy_gr_arg_wrapper_compat(const char *buf, struct gr_arg_wrapper *uwrap);
82206+extern int copy_gr_arg_compat(const struct gr_arg __user *buf, struct gr_arg *arg);
82207+extern int copy_acl_object_label_compat(struct acl_object_label *obj, const struct acl_object_label *userp);
82208+extern int copy_acl_subject_label_compat(struct acl_subject_label *subj, const struct acl_subject_label *userp);
82209+extern int copy_acl_role_label_compat(struct acl_role_label *role, const struct acl_role_label *userp);
82210+extern int copy_role_allowed_ip_compat(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp);
82211+extern int copy_role_transition_compat(struct role_transition *trans, const struct role_transition *userp);
82212+extern int copy_gr_hash_struct_compat(struct gr_hash_struct *hash, const struct gr_hash_struct *userp);
82213+extern int copy_pointer_from_array_compat(void *ptr, unsigned long idx, const void *userp);
82214+extern int copy_acl_ip_label_compat(struct acl_ip_label *ip, const struct acl_ip_label *userp);
82215+extern int copy_sprole_pw_compat(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp);
82216+extern size_t get_gr_arg_wrapper_size_compat(void);
82217+
82218+int (* copy_gr_arg_wrapper)(const char *buf, struct gr_arg_wrapper *uwrap) __read_only;
82219+int (* copy_gr_arg)(const struct gr_arg *buf, struct gr_arg *arg) __read_only;
82220+int (* copy_acl_object_label)(struct acl_object_label *obj, const struct acl_object_label *userp) __read_only;
82221+int (* copy_acl_subject_label)(struct acl_subject_label *subj, const struct acl_subject_label *userp) __read_only;
82222+int (* copy_acl_role_label)(struct acl_role_label *role, const struct acl_role_label *userp) __read_only;
82223+int (* copy_acl_ip_label)(struct acl_ip_label *ip, const struct acl_ip_label *userp) __read_only;
82224+int (* copy_pointer_from_array)(void *ptr, unsigned long idx, const void *userp) __read_only;
82225+int (* copy_sprole_pw)(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp) __read_only;
82226+int (* copy_gr_hash_struct)(struct gr_hash_struct *hash, const struct gr_hash_struct *userp) __read_only;
82227+int (* copy_role_transition)(struct role_transition *trans, const struct role_transition *userp) __read_only;
82228+int (* copy_role_allowed_ip)(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp) __read_only;
82229+size_t (* get_gr_arg_wrapper_size)(void) __read_only;
82230+
82231+#else
82232+#define copy_gr_arg_wrapper copy_gr_arg_wrapper_normal
82233+#define copy_gr_arg copy_gr_arg_normal
82234+#define copy_gr_hash_struct copy_gr_hash_struct_normal
82235+#define copy_acl_object_label copy_acl_object_label_normal
82236+#define copy_acl_subject_label copy_acl_subject_label_normal
82237+#define copy_acl_role_label copy_acl_role_label_normal
82238+#define copy_acl_ip_label copy_acl_ip_label_normal
82239+#define copy_pointer_from_array copy_pointer_from_array_normal
82240+#define copy_sprole_pw copy_sprole_pw_normal
82241+#define copy_role_transition copy_role_transition_normal
82242+#define copy_role_allowed_ip copy_role_allowed_ip_normal
82243+#define get_gr_arg_wrapper_size get_gr_arg_wrapper_size_normal
82244+#endif
82245+
82246+static struct acl_subject_label *
82247+lookup_subject_map(const struct acl_subject_label *userp)
82248+{
82249+ unsigned int index = gr_shash(userp, polstate->subj_map_set.s_size);
82250+ struct subject_map *match;
82251+
82252+ match = polstate->subj_map_set.s_hash[index];
82253+
82254+ while (match && match->user != userp)
82255+ match = match->next;
82256+
82257+ if (match != NULL)
82258+ return match->kernel;
82259+ else
82260+ return NULL;
82261+}
82262+
82263+static void
82264+insert_subj_map_entry(struct subject_map *subjmap)
82265+{
82266+ unsigned int index = gr_shash(subjmap->user, polstate->subj_map_set.s_size);
82267+ struct subject_map **curr;
82268+
82269+ subjmap->prev = NULL;
82270+
82271+ curr = &polstate->subj_map_set.s_hash[index];
82272+ if (*curr != NULL)
82273+ (*curr)->prev = subjmap;
82274+
82275+ subjmap->next = *curr;
82276+ *curr = subjmap;
82277+
82278+ return;
82279+}
82280+
82281+static void
82282+__insert_acl_role_label(struct acl_role_label *role, uid_t uidgid)
82283+{
82284+ unsigned int index =
82285+ gr_rhash(uidgid, role->roletype & (GR_ROLE_USER | GR_ROLE_GROUP), polstate->acl_role_set.r_size);
82286+ struct acl_role_label **curr;
82287+ struct acl_role_label *tmp, *tmp2;
82288+
82289+ curr = &polstate->acl_role_set.r_hash[index];
82290+
82291+ /* simple case, slot is empty, just set it to our role */
82292+ if (*curr == NULL) {
82293+ *curr = role;
82294+ } else {
82295+ /* example:
82296+ 1 -> 2 -> 3 (adding 2 -> 3 to here)
82297+ 2 -> 3
82298+ */
82299+ /* first check to see if we can already be reached via this slot */
82300+ tmp = *curr;
82301+ while (tmp && tmp != role)
82302+ tmp = tmp->next;
82303+ if (tmp == role) {
82304+ /* we don't need to add ourselves to this slot's chain */
82305+ return;
82306+ }
82307+ /* we need to add ourselves to this chain, two cases */
82308+ if (role->next == NULL) {
82309+ /* simple case, append the current chain to our role */
82310+ role->next = *curr;
82311+ *curr = role;
82312+ } else {
82313+ /* 1 -> 2 -> 3 -> 4
82314+ 2 -> 3 -> 4
82315+ 3 -> 4 (adding 1 -> 2 -> 3 -> 4 to here)
82316+ */
82317+ /* trickier case: walk our role's chain until we find
82318+ the role for the start of the current slot's chain */
82319+ tmp = role;
82320+ tmp2 = *curr;
82321+ while (tmp->next && tmp->next != tmp2)
82322+ tmp = tmp->next;
82323+ if (tmp->next == tmp2) {
82324+ /* from example above, we found 3, so just
82325+ replace this slot's chain with ours */
82326+ *curr = role;
82327+ } else {
82328+ /* we didn't find a subset of our role's chain
82329+ in the current slot's chain, so append their
82330+ chain to ours, and set us as the first role in
82331+ the slot's chain
82332+
82333+ we could fold this case with the case above,
82334+ but making it explicit for clarity
82335+ */
82336+ tmp->next = tmp2;
82337+ *curr = role;
82338+ }
82339+ }
82340+ }
82341+
82342+ return;
82343+}
82344+
82345+static void
82346+insert_acl_role_label(struct acl_role_label *role)
82347+{
82348+ int i;
82349+
82350+ if (polstate->role_list == NULL) {
82351+ polstate->role_list = role;
82352+ role->prev = NULL;
82353+ } else {
82354+ role->prev = polstate->role_list;
82355+ polstate->role_list = role;
82356+ }
82357+
82358+ /* used for hash chains */
82359+ role->next = NULL;
82360+
82361+ if (role->roletype & GR_ROLE_DOMAIN) {
82362+ for (i = 0; i < role->domain_child_num; i++)
82363+ __insert_acl_role_label(role, role->domain_children[i]);
82364+ } else
82365+ __insert_acl_role_label(role, role->uidgid);
82366+}
82367+
82368+static int
82369+insert_name_entry(char *name, const u64 inode, const dev_t device, __u8 deleted)
82370+{
82371+ struct name_entry **curr, *nentry;
82372+ struct inodev_entry *ientry;
82373+ unsigned int len = strlen(name);
82374+ unsigned int key = full_name_hash(name, len);
82375+ unsigned int index = key % polstate->name_set.n_size;
82376+
82377+ curr = &polstate->name_set.n_hash[index];
82378+
82379+ while (*curr && ((*curr)->key != key || !gr_streq((*curr)->name, name, (*curr)->len, len)))
82380+ curr = &((*curr)->next);
82381+
82382+ if (*curr != NULL)
82383+ return 1;
82384+
82385+ nentry = acl_alloc(sizeof (struct name_entry));
82386+ if (nentry == NULL)
82387+ return 0;
82388+ ientry = acl_alloc(sizeof (struct inodev_entry));
82389+ if (ientry == NULL)
82390+ return 0;
82391+ ientry->nentry = nentry;
82392+
82393+ nentry->key = key;
82394+ nentry->name = name;
82395+ nentry->inode = inode;
82396+ nentry->device = device;
82397+ nentry->len = len;
82398+ nentry->deleted = deleted;
82399+
82400+ nentry->prev = NULL;
82401+ curr = &polstate->name_set.n_hash[index];
82402+ if (*curr != NULL)
82403+ (*curr)->prev = nentry;
82404+ nentry->next = *curr;
82405+ *curr = nentry;
82406+
82407+ /* insert us into the table searchable by inode/dev */
82408+ __insert_inodev_entry(polstate, ientry);
82409+
82410+ return 1;
82411+}
82412+
82413+/* allocating chained hash tables, so optimal size is where lambda ~ 1 */
82414+
82415+static void *
82416+create_table(__u32 * len, int elementsize)
82417+{
82418+ unsigned int table_sizes[] = {
82419+ 7, 13, 31, 61, 127, 251, 509, 1021, 2039, 4093, 8191, 16381,
82420+ 32749, 65521, 131071, 262139, 524287, 1048573, 2097143,
82421+ 4194301, 8388593, 16777213, 33554393, 67108859
82422+ };
82423+ void *newtable = NULL;
82424+ unsigned int pwr = 0;
82425+
82426+ while ((pwr < ((sizeof (table_sizes) / sizeof (table_sizes[0])) - 1)) &&
82427+ table_sizes[pwr] <= *len)
82428+ pwr++;
82429+
82430+ if (table_sizes[pwr] <= *len || (table_sizes[pwr] > ULONG_MAX / elementsize))
82431+ return newtable;
82432+
82433+ if ((table_sizes[pwr] * elementsize) <= PAGE_SIZE)
82434+ newtable =
82435+ kmalloc(table_sizes[pwr] * elementsize, GFP_KERNEL);
82436+ else
82437+ newtable = vmalloc(table_sizes[pwr] * elementsize);
82438+
82439+ *len = table_sizes[pwr];
82440+
82441+ return newtable;
82442+}
82443+
82444+static int
82445+init_variables(const struct gr_arg *arg, bool reload)
82446+{
82447+ struct task_struct *reaper = init_pid_ns.child_reaper;
82448+ unsigned int stacksize;
82449+
82450+ polstate->subj_map_set.s_size = arg->role_db.num_subjects;
82451+ polstate->acl_role_set.r_size = arg->role_db.num_roles + arg->role_db.num_domain_children;
82452+ polstate->name_set.n_size = arg->role_db.num_objects;
82453+ polstate->inodev_set.i_size = arg->role_db.num_objects;
82454+
82455+ if (!polstate->subj_map_set.s_size || !polstate->acl_role_set.r_size ||
82456+ !polstate->name_set.n_size || !polstate->inodev_set.i_size)
82457+ return 1;
82458+
82459+ if (!reload) {
82460+ if (!gr_init_uidset())
82461+ return 1;
82462+ }
82463+
82464+ /* set up the stack that holds allocation info */
82465+
82466+ stacksize = arg->role_db.num_pointers + 5;
82467+
82468+ if (!acl_alloc_stack_init(stacksize))
82469+ return 1;
82470+
82471+ if (!reload) {
82472+ /* grab reference for the real root dentry and vfsmount */
82473+ get_fs_root(reaper->fs, &gr_real_root);
82474+
82475+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
82476+ 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);
82477+#endif
82478+
82479+ fakefs_obj_rw = kzalloc(sizeof(struct acl_object_label), GFP_KERNEL);
82480+ if (fakefs_obj_rw == NULL)
82481+ return 1;
82482+ fakefs_obj_rw->mode = GR_FIND | GR_READ | GR_WRITE;
82483+
82484+ fakefs_obj_rwx = kzalloc(sizeof(struct acl_object_label), GFP_KERNEL);
82485+ if (fakefs_obj_rwx == NULL)
82486+ return 1;
82487+ fakefs_obj_rwx->mode = GR_FIND | GR_READ | GR_WRITE | GR_EXEC;
82488+ }
82489+
82490+ polstate->subj_map_set.s_hash =
82491+ (struct subject_map **) create_table(&polstate->subj_map_set.s_size, sizeof(void *));
82492+ polstate->acl_role_set.r_hash =
82493+ (struct acl_role_label **) create_table(&polstate->acl_role_set.r_size, sizeof(void *));
82494+ polstate->name_set.n_hash = (struct name_entry **) create_table(&polstate->name_set.n_size, sizeof(void *));
82495+ polstate->inodev_set.i_hash =
82496+ (struct inodev_entry **) create_table(&polstate->inodev_set.i_size, sizeof(void *));
82497+
82498+ if (!polstate->subj_map_set.s_hash || !polstate->acl_role_set.r_hash ||
82499+ !polstate->name_set.n_hash || !polstate->inodev_set.i_hash)
82500+ return 1;
82501+
82502+ memset(polstate->subj_map_set.s_hash, 0,
82503+ sizeof(struct subject_map *) * polstate->subj_map_set.s_size);
82504+ memset(polstate->acl_role_set.r_hash, 0,
82505+ sizeof (struct acl_role_label *) * polstate->acl_role_set.r_size);
82506+ memset(polstate->name_set.n_hash, 0,
82507+ sizeof (struct name_entry *) * polstate->name_set.n_size);
82508+ memset(polstate->inodev_set.i_hash, 0,
82509+ sizeof (struct inodev_entry *) * polstate->inodev_set.i_size);
82510+
82511+ return 0;
82512+}
82513+
82514+/* free information not needed after startup
82515+ currently contains user->kernel pointer mappings for subjects
82516+*/
82517+
82518+static void
82519+free_init_variables(void)
82520+{
82521+ __u32 i;
82522+
82523+ if (polstate->subj_map_set.s_hash) {
82524+ for (i = 0; i < polstate->subj_map_set.s_size; i++) {
82525+ if (polstate->subj_map_set.s_hash[i]) {
82526+ kfree(polstate->subj_map_set.s_hash[i]);
82527+ polstate->subj_map_set.s_hash[i] = NULL;
82528+ }
82529+ }
82530+
82531+ if ((polstate->subj_map_set.s_size * sizeof (struct subject_map *)) <=
82532+ PAGE_SIZE)
82533+ kfree(polstate->subj_map_set.s_hash);
82534+ else
82535+ vfree(polstate->subj_map_set.s_hash);
82536+ }
82537+
82538+ return;
82539+}
82540+
82541+static void
82542+free_variables(bool reload)
82543+{
82544+ struct acl_subject_label *s;
82545+ struct acl_role_label *r;
82546+ struct task_struct *task, *task2;
82547+ unsigned int x;
82548+
82549+ if (!reload) {
82550+ gr_clear_learn_entries();
82551+
82552+ read_lock(&tasklist_lock);
82553+ do_each_thread(task2, task) {
82554+ task->acl_sp_role = 0;
82555+ task->acl_role_id = 0;
82556+ task->inherited = 0;
82557+ task->acl = NULL;
82558+ task->role = NULL;
82559+ } while_each_thread(task2, task);
82560+ read_unlock(&tasklist_lock);
82561+
82562+ kfree(fakefs_obj_rw);
82563+ fakefs_obj_rw = NULL;
82564+ kfree(fakefs_obj_rwx);
82565+ fakefs_obj_rwx = NULL;
82566+
82567+ /* release the reference to the real root dentry and vfsmount */
82568+ path_put(&gr_real_root);
82569+ memset(&gr_real_root, 0, sizeof(gr_real_root));
82570+ }
82571+
82572+ /* free all object hash tables */
82573+
82574+ FOR_EACH_ROLE_START(r)
82575+ if (r->subj_hash == NULL)
82576+ goto next_role;
82577+ FOR_EACH_SUBJECT_START(r, s, x)
82578+ if (s->obj_hash == NULL)
82579+ break;
82580+ if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
82581+ kfree(s->obj_hash);
82582+ else
82583+ vfree(s->obj_hash);
82584+ FOR_EACH_SUBJECT_END(s, x)
82585+ FOR_EACH_NESTED_SUBJECT_START(r, s)
82586+ if (s->obj_hash == NULL)
82587+ break;
82588+ if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
82589+ kfree(s->obj_hash);
82590+ else
82591+ vfree(s->obj_hash);
82592+ FOR_EACH_NESTED_SUBJECT_END(s)
82593+ if ((r->subj_hash_size * sizeof (struct acl_subject_label *)) <= PAGE_SIZE)
82594+ kfree(r->subj_hash);
82595+ else
82596+ vfree(r->subj_hash);
82597+ r->subj_hash = NULL;
82598+next_role:
82599+ FOR_EACH_ROLE_END(r)
82600+
82601+ acl_free_all();
82602+
82603+ if (polstate->acl_role_set.r_hash) {
82604+ if ((polstate->acl_role_set.r_size * sizeof (struct acl_role_label *)) <=
82605+ PAGE_SIZE)
82606+ kfree(polstate->acl_role_set.r_hash);
82607+ else
82608+ vfree(polstate->acl_role_set.r_hash);
82609+ }
82610+ if (polstate->name_set.n_hash) {
82611+ if ((polstate->name_set.n_size * sizeof (struct name_entry *)) <=
82612+ PAGE_SIZE)
82613+ kfree(polstate->name_set.n_hash);
82614+ else
82615+ vfree(polstate->name_set.n_hash);
82616+ }
82617+
82618+ if (polstate->inodev_set.i_hash) {
82619+ if ((polstate->inodev_set.i_size * sizeof (struct inodev_entry *)) <=
82620+ PAGE_SIZE)
82621+ kfree(polstate->inodev_set.i_hash);
82622+ else
82623+ vfree(polstate->inodev_set.i_hash);
82624+ }
82625+
82626+ if (!reload)
82627+ gr_free_uidset();
82628+
82629+ memset(&polstate->name_set, 0, sizeof (struct name_db));
82630+ memset(&polstate->inodev_set, 0, sizeof (struct inodev_db));
82631+ memset(&polstate->acl_role_set, 0, sizeof (struct acl_role_db));
82632+ memset(&polstate->subj_map_set, 0, sizeof (struct acl_subj_map_db));
82633+
82634+ polstate->default_role = NULL;
82635+ polstate->kernel_role = NULL;
82636+ polstate->role_list = NULL;
82637+
82638+ return;
82639+}
82640+
82641+static struct acl_subject_label *
82642+do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role, int *already_copied);
82643+
82644+static int alloc_and_copy_string(char **name, unsigned int maxlen)
82645+{
82646+ unsigned int len = strnlen_user(*name, maxlen);
82647+ char *tmp;
82648+
82649+ if (!len || len >= maxlen)
82650+ return -EINVAL;
82651+
82652+ if ((tmp = (char *) acl_alloc(len)) == NULL)
82653+ return -ENOMEM;
82654+
82655+ if (copy_from_user(tmp, *name, len))
82656+ return -EFAULT;
82657+
82658+ tmp[len-1] = '\0';
82659+ *name = tmp;
82660+
82661+ return 0;
82662+}
82663+
82664+static int
82665+copy_user_glob(struct acl_object_label *obj)
82666+{
82667+ struct acl_object_label *g_tmp, **guser;
82668+ int error;
82669+
82670+ if (obj->globbed == NULL)
82671+ return 0;
82672+
82673+ guser = &obj->globbed;
82674+ while (*guser) {
82675+ g_tmp = (struct acl_object_label *)
82676+ acl_alloc(sizeof (struct acl_object_label));
82677+ if (g_tmp == NULL)
82678+ return -ENOMEM;
82679+
82680+ if (copy_acl_object_label(g_tmp, *guser))
82681+ return -EFAULT;
82682+
82683+ error = alloc_and_copy_string(&g_tmp->filename, PATH_MAX);
82684+ if (error)
82685+ return error;
82686+
82687+ *guser = g_tmp;
82688+ guser = &(g_tmp->next);
82689+ }
82690+
82691+ return 0;
82692+}
82693+
82694+static int
82695+copy_user_objs(struct acl_object_label *userp, struct acl_subject_label *subj,
82696+ struct acl_role_label *role)
82697+{
82698+ struct acl_object_label *o_tmp;
82699+ int ret;
82700+
82701+ while (userp) {
82702+ if ((o_tmp = (struct acl_object_label *)
82703+ acl_alloc(sizeof (struct acl_object_label))) == NULL)
82704+ return -ENOMEM;
82705+
82706+ if (copy_acl_object_label(o_tmp, userp))
82707+ return -EFAULT;
82708+
82709+ userp = o_tmp->prev;
82710+
82711+ ret = alloc_and_copy_string(&o_tmp->filename, PATH_MAX);
82712+ if (ret)
82713+ return ret;
82714+
82715+ insert_acl_obj_label(o_tmp, subj);
82716+ if (!insert_name_entry(o_tmp->filename, o_tmp->inode,
82717+ o_tmp->device, (o_tmp->mode & GR_DELETED) ? 1 : 0))
82718+ return -ENOMEM;
82719+
82720+ ret = copy_user_glob(o_tmp);
82721+ if (ret)
82722+ return ret;
82723+
82724+ if (o_tmp->nested) {
82725+ int already_copied;
82726+
82727+ o_tmp->nested = do_copy_user_subj(o_tmp->nested, role, &already_copied);
82728+ if (IS_ERR(o_tmp->nested))
82729+ return PTR_ERR(o_tmp->nested);
82730+
82731+ /* insert into nested subject list if we haven't copied this one yet
82732+ to prevent duplicate entries */
82733+ if (!already_copied) {
82734+ o_tmp->nested->next = role->hash->first;
82735+ role->hash->first = o_tmp->nested;
82736+ }
82737+ }
82738+ }
82739+
82740+ return 0;
82741+}
82742+
82743+static __u32
82744+count_user_subjs(struct acl_subject_label *userp)
82745+{
82746+ struct acl_subject_label s_tmp;
82747+ __u32 num = 0;
82748+
82749+ while (userp) {
82750+ if (copy_acl_subject_label(&s_tmp, userp))
82751+ break;
82752+
82753+ userp = s_tmp.prev;
82754+ }
82755+
82756+ return num;
82757+}
82758+
82759+static int
82760+copy_user_allowedips(struct acl_role_label *rolep)
82761+{
82762+ struct role_allowed_ip *ruserip, *rtmp = NULL, *rlast;
82763+
82764+ ruserip = rolep->allowed_ips;
82765+
82766+ while (ruserip) {
82767+ rlast = rtmp;
82768+
82769+ if ((rtmp = (struct role_allowed_ip *)
82770+ acl_alloc(sizeof (struct role_allowed_ip))) == NULL)
82771+ return -ENOMEM;
82772+
82773+ if (copy_role_allowed_ip(rtmp, ruserip))
82774+ return -EFAULT;
82775+
82776+ ruserip = rtmp->prev;
82777+
82778+ if (!rlast) {
82779+ rtmp->prev = NULL;
82780+ rolep->allowed_ips = rtmp;
82781+ } else {
82782+ rlast->next = rtmp;
82783+ rtmp->prev = rlast;
82784+ }
82785+
82786+ if (!ruserip)
82787+ rtmp->next = NULL;
82788+ }
82789+
82790+ return 0;
82791+}
82792+
82793+static int
82794+copy_user_transitions(struct acl_role_label *rolep)
82795+{
82796+ struct role_transition *rusertp, *rtmp = NULL, *rlast;
82797+ int error;
82798+
82799+ rusertp = rolep->transitions;
82800+
82801+ while (rusertp) {
82802+ rlast = rtmp;
82803+
82804+ if ((rtmp = (struct role_transition *)
82805+ acl_alloc(sizeof (struct role_transition))) == NULL)
82806+ return -ENOMEM;
82807+
82808+ if (copy_role_transition(rtmp, rusertp))
82809+ return -EFAULT;
82810+
82811+ rusertp = rtmp->prev;
82812+
82813+ error = alloc_and_copy_string(&rtmp->rolename, GR_SPROLE_LEN);
82814+ if (error)
82815+ return error;
82816+
82817+ if (!rlast) {
82818+ rtmp->prev = NULL;
82819+ rolep->transitions = rtmp;
82820+ } else {
82821+ rlast->next = rtmp;
82822+ rtmp->prev = rlast;
82823+ }
82824+
82825+ if (!rusertp)
82826+ rtmp->next = NULL;
82827+ }
82828+
82829+ return 0;
82830+}
82831+
82832+static __u32 count_user_objs(const struct acl_object_label __user *userp)
82833+{
82834+ struct acl_object_label o_tmp;
82835+ __u32 num = 0;
82836+
82837+ while (userp) {
82838+ if (copy_acl_object_label(&o_tmp, userp))
82839+ break;
82840+
82841+ userp = o_tmp.prev;
82842+ num++;
82843+ }
82844+
82845+ return num;
82846+}
82847+
82848+static struct acl_subject_label *
82849+do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role, int *already_copied)
82850+{
82851+ struct acl_subject_label *s_tmp = NULL, *s_tmp2;
82852+ __u32 num_objs;
82853+ struct acl_ip_label **i_tmp, *i_utmp2;
82854+ struct gr_hash_struct ghash;
82855+ struct subject_map *subjmap;
82856+ unsigned int i_num;
82857+ int err;
82858+
82859+ if (already_copied != NULL)
82860+ *already_copied = 0;
82861+
82862+ s_tmp = lookup_subject_map(userp);
82863+
82864+ /* we've already copied this subject into the kernel, just return
82865+ the reference to it, and don't copy it over again
82866+ */
82867+ if (s_tmp) {
82868+ if (already_copied != NULL)
82869+ *already_copied = 1;
82870+ return(s_tmp);
82871+ }
82872+
82873+ if ((s_tmp = (struct acl_subject_label *)
82874+ acl_alloc(sizeof (struct acl_subject_label))) == NULL)
82875+ return ERR_PTR(-ENOMEM);
82876+
82877+ subjmap = (struct subject_map *)kmalloc(sizeof (struct subject_map), GFP_KERNEL);
82878+ if (subjmap == NULL)
82879+ return ERR_PTR(-ENOMEM);
82880+
82881+ subjmap->user = userp;
82882+ subjmap->kernel = s_tmp;
82883+ insert_subj_map_entry(subjmap);
82884+
82885+ if (copy_acl_subject_label(s_tmp, userp))
82886+ return ERR_PTR(-EFAULT);
82887+
82888+ err = alloc_and_copy_string(&s_tmp->filename, PATH_MAX);
82889+ if (err)
82890+ return ERR_PTR(err);
82891+
82892+ if (!strcmp(s_tmp->filename, "/"))
82893+ role->root_label = s_tmp;
82894+
82895+ if (copy_gr_hash_struct(&ghash, s_tmp->hash))
82896+ return ERR_PTR(-EFAULT);
82897+
82898+ /* copy user and group transition tables */
82899+
82900+ if (s_tmp->user_trans_num) {
82901+ uid_t *uidlist;
82902+
82903+ uidlist = (uid_t *)acl_alloc_num(s_tmp->user_trans_num, sizeof(uid_t));
82904+ if (uidlist == NULL)
82905+ return ERR_PTR(-ENOMEM);
82906+ if (copy_from_user(uidlist, s_tmp->user_transitions, s_tmp->user_trans_num * sizeof(uid_t)))
82907+ return ERR_PTR(-EFAULT);
82908+
82909+ s_tmp->user_transitions = uidlist;
82910+ }
82911+
82912+ if (s_tmp->group_trans_num) {
82913+ gid_t *gidlist;
82914+
82915+ gidlist = (gid_t *)acl_alloc_num(s_tmp->group_trans_num, sizeof(gid_t));
82916+ if (gidlist == NULL)
82917+ return ERR_PTR(-ENOMEM);
82918+ if (copy_from_user(gidlist, s_tmp->group_transitions, s_tmp->group_trans_num * sizeof(gid_t)))
82919+ return ERR_PTR(-EFAULT);
82920+
82921+ s_tmp->group_transitions = gidlist;
82922+ }
82923+
82924+ /* set up object hash table */
82925+ num_objs = count_user_objs(ghash.first);
82926+
82927+ s_tmp->obj_hash_size = num_objs;
82928+ s_tmp->obj_hash =
82929+ (struct acl_object_label **)
82930+ create_table(&(s_tmp->obj_hash_size), sizeof(void *));
82931+
82932+ if (!s_tmp->obj_hash)
82933+ return ERR_PTR(-ENOMEM);
82934+
82935+ memset(s_tmp->obj_hash, 0,
82936+ s_tmp->obj_hash_size *
82937+ sizeof (struct acl_object_label *));
82938+
82939+ /* add in objects */
82940+ err = copy_user_objs(ghash.first, s_tmp, role);
82941+
82942+ if (err)
82943+ return ERR_PTR(err);
82944+
82945+ /* set pointer for parent subject */
82946+ if (s_tmp->parent_subject) {
82947+ s_tmp2 = do_copy_user_subj(s_tmp->parent_subject, role, NULL);
82948+
82949+ if (IS_ERR(s_tmp2))
82950+ return s_tmp2;
82951+
82952+ s_tmp->parent_subject = s_tmp2;
82953+ }
82954+
82955+ /* add in ip acls */
82956+
82957+ if (!s_tmp->ip_num) {
82958+ s_tmp->ips = NULL;
82959+ goto insert;
82960+ }
82961+
82962+ i_tmp =
82963+ (struct acl_ip_label **) acl_alloc_num(s_tmp->ip_num,
82964+ sizeof (struct acl_ip_label *));
82965+
82966+ if (!i_tmp)
82967+ return ERR_PTR(-ENOMEM);
82968+
82969+ for (i_num = 0; i_num < s_tmp->ip_num; i_num++) {
82970+ *(i_tmp + i_num) =
82971+ (struct acl_ip_label *)
82972+ acl_alloc(sizeof (struct acl_ip_label));
82973+ if (!*(i_tmp + i_num))
82974+ return ERR_PTR(-ENOMEM);
82975+
82976+ if (copy_pointer_from_array(&i_utmp2, i_num, s_tmp->ips))
82977+ return ERR_PTR(-EFAULT);
82978+
82979+ if (copy_acl_ip_label(*(i_tmp + i_num), i_utmp2))
82980+ return ERR_PTR(-EFAULT);
82981+
82982+ if ((*(i_tmp + i_num))->iface == NULL)
82983+ continue;
82984+
82985+ err = alloc_and_copy_string(&(*(i_tmp + i_num))->iface, IFNAMSIZ);
82986+ if (err)
82987+ return ERR_PTR(err);
82988+ }
82989+
82990+ s_tmp->ips = i_tmp;
82991+
82992+insert:
82993+ if (!insert_name_entry(s_tmp->filename, s_tmp->inode,
82994+ s_tmp->device, (s_tmp->mode & GR_DELETED) ? 1 : 0))
82995+ return ERR_PTR(-ENOMEM);
82996+
82997+ return s_tmp;
82998+}
82999+
83000+static int
83001+copy_user_subjs(struct acl_subject_label *userp, struct acl_role_label *role)
83002+{
83003+ struct acl_subject_label s_pre;
83004+ struct acl_subject_label * ret;
83005+ int err;
83006+
83007+ while (userp) {
83008+ if (copy_acl_subject_label(&s_pre, userp))
83009+ return -EFAULT;
83010+
83011+ ret = do_copy_user_subj(userp, role, NULL);
83012+
83013+ err = PTR_ERR(ret);
83014+ if (IS_ERR(ret))
83015+ return err;
83016+
83017+ insert_acl_subj_label(ret, role);
83018+
83019+ userp = s_pre.prev;
83020+ }
83021+
83022+ return 0;
83023+}
83024+
83025+static int
83026+copy_user_acl(struct gr_arg *arg)
83027+{
83028+ struct acl_role_label *r_tmp = NULL, **r_utmp, *r_utmp2;
83029+ struct acl_subject_label *subj_list;
83030+ struct sprole_pw *sptmp;
83031+ struct gr_hash_struct *ghash;
83032+ uid_t *domainlist;
83033+ unsigned int r_num;
83034+ int err = 0;
83035+ __u16 i;
83036+ __u32 num_subjs;
83037+
83038+ /* we need a default and kernel role */
83039+ if (arg->role_db.num_roles < 2)
83040+ return -EINVAL;
83041+
83042+ /* copy special role authentication info from userspace */
83043+
83044+ polstate->num_sprole_pws = arg->num_sprole_pws;
83045+ polstate->acl_special_roles = (struct sprole_pw **) acl_alloc_num(polstate->num_sprole_pws, sizeof(struct sprole_pw *));
83046+
83047+ if (!polstate->acl_special_roles && polstate->num_sprole_pws)
83048+ return -ENOMEM;
83049+
83050+ for (i = 0; i < polstate->num_sprole_pws; i++) {
83051+ sptmp = (struct sprole_pw *) acl_alloc(sizeof(struct sprole_pw));
83052+ if (!sptmp)
83053+ return -ENOMEM;
83054+ if (copy_sprole_pw(sptmp, i, arg->sprole_pws))
83055+ return -EFAULT;
83056+
83057+ err = alloc_and_copy_string((char **)&sptmp->rolename, GR_SPROLE_LEN);
83058+ if (err)
83059+ return err;
83060+
83061+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
83062+ printk(KERN_ALERT "Copying special role %s\n", sptmp->rolename);
83063+#endif
83064+
83065+ polstate->acl_special_roles[i] = sptmp;
83066+ }
83067+
83068+ r_utmp = (struct acl_role_label **) arg->role_db.r_table;
83069+
83070+ for (r_num = 0; r_num < arg->role_db.num_roles; r_num++) {
83071+ r_tmp = acl_alloc(sizeof (struct acl_role_label));
83072+
83073+ if (!r_tmp)
83074+ return -ENOMEM;
83075+
83076+ if (copy_pointer_from_array(&r_utmp2, r_num, r_utmp))
83077+ return -EFAULT;
83078+
83079+ if (copy_acl_role_label(r_tmp, r_utmp2))
83080+ return -EFAULT;
83081+
83082+ err = alloc_and_copy_string(&r_tmp->rolename, GR_SPROLE_LEN);
83083+ if (err)
83084+ return err;
83085+
83086+ if (!strcmp(r_tmp->rolename, "default")
83087+ && (r_tmp->roletype & GR_ROLE_DEFAULT)) {
83088+ polstate->default_role = r_tmp;
83089+ } else if (!strcmp(r_tmp->rolename, ":::kernel:::")) {
83090+ polstate->kernel_role = r_tmp;
83091+ }
83092+
83093+ if ((ghash = (struct gr_hash_struct *) acl_alloc(sizeof(struct gr_hash_struct))) == NULL)
83094+ return -ENOMEM;
83095+
83096+ if (copy_gr_hash_struct(ghash, r_tmp->hash))
83097+ return -EFAULT;
83098+
83099+ r_tmp->hash = ghash;
83100+
83101+ num_subjs = count_user_subjs(r_tmp->hash->first);
83102+
83103+ r_tmp->subj_hash_size = num_subjs;
83104+ r_tmp->subj_hash =
83105+ (struct acl_subject_label **)
83106+ create_table(&(r_tmp->subj_hash_size), sizeof(void *));
83107+
83108+ if (!r_tmp->subj_hash)
83109+ return -ENOMEM;
83110+
83111+ err = copy_user_allowedips(r_tmp);
83112+ if (err)
83113+ return err;
83114+
83115+ /* copy domain info */
83116+ if (r_tmp->domain_children != NULL) {
83117+ domainlist = acl_alloc_num(r_tmp->domain_child_num, sizeof(uid_t));
83118+ if (domainlist == NULL)
83119+ return -ENOMEM;
83120+
83121+ if (copy_from_user(domainlist, r_tmp->domain_children, r_tmp->domain_child_num * sizeof(uid_t)))
83122+ return -EFAULT;
83123+
83124+ r_tmp->domain_children = domainlist;
83125+ }
83126+
83127+ err = copy_user_transitions(r_tmp);
83128+ if (err)
83129+ return err;
83130+
83131+ memset(r_tmp->subj_hash, 0,
83132+ r_tmp->subj_hash_size *
83133+ sizeof (struct acl_subject_label *));
83134+
83135+ /* acquire the list of subjects, then NULL out
83136+ the list prior to parsing the subjects for this role,
83137+ as during this parsing the list is replaced with a list
83138+ of *nested* subjects for the role
83139+ */
83140+ subj_list = r_tmp->hash->first;
83141+
83142+ /* set nested subject list to null */
83143+ r_tmp->hash->first = NULL;
83144+
83145+ err = copy_user_subjs(subj_list, r_tmp);
83146+
83147+ if (err)
83148+ return err;
83149+
83150+ insert_acl_role_label(r_tmp);
83151+ }
83152+
83153+ if (polstate->default_role == NULL || polstate->kernel_role == NULL)
83154+ return -EINVAL;
83155+
83156+ return err;
83157+}
83158+
83159+static int gracl_reload_apply_policies(void *reload)
83160+{
83161+ struct gr_reload_state *reload_state = (struct gr_reload_state *)reload;
83162+ struct task_struct *task, *task2;
83163+ struct acl_role_label *role, *rtmp;
83164+ struct acl_subject_label *subj;
83165+ const struct cred *cred;
83166+ int role_applied;
83167+ int ret = 0;
83168+
83169+ memcpy(&reload_state->oldpolicy, reload_state->oldpolicy_ptr, sizeof(struct gr_policy_state));
83170+ memcpy(&reload_state->oldalloc, reload_state->oldalloc_ptr, sizeof(struct gr_alloc_state));
83171+
83172+ /* first make sure we'll be able to apply the new policy cleanly */
83173+ do_each_thread(task2, task) {
83174+ if (task->exec_file == NULL)
83175+ continue;
83176+ role_applied = 0;
83177+ if (!reload_state->oldmode && task->role->roletype & GR_ROLE_SPECIAL) {
83178+ /* preserve special roles */
83179+ FOR_EACH_ROLE_START(role)
83180+ if ((role->roletype & GR_ROLE_SPECIAL) && !strcmp(task->role->rolename, role->rolename)) {
83181+ rtmp = task->role;
83182+ task->role = role;
83183+ role_applied = 1;
83184+ break;
83185+ }
83186+ FOR_EACH_ROLE_END(role)
83187+ }
83188+ if (!role_applied) {
83189+ cred = __task_cred(task);
83190+ rtmp = task->role;
83191+ task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
83192+ }
83193+ /* this handles non-nested inherited subjects, nested subjects will still
83194+ be dropped currently */
83195+ subj = __gr_get_subject_for_task(polstate, task, task->acl->filename, 1);
83196+ task->tmpacl = __gr_get_subject_for_task(polstate, task, NULL, 1);
83197+ /* change the role back so that we've made no modifications to the policy */
83198+ task->role = rtmp;
83199+
83200+ if (subj == NULL || task->tmpacl == NULL) {
83201+ ret = -EINVAL;
83202+ goto out;
83203+ }
83204+ } while_each_thread(task2, task);
83205+
83206+ /* now actually apply the policy */
83207+
83208+ do_each_thread(task2, task) {
83209+ if (task->exec_file) {
83210+ role_applied = 0;
83211+ if (!reload_state->oldmode && task->role->roletype & GR_ROLE_SPECIAL) {
83212+ /* preserve special roles */
83213+ FOR_EACH_ROLE_START(role)
83214+ if ((role->roletype & GR_ROLE_SPECIAL) && !strcmp(task->role->rolename, role->rolename)) {
83215+ task->role = role;
83216+ role_applied = 1;
83217+ break;
83218+ }
83219+ FOR_EACH_ROLE_END(role)
83220+ }
83221+ if (!role_applied) {
83222+ cred = __task_cred(task);
83223+ task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
83224+ }
83225+ /* this handles non-nested inherited subjects, nested subjects will still
83226+ be dropped currently */
83227+ if (!reload_state->oldmode && task->inherited)
83228+ subj = __gr_get_subject_for_task(polstate, task, task->acl->filename, 1);
83229+ else {
83230+ /* looked up and tagged to the task previously */
83231+ subj = task->tmpacl;
83232+ }
83233+ /* subj will be non-null */
83234+ __gr_apply_subject_to_task(polstate, task, subj);
83235+ if (reload_state->oldmode) {
83236+ task->acl_role_id = 0;
83237+ task->acl_sp_role = 0;
83238+ task->inherited = 0;
83239+ }
83240+ } else {
83241+ // it's a kernel process
83242+ task->role = polstate->kernel_role;
83243+ task->acl = polstate->kernel_role->root_label;
83244+#ifdef CONFIG_GRKERNSEC_ACL_HIDEKERN
83245+ task->acl->mode &= ~GR_PROCFIND;
83246+#endif
83247+ }
83248+ } while_each_thread(task2, task);
83249+
83250+ memcpy(reload_state->oldpolicy_ptr, &reload_state->newpolicy, sizeof(struct gr_policy_state));
83251+ memcpy(reload_state->oldalloc_ptr, &reload_state->newalloc, sizeof(struct gr_alloc_state));
83252+
83253+out:
83254+
83255+ return ret;
83256+}
83257+
83258+static int gracl_reload(struct gr_arg *args, unsigned char oldmode)
83259+{
83260+ struct gr_reload_state new_reload_state = { };
83261+ int err;
83262+
83263+ new_reload_state.oldpolicy_ptr = polstate;
83264+ new_reload_state.oldalloc_ptr = current_alloc_state;
83265+ new_reload_state.oldmode = oldmode;
83266+
83267+ current_alloc_state = &new_reload_state.newalloc;
83268+ polstate = &new_reload_state.newpolicy;
83269+
83270+ /* everything relevant is now saved off, copy in the new policy */
83271+ if (init_variables(args, true)) {
83272+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_INITF_ACL_MSG, GR_VERSION);
83273+ err = -ENOMEM;
83274+ goto error;
83275+ }
83276+
83277+ err = copy_user_acl(args);
83278+ free_init_variables();
83279+ if (err)
83280+ goto error;
83281+ /* the new policy is copied in, with the old policy available via saved_state
83282+ first go through applying roles, making sure to preserve special roles
83283+ then apply new subjects, making sure to preserve inherited and nested subjects,
83284+ though currently only inherited subjects will be preserved
83285+ */
83286+ err = stop_machine(gracl_reload_apply_policies, &new_reload_state, NULL);
83287+ if (err)
83288+ goto error;
83289+
83290+ /* we've now applied the new policy, so restore the old policy state to free it */
83291+ polstate = &new_reload_state.oldpolicy;
83292+ current_alloc_state = &new_reload_state.oldalloc;
83293+ free_variables(true);
83294+
83295+ /* oldpolicy/oldalloc_ptr point to the new policy/alloc states as they were copied
83296+ to running_polstate/current_alloc_state inside stop_machine
83297+ */
83298+ err = 0;
83299+ goto out;
83300+error:
83301+ /* on error of loading the new policy, we'll just keep the previous
83302+ policy set around
83303+ */
83304+ free_variables(true);
83305+
83306+ /* doesn't affect runtime, but maintains consistent state */
83307+out:
83308+ polstate = new_reload_state.oldpolicy_ptr;
83309+ current_alloc_state = new_reload_state.oldalloc_ptr;
83310+
83311+ return err;
83312+}
83313+
83314+static int
83315+gracl_init(struct gr_arg *args)
83316+{
83317+ int error = 0;
83318+
83319+ memcpy(gr_system_salt, args->salt, GR_SALT_LEN);
83320+ memcpy(gr_system_sum, args->sum, GR_SHA_LEN);
83321+
83322+ if (init_variables(args, false)) {
83323+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_INITF_ACL_MSG, GR_VERSION);
83324+ error = -ENOMEM;
83325+ goto out;
83326+ }
83327+
83328+ error = copy_user_acl(args);
83329+ free_init_variables();
83330+ if (error)
83331+ goto out;
83332+
83333+ error = gr_set_acls(0);
83334+ if (error)
83335+ goto out;
83336+
83337+ gr_enable_rbac_system();
83338+
83339+ return 0;
83340+
83341+out:
83342+ free_variables(false);
83343+ return error;
83344+}
83345+
83346+static int
83347+lookup_special_role_auth(__u16 mode, const char *rolename, unsigned char **salt,
83348+ unsigned char **sum)
83349+{
83350+ struct acl_role_label *r;
83351+ struct role_allowed_ip *ipp;
83352+ struct role_transition *trans;
83353+ unsigned int i;
83354+ int found = 0;
83355+ u32 curr_ip = current->signal->curr_ip;
83356+
83357+ current->signal->saved_ip = curr_ip;
83358+
83359+ /* check transition table */
83360+
83361+ for (trans = current->role->transitions; trans; trans = trans->next) {
83362+ if (!strcmp(rolename, trans->rolename)) {
83363+ found = 1;
83364+ break;
83365+ }
83366+ }
83367+
83368+ if (!found)
83369+ return 0;
83370+
83371+ /* handle special roles that do not require authentication
83372+ and check ip */
83373+
83374+ FOR_EACH_ROLE_START(r)
83375+ if (!strcmp(rolename, r->rolename) &&
83376+ (r->roletype & GR_ROLE_SPECIAL)) {
83377+ found = 0;
83378+ if (r->allowed_ips != NULL) {
83379+ for (ipp = r->allowed_ips; ipp; ipp = ipp->next) {
83380+ if ((ntohl(curr_ip) & ipp->netmask) ==
83381+ (ntohl(ipp->addr) & ipp->netmask))
83382+ found = 1;
83383+ }
83384+ } else
83385+ found = 2;
83386+ if (!found)
83387+ return 0;
83388+
83389+ if (((mode == GR_SPROLE) && (r->roletype & GR_ROLE_NOPW)) ||
83390+ ((mode == GR_SPROLEPAM) && (r->roletype & GR_ROLE_PAM))) {
83391+ *salt = NULL;
83392+ *sum = NULL;
83393+ return 1;
83394+ }
83395+ }
83396+ FOR_EACH_ROLE_END(r)
83397+
83398+ for (i = 0; i < polstate->num_sprole_pws; i++) {
83399+ if (!strcmp(rolename, polstate->acl_special_roles[i]->rolename)) {
83400+ *salt = polstate->acl_special_roles[i]->salt;
83401+ *sum = polstate->acl_special_roles[i]->sum;
83402+ return 1;
83403+ }
83404+ }
83405+
83406+ return 0;
83407+}
83408+
83409+int gr_check_secure_terminal(struct task_struct *task)
83410+{
83411+ struct task_struct *p, *p2, *p3;
83412+ struct files_struct *files;
83413+ struct fdtable *fdt;
83414+ struct file *our_file = NULL, *file;
83415+ int i;
83416+
83417+ if (task->signal->tty == NULL)
83418+ return 1;
83419+
83420+ files = get_files_struct(task);
83421+ if (files != NULL) {
83422+ rcu_read_lock();
83423+ fdt = files_fdtable(files);
83424+ for (i=0; i < fdt->max_fds; i++) {
83425+ file = fcheck_files(files, i);
83426+ if (file && (our_file == NULL) && (file->private_data == task->signal->tty)) {
83427+ get_file(file);
83428+ our_file = file;
83429+ }
83430+ }
83431+ rcu_read_unlock();
83432+ put_files_struct(files);
83433+ }
83434+
83435+ if (our_file == NULL)
83436+ return 1;
83437+
83438+ read_lock(&tasklist_lock);
83439+ do_each_thread(p2, p) {
83440+ files = get_files_struct(p);
83441+ if (files == NULL ||
83442+ (p->signal && p->signal->tty == task->signal->tty)) {
83443+ if (files != NULL)
83444+ put_files_struct(files);
83445+ continue;
83446+ }
83447+ rcu_read_lock();
83448+ fdt = files_fdtable(files);
83449+ for (i=0; i < fdt->max_fds; i++) {
83450+ file = fcheck_files(files, i);
83451+ if (file && S_ISCHR(file->f_path.dentry->d_inode->i_mode) &&
83452+ file->f_path.dentry->d_inode->i_rdev == our_file->f_path.dentry->d_inode->i_rdev) {
83453+ p3 = task;
83454+ while (task_pid_nr(p3) > 0) {
83455+ if (p3 == p)
83456+ break;
83457+ p3 = p3->real_parent;
83458+ }
83459+ if (p3 == p)
83460+ break;
83461+ gr_log_ttysniff(GR_DONT_AUDIT_GOOD, GR_TTYSNIFF_ACL_MSG, p);
83462+ gr_handle_alertkill(p);
83463+ rcu_read_unlock();
83464+ put_files_struct(files);
83465+ read_unlock(&tasklist_lock);
83466+ fput(our_file);
83467+ return 0;
83468+ }
83469+ }
83470+ rcu_read_unlock();
83471+ put_files_struct(files);
83472+ } while_each_thread(p2, p);
83473+ read_unlock(&tasklist_lock);
83474+
83475+ fput(our_file);
83476+ return 1;
83477+}
83478+
83479+ssize_t
83480+write_grsec_handler(struct file *file, const char __user * buf, size_t count, loff_t *ppos)
83481+{
83482+ struct gr_arg_wrapper uwrap;
83483+ unsigned char *sprole_salt = NULL;
83484+ unsigned char *sprole_sum = NULL;
83485+ int error = 0;
83486+ int error2 = 0;
83487+ size_t req_count = 0;
83488+ unsigned char oldmode = 0;
83489+
83490+ mutex_lock(&gr_dev_mutex);
83491+
83492+ if (gr_acl_is_enabled() && !(current->acl->mode & GR_KERNELAUTH)) {
83493+ error = -EPERM;
83494+ goto out;
83495+ }
83496+
83497+#ifdef CONFIG_COMPAT
83498+ pax_open_kernel();
83499+ if (is_compat_task()) {
83500+ copy_gr_arg_wrapper = &copy_gr_arg_wrapper_compat;
83501+ copy_gr_arg = &copy_gr_arg_compat;
83502+ copy_acl_object_label = &copy_acl_object_label_compat;
83503+ copy_acl_subject_label = &copy_acl_subject_label_compat;
83504+ copy_acl_role_label = &copy_acl_role_label_compat;
83505+ copy_acl_ip_label = &copy_acl_ip_label_compat;
83506+ copy_role_allowed_ip = &copy_role_allowed_ip_compat;
83507+ copy_role_transition = &copy_role_transition_compat;
83508+ copy_sprole_pw = &copy_sprole_pw_compat;
83509+ copy_gr_hash_struct = &copy_gr_hash_struct_compat;
83510+ copy_pointer_from_array = &copy_pointer_from_array_compat;
83511+ get_gr_arg_wrapper_size = &get_gr_arg_wrapper_size_compat;
83512+ } else {
83513+ copy_gr_arg_wrapper = &copy_gr_arg_wrapper_normal;
83514+ copy_gr_arg = &copy_gr_arg_normal;
83515+ copy_acl_object_label = &copy_acl_object_label_normal;
83516+ copy_acl_subject_label = &copy_acl_subject_label_normal;
83517+ copy_acl_role_label = &copy_acl_role_label_normal;
83518+ copy_acl_ip_label = &copy_acl_ip_label_normal;
83519+ copy_role_allowed_ip = &copy_role_allowed_ip_normal;
83520+ copy_role_transition = &copy_role_transition_normal;
83521+ copy_sprole_pw = &copy_sprole_pw_normal;
83522+ copy_gr_hash_struct = &copy_gr_hash_struct_normal;
83523+ copy_pointer_from_array = &copy_pointer_from_array_normal;
83524+ get_gr_arg_wrapper_size = &get_gr_arg_wrapper_size_normal;
83525+ }
83526+ pax_close_kernel();
83527+#endif
83528+
83529+ req_count = get_gr_arg_wrapper_size();
83530+
83531+ if (count != req_count) {
83532+ gr_log_int_int(GR_DONT_AUDIT_GOOD, GR_DEV_ACL_MSG, (int)count, (int)req_count);
83533+ error = -EINVAL;
83534+ goto out;
83535+ }
83536+
83537+
83538+ if (gr_auth_expires && time_after_eq(get_seconds(), gr_auth_expires)) {
83539+ gr_auth_expires = 0;
83540+ gr_auth_attempts = 0;
83541+ }
83542+
83543+ error = copy_gr_arg_wrapper(buf, &uwrap);
83544+ if (error)
83545+ goto out;
83546+
83547+ error = copy_gr_arg(uwrap.arg, gr_usermode);
83548+ if (error)
83549+ goto out;
83550+
83551+ if (gr_usermode->mode != GR_SPROLE && gr_usermode->mode != GR_SPROLEPAM &&
83552+ gr_auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
83553+ time_after(gr_auth_expires, get_seconds())) {
83554+ error = -EBUSY;
83555+ goto out;
83556+ }
83557+
83558+ /* if non-root trying to do anything other than use a special role,
83559+ do not attempt authentication, do not count towards authentication
83560+ locking
83561+ */
83562+
83563+ if (gr_usermode->mode != GR_SPROLE && gr_usermode->mode != GR_STATUS &&
83564+ gr_usermode->mode != GR_UNSPROLE && gr_usermode->mode != GR_SPROLEPAM &&
83565+ gr_is_global_nonroot(current_uid())) {
83566+ error = -EPERM;
83567+ goto out;
83568+ }
83569+
83570+ /* ensure pw and special role name are null terminated */
83571+
83572+ gr_usermode->pw[GR_PW_LEN - 1] = '\0';
83573+ gr_usermode->sp_role[GR_SPROLE_LEN - 1] = '\0';
83574+
83575+ /* Okay.
83576+ * We have our enough of the argument structure..(we have yet
83577+ * to copy_from_user the tables themselves) . Copy the tables
83578+ * only if we need them, i.e. for loading operations. */
83579+
83580+ switch (gr_usermode->mode) {
83581+ case GR_STATUS:
83582+ if (gr_acl_is_enabled()) {
83583+ error = 1;
83584+ if (!gr_check_secure_terminal(current))
83585+ error = 3;
83586+ } else
83587+ error = 2;
83588+ goto out;
83589+ case GR_SHUTDOWN:
83590+ if (gr_acl_is_enabled() && !(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
83591+ stop_machine(gr_rbac_disable, NULL, NULL);
83592+ free_variables(false);
83593+ memset(gr_usermode, 0, sizeof(struct gr_arg));
83594+ memset(gr_system_salt, 0, GR_SALT_LEN);
83595+ memset(gr_system_sum, 0, GR_SHA_LEN);
83596+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTS_ACL_MSG);
83597+ } else if (gr_acl_is_enabled()) {
83598+ gr_log_noargs(GR_DONT_AUDIT, GR_SHUTF_ACL_MSG);
83599+ error = -EPERM;
83600+ } else {
83601+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTI_ACL_MSG);
83602+ error = -EAGAIN;
83603+ }
83604+ break;
83605+ case GR_ENABLE:
83606+ if (!gr_acl_is_enabled() && !(error2 = gracl_init(gr_usermode)))
83607+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_ENABLE_ACL_MSG, GR_VERSION);
83608+ else {
83609+ if (gr_acl_is_enabled())
83610+ error = -EAGAIN;
83611+ else
83612+ error = error2;
83613+ gr_log_str(GR_DONT_AUDIT, GR_ENABLEF_ACL_MSG, GR_VERSION);
83614+ }
83615+ break;
83616+ case GR_OLDRELOAD:
83617+ oldmode = 1;
83618+ case GR_RELOAD:
83619+ if (!gr_acl_is_enabled()) {
83620+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOADI_ACL_MSG, GR_VERSION);
83621+ error = -EAGAIN;
83622+ } else if (!(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
83623+ error2 = gracl_reload(gr_usermode, oldmode);
83624+ if (!error2)
83625+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOAD_ACL_MSG, GR_VERSION);
83626+ else {
83627+ gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
83628+ error = error2;
83629+ }
83630+ } else {
83631+ gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
83632+ error = -EPERM;
83633+ }
83634+ break;
83635+ case GR_SEGVMOD:
83636+ if (unlikely(!gr_acl_is_enabled())) {
83637+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODI_ACL_MSG);
83638+ error = -EAGAIN;
83639+ break;
83640+ }
83641+
83642+ if (!(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
83643+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODS_ACL_MSG);
83644+ if (gr_usermode->segv_device && gr_usermode->segv_inode) {
83645+ struct acl_subject_label *segvacl;
83646+ segvacl =
83647+ lookup_acl_subj_label(gr_usermode->segv_inode,
83648+ gr_usermode->segv_device,
83649+ current->role);
83650+ if (segvacl) {
83651+ segvacl->crashes = 0;
83652+ segvacl->expires = 0;
83653+ }
83654+ } else if (gr_find_uid(gr_usermode->segv_uid) >= 0) {
83655+ gr_remove_uid(gr_usermode->segv_uid);
83656+ }
83657+ } else {
83658+ gr_log_noargs(GR_DONT_AUDIT, GR_SEGVMODF_ACL_MSG);
83659+ error = -EPERM;
83660+ }
83661+ break;
83662+ case GR_SPROLE:
83663+ case GR_SPROLEPAM:
83664+ if (unlikely(!gr_acl_is_enabled())) {
83665+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SPROLEI_ACL_MSG);
83666+ error = -EAGAIN;
83667+ break;
83668+ }
83669+
83670+ if (current->role->expires && time_after_eq(get_seconds(), current->role->expires)) {
83671+ current->role->expires = 0;
83672+ current->role->auth_attempts = 0;
83673+ }
83674+
83675+ if (current->role->auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
83676+ time_after(current->role->expires, get_seconds())) {
83677+ error = -EBUSY;
83678+ goto out;
83679+ }
83680+
83681+ if (lookup_special_role_auth
83682+ (gr_usermode->mode, gr_usermode->sp_role, &sprole_salt, &sprole_sum)
83683+ && ((!sprole_salt && !sprole_sum)
83684+ || !(chkpw(gr_usermode, sprole_salt, sprole_sum)))) {
83685+ char *p = "";
83686+ assign_special_role(gr_usermode->sp_role);
83687+ read_lock(&tasklist_lock);
83688+ if (current->real_parent)
83689+ p = current->real_parent->role->rolename;
83690+ read_unlock(&tasklist_lock);
83691+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLES_ACL_MSG,
83692+ p, acl_sp_role_value);
83693+ } else {
83694+ gr_log_str(GR_DONT_AUDIT, GR_SPROLEF_ACL_MSG, gr_usermode->sp_role);
83695+ error = -EPERM;
83696+ if(!(current->role->auth_attempts++))
83697+ current->role->expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
83698+
83699+ goto out;
83700+ }
83701+ break;
83702+ case GR_UNSPROLE:
83703+ if (unlikely(!gr_acl_is_enabled())) {
83704+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_UNSPROLEI_ACL_MSG);
83705+ error = -EAGAIN;
83706+ break;
83707+ }
83708+
83709+ if (current->role->roletype & GR_ROLE_SPECIAL) {
83710+ char *p = "";
83711+ int i = 0;
83712+
83713+ read_lock(&tasklist_lock);
83714+ if (current->real_parent) {
83715+ p = current->real_parent->role->rolename;
83716+ i = current->real_parent->acl_role_id;
83717+ }
83718+ read_unlock(&tasklist_lock);
83719+
83720+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_UNSPROLES_ACL_MSG, p, i);
83721+ gr_set_acls(1);
83722+ } else {
83723+ error = -EPERM;
83724+ goto out;
83725+ }
83726+ break;
83727+ default:
83728+ gr_log_int(GR_DONT_AUDIT, GR_INVMODE_ACL_MSG, gr_usermode->mode);
83729+ error = -EINVAL;
83730+ break;
83731+ }
83732+
83733+ if (error != -EPERM)
83734+ goto out;
83735+
83736+ if(!(gr_auth_attempts++))
83737+ gr_auth_expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
83738+
83739+ out:
83740+ mutex_unlock(&gr_dev_mutex);
83741+
83742+ if (!error)
83743+ error = req_count;
83744+
83745+ return error;
83746+}
83747+
83748+int
83749+gr_set_acls(const int type)
83750+{
83751+ struct task_struct *task, *task2;
83752+ struct acl_role_label *role = current->role;
83753+ struct acl_subject_label *subj;
83754+ __u16 acl_role_id = current->acl_role_id;
83755+ const struct cred *cred;
83756+ int ret;
83757+
83758+ rcu_read_lock();
83759+ read_lock(&tasklist_lock);
83760+ read_lock(&grsec_exec_file_lock);
83761+ do_each_thread(task2, task) {
83762+ /* check to see if we're called from the exit handler,
83763+ if so, only replace ACLs that have inherited the admin
83764+ ACL */
83765+
83766+ if (type && (task->role != role ||
83767+ task->acl_role_id != acl_role_id))
83768+ continue;
83769+
83770+ task->acl_role_id = 0;
83771+ task->acl_sp_role = 0;
83772+ task->inherited = 0;
83773+
83774+ if (task->exec_file) {
83775+ cred = __task_cred(task);
83776+ task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
83777+ subj = __gr_get_subject_for_task(polstate, task, NULL, 1);
83778+ if (subj == NULL) {
83779+ ret = -EINVAL;
83780+ read_unlock(&grsec_exec_file_lock);
83781+ read_unlock(&tasklist_lock);
83782+ rcu_read_unlock();
83783+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_DEFACL_MSG, task->comm, task_pid_nr(task));
83784+ return ret;
83785+ }
83786+ __gr_apply_subject_to_task(polstate, task, subj);
83787+ } else {
83788+ // it's a kernel process
83789+ task->role = polstate->kernel_role;
83790+ task->acl = polstate->kernel_role->root_label;
83791+#ifdef CONFIG_GRKERNSEC_ACL_HIDEKERN
83792+ task->acl->mode &= ~GR_PROCFIND;
83793+#endif
83794+ }
83795+ } while_each_thread(task2, task);
83796+ read_unlock(&grsec_exec_file_lock);
83797+ read_unlock(&tasklist_lock);
83798+ rcu_read_unlock();
83799+
83800+ return 0;
83801+}
83802diff --git a/grsecurity/gracl_res.c b/grsecurity/gracl_res.c
83803new file mode 100644
83804index 0000000..39645c9
83805--- /dev/null
83806+++ b/grsecurity/gracl_res.c
83807@@ -0,0 +1,68 @@
83808+#include <linux/kernel.h>
83809+#include <linux/sched.h>
83810+#include <linux/gracl.h>
83811+#include <linux/grinternal.h>
83812+
83813+static const char *restab_log[] = {
83814+ [RLIMIT_CPU] = "RLIMIT_CPU",
83815+ [RLIMIT_FSIZE] = "RLIMIT_FSIZE",
83816+ [RLIMIT_DATA] = "RLIMIT_DATA",
83817+ [RLIMIT_STACK] = "RLIMIT_STACK",
83818+ [RLIMIT_CORE] = "RLIMIT_CORE",
83819+ [RLIMIT_RSS] = "RLIMIT_RSS",
83820+ [RLIMIT_NPROC] = "RLIMIT_NPROC",
83821+ [RLIMIT_NOFILE] = "RLIMIT_NOFILE",
83822+ [RLIMIT_MEMLOCK] = "RLIMIT_MEMLOCK",
83823+ [RLIMIT_AS] = "RLIMIT_AS",
83824+ [RLIMIT_LOCKS] = "RLIMIT_LOCKS",
83825+ [RLIMIT_SIGPENDING] = "RLIMIT_SIGPENDING",
83826+ [RLIMIT_MSGQUEUE] = "RLIMIT_MSGQUEUE",
83827+ [RLIMIT_NICE] = "RLIMIT_NICE",
83828+ [RLIMIT_RTPRIO] = "RLIMIT_RTPRIO",
83829+ [RLIMIT_RTTIME] = "RLIMIT_RTTIME",
83830+ [GR_CRASH_RES] = "RLIMIT_CRASH"
83831+};
83832+
83833+void
83834+gr_log_resource(const struct task_struct *task,
83835+ const int res, const unsigned long wanted, const int gt)
83836+{
83837+ const struct cred *cred;
83838+ unsigned long rlim;
83839+
83840+ if (!gr_acl_is_enabled() && !grsec_resource_logging)
83841+ return;
83842+
83843+ // not yet supported resource
83844+ if (unlikely(!restab_log[res]))
83845+ return;
83846+
83847+ if (res == RLIMIT_CPU || res == RLIMIT_RTTIME)
83848+ rlim = task_rlimit_max(task, res);
83849+ else
83850+ rlim = task_rlimit(task, res);
83851+
83852+ if (likely((rlim == RLIM_INFINITY) || (gt && wanted <= rlim) || (!gt && wanted < rlim)))
83853+ return;
83854+
83855+ rcu_read_lock();
83856+ cred = __task_cred(task);
83857+
83858+ if (res == RLIMIT_NPROC &&
83859+ (cap_raised(cred->cap_effective, CAP_SYS_ADMIN) ||
83860+ cap_raised(cred->cap_effective, CAP_SYS_RESOURCE)))
83861+ goto out_rcu_unlock;
83862+ else if (res == RLIMIT_MEMLOCK &&
83863+ cap_raised(cred->cap_effective, CAP_IPC_LOCK))
83864+ goto out_rcu_unlock;
83865+ else if (res == RLIMIT_NICE && cap_raised(cred->cap_effective, CAP_SYS_NICE))
83866+ goto out_rcu_unlock;
83867+ rcu_read_unlock();
83868+
83869+ gr_log_res_ulong2_str(GR_DONT_AUDIT, GR_RESOURCE_MSG, task, wanted, restab_log[res], rlim);
83870+
83871+ return;
83872+out_rcu_unlock:
83873+ rcu_read_unlock();
83874+ return;
83875+}
83876diff --git a/grsecurity/gracl_segv.c b/grsecurity/gracl_segv.c
83877new file mode 100644
83878index 0000000..35d9e65
83879--- /dev/null
83880+++ b/grsecurity/gracl_segv.c
83881@@ -0,0 +1,324 @@
83882+#include <linux/kernel.h>
83883+#include <linux/mm.h>
83884+#include <asm/uaccess.h>
83885+#include <asm/errno.h>
83886+#include <asm/mman.h>
83887+#include <net/sock.h>
83888+#include <linux/file.h>
83889+#include <linux/fs.h>
83890+#include <linux/net.h>
83891+#include <linux/in.h>
83892+#include <linux/slab.h>
83893+#include <linux/types.h>
83894+#include <linux/sched.h>
83895+#include <linux/timer.h>
83896+#include <linux/gracl.h>
83897+#include <linux/grsecurity.h>
83898+#include <linux/grinternal.h>
83899+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
83900+#include <linux/magic.h>
83901+#include <linux/pagemap.h>
83902+#include "../fs/btrfs/async-thread.h"
83903+#include "../fs/btrfs/ctree.h"
83904+#include "../fs/btrfs/btrfs_inode.h"
83905+#endif
83906+
83907+static struct crash_uid *uid_set;
83908+static unsigned short uid_used;
83909+static DEFINE_SPINLOCK(gr_uid_lock);
83910+extern rwlock_t gr_inode_lock;
83911+extern struct acl_subject_label *
83912+ lookup_acl_subj_label(const u64 inode, const dev_t dev,
83913+ struct acl_role_label *role);
83914+
83915+static inline dev_t __get_dev(const struct dentry *dentry)
83916+{
83917+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
83918+ if (dentry->d_sb->s_magic == BTRFS_SUPER_MAGIC)
83919+ return BTRFS_I(dentry->d_inode)->root->anon_dev;
83920+ else
83921+#endif
83922+ return dentry->d_sb->s_dev;
83923+}
83924+
83925+static inline u64 __get_ino(const struct dentry *dentry)
83926+{
83927+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
83928+ if (dentry->d_sb->s_magic == BTRFS_SUPER_MAGIC)
83929+ return btrfs_ino(dentry->d_inode);
83930+ else
83931+#endif
83932+ return dentry->d_inode->i_ino;
83933+}
83934+
83935+int
83936+gr_init_uidset(void)
83937+{
83938+ uid_set =
83939+ kmalloc(GR_UIDTABLE_MAX * sizeof (struct crash_uid), GFP_KERNEL);
83940+ uid_used = 0;
83941+
83942+ return uid_set ? 1 : 0;
83943+}
83944+
83945+void
83946+gr_free_uidset(void)
83947+{
83948+ if (uid_set) {
83949+ struct crash_uid *tmpset;
83950+ spin_lock(&gr_uid_lock);
83951+ tmpset = uid_set;
83952+ uid_set = NULL;
83953+ uid_used = 0;
83954+ spin_unlock(&gr_uid_lock);
83955+ if (tmpset)
83956+ kfree(tmpset);
83957+ }
83958+
83959+ return;
83960+}
83961+
83962+int
83963+gr_find_uid(const uid_t uid)
83964+{
83965+ struct crash_uid *tmp = uid_set;
83966+ uid_t buid;
83967+ int low = 0, high = uid_used - 1, mid;
83968+
83969+ while (high >= low) {
83970+ mid = (low + high) >> 1;
83971+ buid = tmp[mid].uid;
83972+ if (buid == uid)
83973+ return mid;
83974+ if (buid > uid)
83975+ high = mid - 1;
83976+ if (buid < uid)
83977+ low = mid + 1;
83978+ }
83979+
83980+ return -1;
83981+}
83982+
83983+static void
83984+gr_insertsort(void)
83985+{
83986+ unsigned short i, j;
83987+ struct crash_uid index;
83988+
83989+ for (i = 1; i < uid_used; i++) {
83990+ index = uid_set[i];
83991+ j = i;
83992+ while ((j > 0) && uid_set[j - 1].uid > index.uid) {
83993+ uid_set[j] = uid_set[j - 1];
83994+ j--;
83995+ }
83996+ uid_set[j] = index;
83997+ }
83998+
83999+ return;
84000+}
84001+
84002+static void
84003+gr_insert_uid(const kuid_t kuid, const unsigned long expires)
84004+{
84005+ int loc;
84006+ uid_t uid = GR_GLOBAL_UID(kuid);
84007+
84008+ if (uid_used == GR_UIDTABLE_MAX)
84009+ return;
84010+
84011+ loc = gr_find_uid(uid);
84012+
84013+ if (loc >= 0) {
84014+ uid_set[loc].expires = expires;
84015+ return;
84016+ }
84017+
84018+ uid_set[uid_used].uid = uid;
84019+ uid_set[uid_used].expires = expires;
84020+ uid_used++;
84021+
84022+ gr_insertsort();
84023+
84024+ return;
84025+}
84026+
84027+void
84028+gr_remove_uid(const unsigned short loc)
84029+{
84030+ unsigned short i;
84031+
84032+ for (i = loc + 1; i < uid_used; i++)
84033+ uid_set[i - 1] = uid_set[i];
84034+
84035+ uid_used--;
84036+
84037+ return;
84038+}
84039+
84040+int
84041+gr_check_crash_uid(const kuid_t kuid)
84042+{
84043+ int loc;
84044+ int ret = 0;
84045+ uid_t uid;
84046+
84047+ if (unlikely(!gr_acl_is_enabled()))
84048+ return 0;
84049+
84050+ uid = GR_GLOBAL_UID(kuid);
84051+
84052+ spin_lock(&gr_uid_lock);
84053+ loc = gr_find_uid(uid);
84054+
84055+ if (loc < 0)
84056+ goto out_unlock;
84057+
84058+ if (time_before_eq(uid_set[loc].expires, get_seconds()))
84059+ gr_remove_uid(loc);
84060+ else
84061+ ret = 1;
84062+
84063+out_unlock:
84064+ spin_unlock(&gr_uid_lock);
84065+ return ret;
84066+}
84067+
84068+static int
84069+proc_is_setxid(const struct cred *cred)
84070+{
84071+ if (!uid_eq(cred->uid, cred->euid) || !uid_eq(cred->uid, cred->suid) ||
84072+ !uid_eq(cred->uid, cred->fsuid))
84073+ return 1;
84074+ if (!gid_eq(cred->gid, cred->egid) || !gid_eq(cred->gid, cred->sgid) ||
84075+ !gid_eq(cred->gid, cred->fsgid))
84076+ return 1;
84077+
84078+ return 0;
84079+}
84080+
84081+extern int gr_fake_force_sig(int sig, struct task_struct *t);
84082+
84083+void
84084+gr_handle_crash(struct task_struct *task, const int sig)
84085+{
84086+ struct acl_subject_label *curr;
84087+ struct task_struct *tsk, *tsk2;
84088+ const struct cred *cred;
84089+ const struct cred *cred2;
84090+
84091+ if (sig != SIGSEGV && sig != SIGKILL && sig != SIGBUS && sig != SIGILL)
84092+ return;
84093+
84094+ if (unlikely(!gr_acl_is_enabled()))
84095+ return;
84096+
84097+ curr = task->acl;
84098+
84099+ if (!(curr->resmask & (1U << GR_CRASH_RES)))
84100+ return;
84101+
84102+ if (time_before_eq(curr->expires, get_seconds())) {
84103+ curr->expires = 0;
84104+ curr->crashes = 0;
84105+ }
84106+
84107+ curr->crashes++;
84108+
84109+ if (!curr->expires)
84110+ curr->expires = get_seconds() + curr->res[GR_CRASH_RES].rlim_max;
84111+
84112+ if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
84113+ time_after(curr->expires, get_seconds())) {
84114+ rcu_read_lock();
84115+ cred = __task_cred(task);
84116+ if (gr_is_global_nonroot(cred->uid) && proc_is_setxid(cred)) {
84117+ gr_log_crash1(GR_DONT_AUDIT, GR_SEGVSTART_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
84118+ spin_lock(&gr_uid_lock);
84119+ gr_insert_uid(cred->uid, curr->expires);
84120+ spin_unlock(&gr_uid_lock);
84121+ curr->expires = 0;
84122+ curr->crashes = 0;
84123+ read_lock(&tasklist_lock);
84124+ do_each_thread(tsk2, tsk) {
84125+ cred2 = __task_cred(tsk);
84126+ if (tsk != task && uid_eq(cred2->uid, cred->uid))
84127+ gr_fake_force_sig(SIGKILL, tsk);
84128+ } while_each_thread(tsk2, tsk);
84129+ read_unlock(&tasklist_lock);
84130+ } else {
84131+ gr_log_crash2(GR_DONT_AUDIT, GR_SEGVNOSUID_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
84132+ read_lock(&tasklist_lock);
84133+ read_lock(&grsec_exec_file_lock);
84134+ do_each_thread(tsk2, tsk) {
84135+ if (likely(tsk != task)) {
84136+ // if this thread has the same subject as the one that triggered
84137+ // RES_CRASH and it's the same binary, kill it
84138+ if (tsk->acl == task->acl && gr_is_same_file(tsk->exec_file, task->exec_file))
84139+ gr_fake_force_sig(SIGKILL, tsk);
84140+ }
84141+ } while_each_thread(tsk2, tsk);
84142+ read_unlock(&grsec_exec_file_lock);
84143+ read_unlock(&tasklist_lock);
84144+ }
84145+ rcu_read_unlock();
84146+ }
84147+
84148+ return;
84149+}
84150+
84151+int
84152+gr_check_crash_exec(const struct file *filp)
84153+{
84154+ struct acl_subject_label *curr;
84155+ struct dentry *dentry;
84156+
84157+ if (unlikely(!gr_acl_is_enabled()))
84158+ return 0;
84159+
84160+ read_lock(&gr_inode_lock);
84161+ dentry = filp->f_path.dentry;
84162+ curr = lookup_acl_subj_label(__get_ino(dentry), __get_dev(dentry),
84163+ current->role);
84164+ read_unlock(&gr_inode_lock);
84165+
84166+ if (!curr || !(curr->resmask & (1U << GR_CRASH_RES)) ||
84167+ (!curr->crashes && !curr->expires))
84168+ return 0;
84169+
84170+ if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
84171+ time_after(curr->expires, get_seconds()))
84172+ return 1;
84173+ else if (time_before_eq(curr->expires, get_seconds())) {
84174+ curr->crashes = 0;
84175+ curr->expires = 0;
84176+ }
84177+
84178+ return 0;
84179+}
84180+
84181+void
84182+gr_handle_alertkill(struct task_struct *task)
84183+{
84184+ struct acl_subject_label *curracl;
84185+ __u32 curr_ip;
84186+ struct task_struct *p, *p2;
84187+
84188+ if (unlikely(!gr_acl_is_enabled()))
84189+ return;
84190+
84191+ curracl = task->acl;
84192+ curr_ip = task->signal->curr_ip;
84193+
84194+ if ((curracl->mode & GR_KILLIPPROC) && curr_ip) {
84195+ read_lock(&tasklist_lock);
84196+ do_each_thread(p2, p) {
84197+ if (p->signal->curr_ip == curr_ip)
84198+ gr_fake_force_sig(SIGKILL, p);
84199+ } while_each_thread(p2, p);
84200+ read_unlock(&tasklist_lock);
84201+ } else if (curracl->mode & GR_KILLPROC)
84202+ gr_fake_force_sig(SIGKILL, task);
84203+
84204+ return;
84205+}
84206diff --git a/grsecurity/gracl_shm.c b/grsecurity/gracl_shm.c
84207new file mode 100644
84208index 0000000..6b0c9cc
84209--- /dev/null
84210+++ b/grsecurity/gracl_shm.c
84211@@ -0,0 +1,40 @@
84212+#include <linux/kernel.h>
84213+#include <linux/mm.h>
84214+#include <linux/sched.h>
84215+#include <linux/file.h>
84216+#include <linux/ipc.h>
84217+#include <linux/gracl.h>
84218+#include <linux/grsecurity.h>
84219+#include <linux/grinternal.h>
84220+
84221+int
84222+gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
84223+ const u64 shm_createtime, const kuid_t cuid, const int shmid)
84224+{
84225+ struct task_struct *task;
84226+
84227+ if (!gr_acl_is_enabled())
84228+ return 1;
84229+
84230+ rcu_read_lock();
84231+ read_lock(&tasklist_lock);
84232+
84233+ task = find_task_by_vpid(shm_cprid);
84234+
84235+ if (unlikely(!task))
84236+ task = find_task_by_vpid(shm_lapid);
84237+
84238+ if (unlikely(task && (time_before_eq64(task->start_time, shm_createtime) ||
84239+ (task_pid_nr(task) == shm_lapid)) &&
84240+ (task->acl->mode & GR_PROTSHM) &&
84241+ (task->acl != current->acl))) {
84242+ read_unlock(&tasklist_lock);
84243+ rcu_read_unlock();
84244+ gr_log_int3(GR_DONT_AUDIT, GR_SHMAT_ACL_MSG, GR_GLOBAL_UID(cuid), shm_cprid, shmid);
84245+ return 0;
84246+ }
84247+ read_unlock(&tasklist_lock);
84248+ rcu_read_unlock();
84249+
84250+ return 1;
84251+}
84252diff --git a/grsecurity/grsec_chdir.c b/grsecurity/grsec_chdir.c
84253new file mode 100644
84254index 0000000..bc0be01
84255--- /dev/null
84256+++ b/grsecurity/grsec_chdir.c
84257@@ -0,0 +1,19 @@
84258+#include <linux/kernel.h>
84259+#include <linux/sched.h>
84260+#include <linux/fs.h>
84261+#include <linux/file.h>
84262+#include <linux/grsecurity.h>
84263+#include <linux/grinternal.h>
84264+
84265+void
84266+gr_log_chdir(const struct dentry *dentry, const struct vfsmount *mnt)
84267+{
84268+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
84269+ if ((grsec_enable_chdir && grsec_enable_group &&
84270+ in_group_p(grsec_audit_gid)) || (grsec_enable_chdir &&
84271+ !grsec_enable_group)) {
84272+ gr_log_fs_generic(GR_DO_AUDIT, GR_CHDIR_AUDIT_MSG, dentry, mnt);
84273+ }
84274+#endif
84275+ return;
84276+}
84277diff --git a/grsecurity/grsec_chroot.c b/grsecurity/grsec_chroot.c
84278new file mode 100644
84279index 0000000..114ea4f
84280--- /dev/null
84281+++ b/grsecurity/grsec_chroot.c
84282@@ -0,0 +1,467 @@
84283+#include <linux/kernel.h>
84284+#include <linux/module.h>
84285+#include <linux/sched.h>
84286+#include <linux/file.h>
84287+#include <linux/fs.h>
84288+#include <linux/mount.h>
84289+#include <linux/types.h>
84290+#include "../fs/mount.h"
84291+#include <linux/grsecurity.h>
84292+#include <linux/grinternal.h>
84293+
84294+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
84295+int gr_init_ran;
84296+#endif
84297+
84298+void gr_inc_chroot_refcnts(struct dentry *dentry, struct vfsmount *mnt)
84299+{
84300+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
84301+ struct dentry *tmpd = dentry;
84302+
84303+ read_seqlock_excl(&mount_lock);
84304+ write_seqlock(&rename_lock);
84305+
84306+ while (tmpd != mnt->mnt_root) {
84307+ atomic_inc(&tmpd->chroot_refcnt);
84308+ tmpd = tmpd->d_parent;
84309+ }
84310+ atomic_inc(&tmpd->chroot_refcnt);
84311+
84312+ write_sequnlock(&rename_lock);
84313+ read_sequnlock_excl(&mount_lock);
84314+#endif
84315+}
84316+
84317+void gr_dec_chroot_refcnts(struct dentry *dentry, struct vfsmount *mnt)
84318+{
84319+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
84320+ struct dentry *tmpd = dentry;
84321+
84322+ read_seqlock_excl(&mount_lock);
84323+ write_seqlock(&rename_lock);
84324+
84325+ while (tmpd != mnt->mnt_root) {
84326+ atomic_dec(&tmpd->chroot_refcnt);
84327+ tmpd = tmpd->d_parent;
84328+ }
84329+ atomic_dec(&tmpd->chroot_refcnt);
84330+
84331+ write_sequnlock(&rename_lock);
84332+ read_sequnlock_excl(&mount_lock);
84333+#endif
84334+}
84335+
84336+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
84337+static struct dentry *get_closest_chroot(struct dentry *dentry)
84338+{
84339+ write_seqlock(&rename_lock);
84340+ do {
84341+ if (atomic_read(&dentry->chroot_refcnt)) {
84342+ write_sequnlock(&rename_lock);
84343+ return dentry;
84344+ }
84345+ dentry = dentry->d_parent;
84346+ } while (!IS_ROOT(dentry));
84347+ write_sequnlock(&rename_lock);
84348+ return NULL;
84349+}
84350+#endif
84351+
84352+int gr_bad_chroot_rename(struct dentry *olddentry, struct vfsmount *oldmnt,
84353+ struct dentry *newdentry, struct vfsmount *newmnt)
84354+{
84355+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
84356+ struct dentry *chroot;
84357+
84358+ if (unlikely(!grsec_enable_chroot_rename))
84359+ return 0;
84360+
84361+ if (likely(!proc_is_chrooted(current) && gr_is_global_root(current_uid())))
84362+ return 0;
84363+
84364+ chroot = get_closest_chroot(olddentry);
84365+
84366+ if (chroot == NULL)
84367+ return 0;
84368+
84369+ if (is_subdir(newdentry, chroot))
84370+ return 0;
84371+
84372+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_RENAME_MSG, olddentry, oldmnt);
84373+
84374+ return 1;
84375+#else
84376+ return 0;
84377+#endif
84378+}
84379+
84380+void gr_set_chroot_entries(struct task_struct *task, const struct path *path)
84381+{
84382+#ifdef CONFIG_GRKERNSEC
84383+ if (task_pid_nr(task) > 1 && path->dentry != init_task.fs->root.dentry &&
84384+ path->dentry != task->nsproxy->mnt_ns->root->mnt.mnt_root
84385+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
84386+ && gr_init_ran
84387+#endif
84388+ )
84389+ task->gr_is_chrooted = 1;
84390+ else {
84391+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
84392+ if (task_pid_nr(task) == 1 && !gr_init_ran)
84393+ gr_init_ran = 1;
84394+#endif
84395+ task->gr_is_chrooted = 0;
84396+ }
84397+
84398+ task->gr_chroot_dentry = path->dentry;
84399+#endif
84400+ return;
84401+}
84402+
84403+void gr_clear_chroot_entries(struct task_struct *task)
84404+{
84405+#ifdef CONFIG_GRKERNSEC
84406+ task->gr_is_chrooted = 0;
84407+ task->gr_chroot_dentry = NULL;
84408+#endif
84409+ return;
84410+}
84411+
84412+int
84413+gr_handle_chroot_unix(const pid_t pid)
84414+{
84415+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
84416+ struct task_struct *p;
84417+
84418+ if (unlikely(!grsec_enable_chroot_unix))
84419+ return 1;
84420+
84421+ if (likely(!proc_is_chrooted(current)))
84422+ return 1;
84423+
84424+ rcu_read_lock();
84425+ read_lock(&tasklist_lock);
84426+ p = find_task_by_vpid_unrestricted(pid);
84427+ if (unlikely(p && !have_same_root(current, p))) {
84428+ read_unlock(&tasklist_lock);
84429+ rcu_read_unlock();
84430+ gr_log_noargs(GR_DONT_AUDIT, GR_UNIX_CHROOT_MSG);
84431+ return 0;
84432+ }
84433+ read_unlock(&tasklist_lock);
84434+ rcu_read_unlock();
84435+#endif
84436+ return 1;
84437+}
84438+
84439+int
84440+gr_handle_chroot_nice(void)
84441+{
84442+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
84443+ if (grsec_enable_chroot_nice && proc_is_chrooted(current)) {
84444+ gr_log_noargs(GR_DONT_AUDIT, GR_NICE_CHROOT_MSG);
84445+ return -EPERM;
84446+ }
84447+#endif
84448+ return 0;
84449+}
84450+
84451+int
84452+gr_handle_chroot_setpriority(struct task_struct *p, const int niceval)
84453+{
84454+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
84455+ if (grsec_enable_chroot_nice && (niceval < task_nice(p))
84456+ && proc_is_chrooted(current)) {
84457+ gr_log_str_int(GR_DONT_AUDIT, GR_PRIORITY_CHROOT_MSG, p->comm, task_pid_nr(p));
84458+ return -EACCES;
84459+ }
84460+#endif
84461+ return 0;
84462+}
84463+
84464+int
84465+gr_handle_chroot_fowner(struct pid *pid, enum pid_type type)
84466+{
84467+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
84468+ struct task_struct *p;
84469+ int ret = 0;
84470+ if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || !pid)
84471+ return ret;
84472+
84473+ read_lock(&tasklist_lock);
84474+ do_each_pid_task(pid, type, p) {
84475+ if (!have_same_root(current, p)) {
84476+ ret = 1;
84477+ goto out;
84478+ }
84479+ } while_each_pid_task(pid, type, p);
84480+out:
84481+ read_unlock(&tasklist_lock);
84482+ return ret;
84483+#endif
84484+ return 0;
84485+}
84486+
84487+int
84488+gr_pid_is_chrooted(struct task_struct *p)
84489+{
84490+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
84491+ if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || p == NULL)
84492+ return 0;
84493+
84494+ if ((p->exit_state & (EXIT_ZOMBIE | EXIT_DEAD)) ||
84495+ !have_same_root(current, p)) {
84496+ return 1;
84497+ }
84498+#endif
84499+ return 0;
84500+}
84501+
84502+EXPORT_SYMBOL_GPL(gr_pid_is_chrooted);
84503+
84504+#if defined(CONFIG_GRKERNSEC_CHROOT_DOUBLE) || defined(CONFIG_GRKERNSEC_CHROOT_FCHDIR)
84505+int gr_is_outside_chroot(const struct dentry *u_dentry, const struct vfsmount *u_mnt)
84506+{
84507+ struct path path, currentroot;
84508+ int ret = 0;
84509+
84510+ path.dentry = (struct dentry *)u_dentry;
84511+ path.mnt = (struct vfsmount *)u_mnt;
84512+ get_fs_root(current->fs, &currentroot);
84513+ if (path_is_under(&path, &currentroot))
84514+ ret = 1;
84515+ path_put(&currentroot);
84516+
84517+ return ret;
84518+}
84519+#endif
84520+
84521+int
84522+gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt)
84523+{
84524+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
84525+ if (!grsec_enable_chroot_fchdir)
84526+ return 1;
84527+
84528+ if (!proc_is_chrooted(current))
84529+ return 1;
84530+ else if (!gr_is_outside_chroot(u_dentry, u_mnt)) {
84531+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_FCHDIR_MSG, u_dentry, u_mnt);
84532+ return 0;
84533+ }
84534+#endif
84535+ return 1;
84536+}
84537+
84538+int
84539+gr_chroot_fhandle(void)
84540+{
84541+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
84542+ if (!grsec_enable_chroot_fchdir)
84543+ return 1;
84544+
84545+ if (!proc_is_chrooted(current))
84546+ return 1;
84547+ else {
84548+ gr_log_noargs(GR_DONT_AUDIT, GR_CHROOT_FHANDLE_MSG);
84549+ return 0;
84550+ }
84551+#endif
84552+ return 1;
84553+}
84554+
84555+int
84556+gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
84557+ const u64 shm_createtime)
84558+{
84559+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
84560+ struct task_struct *p;
84561+
84562+ if (unlikely(!grsec_enable_chroot_shmat))
84563+ return 1;
84564+
84565+ if (likely(!proc_is_chrooted(current)))
84566+ return 1;
84567+
84568+ rcu_read_lock();
84569+ read_lock(&tasklist_lock);
84570+
84571+ if ((p = find_task_by_vpid_unrestricted(shm_cprid))) {
84572+ if (time_before_eq64(p->start_time, shm_createtime)) {
84573+ if (have_same_root(current, p)) {
84574+ goto allow;
84575+ } else {
84576+ read_unlock(&tasklist_lock);
84577+ rcu_read_unlock();
84578+ gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
84579+ return 0;
84580+ }
84581+ }
84582+ /* creator exited, pid reuse, fall through to next check */
84583+ }
84584+ if ((p = find_task_by_vpid_unrestricted(shm_lapid))) {
84585+ if (unlikely(!have_same_root(current, p))) {
84586+ read_unlock(&tasklist_lock);
84587+ rcu_read_unlock();
84588+ gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
84589+ return 0;
84590+ }
84591+ }
84592+
84593+allow:
84594+ read_unlock(&tasklist_lock);
84595+ rcu_read_unlock();
84596+#endif
84597+ return 1;
84598+}
84599+
84600+void
84601+gr_log_chroot_exec(const struct dentry *dentry, const struct vfsmount *mnt)
84602+{
84603+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
84604+ if (grsec_enable_chroot_execlog && proc_is_chrooted(current))
84605+ gr_log_fs_generic(GR_DO_AUDIT, GR_EXEC_CHROOT_MSG, dentry, mnt);
84606+#endif
84607+ return;
84608+}
84609+
84610+int
84611+gr_handle_chroot_mknod(const struct dentry *dentry,
84612+ const struct vfsmount *mnt, const int mode)
84613+{
84614+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
84615+ if (grsec_enable_chroot_mknod && !S_ISFIFO(mode) && !S_ISREG(mode) &&
84616+ proc_is_chrooted(current)) {
84617+ gr_log_fs_generic(GR_DONT_AUDIT, GR_MKNOD_CHROOT_MSG, dentry, mnt);
84618+ return -EPERM;
84619+ }
84620+#endif
84621+ return 0;
84622+}
84623+
84624+int
84625+gr_handle_chroot_mount(const struct dentry *dentry,
84626+ const struct vfsmount *mnt, const char *dev_name)
84627+{
84628+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
84629+ if (grsec_enable_chroot_mount && proc_is_chrooted(current)) {
84630+ gr_log_str_fs(GR_DONT_AUDIT, GR_MOUNT_CHROOT_MSG, dev_name ? dev_name : "none", dentry, mnt);
84631+ return -EPERM;
84632+ }
84633+#endif
84634+ return 0;
84635+}
84636+
84637+int
84638+gr_handle_chroot_pivot(void)
84639+{
84640+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
84641+ if (grsec_enable_chroot_pivot && proc_is_chrooted(current)) {
84642+ gr_log_noargs(GR_DONT_AUDIT, GR_PIVOT_CHROOT_MSG);
84643+ return -EPERM;
84644+ }
84645+#endif
84646+ return 0;
84647+}
84648+
84649+int
84650+gr_handle_chroot_chroot(const struct dentry *dentry, const struct vfsmount *mnt)
84651+{
84652+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
84653+ if (grsec_enable_chroot_double && proc_is_chrooted(current) &&
84654+ !gr_is_outside_chroot(dentry, mnt)) {
84655+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_CHROOT_MSG, dentry, mnt);
84656+ return -EPERM;
84657+ }
84658+#endif
84659+ return 0;
84660+}
84661+
84662+extern const char *captab_log[];
84663+extern int captab_log_entries;
84664+
84665+int
84666+gr_task_chroot_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
84667+{
84668+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
84669+ if (grsec_enable_chroot_caps && proc_is_chrooted(task)) {
84670+ kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
84671+ if (cap_raised(chroot_caps, cap)) {
84672+ if (cap_raised(cred->cap_effective, cap) && cap < captab_log_entries) {
84673+ gr_log_cap(GR_DONT_AUDIT, GR_CAP_CHROOT_MSG, task, captab_log[cap]);
84674+ }
84675+ return 0;
84676+ }
84677+ }
84678+#endif
84679+ return 1;
84680+}
84681+
84682+int
84683+gr_chroot_is_capable(const int cap)
84684+{
84685+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
84686+ return gr_task_chroot_is_capable(current, current_cred(), cap);
84687+#endif
84688+ return 1;
84689+}
84690+
84691+int
84692+gr_task_chroot_is_capable_nolog(const struct task_struct *task, const int cap)
84693+{
84694+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
84695+ if (grsec_enable_chroot_caps && proc_is_chrooted(task)) {
84696+ kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
84697+ if (cap_raised(chroot_caps, cap)) {
84698+ return 0;
84699+ }
84700+ }
84701+#endif
84702+ return 1;
84703+}
84704+
84705+int
84706+gr_chroot_is_capable_nolog(const int cap)
84707+{
84708+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
84709+ return gr_task_chroot_is_capable_nolog(current, cap);
84710+#endif
84711+ return 1;
84712+}
84713+
84714+int
84715+gr_handle_chroot_sysctl(const int op)
84716+{
84717+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
84718+ if (grsec_enable_chroot_sysctl && (op & MAY_WRITE) &&
84719+ proc_is_chrooted(current))
84720+ return -EACCES;
84721+#endif
84722+ return 0;
84723+}
84724+
84725+void
84726+gr_handle_chroot_chdir(const struct path *path)
84727+{
84728+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
84729+ if (grsec_enable_chroot_chdir)
84730+ set_fs_pwd(current->fs, path);
84731+#endif
84732+ return;
84733+}
84734+
84735+int
84736+gr_handle_chroot_chmod(const struct dentry *dentry,
84737+ const struct vfsmount *mnt, const int mode)
84738+{
84739+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
84740+ /* allow chmod +s on directories, but not files */
84741+ if (grsec_enable_chroot_chmod && !S_ISDIR(dentry->d_inode->i_mode) &&
84742+ ((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))) &&
84743+ proc_is_chrooted(current)) {
84744+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHMOD_CHROOT_MSG, dentry, mnt);
84745+ return -EPERM;
84746+ }
84747+#endif
84748+ return 0;
84749+}
84750diff --git a/grsecurity/grsec_disabled.c b/grsecurity/grsec_disabled.c
84751new file mode 100644
84752index 0000000..946f750
84753--- /dev/null
84754+++ b/grsecurity/grsec_disabled.c
84755@@ -0,0 +1,445 @@
84756+#include <linux/kernel.h>
84757+#include <linux/module.h>
84758+#include <linux/sched.h>
84759+#include <linux/file.h>
84760+#include <linux/fs.h>
84761+#include <linux/kdev_t.h>
84762+#include <linux/net.h>
84763+#include <linux/in.h>
84764+#include <linux/ip.h>
84765+#include <linux/skbuff.h>
84766+#include <linux/sysctl.h>
84767+
84768+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
84769+void
84770+pax_set_initial_flags(struct linux_binprm *bprm)
84771+{
84772+ return;
84773+}
84774+#endif
84775+
84776+#ifdef CONFIG_SYSCTL
84777+__u32
84778+gr_handle_sysctl(const struct ctl_table * table, const int op)
84779+{
84780+ return 0;
84781+}
84782+#endif
84783+
84784+#ifdef CONFIG_TASKSTATS
84785+int gr_is_taskstats_denied(int pid)
84786+{
84787+ return 0;
84788+}
84789+#endif
84790+
84791+int
84792+gr_acl_is_enabled(void)
84793+{
84794+ return 0;
84795+}
84796+
84797+int
84798+gr_learn_cap(const struct task_struct *task, const struct cred *cred, const int cap)
84799+{
84800+ return 0;
84801+}
84802+
84803+void
84804+gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
84805+{
84806+ return;
84807+}
84808+
84809+int
84810+gr_handle_rawio(const struct inode *inode)
84811+{
84812+ return 0;
84813+}
84814+
84815+void
84816+gr_acl_handle_psacct(struct task_struct *task, const long code)
84817+{
84818+ return;
84819+}
84820+
84821+int
84822+gr_handle_ptrace(struct task_struct *task, const long request)
84823+{
84824+ return 0;
84825+}
84826+
84827+int
84828+gr_handle_proc_ptrace(struct task_struct *task)
84829+{
84830+ return 0;
84831+}
84832+
84833+int
84834+gr_set_acls(const int type)
84835+{
84836+ return 0;
84837+}
84838+
84839+int
84840+gr_check_hidden_task(const struct task_struct *tsk)
84841+{
84842+ return 0;
84843+}
84844+
84845+int
84846+gr_check_protected_task(const struct task_struct *task)
84847+{
84848+ return 0;
84849+}
84850+
84851+int
84852+gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
84853+{
84854+ return 0;
84855+}
84856+
84857+void
84858+gr_copy_label(struct task_struct *tsk)
84859+{
84860+ return;
84861+}
84862+
84863+void
84864+gr_set_pax_flags(struct task_struct *task)
84865+{
84866+ return;
84867+}
84868+
84869+int
84870+gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
84871+ const int unsafe_share)
84872+{
84873+ return 0;
84874+}
84875+
84876+void
84877+gr_handle_delete(const u64 ino, const dev_t dev)
84878+{
84879+ return;
84880+}
84881+
84882+void
84883+gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
84884+{
84885+ return;
84886+}
84887+
84888+void
84889+gr_handle_crash(struct task_struct *task, const int sig)
84890+{
84891+ return;
84892+}
84893+
84894+int
84895+gr_check_crash_exec(const struct file *filp)
84896+{
84897+ return 0;
84898+}
84899+
84900+int
84901+gr_check_crash_uid(const kuid_t uid)
84902+{
84903+ return 0;
84904+}
84905+
84906+void
84907+gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
84908+ struct dentry *old_dentry,
84909+ struct dentry *new_dentry,
84910+ struct vfsmount *mnt, const __u8 replace, unsigned int flags)
84911+{
84912+ return;
84913+}
84914+
84915+int
84916+gr_search_socket(const int family, const int type, const int protocol)
84917+{
84918+ return 1;
84919+}
84920+
84921+int
84922+gr_search_connectbind(const int mode, const struct socket *sock,
84923+ const struct sockaddr_in *addr)
84924+{
84925+ return 0;
84926+}
84927+
84928+void
84929+gr_handle_alertkill(struct task_struct *task)
84930+{
84931+ return;
84932+}
84933+
84934+__u32
84935+gr_acl_handle_execve(const struct dentry * dentry, const struct vfsmount * mnt)
84936+{
84937+ return 1;
84938+}
84939+
84940+__u32
84941+gr_acl_handle_hidden_file(const struct dentry * dentry,
84942+ const struct vfsmount * mnt)
84943+{
84944+ return 1;
84945+}
84946+
84947+__u32
84948+gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
84949+ int acc_mode)
84950+{
84951+ return 1;
84952+}
84953+
84954+__u32
84955+gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
84956+{
84957+ return 1;
84958+}
84959+
84960+__u32
84961+gr_acl_handle_unlink(const struct dentry * dentry, const struct vfsmount * mnt)
84962+{
84963+ return 1;
84964+}
84965+
84966+int
84967+gr_acl_handle_mmap(const struct file *file, const unsigned long prot,
84968+ unsigned int *vm_flags)
84969+{
84970+ return 1;
84971+}
84972+
84973+__u32
84974+gr_acl_handle_truncate(const struct dentry * dentry,
84975+ const struct vfsmount * mnt)
84976+{
84977+ return 1;
84978+}
84979+
84980+__u32
84981+gr_acl_handle_utime(const struct dentry * dentry, const struct vfsmount * mnt)
84982+{
84983+ return 1;
84984+}
84985+
84986+__u32
84987+gr_acl_handle_access(const struct dentry * dentry,
84988+ const struct vfsmount * mnt, const int fmode)
84989+{
84990+ return 1;
84991+}
84992+
84993+__u32
84994+gr_acl_handle_chmod(const struct dentry * dentry, const struct vfsmount * mnt,
84995+ umode_t *mode)
84996+{
84997+ return 1;
84998+}
84999+
85000+__u32
85001+gr_acl_handle_chown(const struct dentry * dentry, const struct vfsmount * mnt)
85002+{
85003+ return 1;
85004+}
85005+
85006+__u32
85007+gr_acl_handle_setxattr(const struct dentry * dentry, const struct vfsmount * mnt)
85008+{
85009+ return 1;
85010+}
85011+
85012+__u32
85013+gr_acl_handle_removexattr(const struct dentry * dentry, const struct vfsmount * mnt)
85014+{
85015+ return 1;
85016+}
85017+
85018+void
85019+grsecurity_init(void)
85020+{
85021+ return;
85022+}
85023+
85024+umode_t gr_acl_umask(void)
85025+{
85026+ return 0;
85027+}
85028+
85029+__u32
85030+gr_acl_handle_mknod(const struct dentry * new_dentry,
85031+ const struct dentry * parent_dentry,
85032+ const struct vfsmount * parent_mnt,
85033+ const int mode)
85034+{
85035+ return 1;
85036+}
85037+
85038+__u32
85039+gr_acl_handle_mkdir(const struct dentry * new_dentry,
85040+ const struct dentry * parent_dentry,
85041+ const struct vfsmount * parent_mnt)
85042+{
85043+ return 1;
85044+}
85045+
85046+__u32
85047+gr_acl_handle_symlink(const struct dentry * new_dentry,
85048+ const struct dentry * parent_dentry,
85049+ const struct vfsmount * parent_mnt, const struct filename *from)
85050+{
85051+ return 1;
85052+}
85053+
85054+__u32
85055+gr_acl_handle_link(const struct dentry * new_dentry,
85056+ const struct dentry * parent_dentry,
85057+ const struct vfsmount * parent_mnt,
85058+ const struct dentry * old_dentry,
85059+ const struct vfsmount * old_mnt, const struct filename *to)
85060+{
85061+ return 1;
85062+}
85063+
85064+int
85065+gr_acl_handle_rename(const struct dentry *new_dentry,
85066+ const struct dentry *parent_dentry,
85067+ const struct vfsmount *parent_mnt,
85068+ const struct dentry *old_dentry,
85069+ const struct inode *old_parent_inode,
85070+ const struct vfsmount *old_mnt, const struct filename *newname,
85071+ unsigned int flags)
85072+{
85073+ return 0;
85074+}
85075+
85076+int
85077+gr_acl_handle_filldir(const struct file *file, const char *name,
85078+ const int namelen, const u64 ino)
85079+{
85080+ return 1;
85081+}
85082+
85083+int
85084+gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
85085+ const u64 shm_createtime, const kuid_t cuid, const int shmid)
85086+{
85087+ return 1;
85088+}
85089+
85090+int
85091+gr_search_bind(const struct socket *sock, const struct sockaddr_in *addr)
85092+{
85093+ return 0;
85094+}
85095+
85096+int
85097+gr_search_accept(const struct socket *sock)
85098+{
85099+ return 0;
85100+}
85101+
85102+int
85103+gr_search_listen(const struct socket *sock)
85104+{
85105+ return 0;
85106+}
85107+
85108+int
85109+gr_search_connect(const struct socket *sock, const struct sockaddr_in *addr)
85110+{
85111+ return 0;
85112+}
85113+
85114+__u32
85115+gr_acl_handle_unix(const struct dentry * dentry, const struct vfsmount * mnt)
85116+{
85117+ return 1;
85118+}
85119+
85120+__u32
85121+gr_acl_handle_creat(const struct dentry * dentry,
85122+ const struct dentry * p_dentry,
85123+ const struct vfsmount * p_mnt, int open_flags, int acc_mode,
85124+ const int imode)
85125+{
85126+ return 1;
85127+}
85128+
85129+void
85130+gr_acl_handle_exit(void)
85131+{
85132+ return;
85133+}
85134+
85135+int
85136+gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
85137+{
85138+ return 1;
85139+}
85140+
85141+void
85142+gr_set_role_label(const kuid_t uid, const kgid_t gid)
85143+{
85144+ return;
85145+}
85146+
85147+int
85148+gr_acl_handle_procpidmem(const struct task_struct *task)
85149+{
85150+ return 0;
85151+}
85152+
85153+int
85154+gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb)
85155+{
85156+ return 0;
85157+}
85158+
85159+int
85160+gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr)
85161+{
85162+ return 0;
85163+}
85164+
85165+int
85166+gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs)
85167+{
85168+ return 0;
85169+}
85170+
85171+int
85172+gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs)
85173+{
85174+ return 0;
85175+}
85176+
85177+int gr_acl_enable_at_secure(void)
85178+{
85179+ return 0;
85180+}
85181+
85182+dev_t gr_get_dev_from_dentry(struct dentry *dentry)
85183+{
85184+ return dentry->d_sb->s_dev;
85185+}
85186+
85187+u64 gr_get_ino_from_dentry(struct dentry *dentry)
85188+{
85189+ return dentry->d_inode->i_ino;
85190+}
85191+
85192+void gr_put_exec_file(struct task_struct *task)
85193+{
85194+ return;
85195+}
85196+
85197+#ifdef CONFIG_SECURITY
85198+EXPORT_SYMBOL_GPL(gr_check_user_change);
85199+EXPORT_SYMBOL_GPL(gr_check_group_change);
85200+#endif
85201diff --git a/grsecurity/grsec_exec.c b/grsecurity/grsec_exec.c
85202new file mode 100644
85203index 0000000..fb7531e
85204--- /dev/null
85205+++ b/grsecurity/grsec_exec.c
85206@@ -0,0 +1,189 @@
85207+#include <linux/kernel.h>
85208+#include <linux/sched.h>
85209+#include <linux/file.h>
85210+#include <linux/binfmts.h>
85211+#include <linux/fs.h>
85212+#include <linux/types.h>
85213+#include <linux/grdefs.h>
85214+#include <linux/grsecurity.h>
85215+#include <linux/grinternal.h>
85216+#include <linux/capability.h>
85217+#include <linux/module.h>
85218+#include <linux/compat.h>
85219+
85220+#include <asm/uaccess.h>
85221+
85222+#ifdef CONFIG_GRKERNSEC_EXECLOG
85223+static char gr_exec_arg_buf[132];
85224+static DEFINE_MUTEX(gr_exec_arg_mutex);
85225+#endif
85226+
85227+struct user_arg_ptr {
85228+#ifdef CONFIG_COMPAT
85229+ bool is_compat;
85230+#endif
85231+ union {
85232+ const char __user *const __user *native;
85233+#ifdef CONFIG_COMPAT
85234+ const compat_uptr_t __user *compat;
85235+#endif
85236+ } ptr;
85237+};
85238+
85239+extern const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr);
85240+
85241+void
85242+gr_handle_exec_args(struct linux_binprm *bprm, struct user_arg_ptr argv)
85243+{
85244+#ifdef CONFIG_GRKERNSEC_EXECLOG
85245+ char *grarg = gr_exec_arg_buf;
85246+ unsigned int i, x, execlen = 0;
85247+ char c;
85248+
85249+ if (!((grsec_enable_execlog && grsec_enable_group &&
85250+ in_group_p(grsec_audit_gid))
85251+ || (grsec_enable_execlog && !grsec_enable_group)))
85252+ return;
85253+
85254+ mutex_lock(&gr_exec_arg_mutex);
85255+ memset(grarg, 0, sizeof(gr_exec_arg_buf));
85256+
85257+ for (i = 0; i < bprm->argc && execlen < 128; i++) {
85258+ const char __user *p;
85259+ unsigned int len;
85260+
85261+ p = get_user_arg_ptr(argv, i);
85262+ if (IS_ERR(p))
85263+ goto log;
85264+
85265+ len = strnlen_user(p, 128 - execlen);
85266+ if (len > 128 - execlen)
85267+ len = 128 - execlen;
85268+ else if (len > 0)
85269+ len--;
85270+ if (copy_from_user(grarg + execlen, p, len))
85271+ goto log;
85272+
85273+ /* rewrite unprintable characters */
85274+ for (x = 0; x < len; x++) {
85275+ c = *(grarg + execlen + x);
85276+ if (c < 32 || c > 126)
85277+ *(grarg + execlen + x) = ' ';
85278+ }
85279+
85280+ execlen += len;
85281+ *(grarg + execlen) = ' ';
85282+ *(grarg + execlen + 1) = '\0';
85283+ execlen++;
85284+ }
85285+
85286+ log:
85287+ gr_log_fs_str(GR_DO_AUDIT, GR_EXEC_AUDIT_MSG, bprm->file->f_path.dentry,
85288+ bprm->file->f_path.mnt, grarg);
85289+ mutex_unlock(&gr_exec_arg_mutex);
85290+#endif
85291+ return;
85292+}
85293+
85294+#ifdef CONFIG_GRKERNSEC
85295+extern int gr_acl_is_capable(const int cap);
85296+extern int gr_acl_is_capable_nolog(const int cap);
85297+extern int gr_task_acl_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
85298+extern int gr_task_acl_is_capable_nolog(const struct task_struct *task, const int cap);
85299+extern int gr_chroot_is_capable(const int cap);
85300+extern int gr_chroot_is_capable_nolog(const int cap);
85301+extern int gr_task_chroot_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
85302+extern int gr_task_chroot_is_capable_nolog(const struct task_struct *task, const int cap);
85303+#endif
85304+
85305+const char *captab_log[] = {
85306+ "CAP_CHOWN",
85307+ "CAP_DAC_OVERRIDE",
85308+ "CAP_DAC_READ_SEARCH",
85309+ "CAP_FOWNER",
85310+ "CAP_FSETID",
85311+ "CAP_KILL",
85312+ "CAP_SETGID",
85313+ "CAP_SETUID",
85314+ "CAP_SETPCAP",
85315+ "CAP_LINUX_IMMUTABLE",
85316+ "CAP_NET_BIND_SERVICE",
85317+ "CAP_NET_BROADCAST",
85318+ "CAP_NET_ADMIN",
85319+ "CAP_NET_RAW",
85320+ "CAP_IPC_LOCK",
85321+ "CAP_IPC_OWNER",
85322+ "CAP_SYS_MODULE",
85323+ "CAP_SYS_RAWIO",
85324+ "CAP_SYS_CHROOT",
85325+ "CAP_SYS_PTRACE",
85326+ "CAP_SYS_PACCT",
85327+ "CAP_SYS_ADMIN",
85328+ "CAP_SYS_BOOT",
85329+ "CAP_SYS_NICE",
85330+ "CAP_SYS_RESOURCE",
85331+ "CAP_SYS_TIME",
85332+ "CAP_SYS_TTY_CONFIG",
85333+ "CAP_MKNOD",
85334+ "CAP_LEASE",
85335+ "CAP_AUDIT_WRITE",
85336+ "CAP_AUDIT_CONTROL",
85337+ "CAP_SETFCAP",
85338+ "CAP_MAC_OVERRIDE",
85339+ "CAP_MAC_ADMIN",
85340+ "CAP_SYSLOG",
85341+ "CAP_WAKE_ALARM",
85342+ "CAP_BLOCK_SUSPEND",
85343+ "CAP_AUDIT_READ"
85344+};
85345+
85346+int captab_log_entries = sizeof(captab_log)/sizeof(captab_log[0]);
85347+
85348+int gr_is_capable(const int cap)
85349+{
85350+#ifdef CONFIG_GRKERNSEC
85351+ if (gr_acl_is_capable(cap) && gr_chroot_is_capable(cap))
85352+ return 1;
85353+ return 0;
85354+#else
85355+ return 1;
85356+#endif
85357+}
85358+
85359+int gr_task_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
85360+{
85361+#ifdef CONFIG_GRKERNSEC
85362+ if (gr_task_acl_is_capable(task, cred, cap) && gr_task_chroot_is_capable(task, cred, cap))
85363+ return 1;
85364+ return 0;
85365+#else
85366+ return 1;
85367+#endif
85368+}
85369+
85370+int gr_is_capable_nolog(const int cap)
85371+{
85372+#ifdef CONFIG_GRKERNSEC
85373+ if (gr_acl_is_capable_nolog(cap) && gr_chroot_is_capable_nolog(cap))
85374+ return 1;
85375+ return 0;
85376+#else
85377+ return 1;
85378+#endif
85379+}
85380+
85381+int gr_task_is_capable_nolog(const struct task_struct *task, const int cap)
85382+{
85383+#ifdef CONFIG_GRKERNSEC
85384+ if (gr_task_acl_is_capable_nolog(task, cap) && gr_task_chroot_is_capable_nolog(task, cap))
85385+ return 1;
85386+ return 0;
85387+#else
85388+ return 1;
85389+#endif
85390+}
85391+
85392+EXPORT_SYMBOL_GPL(gr_is_capable);
85393+EXPORT_SYMBOL_GPL(gr_is_capable_nolog);
85394+EXPORT_SYMBOL_GPL(gr_task_is_capable);
85395+EXPORT_SYMBOL_GPL(gr_task_is_capable_nolog);
85396diff --git a/grsecurity/grsec_fifo.c b/grsecurity/grsec_fifo.c
85397new file mode 100644
85398index 0000000..06cc6ea
85399--- /dev/null
85400+++ b/grsecurity/grsec_fifo.c
85401@@ -0,0 +1,24 @@
85402+#include <linux/kernel.h>
85403+#include <linux/sched.h>
85404+#include <linux/fs.h>
85405+#include <linux/file.h>
85406+#include <linux/grinternal.h>
85407+
85408+int
85409+gr_handle_fifo(const struct dentry *dentry, const struct vfsmount *mnt,
85410+ const struct dentry *dir, const int flag, const int acc_mode)
85411+{
85412+#ifdef CONFIG_GRKERNSEC_FIFO
85413+ const struct cred *cred = current_cred();
85414+
85415+ if (grsec_enable_fifo && S_ISFIFO(dentry->d_inode->i_mode) &&
85416+ !(flag & O_EXCL) && (dir->d_inode->i_mode & S_ISVTX) &&
85417+ !uid_eq(dentry->d_inode->i_uid, dir->d_inode->i_uid) &&
85418+ !uid_eq(cred->fsuid, dentry->d_inode->i_uid)) {
85419+ if (!inode_permission(dentry->d_inode, acc_mode))
85420+ 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));
85421+ return -EACCES;
85422+ }
85423+#endif
85424+ return 0;
85425+}
85426diff --git a/grsecurity/grsec_fork.c b/grsecurity/grsec_fork.c
85427new file mode 100644
85428index 0000000..8ca18bf
85429--- /dev/null
85430+++ b/grsecurity/grsec_fork.c
85431@@ -0,0 +1,23 @@
85432+#include <linux/kernel.h>
85433+#include <linux/sched.h>
85434+#include <linux/grsecurity.h>
85435+#include <linux/grinternal.h>
85436+#include <linux/errno.h>
85437+
85438+void
85439+gr_log_forkfail(const int retval)
85440+{
85441+#ifdef CONFIG_GRKERNSEC_FORKFAIL
85442+ if (grsec_enable_forkfail && (retval == -EAGAIN || retval == -ENOMEM)) {
85443+ switch (retval) {
85444+ case -EAGAIN:
85445+ gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "EAGAIN");
85446+ break;
85447+ case -ENOMEM:
85448+ gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "ENOMEM");
85449+ break;
85450+ }
85451+ }
85452+#endif
85453+ return;
85454+}
85455diff --git a/grsecurity/grsec_init.c b/grsecurity/grsec_init.c
85456new file mode 100644
85457index 0000000..4ed9e7d
85458--- /dev/null
85459+++ b/grsecurity/grsec_init.c
85460@@ -0,0 +1,290 @@
85461+#include <linux/kernel.h>
85462+#include <linux/sched.h>
85463+#include <linux/mm.h>
85464+#include <linux/gracl.h>
85465+#include <linux/slab.h>
85466+#include <linux/vmalloc.h>
85467+#include <linux/percpu.h>
85468+#include <linux/module.h>
85469+
85470+int grsec_enable_ptrace_readexec;
85471+int grsec_enable_setxid;
85472+int grsec_enable_symlinkown;
85473+kgid_t grsec_symlinkown_gid;
85474+int grsec_enable_brute;
85475+int grsec_enable_link;
85476+int grsec_enable_dmesg;
85477+int grsec_enable_harden_ptrace;
85478+int grsec_enable_harden_ipc;
85479+int grsec_enable_fifo;
85480+int grsec_enable_execlog;
85481+int grsec_enable_signal;
85482+int grsec_enable_forkfail;
85483+int grsec_enable_audit_ptrace;
85484+int grsec_enable_time;
85485+int grsec_enable_group;
85486+kgid_t grsec_audit_gid;
85487+int grsec_enable_chdir;
85488+int grsec_enable_mount;
85489+int grsec_enable_rofs;
85490+int grsec_deny_new_usb;
85491+int grsec_enable_chroot_findtask;
85492+int grsec_enable_chroot_mount;
85493+int grsec_enable_chroot_shmat;
85494+int grsec_enable_chroot_fchdir;
85495+int grsec_enable_chroot_double;
85496+int grsec_enable_chroot_pivot;
85497+int grsec_enable_chroot_chdir;
85498+int grsec_enable_chroot_chmod;
85499+int grsec_enable_chroot_mknod;
85500+int grsec_enable_chroot_nice;
85501+int grsec_enable_chroot_execlog;
85502+int grsec_enable_chroot_caps;
85503+int grsec_enable_chroot_rename;
85504+int grsec_enable_chroot_sysctl;
85505+int grsec_enable_chroot_unix;
85506+int grsec_enable_tpe;
85507+kgid_t grsec_tpe_gid;
85508+int grsec_enable_blackhole;
85509+#ifdef CONFIG_IPV6_MODULE
85510+EXPORT_SYMBOL_GPL(grsec_enable_blackhole);
85511+#endif
85512+int grsec_lastack_retries;
85513+int grsec_enable_tpe_all;
85514+int grsec_enable_tpe_invert;
85515+int grsec_enable_socket_all;
85516+kgid_t grsec_socket_all_gid;
85517+int grsec_enable_socket_client;
85518+kgid_t grsec_socket_client_gid;
85519+int grsec_enable_socket_server;
85520+kgid_t grsec_socket_server_gid;
85521+int grsec_resource_logging;
85522+int grsec_disable_privio;
85523+int grsec_enable_log_rwxmaps;
85524+int grsec_lock;
85525+
85526+DEFINE_SPINLOCK(grsec_alert_lock);
85527+unsigned long grsec_alert_wtime = 0;
85528+unsigned long grsec_alert_fyet = 0;
85529+
85530+DEFINE_SPINLOCK(grsec_audit_lock);
85531+
85532+DEFINE_RWLOCK(grsec_exec_file_lock);
85533+
85534+char *gr_shared_page[4];
85535+
85536+char *gr_alert_log_fmt;
85537+char *gr_audit_log_fmt;
85538+char *gr_alert_log_buf;
85539+char *gr_audit_log_buf;
85540+
85541+extern struct gr_arg *gr_usermode;
85542+extern unsigned char *gr_system_salt;
85543+extern unsigned char *gr_system_sum;
85544+
85545+void __init
85546+grsecurity_init(void)
85547+{
85548+ int j;
85549+ /* create the per-cpu shared pages */
85550+
85551+#ifdef CONFIG_X86
85552+ memset((char *)(0x41a + PAGE_OFFSET), 0, 36);
85553+#endif
85554+
85555+ for (j = 0; j < 4; j++) {
85556+ gr_shared_page[j] = (char *)__alloc_percpu(PAGE_SIZE, __alignof__(unsigned long long));
85557+ if (gr_shared_page[j] == NULL) {
85558+ panic("Unable to allocate grsecurity shared page");
85559+ return;
85560+ }
85561+ }
85562+
85563+ /* allocate log buffers */
85564+ gr_alert_log_fmt = kmalloc(512, GFP_KERNEL);
85565+ if (!gr_alert_log_fmt) {
85566+ panic("Unable to allocate grsecurity alert log format buffer");
85567+ return;
85568+ }
85569+ gr_audit_log_fmt = kmalloc(512, GFP_KERNEL);
85570+ if (!gr_audit_log_fmt) {
85571+ panic("Unable to allocate grsecurity audit log format buffer");
85572+ return;
85573+ }
85574+ gr_alert_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
85575+ if (!gr_alert_log_buf) {
85576+ panic("Unable to allocate grsecurity alert log buffer");
85577+ return;
85578+ }
85579+ gr_audit_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
85580+ if (!gr_audit_log_buf) {
85581+ panic("Unable to allocate grsecurity audit log buffer");
85582+ return;
85583+ }
85584+
85585+ /* allocate memory for authentication structure */
85586+ gr_usermode = kmalloc(sizeof(struct gr_arg), GFP_KERNEL);
85587+ gr_system_salt = kmalloc(GR_SALT_LEN, GFP_KERNEL);
85588+ gr_system_sum = kmalloc(GR_SHA_LEN, GFP_KERNEL);
85589+
85590+ if (!gr_usermode || !gr_system_salt || !gr_system_sum) {
85591+ panic("Unable to allocate grsecurity authentication structure");
85592+ return;
85593+ }
85594+
85595+#ifdef CONFIG_GRKERNSEC_IO
85596+#if !defined(CONFIG_GRKERNSEC_SYSCTL_DISTRO)
85597+ grsec_disable_privio = 1;
85598+#elif defined(CONFIG_GRKERNSEC_SYSCTL_ON)
85599+ grsec_disable_privio = 1;
85600+#else
85601+ grsec_disable_privio = 0;
85602+#endif
85603+#endif
85604+
85605+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
85606+ /* for backward compatibility, tpe_invert always defaults to on if
85607+ enabled in the kernel
85608+ */
85609+ grsec_enable_tpe_invert = 1;
85610+#endif
85611+
85612+#if !defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_SYSCTL_ON)
85613+#ifndef CONFIG_GRKERNSEC_SYSCTL
85614+ grsec_lock = 1;
85615+#endif
85616+
85617+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
85618+ grsec_enable_log_rwxmaps = 1;
85619+#endif
85620+#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
85621+ grsec_enable_group = 1;
85622+ grsec_audit_gid = KGIDT_INIT(CONFIG_GRKERNSEC_AUDIT_GID);
85623+#endif
85624+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
85625+ grsec_enable_ptrace_readexec = 1;
85626+#endif
85627+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
85628+ grsec_enable_chdir = 1;
85629+#endif
85630+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
85631+ grsec_enable_harden_ptrace = 1;
85632+#endif
85633+#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
85634+ grsec_enable_harden_ipc = 1;
85635+#endif
85636+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
85637+ grsec_enable_mount = 1;
85638+#endif
85639+#ifdef CONFIG_GRKERNSEC_LINK
85640+ grsec_enable_link = 1;
85641+#endif
85642+#ifdef CONFIG_GRKERNSEC_BRUTE
85643+ grsec_enable_brute = 1;
85644+#endif
85645+#ifdef CONFIG_GRKERNSEC_DMESG
85646+ grsec_enable_dmesg = 1;
85647+#endif
85648+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
85649+ grsec_enable_blackhole = 1;
85650+ grsec_lastack_retries = 4;
85651+#endif
85652+#ifdef CONFIG_GRKERNSEC_FIFO
85653+ grsec_enable_fifo = 1;
85654+#endif
85655+#ifdef CONFIG_GRKERNSEC_EXECLOG
85656+ grsec_enable_execlog = 1;
85657+#endif
85658+#ifdef CONFIG_GRKERNSEC_SETXID
85659+ grsec_enable_setxid = 1;
85660+#endif
85661+#ifdef CONFIG_GRKERNSEC_SIGNAL
85662+ grsec_enable_signal = 1;
85663+#endif
85664+#ifdef CONFIG_GRKERNSEC_FORKFAIL
85665+ grsec_enable_forkfail = 1;
85666+#endif
85667+#ifdef CONFIG_GRKERNSEC_TIME
85668+ grsec_enable_time = 1;
85669+#endif
85670+#ifdef CONFIG_GRKERNSEC_RESLOG
85671+ grsec_resource_logging = 1;
85672+#endif
85673+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
85674+ grsec_enable_chroot_findtask = 1;
85675+#endif
85676+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
85677+ grsec_enable_chroot_unix = 1;
85678+#endif
85679+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
85680+ grsec_enable_chroot_mount = 1;
85681+#endif
85682+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
85683+ grsec_enable_chroot_fchdir = 1;
85684+#endif
85685+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
85686+ grsec_enable_chroot_shmat = 1;
85687+#endif
85688+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
85689+ grsec_enable_audit_ptrace = 1;
85690+#endif
85691+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
85692+ grsec_enable_chroot_double = 1;
85693+#endif
85694+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
85695+ grsec_enable_chroot_pivot = 1;
85696+#endif
85697+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
85698+ grsec_enable_chroot_chdir = 1;
85699+#endif
85700+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
85701+ grsec_enable_chroot_chmod = 1;
85702+#endif
85703+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
85704+ grsec_enable_chroot_mknod = 1;
85705+#endif
85706+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
85707+ grsec_enable_chroot_nice = 1;
85708+#endif
85709+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
85710+ grsec_enable_chroot_execlog = 1;
85711+#endif
85712+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
85713+ grsec_enable_chroot_caps = 1;
85714+#endif
85715+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
85716+ grsec_enable_chroot_rename = 1;
85717+#endif
85718+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
85719+ grsec_enable_chroot_sysctl = 1;
85720+#endif
85721+#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
85722+ grsec_enable_symlinkown = 1;
85723+ grsec_symlinkown_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SYMLINKOWN_GID);
85724+#endif
85725+#ifdef CONFIG_GRKERNSEC_TPE
85726+ grsec_enable_tpe = 1;
85727+ grsec_tpe_gid = KGIDT_INIT(CONFIG_GRKERNSEC_TPE_GID);
85728+#ifdef CONFIG_GRKERNSEC_TPE_ALL
85729+ grsec_enable_tpe_all = 1;
85730+#endif
85731+#endif
85732+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
85733+ grsec_enable_socket_all = 1;
85734+ grsec_socket_all_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_ALL_GID);
85735+#endif
85736+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
85737+ grsec_enable_socket_client = 1;
85738+ grsec_socket_client_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_CLIENT_GID);
85739+#endif
85740+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
85741+ grsec_enable_socket_server = 1;
85742+ grsec_socket_server_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_SERVER_GID);
85743+#endif
85744+#endif
85745+#ifdef CONFIG_GRKERNSEC_DENYUSB_FORCE
85746+ grsec_deny_new_usb = 1;
85747+#endif
85748+
85749+ return;
85750+}
85751diff --git a/grsecurity/grsec_ipc.c b/grsecurity/grsec_ipc.c
85752new file mode 100644
85753index 0000000..1773300
85754--- /dev/null
85755+++ b/grsecurity/grsec_ipc.c
85756@@ -0,0 +1,48 @@
85757+#include <linux/kernel.h>
85758+#include <linux/mm.h>
85759+#include <linux/sched.h>
85760+#include <linux/file.h>
85761+#include <linux/ipc.h>
85762+#include <linux/ipc_namespace.h>
85763+#include <linux/grsecurity.h>
85764+#include <linux/grinternal.h>
85765+
85766+int
85767+gr_ipc_permitted(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, int requested_mode, int granted_mode)
85768+{
85769+#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
85770+ int write;
85771+ int orig_granted_mode;
85772+ kuid_t euid;
85773+ kgid_t egid;
85774+
85775+ if (!grsec_enable_harden_ipc)
85776+ return 1;
85777+
85778+ euid = current_euid();
85779+ egid = current_egid();
85780+
85781+ write = requested_mode & 00002;
85782+ orig_granted_mode = ipcp->mode;
85783+
85784+ if (uid_eq(euid, ipcp->cuid) || uid_eq(euid, ipcp->uid))
85785+ orig_granted_mode >>= 6;
85786+ else {
85787+ /* if likely wrong permissions, lock to user */
85788+ if (orig_granted_mode & 0007)
85789+ orig_granted_mode = 0;
85790+ /* otherwise do a egid-only check */
85791+ else if (gid_eq(egid, ipcp->cgid) || gid_eq(egid, ipcp->gid))
85792+ orig_granted_mode >>= 3;
85793+ /* otherwise, no access */
85794+ else
85795+ orig_granted_mode = 0;
85796+ }
85797+ if (!(requested_mode & ~granted_mode & 0007) && (requested_mode & ~orig_granted_mode & 0007) &&
85798+ !ns_capable_nolog(ns->user_ns, CAP_IPC_OWNER)) {
85799+ gr_log_str_int(GR_DONT_AUDIT, GR_IPC_DENIED_MSG, write ? "write" : "read", GR_GLOBAL_UID(ipcp->cuid));
85800+ return 0;
85801+ }
85802+#endif
85803+ return 1;
85804+}
85805diff --git a/grsecurity/grsec_link.c b/grsecurity/grsec_link.c
85806new file mode 100644
85807index 0000000..5e05e20
85808--- /dev/null
85809+++ b/grsecurity/grsec_link.c
85810@@ -0,0 +1,58 @@
85811+#include <linux/kernel.h>
85812+#include <linux/sched.h>
85813+#include <linux/fs.h>
85814+#include <linux/file.h>
85815+#include <linux/grinternal.h>
85816+
85817+int gr_handle_symlink_owner(const struct path *link, const struct inode *target)
85818+{
85819+#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
85820+ const struct inode *link_inode = link->dentry->d_inode;
85821+
85822+ if (grsec_enable_symlinkown && in_group_p(grsec_symlinkown_gid) &&
85823+ /* ignore root-owned links, e.g. /proc/self */
85824+ gr_is_global_nonroot(link_inode->i_uid) && target &&
85825+ !uid_eq(link_inode->i_uid, target->i_uid)) {
85826+ gr_log_fs_int2(GR_DONT_AUDIT, GR_SYMLINKOWNER_MSG, link->dentry, link->mnt, link_inode->i_uid, target->i_uid);
85827+ return 1;
85828+ }
85829+#endif
85830+ return 0;
85831+}
85832+
85833+int
85834+gr_handle_follow_link(const struct inode *parent,
85835+ const struct inode *inode,
85836+ const struct dentry *dentry, const struct vfsmount *mnt)
85837+{
85838+#ifdef CONFIG_GRKERNSEC_LINK
85839+ const struct cred *cred = current_cred();
85840+
85841+ if (grsec_enable_link && S_ISLNK(inode->i_mode) &&
85842+ (parent->i_mode & S_ISVTX) && !uid_eq(parent->i_uid, inode->i_uid) &&
85843+ (parent->i_mode & S_IWOTH) && !uid_eq(cred->fsuid, inode->i_uid)) {
85844+ gr_log_fs_int2(GR_DONT_AUDIT, GR_SYMLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid);
85845+ return -EACCES;
85846+ }
85847+#endif
85848+ return 0;
85849+}
85850+
85851+int
85852+gr_handle_hardlink(const struct dentry *dentry,
85853+ const struct vfsmount *mnt,
85854+ struct inode *inode, const int mode, const struct filename *to)
85855+{
85856+#ifdef CONFIG_GRKERNSEC_LINK
85857+ const struct cred *cred = current_cred();
85858+
85859+ if (grsec_enable_link && !uid_eq(cred->fsuid, inode->i_uid) &&
85860+ (!S_ISREG(mode) || is_privileged_binary(dentry) ||
85861+ (inode_permission(inode, MAY_READ | MAY_WRITE))) &&
85862+ !capable(CAP_FOWNER) && gr_is_global_nonroot(cred->uid)) {
85863+ gr_log_fs_int2_str(GR_DONT_AUDIT, GR_HARDLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid, to->name);
85864+ return -EPERM;
85865+ }
85866+#endif
85867+ return 0;
85868+}
85869diff --git a/grsecurity/grsec_log.c b/grsecurity/grsec_log.c
85870new file mode 100644
85871index 0000000..dbe0a6b
85872--- /dev/null
85873+++ b/grsecurity/grsec_log.c
85874@@ -0,0 +1,341 @@
85875+#include <linux/kernel.h>
85876+#include <linux/sched.h>
85877+#include <linux/file.h>
85878+#include <linux/tty.h>
85879+#include <linux/fs.h>
85880+#include <linux/mm.h>
85881+#include <linux/grinternal.h>
85882+
85883+#ifdef CONFIG_TREE_PREEMPT_RCU
85884+#define DISABLE_PREEMPT() preempt_disable()
85885+#define ENABLE_PREEMPT() preempt_enable()
85886+#else
85887+#define DISABLE_PREEMPT()
85888+#define ENABLE_PREEMPT()
85889+#endif
85890+
85891+#define BEGIN_LOCKS(x) \
85892+ DISABLE_PREEMPT(); \
85893+ rcu_read_lock(); \
85894+ read_lock(&tasklist_lock); \
85895+ read_lock(&grsec_exec_file_lock); \
85896+ if (x != GR_DO_AUDIT) \
85897+ spin_lock(&grsec_alert_lock); \
85898+ else \
85899+ spin_lock(&grsec_audit_lock)
85900+
85901+#define END_LOCKS(x) \
85902+ if (x != GR_DO_AUDIT) \
85903+ spin_unlock(&grsec_alert_lock); \
85904+ else \
85905+ spin_unlock(&grsec_audit_lock); \
85906+ read_unlock(&grsec_exec_file_lock); \
85907+ read_unlock(&tasklist_lock); \
85908+ rcu_read_unlock(); \
85909+ ENABLE_PREEMPT(); \
85910+ if (x == GR_DONT_AUDIT) \
85911+ gr_handle_alertkill(current)
85912+
85913+enum {
85914+ FLOODING,
85915+ NO_FLOODING
85916+};
85917+
85918+extern char *gr_alert_log_fmt;
85919+extern char *gr_audit_log_fmt;
85920+extern char *gr_alert_log_buf;
85921+extern char *gr_audit_log_buf;
85922+
85923+static int gr_log_start(int audit)
85924+{
85925+ char *loglevel = (audit == GR_DO_AUDIT) ? KERN_INFO : KERN_ALERT;
85926+ char *fmt = (audit == GR_DO_AUDIT) ? gr_audit_log_fmt : gr_alert_log_fmt;
85927+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
85928+#if (CONFIG_GRKERNSEC_FLOODTIME > 0 && CONFIG_GRKERNSEC_FLOODBURST > 0)
85929+ unsigned long curr_secs = get_seconds();
85930+
85931+ if (audit == GR_DO_AUDIT)
85932+ goto set_fmt;
85933+
85934+ if (!grsec_alert_wtime || time_after(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)) {
85935+ grsec_alert_wtime = curr_secs;
85936+ grsec_alert_fyet = 0;
85937+ } else if (time_before_eq(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)
85938+ && (grsec_alert_fyet < CONFIG_GRKERNSEC_FLOODBURST)) {
85939+ grsec_alert_fyet++;
85940+ } else if (grsec_alert_fyet == CONFIG_GRKERNSEC_FLOODBURST) {
85941+ grsec_alert_wtime = curr_secs;
85942+ grsec_alert_fyet++;
85943+ printk(KERN_ALERT "grsec: more alerts, logging disabled for %d seconds\n", CONFIG_GRKERNSEC_FLOODTIME);
85944+ return FLOODING;
85945+ }
85946+ else return FLOODING;
85947+
85948+set_fmt:
85949+#endif
85950+ memset(buf, 0, PAGE_SIZE);
85951+ if (current->signal->curr_ip && gr_acl_is_enabled()) {
85952+ sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: (%.64s:%c:%.950s) ");
85953+ snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
85954+ } else if (current->signal->curr_ip) {
85955+ sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: ");
85956+ snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip);
85957+ } else if (gr_acl_is_enabled()) {
85958+ sprintf(fmt, "%s%s", loglevel, "grsec: (%.64s:%c:%.950s) ");
85959+ snprintf(buf, PAGE_SIZE - 1, fmt, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
85960+ } else {
85961+ sprintf(fmt, "%s%s", loglevel, "grsec: ");
85962+ strcpy(buf, fmt);
85963+ }
85964+
85965+ return NO_FLOODING;
85966+}
85967+
85968+static void gr_log_middle(int audit, const char *msg, va_list ap)
85969+ __attribute__ ((format (printf, 2, 0)));
85970+
85971+static void gr_log_middle(int audit, const char *msg, va_list ap)
85972+{
85973+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
85974+ unsigned int len = strlen(buf);
85975+
85976+ vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
85977+
85978+ return;
85979+}
85980+
85981+static void gr_log_middle_varargs(int audit, const char *msg, ...)
85982+ __attribute__ ((format (printf, 2, 3)));
85983+
85984+static void gr_log_middle_varargs(int audit, const char *msg, ...)
85985+{
85986+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
85987+ unsigned int len = strlen(buf);
85988+ va_list ap;
85989+
85990+ va_start(ap, msg);
85991+ vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
85992+ va_end(ap);
85993+
85994+ return;
85995+}
85996+
85997+static void gr_log_end(int audit, int append_default)
85998+{
85999+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
86000+ if (append_default) {
86001+ struct task_struct *task = current;
86002+ struct task_struct *parent = task->real_parent;
86003+ const struct cred *cred = __task_cred(task);
86004+ const struct cred *pcred = __task_cred(parent);
86005+ unsigned int len = strlen(buf);
86006+
86007+ 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));
86008+ }
86009+
86010+ printk("%s\n", buf);
86011+
86012+ return;
86013+}
86014+
86015+void gr_log_varargs(int audit, const char *msg, int argtypes, ...)
86016+{
86017+ int logtype;
86018+ char *result = (audit == GR_DO_AUDIT) ? "successful" : "denied";
86019+ char *str1 = NULL, *str2 = NULL, *str3 = NULL;
86020+ void *voidptr = NULL;
86021+ int num1 = 0, num2 = 0;
86022+ unsigned long ulong1 = 0, ulong2 = 0;
86023+ struct dentry *dentry = NULL;
86024+ struct vfsmount *mnt = NULL;
86025+ struct file *file = NULL;
86026+ struct task_struct *task = NULL;
86027+ struct vm_area_struct *vma = NULL;
86028+ const struct cred *cred, *pcred;
86029+ va_list ap;
86030+
86031+ BEGIN_LOCKS(audit);
86032+ logtype = gr_log_start(audit);
86033+ if (logtype == FLOODING) {
86034+ END_LOCKS(audit);
86035+ return;
86036+ }
86037+ va_start(ap, argtypes);
86038+ switch (argtypes) {
86039+ case GR_TTYSNIFF:
86040+ task = va_arg(ap, struct task_struct *);
86041+ 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));
86042+ break;
86043+ case GR_SYSCTL_HIDDEN:
86044+ str1 = va_arg(ap, char *);
86045+ gr_log_middle_varargs(audit, msg, result, str1);
86046+ break;
86047+ case GR_RBAC:
86048+ dentry = va_arg(ap, struct dentry *);
86049+ mnt = va_arg(ap, struct vfsmount *);
86050+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt));
86051+ break;
86052+ case GR_RBAC_STR:
86053+ dentry = va_arg(ap, struct dentry *);
86054+ mnt = va_arg(ap, struct vfsmount *);
86055+ str1 = va_arg(ap, char *);
86056+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1);
86057+ break;
86058+ case GR_STR_RBAC:
86059+ str1 = va_arg(ap, char *);
86060+ dentry = va_arg(ap, struct dentry *);
86061+ mnt = va_arg(ap, struct vfsmount *);
86062+ gr_log_middle_varargs(audit, msg, result, str1, gr_to_filename(dentry, mnt));
86063+ break;
86064+ case GR_RBAC_MODE2:
86065+ dentry = va_arg(ap, struct dentry *);
86066+ mnt = va_arg(ap, struct vfsmount *);
86067+ str1 = va_arg(ap, char *);
86068+ str2 = va_arg(ap, char *);
86069+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2);
86070+ break;
86071+ case GR_RBAC_MODE3:
86072+ dentry = va_arg(ap, struct dentry *);
86073+ mnt = va_arg(ap, struct vfsmount *);
86074+ str1 = va_arg(ap, char *);
86075+ str2 = va_arg(ap, char *);
86076+ str3 = va_arg(ap, char *);
86077+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2, str3);
86078+ break;
86079+ case GR_FILENAME:
86080+ dentry = va_arg(ap, struct dentry *);
86081+ mnt = va_arg(ap, struct vfsmount *);
86082+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt));
86083+ break;
86084+ case GR_STR_FILENAME:
86085+ str1 = va_arg(ap, char *);
86086+ dentry = va_arg(ap, struct dentry *);
86087+ mnt = va_arg(ap, struct vfsmount *);
86088+ gr_log_middle_varargs(audit, msg, str1, gr_to_filename(dentry, mnt));
86089+ break;
86090+ case GR_FILENAME_STR:
86091+ dentry = va_arg(ap, struct dentry *);
86092+ mnt = va_arg(ap, struct vfsmount *);
86093+ str1 = va_arg(ap, char *);
86094+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), str1);
86095+ break;
86096+ case GR_FILENAME_TWO_INT:
86097+ dentry = va_arg(ap, struct dentry *);
86098+ mnt = va_arg(ap, struct vfsmount *);
86099+ num1 = va_arg(ap, int);
86100+ num2 = va_arg(ap, int);
86101+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2);
86102+ break;
86103+ case GR_FILENAME_TWO_INT_STR:
86104+ dentry = va_arg(ap, struct dentry *);
86105+ mnt = va_arg(ap, struct vfsmount *);
86106+ num1 = va_arg(ap, int);
86107+ num2 = va_arg(ap, int);
86108+ str1 = va_arg(ap, char *);
86109+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2, str1);
86110+ break;
86111+ case GR_TEXTREL:
86112+ file = va_arg(ap, struct file *);
86113+ ulong1 = va_arg(ap, unsigned long);
86114+ ulong2 = va_arg(ap, unsigned long);
86115+ gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>", ulong1, ulong2);
86116+ break;
86117+ case GR_PTRACE:
86118+ task = va_arg(ap, struct task_struct *);
86119+ 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));
86120+ break;
86121+ case GR_RESOURCE:
86122+ task = va_arg(ap, struct task_struct *);
86123+ cred = __task_cred(task);
86124+ pcred = __task_cred(task->real_parent);
86125+ ulong1 = va_arg(ap, unsigned long);
86126+ str1 = va_arg(ap, char *);
86127+ ulong2 = va_arg(ap, unsigned long);
86128+ 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));
86129+ break;
86130+ case GR_CAP:
86131+ task = va_arg(ap, struct task_struct *);
86132+ cred = __task_cred(task);
86133+ pcred = __task_cred(task->real_parent);
86134+ str1 = va_arg(ap, char *);
86135+ 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));
86136+ break;
86137+ case GR_SIG:
86138+ str1 = va_arg(ap, char *);
86139+ voidptr = va_arg(ap, void *);
86140+ gr_log_middle_varargs(audit, msg, str1, voidptr);
86141+ break;
86142+ case GR_SIG2:
86143+ task = va_arg(ap, struct task_struct *);
86144+ cred = __task_cred(task);
86145+ pcred = __task_cred(task->real_parent);
86146+ num1 = va_arg(ap, int);
86147+ 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));
86148+ break;
86149+ case GR_CRASH1:
86150+ task = va_arg(ap, struct task_struct *);
86151+ cred = __task_cred(task);
86152+ pcred = __task_cred(task->real_parent);
86153+ ulong1 = va_arg(ap, unsigned long);
86154+ 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);
86155+ break;
86156+ case GR_CRASH2:
86157+ task = va_arg(ap, struct task_struct *);
86158+ cred = __task_cred(task);
86159+ pcred = __task_cred(task->real_parent);
86160+ ulong1 = va_arg(ap, unsigned long);
86161+ 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);
86162+ break;
86163+ case GR_RWXMAP:
86164+ file = va_arg(ap, struct file *);
86165+ gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>");
86166+ break;
86167+ case GR_RWXMAPVMA:
86168+ vma = va_arg(ap, struct vm_area_struct *);
86169+ if (vma->vm_file)
86170+ str1 = gr_to_filename(vma->vm_file->f_path.dentry, vma->vm_file->f_path.mnt);
86171+ else if (vma->vm_flags & (VM_GROWSDOWN | VM_GROWSUP))
86172+ str1 = "<stack>";
86173+ else if (vma->vm_start <= current->mm->brk &&
86174+ vma->vm_end >= current->mm->start_brk)
86175+ str1 = "<heap>";
86176+ else
86177+ str1 = "<anonymous mapping>";
86178+ gr_log_middle_varargs(audit, msg, str1);
86179+ break;
86180+ case GR_PSACCT:
86181+ {
86182+ unsigned int wday, cday;
86183+ __u8 whr, chr;
86184+ __u8 wmin, cmin;
86185+ __u8 wsec, csec;
86186+ char cur_tty[64] = { 0 };
86187+ char parent_tty[64] = { 0 };
86188+
86189+ task = va_arg(ap, struct task_struct *);
86190+ wday = va_arg(ap, unsigned int);
86191+ cday = va_arg(ap, unsigned int);
86192+ whr = va_arg(ap, int);
86193+ chr = va_arg(ap, int);
86194+ wmin = va_arg(ap, int);
86195+ cmin = va_arg(ap, int);
86196+ wsec = va_arg(ap, int);
86197+ csec = va_arg(ap, int);
86198+ ulong1 = va_arg(ap, unsigned long);
86199+ cred = __task_cred(task);
86200+ pcred = __task_cred(task->real_parent);
86201+
86202+ 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));
86203+ }
86204+ break;
86205+ default:
86206+ gr_log_middle(audit, msg, ap);
86207+ }
86208+ va_end(ap);
86209+ // these don't need DEFAULTSECARGS printed on the end
86210+ if (argtypes == GR_CRASH1 || argtypes == GR_CRASH2)
86211+ gr_log_end(audit, 0);
86212+ else
86213+ gr_log_end(audit, 1);
86214+ END_LOCKS(audit);
86215+}
86216diff --git a/grsecurity/grsec_mem.c b/grsecurity/grsec_mem.c
86217new file mode 100644
86218index 0000000..0e39d8c
86219--- /dev/null
86220+++ b/grsecurity/grsec_mem.c
86221@@ -0,0 +1,48 @@
86222+#include <linux/kernel.h>
86223+#include <linux/sched.h>
86224+#include <linux/mm.h>
86225+#include <linux/mman.h>
86226+#include <linux/module.h>
86227+#include <linux/grinternal.h>
86228+
86229+void gr_handle_msr_write(void)
86230+{
86231+ gr_log_noargs(GR_DONT_AUDIT, GR_MSRWRITE_MSG);
86232+ return;
86233+}
86234+EXPORT_SYMBOL_GPL(gr_handle_msr_write);
86235+
86236+void
86237+gr_handle_ioperm(void)
86238+{
86239+ gr_log_noargs(GR_DONT_AUDIT, GR_IOPERM_MSG);
86240+ return;
86241+}
86242+
86243+void
86244+gr_handle_iopl(void)
86245+{
86246+ gr_log_noargs(GR_DONT_AUDIT, GR_IOPL_MSG);
86247+ return;
86248+}
86249+
86250+void
86251+gr_handle_mem_readwrite(u64 from, u64 to)
86252+{
86253+ gr_log_two_u64(GR_DONT_AUDIT, GR_MEM_READWRITE_MSG, from, to);
86254+ return;
86255+}
86256+
86257+void
86258+gr_handle_vm86(void)
86259+{
86260+ gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG);
86261+ return;
86262+}
86263+
86264+void
86265+gr_log_badprocpid(const char *entry)
86266+{
86267+ gr_log_str(GR_DONT_AUDIT, GR_BADPROCPID_MSG, entry);
86268+ return;
86269+}
86270diff --git a/grsecurity/grsec_mount.c b/grsecurity/grsec_mount.c
86271new file mode 100644
86272index 0000000..6f9eb73
86273--- /dev/null
86274+++ b/grsecurity/grsec_mount.c
86275@@ -0,0 +1,65 @@
86276+#include <linux/kernel.h>
86277+#include <linux/sched.h>
86278+#include <linux/mount.h>
86279+#include <linux/major.h>
86280+#include <linux/grsecurity.h>
86281+#include <linux/grinternal.h>
86282+
86283+void
86284+gr_log_remount(const char *devname, const int retval)
86285+{
86286+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
86287+ if (grsec_enable_mount && (retval >= 0))
86288+ gr_log_str(GR_DO_AUDIT, GR_REMOUNT_AUDIT_MSG, devname ? devname : "none");
86289+#endif
86290+ return;
86291+}
86292+
86293+void
86294+gr_log_unmount(const char *devname, const int retval)
86295+{
86296+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
86297+ if (grsec_enable_mount && (retval >= 0))
86298+ gr_log_str(GR_DO_AUDIT, GR_UNMOUNT_AUDIT_MSG, devname ? devname : "none");
86299+#endif
86300+ return;
86301+}
86302+
86303+void
86304+gr_log_mount(const char *from, struct path *to, const int retval)
86305+{
86306+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
86307+ if (grsec_enable_mount && (retval >= 0))
86308+ gr_log_str_fs(GR_DO_AUDIT, GR_MOUNT_AUDIT_MSG, from ? from : "none", to->dentry, to->mnt);
86309+#endif
86310+ return;
86311+}
86312+
86313+int
86314+gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags)
86315+{
86316+#ifdef CONFIG_GRKERNSEC_ROFS
86317+ if (grsec_enable_rofs && !(mnt_flags & MNT_READONLY)) {
86318+ gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_MOUNT_MSG, dentry, mnt);
86319+ return -EPERM;
86320+ } else
86321+ return 0;
86322+#endif
86323+ return 0;
86324+}
86325+
86326+int
86327+gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode)
86328+{
86329+#ifdef CONFIG_GRKERNSEC_ROFS
86330+ struct inode *inode = dentry->d_inode;
86331+
86332+ if (grsec_enable_rofs && (acc_mode & MAY_WRITE) &&
86333+ inode && (S_ISBLK(inode->i_mode) || (S_ISCHR(inode->i_mode) && imajor(inode) == RAW_MAJOR))) {
86334+ gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_BLOCKWRITE_MSG, dentry, mnt);
86335+ return -EPERM;
86336+ } else
86337+ return 0;
86338+#endif
86339+ return 0;
86340+}
86341diff --git a/grsecurity/grsec_pax.c b/grsecurity/grsec_pax.c
86342new file mode 100644
86343index 0000000..6ee9d50
86344--- /dev/null
86345+++ b/grsecurity/grsec_pax.c
86346@@ -0,0 +1,45 @@
86347+#include <linux/kernel.h>
86348+#include <linux/sched.h>
86349+#include <linux/mm.h>
86350+#include <linux/file.h>
86351+#include <linux/grinternal.h>
86352+#include <linux/grsecurity.h>
86353+
86354+void
86355+gr_log_textrel(struct vm_area_struct * vma)
86356+{
86357+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
86358+ if (grsec_enable_log_rwxmaps)
86359+ gr_log_textrel_ulong_ulong(GR_DONT_AUDIT, GR_TEXTREL_AUDIT_MSG, vma->vm_file, vma->vm_start, vma->vm_pgoff);
86360+#endif
86361+ return;
86362+}
86363+
86364+void gr_log_ptgnustack(struct file *file)
86365+{
86366+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
86367+ if (grsec_enable_log_rwxmaps)
86368+ gr_log_rwxmap(GR_DONT_AUDIT, GR_PTGNUSTACK_MSG, file);
86369+#endif
86370+ return;
86371+}
86372+
86373+void
86374+gr_log_rwxmmap(struct file *file)
86375+{
86376+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
86377+ if (grsec_enable_log_rwxmaps)
86378+ gr_log_rwxmap(GR_DONT_AUDIT, GR_RWXMMAP_MSG, file);
86379+#endif
86380+ return;
86381+}
86382+
86383+void
86384+gr_log_rwxmprotect(struct vm_area_struct *vma)
86385+{
86386+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
86387+ if (grsec_enable_log_rwxmaps)
86388+ gr_log_rwxmap_vma(GR_DONT_AUDIT, GR_RWXMPROTECT_MSG, vma);
86389+#endif
86390+ return;
86391+}
86392diff --git a/grsecurity/grsec_proc.c b/grsecurity/grsec_proc.c
86393new file mode 100644
86394index 0000000..2005a3a
86395--- /dev/null
86396+++ b/grsecurity/grsec_proc.c
86397@@ -0,0 +1,20 @@
86398+#include <linux/kernel.h>
86399+#include <linux/sched.h>
86400+#include <linux/grsecurity.h>
86401+#include <linux/grinternal.h>
86402+
86403+int gr_proc_is_restricted(void)
86404+{
86405+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
86406+ const struct cred *cred = current_cred();
86407+#endif
86408+
86409+#ifdef CONFIG_GRKERNSEC_PROC_USER
86410+ if (!uid_eq(cred->fsuid, GLOBAL_ROOT_UID))
86411+ return -EACCES;
86412+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
86413+ if (!uid_eq(cred->fsuid, GLOBAL_ROOT_UID) && !in_group_p(grsec_proc_gid))
86414+ return -EACCES;
86415+#endif
86416+ return 0;
86417+}
86418diff --git a/grsecurity/grsec_ptrace.c b/grsecurity/grsec_ptrace.c
86419new file mode 100644
86420index 0000000..f7f29aa
86421--- /dev/null
86422+++ b/grsecurity/grsec_ptrace.c
86423@@ -0,0 +1,30 @@
86424+#include <linux/kernel.h>
86425+#include <linux/sched.h>
86426+#include <linux/grinternal.h>
86427+#include <linux/security.h>
86428+
86429+void
86430+gr_audit_ptrace(struct task_struct *task)
86431+{
86432+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
86433+ if (grsec_enable_audit_ptrace)
86434+ gr_log_ptrace(GR_DO_AUDIT, GR_PTRACE_AUDIT_MSG, task);
86435+#endif
86436+ return;
86437+}
86438+
86439+int
86440+gr_ptrace_readexec(struct file *file, int unsafe_flags)
86441+{
86442+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
86443+ const struct dentry *dentry = file->f_path.dentry;
86444+ const struct vfsmount *mnt = file->f_path.mnt;
86445+
86446+ if (grsec_enable_ptrace_readexec && (unsafe_flags & LSM_UNSAFE_PTRACE) &&
86447+ (inode_permission(dentry->d_inode, MAY_READ) || !gr_acl_handle_open(dentry, mnt, MAY_READ))) {
86448+ gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_READEXEC_MSG, dentry, mnt);
86449+ return -EACCES;
86450+ }
86451+#endif
86452+ return 0;
86453+}
86454diff --git a/grsecurity/grsec_sig.c b/grsecurity/grsec_sig.c
86455new file mode 100644
86456index 0000000..3860c7e
86457--- /dev/null
86458+++ b/grsecurity/grsec_sig.c
86459@@ -0,0 +1,236 @@
86460+#include <linux/kernel.h>
86461+#include <linux/sched.h>
86462+#include <linux/fs.h>
86463+#include <linux/delay.h>
86464+#include <linux/grsecurity.h>
86465+#include <linux/grinternal.h>
86466+#include <linux/hardirq.h>
86467+
86468+char *signames[] = {
86469+ [SIGSEGV] = "Segmentation fault",
86470+ [SIGILL] = "Illegal instruction",
86471+ [SIGABRT] = "Abort",
86472+ [SIGBUS] = "Invalid alignment/Bus error"
86473+};
86474+
86475+void
86476+gr_log_signal(const int sig, const void *addr, const struct task_struct *t)
86477+{
86478+#ifdef CONFIG_GRKERNSEC_SIGNAL
86479+ if (grsec_enable_signal && ((sig == SIGSEGV) || (sig == SIGILL) ||
86480+ (sig == SIGABRT) || (sig == SIGBUS))) {
86481+ if (task_pid_nr(t) == task_pid_nr(current)) {
86482+ gr_log_sig_addr(GR_DONT_AUDIT_GOOD, GR_UNISIGLOG_MSG, signames[sig], addr);
86483+ } else {
86484+ gr_log_sig_task(GR_DONT_AUDIT_GOOD, GR_DUALSIGLOG_MSG, t, sig);
86485+ }
86486+ }
86487+#endif
86488+ return;
86489+}
86490+
86491+int
86492+gr_handle_signal(const struct task_struct *p, const int sig)
86493+{
86494+#ifdef CONFIG_GRKERNSEC
86495+ /* ignore the 0 signal for protected task checks */
86496+ if (task_pid_nr(current) > 1 && sig && gr_check_protected_task(p)) {
86497+ gr_log_sig_task(GR_DONT_AUDIT, GR_SIG_ACL_MSG, p, sig);
86498+ return -EPERM;
86499+ } else if (gr_pid_is_chrooted((struct task_struct *)p)) {
86500+ return -EPERM;
86501+ }
86502+#endif
86503+ return 0;
86504+}
86505+
86506+#ifdef CONFIG_GRKERNSEC
86507+extern int specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t);
86508+
86509+int gr_fake_force_sig(int sig, struct task_struct *t)
86510+{
86511+ unsigned long int flags;
86512+ int ret, blocked, ignored;
86513+ struct k_sigaction *action;
86514+
86515+ spin_lock_irqsave(&t->sighand->siglock, flags);
86516+ action = &t->sighand->action[sig-1];
86517+ ignored = action->sa.sa_handler == SIG_IGN;
86518+ blocked = sigismember(&t->blocked, sig);
86519+ if (blocked || ignored) {
86520+ action->sa.sa_handler = SIG_DFL;
86521+ if (blocked) {
86522+ sigdelset(&t->blocked, sig);
86523+ recalc_sigpending_and_wake(t);
86524+ }
86525+ }
86526+ if (action->sa.sa_handler == SIG_DFL)
86527+ t->signal->flags &= ~SIGNAL_UNKILLABLE;
86528+ ret = specific_send_sig_info(sig, SEND_SIG_PRIV, t);
86529+
86530+ spin_unlock_irqrestore(&t->sighand->siglock, flags);
86531+
86532+ return ret;
86533+}
86534+#endif
86535+
86536+#define GR_USER_BAN_TIME (15 * 60)
86537+#define GR_DAEMON_BRUTE_TIME (30 * 60)
86538+
86539+void gr_handle_brute_attach(int dumpable)
86540+{
86541+#ifdef CONFIG_GRKERNSEC_BRUTE
86542+ struct task_struct *p = current;
86543+ kuid_t uid = GLOBAL_ROOT_UID;
86544+ int daemon = 0;
86545+
86546+ if (!grsec_enable_brute)
86547+ return;
86548+
86549+ rcu_read_lock();
86550+ read_lock(&tasklist_lock);
86551+ read_lock(&grsec_exec_file_lock);
86552+ if (p->real_parent && gr_is_same_file(p->real_parent->exec_file, p->exec_file)) {
86553+ p->real_parent->brute_expires = get_seconds() + GR_DAEMON_BRUTE_TIME;
86554+ p->real_parent->brute = 1;
86555+ daemon = 1;
86556+ } else {
86557+ const struct cred *cred = __task_cred(p), *cred2;
86558+ struct task_struct *tsk, *tsk2;
86559+
86560+ if (dumpable != SUID_DUMP_USER && gr_is_global_nonroot(cred->uid)) {
86561+ struct user_struct *user;
86562+
86563+ uid = cred->uid;
86564+
86565+ /* this is put upon execution past expiration */
86566+ user = find_user(uid);
86567+ if (user == NULL)
86568+ goto unlock;
86569+ user->suid_banned = 1;
86570+ user->suid_ban_expires = get_seconds() + GR_USER_BAN_TIME;
86571+ if (user->suid_ban_expires == ~0UL)
86572+ user->suid_ban_expires--;
86573+
86574+ /* only kill other threads of the same binary, from the same user */
86575+ do_each_thread(tsk2, tsk) {
86576+ cred2 = __task_cred(tsk);
86577+ if (tsk != p && uid_eq(cred2->uid, uid) && gr_is_same_file(tsk->exec_file, p->exec_file))
86578+ gr_fake_force_sig(SIGKILL, tsk);
86579+ } while_each_thread(tsk2, tsk);
86580+ }
86581+ }
86582+unlock:
86583+ read_unlock(&grsec_exec_file_lock);
86584+ read_unlock(&tasklist_lock);
86585+ rcu_read_unlock();
86586+
86587+ if (gr_is_global_nonroot(uid))
86588+ 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);
86589+ else if (daemon)
86590+ gr_log_noargs(GR_DONT_AUDIT, GR_BRUTE_DAEMON_MSG);
86591+
86592+#endif
86593+ return;
86594+}
86595+
86596+void gr_handle_brute_check(void)
86597+{
86598+#ifdef CONFIG_GRKERNSEC_BRUTE
86599+ struct task_struct *p = current;
86600+
86601+ if (unlikely(p->brute)) {
86602+ if (!grsec_enable_brute)
86603+ p->brute = 0;
86604+ else if (time_before(get_seconds(), p->brute_expires))
86605+ msleep(30 * 1000);
86606+ }
86607+#endif
86608+ return;
86609+}
86610+
86611+void gr_handle_kernel_exploit(void)
86612+{
86613+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
86614+ const struct cred *cred;
86615+ struct task_struct *tsk, *tsk2;
86616+ struct user_struct *user;
86617+ kuid_t uid;
86618+
86619+ if (in_irq() || in_serving_softirq() || in_nmi())
86620+ panic("grsec: halting the system due to suspicious kernel crash caused in interrupt context");
86621+
86622+ uid = current_uid();
86623+
86624+ if (gr_is_global_root(uid))
86625+ panic("grsec: halting the system due to suspicious kernel crash caused by root");
86626+ else {
86627+ /* kill all the processes of this user, hold a reference
86628+ to their creds struct, and prevent them from creating
86629+ another process until system reset
86630+ */
86631+ printk(KERN_ALERT "grsec: banning user with uid %u until system restart for suspicious kernel crash\n",
86632+ GR_GLOBAL_UID(uid));
86633+ /* we intentionally leak this ref */
86634+ user = get_uid(current->cred->user);
86635+ if (user)
86636+ user->kernel_banned = 1;
86637+
86638+ /* kill all processes of this user */
86639+ read_lock(&tasklist_lock);
86640+ do_each_thread(tsk2, tsk) {
86641+ cred = __task_cred(tsk);
86642+ if (uid_eq(cred->uid, uid))
86643+ gr_fake_force_sig(SIGKILL, tsk);
86644+ } while_each_thread(tsk2, tsk);
86645+ read_unlock(&tasklist_lock);
86646+ }
86647+#endif
86648+}
86649+
86650+#ifdef CONFIG_GRKERNSEC_BRUTE
86651+static bool suid_ban_expired(struct user_struct *user)
86652+{
86653+ if (user->suid_ban_expires != ~0UL && time_after_eq(get_seconds(), user->suid_ban_expires)) {
86654+ user->suid_banned = 0;
86655+ user->suid_ban_expires = 0;
86656+ free_uid(user);
86657+ return true;
86658+ }
86659+
86660+ return false;
86661+}
86662+#endif
86663+
86664+int gr_process_kernel_exec_ban(void)
86665+{
86666+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
86667+ if (unlikely(current->cred->user->kernel_banned))
86668+ return -EPERM;
86669+#endif
86670+ return 0;
86671+}
86672+
86673+int gr_process_kernel_setuid_ban(struct user_struct *user)
86674+{
86675+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
86676+ if (unlikely(user->kernel_banned))
86677+ gr_fake_force_sig(SIGKILL, current);
86678+#endif
86679+ return 0;
86680+}
86681+
86682+int gr_process_suid_exec_ban(const struct linux_binprm *bprm)
86683+{
86684+#ifdef CONFIG_GRKERNSEC_BRUTE
86685+ struct user_struct *user = current->cred->user;
86686+ if (unlikely(user->suid_banned)) {
86687+ if (suid_ban_expired(user))
86688+ return 0;
86689+ /* disallow execution of suid binaries only */
86690+ else if (!uid_eq(bprm->cred->euid, current->cred->uid))
86691+ return -EPERM;
86692+ }
86693+#endif
86694+ return 0;
86695+}
86696diff --git a/grsecurity/grsec_sock.c b/grsecurity/grsec_sock.c
86697new file mode 100644
86698index 0000000..a523bd2
86699--- /dev/null
86700+++ b/grsecurity/grsec_sock.c
86701@@ -0,0 +1,244 @@
86702+#include <linux/kernel.h>
86703+#include <linux/module.h>
86704+#include <linux/sched.h>
86705+#include <linux/file.h>
86706+#include <linux/net.h>
86707+#include <linux/in.h>
86708+#include <linux/ip.h>
86709+#include <net/sock.h>
86710+#include <net/inet_sock.h>
86711+#include <linux/grsecurity.h>
86712+#include <linux/grinternal.h>
86713+#include <linux/gracl.h>
86714+
86715+extern int gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb);
86716+extern int gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr);
86717+
86718+EXPORT_SYMBOL_GPL(gr_search_udp_recvmsg);
86719+EXPORT_SYMBOL_GPL(gr_search_udp_sendmsg);
86720+
86721+#ifdef CONFIG_UNIX_MODULE
86722+EXPORT_SYMBOL_GPL(gr_acl_handle_unix);
86723+EXPORT_SYMBOL_GPL(gr_acl_handle_mknod);
86724+EXPORT_SYMBOL_GPL(gr_handle_chroot_unix);
86725+EXPORT_SYMBOL_GPL(gr_handle_create);
86726+#endif
86727+
86728+#ifdef CONFIG_GRKERNSEC
86729+#define gr_conn_table_size 32749
86730+struct conn_table_entry {
86731+ struct conn_table_entry *next;
86732+ struct signal_struct *sig;
86733+};
86734+
86735+struct conn_table_entry *gr_conn_table[gr_conn_table_size];
86736+DEFINE_SPINLOCK(gr_conn_table_lock);
86737+
86738+extern const char * gr_socktype_to_name(unsigned char type);
86739+extern const char * gr_proto_to_name(unsigned char proto);
86740+extern const char * gr_sockfamily_to_name(unsigned char family);
86741+
86742+static int
86743+conn_hash(__u32 saddr, __u32 daddr, __u16 sport, __u16 dport, unsigned int size)
86744+{
86745+ return ((daddr + saddr + (sport << 8) + (dport << 16)) % size);
86746+}
86747+
86748+static int
86749+conn_match(const struct signal_struct *sig, __u32 saddr, __u32 daddr,
86750+ __u16 sport, __u16 dport)
86751+{
86752+ if (unlikely(sig->gr_saddr == saddr && sig->gr_daddr == daddr &&
86753+ sig->gr_sport == sport && sig->gr_dport == dport))
86754+ return 1;
86755+ else
86756+ return 0;
86757+}
86758+
86759+static void gr_add_to_task_ip_table_nolock(struct signal_struct *sig, struct conn_table_entry *newent)
86760+{
86761+ struct conn_table_entry **match;
86762+ unsigned int index;
86763+
86764+ index = conn_hash(sig->gr_saddr, sig->gr_daddr,
86765+ sig->gr_sport, sig->gr_dport,
86766+ gr_conn_table_size);
86767+
86768+ newent->sig = sig;
86769+
86770+ match = &gr_conn_table[index];
86771+ newent->next = *match;
86772+ *match = newent;
86773+
86774+ return;
86775+}
86776+
86777+static void gr_del_task_from_ip_table_nolock(struct signal_struct *sig)
86778+{
86779+ struct conn_table_entry *match, *last = NULL;
86780+ unsigned int index;
86781+
86782+ index = conn_hash(sig->gr_saddr, sig->gr_daddr,
86783+ sig->gr_sport, sig->gr_dport,
86784+ gr_conn_table_size);
86785+
86786+ match = gr_conn_table[index];
86787+ while (match && !conn_match(match->sig,
86788+ sig->gr_saddr, sig->gr_daddr, sig->gr_sport,
86789+ sig->gr_dport)) {
86790+ last = match;
86791+ match = match->next;
86792+ }
86793+
86794+ if (match) {
86795+ if (last)
86796+ last->next = match->next;
86797+ else
86798+ gr_conn_table[index] = NULL;
86799+ kfree(match);
86800+ }
86801+
86802+ return;
86803+}
86804+
86805+static struct signal_struct * gr_lookup_task_ip_table(__u32 saddr, __u32 daddr,
86806+ __u16 sport, __u16 dport)
86807+{
86808+ struct conn_table_entry *match;
86809+ unsigned int index;
86810+
86811+ index = conn_hash(saddr, daddr, sport, dport, gr_conn_table_size);
86812+
86813+ match = gr_conn_table[index];
86814+ while (match && !conn_match(match->sig, saddr, daddr, sport, dport))
86815+ match = match->next;
86816+
86817+ if (match)
86818+ return match->sig;
86819+ else
86820+ return NULL;
86821+}
86822+
86823+#endif
86824+
86825+void gr_update_task_in_ip_table(const struct inet_sock *inet)
86826+{
86827+#ifdef CONFIG_GRKERNSEC
86828+ struct signal_struct *sig = current->signal;
86829+ struct conn_table_entry *newent;
86830+
86831+ newent = kmalloc(sizeof(struct conn_table_entry), GFP_ATOMIC);
86832+ if (newent == NULL)
86833+ return;
86834+ /* no bh lock needed since we are called with bh disabled */
86835+ spin_lock(&gr_conn_table_lock);
86836+ gr_del_task_from_ip_table_nolock(sig);
86837+ sig->gr_saddr = inet->inet_rcv_saddr;
86838+ sig->gr_daddr = inet->inet_daddr;
86839+ sig->gr_sport = inet->inet_sport;
86840+ sig->gr_dport = inet->inet_dport;
86841+ gr_add_to_task_ip_table_nolock(sig, newent);
86842+ spin_unlock(&gr_conn_table_lock);
86843+#endif
86844+ return;
86845+}
86846+
86847+void gr_del_task_from_ip_table(struct task_struct *task)
86848+{
86849+#ifdef CONFIG_GRKERNSEC
86850+ spin_lock_bh(&gr_conn_table_lock);
86851+ gr_del_task_from_ip_table_nolock(task->signal);
86852+ spin_unlock_bh(&gr_conn_table_lock);
86853+#endif
86854+ return;
86855+}
86856+
86857+void
86858+gr_attach_curr_ip(const struct sock *sk)
86859+{
86860+#ifdef CONFIG_GRKERNSEC
86861+ struct signal_struct *p, *set;
86862+ const struct inet_sock *inet = inet_sk(sk);
86863+
86864+ if (unlikely(sk->sk_protocol != IPPROTO_TCP))
86865+ return;
86866+
86867+ set = current->signal;
86868+
86869+ spin_lock_bh(&gr_conn_table_lock);
86870+ p = gr_lookup_task_ip_table(inet->inet_daddr, inet->inet_rcv_saddr,
86871+ inet->inet_dport, inet->inet_sport);
86872+ if (unlikely(p != NULL)) {
86873+ set->curr_ip = p->curr_ip;
86874+ set->used_accept = 1;
86875+ gr_del_task_from_ip_table_nolock(p);
86876+ spin_unlock_bh(&gr_conn_table_lock);
86877+ return;
86878+ }
86879+ spin_unlock_bh(&gr_conn_table_lock);
86880+
86881+ set->curr_ip = inet->inet_daddr;
86882+ set->used_accept = 1;
86883+#endif
86884+ return;
86885+}
86886+
86887+int
86888+gr_handle_sock_all(const int family, const int type, const int protocol)
86889+{
86890+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
86891+ if (grsec_enable_socket_all && in_group_p(grsec_socket_all_gid) &&
86892+ (family != AF_UNIX)) {
86893+ if (family == AF_INET)
86894+ gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), gr_proto_to_name(protocol));
86895+ else
86896+ gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), protocol);
86897+ return -EACCES;
86898+ }
86899+#endif
86900+ return 0;
86901+}
86902+
86903+int
86904+gr_handle_sock_server(const struct sockaddr *sck)
86905+{
86906+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
86907+ if (grsec_enable_socket_server &&
86908+ in_group_p(grsec_socket_server_gid) &&
86909+ sck && (sck->sa_family != AF_UNIX) &&
86910+ (sck->sa_family != AF_LOCAL)) {
86911+ gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
86912+ return -EACCES;
86913+ }
86914+#endif
86915+ return 0;
86916+}
86917+
86918+int
86919+gr_handle_sock_server_other(const struct sock *sck)
86920+{
86921+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
86922+ if (grsec_enable_socket_server &&
86923+ in_group_p(grsec_socket_server_gid) &&
86924+ sck && (sck->sk_family != AF_UNIX) &&
86925+ (sck->sk_family != AF_LOCAL)) {
86926+ gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
86927+ return -EACCES;
86928+ }
86929+#endif
86930+ return 0;
86931+}
86932+
86933+int
86934+gr_handle_sock_client(const struct sockaddr *sck)
86935+{
86936+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
86937+ if (grsec_enable_socket_client && in_group_p(grsec_socket_client_gid) &&
86938+ sck && (sck->sa_family != AF_UNIX) &&
86939+ (sck->sa_family != AF_LOCAL)) {
86940+ gr_log_noargs(GR_DONT_AUDIT, GR_CONNECT_MSG);
86941+ return -EACCES;
86942+ }
86943+#endif
86944+ return 0;
86945+}
86946diff --git a/grsecurity/grsec_sysctl.c b/grsecurity/grsec_sysctl.c
86947new file mode 100644
86948index 0000000..cce889e
86949--- /dev/null
86950+++ b/grsecurity/grsec_sysctl.c
86951@@ -0,0 +1,488 @@
86952+#include <linux/kernel.h>
86953+#include <linux/sched.h>
86954+#include <linux/sysctl.h>
86955+#include <linux/grsecurity.h>
86956+#include <linux/grinternal.h>
86957+
86958+int
86959+gr_handle_sysctl_mod(const char *dirname, const char *name, const int op)
86960+{
86961+#ifdef CONFIG_GRKERNSEC_SYSCTL
86962+ if (dirname == NULL || name == NULL)
86963+ return 0;
86964+ if (!strcmp(dirname, "grsecurity") && grsec_lock && (op & MAY_WRITE)) {
86965+ gr_log_str(GR_DONT_AUDIT, GR_SYSCTL_MSG, name);
86966+ return -EACCES;
86967+ }
86968+#endif
86969+ return 0;
86970+}
86971+
86972+#if defined(CONFIG_GRKERNSEC_ROFS) || defined(CONFIG_GRKERNSEC_DENYUSB)
86973+static int __maybe_unused __read_only one = 1;
86974+#endif
86975+
86976+#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS) || \
86977+ defined(CONFIG_GRKERNSEC_DENYUSB)
86978+struct ctl_table grsecurity_table[] = {
86979+#ifdef CONFIG_GRKERNSEC_SYSCTL
86980+#ifdef CONFIG_GRKERNSEC_SYSCTL_DISTRO
86981+#ifdef CONFIG_GRKERNSEC_IO
86982+ {
86983+ .procname = "disable_priv_io",
86984+ .data = &grsec_disable_privio,
86985+ .maxlen = sizeof(int),
86986+ .mode = 0600,
86987+ .proc_handler = &proc_dointvec,
86988+ },
86989+#endif
86990+#endif
86991+#ifdef CONFIG_GRKERNSEC_LINK
86992+ {
86993+ .procname = "linking_restrictions",
86994+ .data = &grsec_enable_link,
86995+ .maxlen = sizeof(int),
86996+ .mode = 0600,
86997+ .proc_handler = &proc_dointvec,
86998+ },
86999+#endif
87000+#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
87001+ {
87002+ .procname = "enforce_symlinksifowner",
87003+ .data = &grsec_enable_symlinkown,
87004+ .maxlen = sizeof(int),
87005+ .mode = 0600,
87006+ .proc_handler = &proc_dointvec,
87007+ },
87008+ {
87009+ .procname = "symlinkown_gid",
87010+ .data = &grsec_symlinkown_gid,
87011+ .maxlen = sizeof(int),
87012+ .mode = 0600,
87013+ .proc_handler = &proc_dointvec,
87014+ },
87015+#endif
87016+#ifdef CONFIG_GRKERNSEC_BRUTE
87017+ {
87018+ .procname = "deter_bruteforce",
87019+ .data = &grsec_enable_brute,
87020+ .maxlen = sizeof(int),
87021+ .mode = 0600,
87022+ .proc_handler = &proc_dointvec,
87023+ },
87024+#endif
87025+#ifdef CONFIG_GRKERNSEC_FIFO
87026+ {
87027+ .procname = "fifo_restrictions",
87028+ .data = &grsec_enable_fifo,
87029+ .maxlen = sizeof(int),
87030+ .mode = 0600,
87031+ .proc_handler = &proc_dointvec,
87032+ },
87033+#endif
87034+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
87035+ {
87036+ .procname = "ptrace_readexec",
87037+ .data = &grsec_enable_ptrace_readexec,
87038+ .maxlen = sizeof(int),
87039+ .mode = 0600,
87040+ .proc_handler = &proc_dointvec,
87041+ },
87042+#endif
87043+#ifdef CONFIG_GRKERNSEC_SETXID
87044+ {
87045+ .procname = "consistent_setxid",
87046+ .data = &grsec_enable_setxid,
87047+ .maxlen = sizeof(int),
87048+ .mode = 0600,
87049+ .proc_handler = &proc_dointvec,
87050+ },
87051+#endif
87052+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
87053+ {
87054+ .procname = "ip_blackhole",
87055+ .data = &grsec_enable_blackhole,
87056+ .maxlen = sizeof(int),
87057+ .mode = 0600,
87058+ .proc_handler = &proc_dointvec,
87059+ },
87060+ {
87061+ .procname = "lastack_retries",
87062+ .data = &grsec_lastack_retries,
87063+ .maxlen = sizeof(int),
87064+ .mode = 0600,
87065+ .proc_handler = &proc_dointvec,
87066+ },
87067+#endif
87068+#ifdef CONFIG_GRKERNSEC_EXECLOG
87069+ {
87070+ .procname = "exec_logging",
87071+ .data = &grsec_enable_execlog,
87072+ .maxlen = sizeof(int),
87073+ .mode = 0600,
87074+ .proc_handler = &proc_dointvec,
87075+ },
87076+#endif
87077+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
87078+ {
87079+ .procname = "rwxmap_logging",
87080+ .data = &grsec_enable_log_rwxmaps,
87081+ .maxlen = sizeof(int),
87082+ .mode = 0600,
87083+ .proc_handler = &proc_dointvec,
87084+ },
87085+#endif
87086+#ifdef CONFIG_GRKERNSEC_SIGNAL
87087+ {
87088+ .procname = "signal_logging",
87089+ .data = &grsec_enable_signal,
87090+ .maxlen = sizeof(int),
87091+ .mode = 0600,
87092+ .proc_handler = &proc_dointvec,
87093+ },
87094+#endif
87095+#ifdef CONFIG_GRKERNSEC_FORKFAIL
87096+ {
87097+ .procname = "forkfail_logging",
87098+ .data = &grsec_enable_forkfail,
87099+ .maxlen = sizeof(int),
87100+ .mode = 0600,
87101+ .proc_handler = &proc_dointvec,
87102+ },
87103+#endif
87104+#ifdef CONFIG_GRKERNSEC_TIME
87105+ {
87106+ .procname = "timechange_logging",
87107+ .data = &grsec_enable_time,
87108+ .maxlen = sizeof(int),
87109+ .mode = 0600,
87110+ .proc_handler = &proc_dointvec,
87111+ },
87112+#endif
87113+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
87114+ {
87115+ .procname = "chroot_deny_shmat",
87116+ .data = &grsec_enable_chroot_shmat,
87117+ .maxlen = sizeof(int),
87118+ .mode = 0600,
87119+ .proc_handler = &proc_dointvec,
87120+ },
87121+#endif
87122+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
87123+ {
87124+ .procname = "chroot_deny_unix",
87125+ .data = &grsec_enable_chroot_unix,
87126+ .maxlen = sizeof(int),
87127+ .mode = 0600,
87128+ .proc_handler = &proc_dointvec,
87129+ },
87130+#endif
87131+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
87132+ {
87133+ .procname = "chroot_deny_mount",
87134+ .data = &grsec_enable_chroot_mount,
87135+ .maxlen = sizeof(int),
87136+ .mode = 0600,
87137+ .proc_handler = &proc_dointvec,
87138+ },
87139+#endif
87140+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
87141+ {
87142+ .procname = "chroot_deny_fchdir",
87143+ .data = &grsec_enable_chroot_fchdir,
87144+ .maxlen = sizeof(int),
87145+ .mode = 0600,
87146+ .proc_handler = &proc_dointvec,
87147+ },
87148+#endif
87149+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
87150+ {
87151+ .procname = "chroot_deny_chroot",
87152+ .data = &grsec_enable_chroot_double,
87153+ .maxlen = sizeof(int),
87154+ .mode = 0600,
87155+ .proc_handler = &proc_dointvec,
87156+ },
87157+#endif
87158+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
87159+ {
87160+ .procname = "chroot_deny_pivot",
87161+ .data = &grsec_enable_chroot_pivot,
87162+ .maxlen = sizeof(int),
87163+ .mode = 0600,
87164+ .proc_handler = &proc_dointvec,
87165+ },
87166+#endif
87167+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
87168+ {
87169+ .procname = "chroot_enforce_chdir",
87170+ .data = &grsec_enable_chroot_chdir,
87171+ .maxlen = sizeof(int),
87172+ .mode = 0600,
87173+ .proc_handler = &proc_dointvec,
87174+ },
87175+#endif
87176+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
87177+ {
87178+ .procname = "chroot_deny_chmod",
87179+ .data = &grsec_enable_chroot_chmod,
87180+ .maxlen = sizeof(int),
87181+ .mode = 0600,
87182+ .proc_handler = &proc_dointvec,
87183+ },
87184+#endif
87185+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
87186+ {
87187+ .procname = "chroot_deny_mknod",
87188+ .data = &grsec_enable_chroot_mknod,
87189+ .maxlen = sizeof(int),
87190+ .mode = 0600,
87191+ .proc_handler = &proc_dointvec,
87192+ },
87193+#endif
87194+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
87195+ {
87196+ .procname = "chroot_restrict_nice",
87197+ .data = &grsec_enable_chroot_nice,
87198+ .maxlen = sizeof(int),
87199+ .mode = 0600,
87200+ .proc_handler = &proc_dointvec,
87201+ },
87202+#endif
87203+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
87204+ {
87205+ .procname = "chroot_execlog",
87206+ .data = &grsec_enable_chroot_execlog,
87207+ .maxlen = sizeof(int),
87208+ .mode = 0600,
87209+ .proc_handler = &proc_dointvec,
87210+ },
87211+#endif
87212+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
87213+ {
87214+ .procname = "chroot_caps",
87215+ .data = &grsec_enable_chroot_caps,
87216+ .maxlen = sizeof(int),
87217+ .mode = 0600,
87218+ .proc_handler = &proc_dointvec,
87219+ },
87220+#endif
87221+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
87222+ {
87223+ .procname = "chroot_deny_bad_rename",
87224+ .data = &grsec_enable_chroot_rename,
87225+ .maxlen = sizeof(int),
87226+ .mode = 0600,
87227+ .proc_handler = &proc_dointvec,
87228+ },
87229+#endif
87230+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
87231+ {
87232+ .procname = "chroot_deny_sysctl",
87233+ .data = &grsec_enable_chroot_sysctl,
87234+ .maxlen = sizeof(int),
87235+ .mode = 0600,
87236+ .proc_handler = &proc_dointvec,
87237+ },
87238+#endif
87239+#ifdef CONFIG_GRKERNSEC_TPE
87240+ {
87241+ .procname = "tpe",
87242+ .data = &grsec_enable_tpe,
87243+ .maxlen = sizeof(int),
87244+ .mode = 0600,
87245+ .proc_handler = &proc_dointvec,
87246+ },
87247+ {
87248+ .procname = "tpe_gid",
87249+ .data = &grsec_tpe_gid,
87250+ .maxlen = sizeof(int),
87251+ .mode = 0600,
87252+ .proc_handler = &proc_dointvec,
87253+ },
87254+#endif
87255+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
87256+ {
87257+ .procname = "tpe_invert",
87258+ .data = &grsec_enable_tpe_invert,
87259+ .maxlen = sizeof(int),
87260+ .mode = 0600,
87261+ .proc_handler = &proc_dointvec,
87262+ },
87263+#endif
87264+#ifdef CONFIG_GRKERNSEC_TPE_ALL
87265+ {
87266+ .procname = "tpe_restrict_all",
87267+ .data = &grsec_enable_tpe_all,
87268+ .maxlen = sizeof(int),
87269+ .mode = 0600,
87270+ .proc_handler = &proc_dointvec,
87271+ },
87272+#endif
87273+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
87274+ {
87275+ .procname = "socket_all",
87276+ .data = &grsec_enable_socket_all,
87277+ .maxlen = sizeof(int),
87278+ .mode = 0600,
87279+ .proc_handler = &proc_dointvec,
87280+ },
87281+ {
87282+ .procname = "socket_all_gid",
87283+ .data = &grsec_socket_all_gid,
87284+ .maxlen = sizeof(int),
87285+ .mode = 0600,
87286+ .proc_handler = &proc_dointvec,
87287+ },
87288+#endif
87289+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
87290+ {
87291+ .procname = "socket_client",
87292+ .data = &grsec_enable_socket_client,
87293+ .maxlen = sizeof(int),
87294+ .mode = 0600,
87295+ .proc_handler = &proc_dointvec,
87296+ },
87297+ {
87298+ .procname = "socket_client_gid",
87299+ .data = &grsec_socket_client_gid,
87300+ .maxlen = sizeof(int),
87301+ .mode = 0600,
87302+ .proc_handler = &proc_dointvec,
87303+ },
87304+#endif
87305+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
87306+ {
87307+ .procname = "socket_server",
87308+ .data = &grsec_enable_socket_server,
87309+ .maxlen = sizeof(int),
87310+ .mode = 0600,
87311+ .proc_handler = &proc_dointvec,
87312+ },
87313+ {
87314+ .procname = "socket_server_gid",
87315+ .data = &grsec_socket_server_gid,
87316+ .maxlen = sizeof(int),
87317+ .mode = 0600,
87318+ .proc_handler = &proc_dointvec,
87319+ },
87320+#endif
87321+#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
87322+ {
87323+ .procname = "audit_group",
87324+ .data = &grsec_enable_group,
87325+ .maxlen = sizeof(int),
87326+ .mode = 0600,
87327+ .proc_handler = &proc_dointvec,
87328+ },
87329+ {
87330+ .procname = "audit_gid",
87331+ .data = &grsec_audit_gid,
87332+ .maxlen = sizeof(int),
87333+ .mode = 0600,
87334+ .proc_handler = &proc_dointvec,
87335+ },
87336+#endif
87337+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
87338+ {
87339+ .procname = "audit_chdir",
87340+ .data = &grsec_enable_chdir,
87341+ .maxlen = sizeof(int),
87342+ .mode = 0600,
87343+ .proc_handler = &proc_dointvec,
87344+ },
87345+#endif
87346+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
87347+ {
87348+ .procname = "audit_mount",
87349+ .data = &grsec_enable_mount,
87350+ .maxlen = sizeof(int),
87351+ .mode = 0600,
87352+ .proc_handler = &proc_dointvec,
87353+ },
87354+#endif
87355+#ifdef CONFIG_GRKERNSEC_DMESG
87356+ {
87357+ .procname = "dmesg",
87358+ .data = &grsec_enable_dmesg,
87359+ .maxlen = sizeof(int),
87360+ .mode = 0600,
87361+ .proc_handler = &proc_dointvec,
87362+ },
87363+#endif
87364+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
87365+ {
87366+ .procname = "chroot_findtask",
87367+ .data = &grsec_enable_chroot_findtask,
87368+ .maxlen = sizeof(int),
87369+ .mode = 0600,
87370+ .proc_handler = &proc_dointvec,
87371+ },
87372+#endif
87373+#ifdef CONFIG_GRKERNSEC_RESLOG
87374+ {
87375+ .procname = "resource_logging",
87376+ .data = &grsec_resource_logging,
87377+ .maxlen = sizeof(int),
87378+ .mode = 0600,
87379+ .proc_handler = &proc_dointvec,
87380+ },
87381+#endif
87382+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
87383+ {
87384+ .procname = "audit_ptrace",
87385+ .data = &grsec_enable_audit_ptrace,
87386+ .maxlen = sizeof(int),
87387+ .mode = 0600,
87388+ .proc_handler = &proc_dointvec,
87389+ },
87390+#endif
87391+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
87392+ {
87393+ .procname = "harden_ptrace",
87394+ .data = &grsec_enable_harden_ptrace,
87395+ .maxlen = sizeof(int),
87396+ .mode = 0600,
87397+ .proc_handler = &proc_dointvec,
87398+ },
87399+#endif
87400+#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
87401+ {
87402+ .procname = "harden_ipc",
87403+ .data = &grsec_enable_harden_ipc,
87404+ .maxlen = sizeof(int),
87405+ .mode = 0600,
87406+ .proc_handler = &proc_dointvec,
87407+ },
87408+#endif
87409+ {
87410+ .procname = "grsec_lock",
87411+ .data = &grsec_lock,
87412+ .maxlen = sizeof(int),
87413+ .mode = 0600,
87414+ .proc_handler = &proc_dointvec,
87415+ },
87416+#endif
87417+#ifdef CONFIG_GRKERNSEC_ROFS
87418+ {
87419+ .procname = "romount_protect",
87420+ .data = &grsec_enable_rofs,
87421+ .maxlen = sizeof(int),
87422+ .mode = 0600,
87423+ .proc_handler = &proc_dointvec_minmax,
87424+ .extra1 = &one,
87425+ .extra2 = &one,
87426+ },
87427+#endif
87428+#if defined(CONFIG_GRKERNSEC_DENYUSB) && !defined(CONFIG_GRKERNSEC_DENYUSB_FORCE)
87429+ {
87430+ .procname = "deny_new_usb",
87431+ .data = &grsec_deny_new_usb,
87432+ .maxlen = sizeof(int),
87433+ .mode = 0600,
87434+ .proc_handler = &proc_dointvec,
87435+ },
87436+#endif
87437+ { }
87438+};
87439+#endif
87440diff --git a/grsecurity/grsec_time.c b/grsecurity/grsec_time.c
87441new file mode 100644
87442index 0000000..61b514e
87443--- /dev/null
87444+++ b/grsecurity/grsec_time.c
87445@@ -0,0 +1,16 @@
87446+#include <linux/kernel.h>
87447+#include <linux/sched.h>
87448+#include <linux/grinternal.h>
87449+#include <linux/module.h>
87450+
87451+void
87452+gr_log_timechange(void)
87453+{
87454+#ifdef CONFIG_GRKERNSEC_TIME
87455+ if (grsec_enable_time)
87456+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_TIME_MSG);
87457+#endif
87458+ return;
87459+}
87460+
87461+EXPORT_SYMBOL_GPL(gr_log_timechange);
87462diff --git a/grsecurity/grsec_tpe.c b/grsecurity/grsec_tpe.c
87463new file mode 100644
87464index 0000000..d1953de
87465--- /dev/null
87466+++ b/grsecurity/grsec_tpe.c
87467@@ -0,0 +1,78 @@
87468+#include <linux/kernel.h>
87469+#include <linux/sched.h>
87470+#include <linux/file.h>
87471+#include <linux/fs.h>
87472+#include <linux/grinternal.h>
87473+
87474+extern int gr_acl_tpe_check(void);
87475+
87476+int
87477+gr_tpe_allow(const struct file *file)
87478+{
87479+#ifdef CONFIG_GRKERNSEC
87480+ struct inode *inode = file->f_path.dentry->d_parent->d_inode;
87481+ struct inode *file_inode = file->f_path.dentry->d_inode;
87482+ const struct cred *cred = current_cred();
87483+ char *msg = NULL;
87484+ char *msg2 = NULL;
87485+
87486+ // never restrict root
87487+ if (gr_is_global_root(cred->uid))
87488+ return 1;
87489+
87490+ if (grsec_enable_tpe) {
87491+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
87492+ if (grsec_enable_tpe_invert && !in_group_p(grsec_tpe_gid))
87493+ msg = "not being in trusted group";
87494+ else if (!grsec_enable_tpe_invert && in_group_p(grsec_tpe_gid))
87495+ msg = "being in untrusted group";
87496+#else
87497+ if (in_group_p(grsec_tpe_gid))
87498+ msg = "being in untrusted group";
87499+#endif
87500+ }
87501+ if (!msg && gr_acl_tpe_check())
87502+ msg = "being in untrusted role";
87503+
87504+ // not in any affected group/role
87505+ if (!msg)
87506+ goto next_check;
87507+
87508+ if (gr_is_global_nonroot(inode->i_uid))
87509+ msg2 = "file in non-root-owned directory";
87510+ else if (inode->i_mode & S_IWOTH)
87511+ msg2 = "file in world-writable directory";
87512+ else if (inode->i_mode & S_IWGRP)
87513+ msg2 = "file in group-writable directory";
87514+ else if (file_inode->i_mode & S_IWOTH)
87515+ msg2 = "file is world-writable";
87516+
87517+ if (msg && msg2) {
87518+ char fullmsg[70] = {0};
87519+ snprintf(fullmsg, sizeof(fullmsg)-1, "%s and %s", msg, msg2);
87520+ gr_log_str_fs(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, fullmsg, file->f_path.dentry, file->f_path.mnt);
87521+ return 0;
87522+ }
87523+ msg = NULL;
87524+next_check:
87525+#ifdef CONFIG_GRKERNSEC_TPE_ALL
87526+ if (!grsec_enable_tpe || !grsec_enable_tpe_all)
87527+ return 1;
87528+
87529+ if (gr_is_global_nonroot(inode->i_uid) && !uid_eq(inode->i_uid, cred->uid))
87530+ msg = "directory not owned by user";
87531+ else if (inode->i_mode & S_IWOTH)
87532+ msg = "file in world-writable directory";
87533+ else if (inode->i_mode & S_IWGRP)
87534+ msg = "file in group-writable directory";
87535+ else if (file_inode->i_mode & S_IWOTH)
87536+ msg = "file is world-writable";
87537+
87538+ if (msg) {
87539+ gr_log_str_fs(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, msg, file->f_path.dentry, file->f_path.mnt);
87540+ return 0;
87541+ }
87542+#endif
87543+#endif
87544+ return 1;
87545+}
87546diff --git a/grsecurity/grsec_usb.c b/grsecurity/grsec_usb.c
87547new file mode 100644
87548index 0000000..ae02d8e
87549--- /dev/null
87550+++ b/grsecurity/grsec_usb.c
87551@@ -0,0 +1,15 @@
87552+#include <linux/kernel.h>
87553+#include <linux/grinternal.h>
87554+#include <linux/module.h>
87555+
87556+int gr_handle_new_usb(void)
87557+{
87558+#ifdef CONFIG_GRKERNSEC_DENYUSB
87559+ if (grsec_deny_new_usb) {
87560+ printk(KERN_ALERT "grsec: denied insert of new USB device\n");
87561+ return 1;
87562+ }
87563+#endif
87564+ return 0;
87565+}
87566+EXPORT_SYMBOL_GPL(gr_handle_new_usb);
87567diff --git a/grsecurity/grsum.c b/grsecurity/grsum.c
87568new file mode 100644
87569index 0000000..158b330
87570--- /dev/null
87571+++ b/grsecurity/grsum.c
87572@@ -0,0 +1,64 @@
87573+#include <linux/err.h>
87574+#include <linux/kernel.h>
87575+#include <linux/sched.h>
87576+#include <linux/mm.h>
87577+#include <linux/scatterlist.h>
87578+#include <linux/crypto.h>
87579+#include <linux/gracl.h>
87580+
87581+
87582+#if !defined(CONFIG_CRYPTO) || defined(CONFIG_CRYPTO_MODULE) || !defined(CONFIG_CRYPTO_SHA256) || defined(CONFIG_CRYPTO_SHA256_MODULE)
87583+#error "crypto and sha256 must be built into the kernel"
87584+#endif
87585+
87586+int
87587+chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum)
87588+{
87589+ struct crypto_hash *tfm;
87590+ struct hash_desc desc;
87591+ struct scatterlist sg[2];
87592+ unsigned char temp_sum[GR_SHA_LEN] __attribute__((aligned(__alignof__(unsigned long))));
87593+ unsigned long *tmpsumptr = (unsigned long *)temp_sum;
87594+ unsigned long *sumptr = (unsigned long *)sum;
87595+ int cryptres;
87596+ int retval = 1;
87597+ volatile int mismatched = 0;
87598+ volatile int dummy = 0;
87599+ unsigned int i;
87600+
87601+ tfm = crypto_alloc_hash("sha256", 0, CRYPTO_ALG_ASYNC);
87602+ if (IS_ERR(tfm)) {
87603+ /* should never happen, since sha256 should be built in */
87604+ memset(entry->pw, 0, GR_PW_LEN);
87605+ return 1;
87606+ }
87607+
87608+ sg_init_table(sg, 2);
87609+ sg_set_buf(&sg[0], salt, GR_SALT_LEN);
87610+ sg_set_buf(&sg[1], entry->pw, strlen(entry->pw));
87611+
87612+ desc.tfm = tfm;
87613+ desc.flags = 0;
87614+
87615+ cryptres = crypto_hash_digest(&desc, sg, GR_SALT_LEN + strlen(entry->pw),
87616+ temp_sum);
87617+
87618+ memset(entry->pw, 0, GR_PW_LEN);
87619+
87620+ if (cryptres)
87621+ goto out;
87622+
87623+ for (i = 0; i < GR_SHA_LEN/sizeof(tmpsumptr[0]); i++)
87624+ if (sumptr[i] != tmpsumptr[i])
87625+ mismatched = 1;
87626+ else
87627+ dummy = 1; // waste a cycle
87628+
87629+ if (!mismatched)
87630+ retval = dummy - 1;
87631+
87632+out:
87633+ crypto_free_hash(tfm);
87634+
87635+ return retval;
87636+}
87637diff --git a/include/asm-generic/4level-fixup.h b/include/asm-generic/4level-fixup.h
87638index 5bdab6b..9ae82fe 100644
87639--- a/include/asm-generic/4level-fixup.h
87640+++ b/include/asm-generic/4level-fixup.h
87641@@ -14,8 +14,10 @@
87642 #define pmd_alloc(mm, pud, address) \
87643 ((unlikely(pgd_none(*(pud))) && __pmd_alloc(mm, pud, address))? \
87644 NULL: pmd_offset(pud, address))
87645+#define pmd_alloc_kernel(mm, pud, address) pmd_alloc((mm), (pud), (address))
87646
87647 #define pud_alloc(mm, pgd, address) (pgd)
87648+#define pud_alloc_kernel(mm, pgd, address) pud_alloc((mm), (pgd), (address))
87649 #define pud_offset(pgd, start) (pgd)
87650 #define pud_none(pud) 0
87651 #define pud_bad(pud) 0
87652diff --git a/include/asm-generic/atomic-long.h b/include/asm-generic/atomic-long.h
87653index b7babf0..1e4b4f1 100644
87654--- a/include/asm-generic/atomic-long.h
87655+++ b/include/asm-generic/atomic-long.h
87656@@ -22,6 +22,12 @@
87657
87658 typedef atomic64_t atomic_long_t;
87659
87660+#ifdef CONFIG_PAX_REFCOUNT
87661+typedef atomic64_unchecked_t atomic_long_unchecked_t;
87662+#else
87663+typedef atomic64_t atomic_long_unchecked_t;
87664+#endif
87665+
87666 #define ATOMIC_LONG_INIT(i) ATOMIC64_INIT(i)
87667
87668 static inline long atomic_long_read(atomic_long_t *l)
87669@@ -31,6 +37,15 @@ static inline long atomic_long_read(atomic_long_t *l)
87670 return (long)atomic64_read(v);
87671 }
87672
87673+#ifdef CONFIG_PAX_REFCOUNT
87674+static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
87675+{
87676+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
87677+
87678+ return (long)atomic64_read_unchecked(v);
87679+}
87680+#endif
87681+
87682 static inline void atomic_long_set(atomic_long_t *l, long i)
87683 {
87684 atomic64_t *v = (atomic64_t *)l;
87685@@ -38,6 +53,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
87686 atomic64_set(v, i);
87687 }
87688
87689+#ifdef CONFIG_PAX_REFCOUNT
87690+static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
87691+{
87692+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
87693+
87694+ atomic64_set_unchecked(v, i);
87695+}
87696+#endif
87697+
87698 static inline void atomic_long_inc(atomic_long_t *l)
87699 {
87700 atomic64_t *v = (atomic64_t *)l;
87701@@ -45,6 +69,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
87702 atomic64_inc(v);
87703 }
87704
87705+#ifdef CONFIG_PAX_REFCOUNT
87706+static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
87707+{
87708+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
87709+
87710+ atomic64_inc_unchecked(v);
87711+}
87712+#endif
87713+
87714 static inline void atomic_long_dec(atomic_long_t *l)
87715 {
87716 atomic64_t *v = (atomic64_t *)l;
87717@@ -52,6 +85,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
87718 atomic64_dec(v);
87719 }
87720
87721+#ifdef CONFIG_PAX_REFCOUNT
87722+static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
87723+{
87724+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
87725+
87726+ atomic64_dec_unchecked(v);
87727+}
87728+#endif
87729+
87730 static inline void atomic_long_add(long i, atomic_long_t *l)
87731 {
87732 atomic64_t *v = (atomic64_t *)l;
87733@@ -59,6 +101,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
87734 atomic64_add(i, v);
87735 }
87736
87737+#ifdef CONFIG_PAX_REFCOUNT
87738+static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
87739+{
87740+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
87741+
87742+ atomic64_add_unchecked(i, v);
87743+}
87744+#endif
87745+
87746 static inline void atomic_long_sub(long i, atomic_long_t *l)
87747 {
87748 atomic64_t *v = (atomic64_t *)l;
87749@@ -66,6 +117,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
87750 atomic64_sub(i, v);
87751 }
87752
87753+#ifdef CONFIG_PAX_REFCOUNT
87754+static inline void atomic_long_sub_unchecked(long i, atomic_long_unchecked_t *l)
87755+{
87756+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
87757+
87758+ atomic64_sub_unchecked(i, v);
87759+}
87760+#endif
87761+
87762 static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
87763 {
87764 atomic64_t *v = (atomic64_t *)l;
87765@@ -94,13 +154,22 @@ static inline int atomic_long_add_negative(long i, atomic_long_t *l)
87766 return atomic64_add_negative(i, v);
87767 }
87768
87769-static inline long atomic_long_add_return(long i, atomic_long_t *l)
87770+static inline long __intentional_overflow(-1) atomic_long_add_return(long i, atomic_long_t *l)
87771 {
87772 atomic64_t *v = (atomic64_t *)l;
87773
87774 return (long)atomic64_add_return(i, v);
87775 }
87776
87777+#ifdef CONFIG_PAX_REFCOUNT
87778+static inline long atomic_long_add_return_unchecked(long i, atomic_long_unchecked_t *l)
87779+{
87780+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
87781+
87782+ return (long)atomic64_add_return_unchecked(i, v);
87783+}
87784+#endif
87785+
87786 static inline long atomic_long_sub_return(long i, atomic_long_t *l)
87787 {
87788 atomic64_t *v = (atomic64_t *)l;
87789@@ -115,6 +184,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
87790 return (long)atomic64_inc_return(v);
87791 }
87792
87793+#ifdef CONFIG_PAX_REFCOUNT
87794+static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
87795+{
87796+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
87797+
87798+ return (long)atomic64_inc_return_unchecked(v);
87799+}
87800+#endif
87801+
87802 static inline long atomic_long_dec_return(atomic_long_t *l)
87803 {
87804 atomic64_t *v = (atomic64_t *)l;
87805@@ -140,6 +218,12 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
87806
87807 typedef atomic_t atomic_long_t;
87808
87809+#ifdef CONFIG_PAX_REFCOUNT
87810+typedef atomic_unchecked_t atomic_long_unchecked_t;
87811+#else
87812+typedef atomic_t atomic_long_unchecked_t;
87813+#endif
87814+
87815 #define ATOMIC_LONG_INIT(i) ATOMIC_INIT(i)
87816 static inline long atomic_long_read(atomic_long_t *l)
87817 {
87818@@ -148,6 +232,15 @@ static inline long atomic_long_read(atomic_long_t *l)
87819 return (long)atomic_read(v);
87820 }
87821
87822+#ifdef CONFIG_PAX_REFCOUNT
87823+static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
87824+{
87825+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
87826+
87827+ return (long)atomic_read_unchecked(v);
87828+}
87829+#endif
87830+
87831 static inline void atomic_long_set(atomic_long_t *l, long i)
87832 {
87833 atomic_t *v = (atomic_t *)l;
87834@@ -155,6 +248,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
87835 atomic_set(v, i);
87836 }
87837
87838+#ifdef CONFIG_PAX_REFCOUNT
87839+static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
87840+{
87841+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
87842+
87843+ atomic_set_unchecked(v, i);
87844+}
87845+#endif
87846+
87847 static inline void atomic_long_inc(atomic_long_t *l)
87848 {
87849 atomic_t *v = (atomic_t *)l;
87850@@ -162,6 +264,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
87851 atomic_inc(v);
87852 }
87853
87854+#ifdef CONFIG_PAX_REFCOUNT
87855+static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
87856+{
87857+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
87858+
87859+ atomic_inc_unchecked(v);
87860+}
87861+#endif
87862+
87863 static inline void atomic_long_dec(atomic_long_t *l)
87864 {
87865 atomic_t *v = (atomic_t *)l;
87866@@ -169,6 +280,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
87867 atomic_dec(v);
87868 }
87869
87870+#ifdef CONFIG_PAX_REFCOUNT
87871+static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
87872+{
87873+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
87874+
87875+ atomic_dec_unchecked(v);
87876+}
87877+#endif
87878+
87879 static inline void atomic_long_add(long i, atomic_long_t *l)
87880 {
87881 atomic_t *v = (atomic_t *)l;
87882@@ -176,6 +296,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
87883 atomic_add(i, v);
87884 }
87885
87886+#ifdef CONFIG_PAX_REFCOUNT
87887+static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
87888+{
87889+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
87890+
87891+ atomic_add_unchecked(i, v);
87892+}
87893+#endif
87894+
87895 static inline void atomic_long_sub(long i, atomic_long_t *l)
87896 {
87897 atomic_t *v = (atomic_t *)l;
87898@@ -183,6 +312,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
87899 atomic_sub(i, v);
87900 }
87901
87902+#ifdef CONFIG_PAX_REFCOUNT
87903+static inline void atomic_long_sub_unchecked(long i, atomic_long_unchecked_t *l)
87904+{
87905+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
87906+
87907+ atomic_sub_unchecked(i, v);
87908+}
87909+#endif
87910+
87911 static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
87912 {
87913 atomic_t *v = (atomic_t *)l;
87914@@ -211,13 +349,23 @@ static inline int atomic_long_add_negative(long i, atomic_long_t *l)
87915 return atomic_add_negative(i, v);
87916 }
87917
87918-static inline long atomic_long_add_return(long i, atomic_long_t *l)
87919+static inline long __intentional_overflow(-1) atomic_long_add_return(long i, atomic_long_t *l)
87920 {
87921 atomic_t *v = (atomic_t *)l;
87922
87923 return (long)atomic_add_return(i, v);
87924 }
87925
87926+#ifdef CONFIG_PAX_REFCOUNT
87927+static inline long atomic_long_add_return_unchecked(long i, atomic_long_unchecked_t *l)
87928+{
87929+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
87930+
87931+ return (long)atomic_add_return_unchecked(i, v);
87932+}
87933+
87934+#endif
87935+
87936 static inline long atomic_long_sub_return(long i, atomic_long_t *l)
87937 {
87938 atomic_t *v = (atomic_t *)l;
87939@@ -232,6 +380,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
87940 return (long)atomic_inc_return(v);
87941 }
87942
87943+#ifdef CONFIG_PAX_REFCOUNT
87944+static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
87945+{
87946+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
87947+
87948+ return (long)atomic_inc_return_unchecked(v);
87949+}
87950+#endif
87951+
87952 static inline long atomic_long_dec_return(atomic_long_t *l)
87953 {
87954 atomic_t *v = (atomic_t *)l;
87955@@ -255,4 +412,57 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
87956
87957 #endif /* BITS_PER_LONG == 64 */
87958
87959+#ifdef CONFIG_PAX_REFCOUNT
87960+static inline void pax_refcount_needs_these_functions(void)
87961+{
87962+ atomic_read_unchecked((atomic_unchecked_t *)NULL);
87963+ atomic_set_unchecked((atomic_unchecked_t *)NULL, 0);
87964+ atomic_add_unchecked(0, (atomic_unchecked_t *)NULL);
87965+ atomic_sub_unchecked(0, (atomic_unchecked_t *)NULL);
87966+ atomic_inc_unchecked((atomic_unchecked_t *)NULL);
87967+ (void)atomic_inc_and_test_unchecked((atomic_unchecked_t *)NULL);
87968+ atomic_inc_return_unchecked((atomic_unchecked_t *)NULL);
87969+ atomic_add_return_unchecked(0, (atomic_unchecked_t *)NULL);
87970+ atomic_dec_unchecked((atomic_unchecked_t *)NULL);
87971+ atomic_cmpxchg_unchecked((atomic_unchecked_t *)NULL, 0, 0);
87972+ (void)atomic_xchg_unchecked((atomic_unchecked_t *)NULL, 0);
87973+#ifdef CONFIG_X86
87974+ atomic_clear_mask_unchecked(0, NULL);
87975+ atomic_set_mask_unchecked(0, NULL);
87976+#endif
87977+
87978+ atomic_long_read_unchecked((atomic_long_unchecked_t *)NULL);
87979+ atomic_long_set_unchecked((atomic_long_unchecked_t *)NULL, 0);
87980+ atomic_long_add_unchecked(0, (atomic_long_unchecked_t *)NULL);
87981+ atomic_long_sub_unchecked(0, (atomic_long_unchecked_t *)NULL);
87982+ atomic_long_inc_unchecked((atomic_long_unchecked_t *)NULL);
87983+ atomic_long_add_return_unchecked(0, (atomic_long_unchecked_t *)NULL);
87984+ atomic_long_inc_return_unchecked((atomic_long_unchecked_t *)NULL);
87985+ atomic_long_dec_unchecked((atomic_long_unchecked_t *)NULL);
87986+}
87987+#else
87988+#define atomic_read_unchecked(v) atomic_read(v)
87989+#define atomic_set_unchecked(v, i) atomic_set((v), (i))
87990+#define atomic_add_unchecked(i, v) atomic_add((i), (v))
87991+#define atomic_sub_unchecked(i, v) atomic_sub((i), (v))
87992+#define atomic_inc_unchecked(v) atomic_inc(v)
87993+#define atomic_inc_and_test_unchecked(v) atomic_inc_and_test(v)
87994+#define atomic_inc_return_unchecked(v) atomic_inc_return(v)
87995+#define atomic_add_return_unchecked(i, v) atomic_add_return((i), (v))
87996+#define atomic_dec_unchecked(v) atomic_dec(v)
87997+#define atomic_cmpxchg_unchecked(v, o, n) atomic_cmpxchg((v), (o), (n))
87998+#define atomic_xchg_unchecked(v, i) atomic_xchg((v), (i))
87999+#define atomic_clear_mask_unchecked(mask, v) atomic_clear_mask((mask), (v))
88000+#define atomic_set_mask_unchecked(mask, v) atomic_set_mask((mask), (v))
88001+
88002+#define atomic_long_read_unchecked(v) atomic_long_read(v)
88003+#define atomic_long_set_unchecked(v, i) atomic_long_set((v), (i))
88004+#define atomic_long_add_unchecked(i, v) atomic_long_add((i), (v))
88005+#define atomic_long_sub_unchecked(i, v) atomic_long_sub((i), (v))
88006+#define atomic_long_inc_unchecked(v) atomic_long_inc(v)
88007+#define atomic_long_add_return_unchecked(i, v) atomic_long_add_return((i), (v))
88008+#define atomic_long_inc_return_unchecked(v) atomic_long_inc_return(v)
88009+#define atomic_long_dec_unchecked(v) atomic_long_dec(v)
88010+#endif
88011+
88012 #endif /* _ASM_GENERIC_ATOMIC_LONG_H */
88013diff --git a/include/asm-generic/atomic64.h b/include/asm-generic/atomic64.h
88014index 30ad9c8..c70c170 100644
88015--- a/include/asm-generic/atomic64.h
88016+++ b/include/asm-generic/atomic64.h
88017@@ -16,6 +16,8 @@ typedef struct {
88018 long long counter;
88019 } atomic64_t;
88020
88021+typedef atomic64_t atomic64_unchecked_t;
88022+
88023 #define ATOMIC64_INIT(i) { (i) }
88024
88025 extern long long atomic64_read(const atomic64_t *v);
88026@@ -51,4 +53,14 @@ extern int atomic64_add_unless(atomic64_t *v, long long a, long long u);
88027 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
88028 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
88029
88030+#define atomic64_read_unchecked(v) atomic64_read(v)
88031+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
88032+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
88033+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
88034+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
88035+#define atomic64_inc_unchecked(v) atomic64_inc(v)
88036+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
88037+#define atomic64_dec_unchecked(v) atomic64_dec(v)
88038+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
88039+
88040 #endif /* _ASM_GENERIC_ATOMIC64_H */
88041diff --git a/include/asm-generic/barrier.h b/include/asm-generic/barrier.h
88042index f5c40b0..e902f9d 100644
88043--- a/include/asm-generic/barrier.h
88044+++ b/include/asm-generic/barrier.h
88045@@ -82,7 +82,7 @@
88046 do { \
88047 compiletime_assert_atomic_type(*p); \
88048 smp_mb(); \
88049- ACCESS_ONCE(*p) = (v); \
88050+ ACCESS_ONCE_RW(*p) = (v); \
88051 } while (0)
88052
88053 #define smp_load_acquire(p) \
88054diff --git a/include/asm-generic/bitops/__fls.h b/include/asm-generic/bitops/__fls.h
88055index a60a7cc..0fe12f2 100644
88056--- a/include/asm-generic/bitops/__fls.h
88057+++ b/include/asm-generic/bitops/__fls.h
88058@@ -9,7 +9,7 @@
88059 *
88060 * Undefined if no set bit exists, so code should check against 0 first.
88061 */
88062-static __always_inline unsigned long __fls(unsigned long word)
88063+static __always_inline unsigned long __intentional_overflow(-1) __fls(unsigned long word)
88064 {
88065 int num = BITS_PER_LONG - 1;
88066
88067diff --git a/include/asm-generic/bitops/fls.h b/include/asm-generic/bitops/fls.h
88068index 0576d1f..dad6c71 100644
88069--- a/include/asm-generic/bitops/fls.h
88070+++ b/include/asm-generic/bitops/fls.h
88071@@ -9,7 +9,7 @@
88072 * Note fls(0) = 0, fls(1) = 1, fls(0x80000000) = 32.
88073 */
88074
88075-static __always_inline int fls(int x)
88076+static __always_inline int __intentional_overflow(-1) fls(int x)
88077 {
88078 int r = 32;
88079
88080diff --git a/include/asm-generic/bitops/fls64.h b/include/asm-generic/bitops/fls64.h
88081index b097cf8..3d40e14 100644
88082--- a/include/asm-generic/bitops/fls64.h
88083+++ b/include/asm-generic/bitops/fls64.h
88084@@ -15,7 +15,7 @@
88085 * at position 64.
88086 */
88087 #if BITS_PER_LONG == 32
88088-static __always_inline int fls64(__u64 x)
88089+static __always_inline int __intentional_overflow(-1) fls64(__u64 x)
88090 {
88091 __u32 h = x >> 32;
88092 if (h)
88093@@ -23,7 +23,7 @@ static __always_inline int fls64(__u64 x)
88094 return fls(x);
88095 }
88096 #elif BITS_PER_LONG == 64
88097-static __always_inline int fls64(__u64 x)
88098+static __always_inline int __intentional_overflow(-1) fls64(__u64 x)
88099 {
88100 if (x == 0)
88101 return 0;
88102diff --git a/include/asm-generic/bug.h b/include/asm-generic/bug.h
88103index 630dd23..8c1dcb6b 100644
88104--- a/include/asm-generic/bug.h
88105+++ b/include/asm-generic/bug.h
88106@@ -62,13 +62,13 @@ struct bug_entry {
88107 * to provide better diagnostics.
88108 */
88109 #ifndef __WARN_TAINT
88110-extern __printf(3, 4)
88111+extern __printf(3, 4) __nocapture(1, 3, 4)
88112 void warn_slowpath_fmt(const char *file, const int line,
88113 const char *fmt, ...);
88114-extern __printf(4, 5)
88115+extern __printf(4, 5) __nocapture(1, 4, 5)
88116 void warn_slowpath_fmt_taint(const char *file, const int line, unsigned taint,
88117 const char *fmt, ...);
88118-extern void warn_slowpath_null(const char *file, const int line);
88119+extern __nocapture(1) void warn_slowpath_null(const char *file, const int line);
88120 #define WANT_WARN_ON_SLOWPATH
88121 #define __WARN() warn_slowpath_null(__FILE__, __LINE__)
88122 #define __WARN_printf(arg...) warn_slowpath_fmt(__FILE__, __LINE__, arg)
88123diff --git a/include/asm-generic/cache.h b/include/asm-generic/cache.h
88124index 1bfcfe5..e04c5c9 100644
88125--- a/include/asm-generic/cache.h
88126+++ b/include/asm-generic/cache.h
88127@@ -6,7 +6,7 @@
88128 * cache lines need to provide their own cache.h.
88129 */
88130
88131-#define L1_CACHE_SHIFT 5
88132-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
88133+#define L1_CACHE_SHIFT 5UL
88134+#define L1_CACHE_BYTES (1UL << L1_CACHE_SHIFT)
88135
88136 #endif /* __ASM_GENERIC_CACHE_H */
88137diff --git a/include/asm-generic/emergency-restart.h b/include/asm-generic/emergency-restart.h
88138index 0d68a1e..b74a761 100644
88139--- a/include/asm-generic/emergency-restart.h
88140+++ b/include/asm-generic/emergency-restart.h
88141@@ -1,7 +1,7 @@
88142 #ifndef _ASM_GENERIC_EMERGENCY_RESTART_H
88143 #define _ASM_GENERIC_EMERGENCY_RESTART_H
88144
88145-static inline void machine_emergency_restart(void)
88146+static inline __noreturn void machine_emergency_restart(void)
88147 {
88148 machine_restart(NULL);
88149 }
88150diff --git a/include/asm-generic/kmap_types.h b/include/asm-generic/kmap_types.h
88151index 90f99c7..00ce236 100644
88152--- a/include/asm-generic/kmap_types.h
88153+++ b/include/asm-generic/kmap_types.h
88154@@ -2,9 +2,9 @@
88155 #define _ASM_GENERIC_KMAP_TYPES_H
88156
88157 #ifdef __WITH_KM_FENCE
88158-# define KM_TYPE_NR 41
88159+# define KM_TYPE_NR 42
88160 #else
88161-# define KM_TYPE_NR 20
88162+# define KM_TYPE_NR 21
88163 #endif
88164
88165 #endif
88166diff --git a/include/asm-generic/local.h b/include/asm-generic/local.h
88167index 9ceb03b..62b0b8f 100644
88168--- a/include/asm-generic/local.h
88169+++ b/include/asm-generic/local.h
88170@@ -23,24 +23,37 @@ typedef struct
88171 atomic_long_t a;
88172 } local_t;
88173
88174+typedef struct {
88175+ atomic_long_unchecked_t a;
88176+} local_unchecked_t;
88177+
88178 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
88179
88180 #define local_read(l) atomic_long_read(&(l)->a)
88181+#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
88182 #define local_set(l,i) atomic_long_set((&(l)->a),(i))
88183+#define local_set_unchecked(l,i) atomic_long_set_unchecked((&(l)->a),(i))
88184 #define local_inc(l) atomic_long_inc(&(l)->a)
88185+#define local_inc_unchecked(l) atomic_long_inc_unchecked(&(l)->a)
88186 #define local_dec(l) atomic_long_dec(&(l)->a)
88187+#define local_dec_unchecked(l) atomic_long_dec_unchecked(&(l)->a)
88188 #define local_add(i,l) atomic_long_add((i),(&(l)->a))
88189+#define local_add_unchecked(i,l) atomic_long_add_unchecked((i),(&(l)->a))
88190 #define local_sub(i,l) atomic_long_sub((i),(&(l)->a))
88191+#define local_sub_unchecked(i,l) atomic_long_sub_unchecked((i),(&(l)->a))
88192
88193 #define local_sub_and_test(i, l) atomic_long_sub_and_test((i), (&(l)->a))
88194 #define local_dec_and_test(l) atomic_long_dec_and_test(&(l)->a)
88195 #define local_inc_and_test(l) atomic_long_inc_and_test(&(l)->a)
88196 #define local_add_negative(i, l) atomic_long_add_negative((i), (&(l)->a))
88197 #define local_add_return(i, l) atomic_long_add_return((i), (&(l)->a))
88198+#define local_add_return_unchecked(i, l) atomic_long_add_return_unchecked((i), (&(l)->a))
88199 #define local_sub_return(i, l) atomic_long_sub_return((i), (&(l)->a))
88200 #define local_inc_return(l) atomic_long_inc_return(&(l)->a)
88201+#define local_dec_return(l) atomic_long_dec_return(&(l)->a)
88202
88203 #define local_cmpxchg(l, o, n) atomic_long_cmpxchg((&(l)->a), (o), (n))
88204+#define local_cmpxchg_unchecked(l, o, n) atomic_long_cmpxchg((&(l)->a), (o), (n))
88205 #define local_xchg(l, n) atomic_long_xchg((&(l)->a), (n))
88206 #define local_add_unless(l, _a, u) atomic_long_add_unless((&(l)->a), (_a), (u))
88207 #define local_inc_not_zero(l) atomic_long_inc_not_zero(&(l)->a)
88208diff --git a/include/asm-generic/pgtable-nopmd.h b/include/asm-generic/pgtable-nopmd.h
88209index 725612b..9cc513a 100644
88210--- a/include/asm-generic/pgtable-nopmd.h
88211+++ b/include/asm-generic/pgtable-nopmd.h
88212@@ -1,14 +1,19 @@
88213 #ifndef _PGTABLE_NOPMD_H
88214 #define _PGTABLE_NOPMD_H
88215
88216-#ifndef __ASSEMBLY__
88217-
88218 #include <asm-generic/pgtable-nopud.h>
88219
88220-struct mm_struct;
88221-
88222 #define __PAGETABLE_PMD_FOLDED
88223
88224+#define PMD_SHIFT PUD_SHIFT
88225+#define PTRS_PER_PMD 1
88226+#define PMD_SIZE (_AC(1,UL) << PMD_SHIFT)
88227+#define PMD_MASK (~(PMD_SIZE-1))
88228+
88229+#ifndef __ASSEMBLY__
88230+
88231+struct mm_struct;
88232+
88233 /*
88234 * Having the pmd type consist of a pud gets the size right, and allows
88235 * us to conceptually access the pud entry that this pmd is folded into
88236@@ -16,11 +21,6 @@ struct mm_struct;
88237 */
88238 typedef struct { pud_t pud; } pmd_t;
88239
88240-#define PMD_SHIFT PUD_SHIFT
88241-#define PTRS_PER_PMD 1
88242-#define PMD_SIZE (1UL << PMD_SHIFT)
88243-#define PMD_MASK (~(PMD_SIZE-1))
88244-
88245 /*
88246 * The "pud_xxx()" functions here are trivial for a folded two-level
88247 * setup: the pmd is never bad, and a pmd always exists (as it's folded
88248diff --git a/include/asm-generic/pgtable-nopud.h b/include/asm-generic/pgtable-nopud.h
88249index 810431d..0ec4804f 100644
88250--- a/include/asm-generic/pgtable-nopud.h
88251+++ b/include/asm-generic/pgtable-nopud.h
88252@@ -1,10 +1,15 @@
88253 #ifndef _PGTABLE_NOPUD_H
88254 #define _PGTABLE_NOPUD_H
88255
88256-#ifndef __ASSEMBLY__
88257-
88258 #define __PAGETABLE_PUD_FOLDED
88259
88260+#define PUD_SHIFT PGDIR_SHIFT
88261+#define PTRS_PER_PUD 1
88262+#define PUD_SIZE (_AC(1,UL) << PUD_SHIFT)
88263+#define PUD_MASK (~(PUD_SIZE-1))
88264+
88265+#ifndef __ASSEMBLY__
88266+
88267 /*
88268 * Having the pud type consist of a pgd gets the size right, and allows
88269 * us to conceptually access the pgd entry that this pud is folded into
88270@@ -12,11 +17,6 @@
88271 */
88272 typedef struct { pgd_t pgd; } pud_t;
88273
88274-#define PUD_SHIFT PGDIR_SHIFT
88275-#define PTRS_PER_PUD 1
88276-#define PUD_SIZE (1UL << PUD_SHIFT)
88277-#define PUD_MASK (~(PUD_SIZE-1))
88278-
88279 /*
88280 * The "pgd_xxx()" functions here are trivial for a folded two-level
88281 * setup: the pud is never bad, and a pud always exists (as it's folded
88282@@ -29,6 +29,7 @@ static inline void pgd_clear(pgd_t *pgd) { }
88283 #define pud_ERROR(pud) (pgd_ERROR((pud).pgd))
88284
88285 #define pgd_populate(mm, pgd, pud) do { } while (0)
88286+#define pgd_populate_kernel(mm, pgd, pud) do { } while (0)
88287 /*
88288 * (puds are folded into pgds so this doesn't get actually called,
88289 * but the define is needed for a generic inline function.)
88290diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h
88291index 4d46085..f4e92ef 100644
88292--- a/include/asm-generic/pgtable.h
88293+++ b/include/asm-generic/pgtable.h
88294@@ -689,6 +689,22 @@ static inline int pmd_protnone(pmd_t pmd)
88295 }
88296 #endif /* CONFIG_NUMA_BALANCING */
88297
88298+#ifndef __HAVE_ARCH_PAX_OPEN_KERNEL
88299+#ifdef CONFIG_PAX_KERNEXEC
88300+#error KERNEXEC requires pax_open_kernel
88301+#else
88302+static inline unsigned long pax_open_kernel(void) { return 0; }
88303+#endif
88304+#endif
88305+
88306+#ifndef __HAVE_ARCH_PAX_CLOSE_KERNEL
88307+#ifdef CONFIG_PAX_KERNEXEC
88308+#error KERNEXEC requires pax_close_kernel
88309+#else
88310+static inline unsigned long pax_close_kernel(void) { return 0; }
88311+#endif
88312+#endif
88313+
88314 #endif /* CONFIG_MMU */
88315
88316 #endif /* !__ASSEMBLY__ */
88317diff --git a/include/asm-generic/uaccess.h b/include/asm-generic/uaccess.h
88318index 72d8803..cb9749c 100644
88319--- a/include/asm-generic/uaccess.h
88320+++ b/include/asm-generic/uaccess.h
88321@@ -343,4 +343,20 @@ clear_user(void __user *to, unsigned long n)
88322 return __clear_user(to, n);
88323 }
88324
88325+#ifndef __HAVE_ARCH_PAX_OPEN_USERLAND
88326+#ifdef CONFIG_PAX_MEMORY_UDEREF
88327+#error UDEREF requires pax_open_userland
88328+#else
88329+static inline unsigned long pax_open_userland(void) { return 0; }
88330+#endif
88331+#endif
88332+
88333+#ifndef __HAVE_ARCH_PAX_CLOSE_USERLAND
88334+#ifdef CONFIG_PAX_MEMORY_UDEREF
88335+#error UDEREF requires pax_close_userland
88336+#else
88337+static inline unsigned long pax_close_userland(void) { return 0; }
88338+#endif
88339+#endif
88340+
88341 #endif /* __ASM_GENERIC_UACCESS_H */
88342diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
88343index ac78910..8b5f068 100644
88344--- a/include/asm-generic/vmlinux.lds.h
88345+++ b/include/asm-generic/vmlinux.lds.h
88346@@ -234,6 +234,7 @@
88347 .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
88348 VMLINUX_SYMBOL(__start_rodata) = .; \
88349 *(.rodata) *(.rodata.*) \
88350+ *(.data..read_only) \
88351 *(__vermagic) /* Kernel version magic */ \
88352 . = ALIGN(8); \
88353 VMLINUX_SYMBOL(__start___tracepoints_ptrs) = .; \
88354@@ -492,6 +493,7 @@
88355 KERNEL_CTORS() \
88356 MCOUNT_REC() \
88357 *(.init.rodata) \
88358+ *(.init.rodata.*) \
88359 FTRACE_EVENTS() \
88360 TRACE_SYSCALLS() \
88361 KPROBE_BLACKLIST() \
88362@@ -511,6 +513,8 @@
88363
88364 #define EXIT_DATA \
88365 *(.exit.data) \
88366+ *(.exit.rodata) \
88367+ *(.exit.rodata.*) \
88368 MEM_DISCARD(exit.data) \
88369 MEM_DISCARD(exit.rodata)
88370
88371@@ -727,17 +731,18 @@
88372 * section in the linker script will go there too. @phdr should have
88373 * a leading colon.
88374 *
88375- * Note that this macros defines __per_cpu_load as an absolute symbol.
88376+ * Note that this macros defines per_cpu_load as an absolute symbol.
88377 * If there is no need to put the percpu section at a predetermined
88378 * address, use PERCPU_SECTION.
88379 */
88380 #define PERCPU_VADDR(cacheline, vaddr, phdr) \
88381- VMLINUX_SYMBOL(__per_cpu_load) = .; \
88382- .data..percpu vaddr : AT(VMLINUX_SYMBOL(__per_cpu_load) \
88383+ per_cpu_load = .; \
88384+ .data..percpu vaddr : AT(VMLINUX_SYMBOL(per_cpu_load) \
88385 - LOAD_OFFSET) { \
88386+ VMLINUX_SYMBOL(__per_cpu_load) = . + per_cpu_load; \
88387 PERCPU_INPUT(cacheline) \
88388 } phdr \
88389- . = VMLINUX_SYMBOL(__per_cpu_load) + SIZEOF(.data..percpu);
88390+ . = VMLINUX_SYMBOL(per_cpu_load) + SIZEOF(.data..percpu);
88391
88392 /**
88393 * PERCPU_SECTION - define output section for percpu area, simple version
88394diff --git a/include/crypto/algapi.h b/include/crypto/algapi.h
88395index 623a59c..1e79ab9 100644
88396--- a/include/crypto/algapi.h
88397+++ b/include/crypto/algapi.h
88398@@ -34,7 +34,7 @@ struct crypto_type {
88399 unsigned int maskclear;
88400 unsigned int maskset;
88401 unsigned int tfmsize;
88402-};
88403+} __do_const;
88404
88405 struct crypto_instance {
88406 struct crypto_alg alg;
88407diff --git a/include/drm/drmP.h b/include/drm/drmP.h
88408index e928625..ff97886 100644
88409--- a/include/drm/drmP.h
88410+++ b/include/drm/drmP.h
88411@@ -59,6 +59,7 @@
88412
88413 #include <asm/mman.h>
88414 #include <asm/pgalloc.h>
88415+#include <asm/local.h>
88416 #include <asm/uaccess.h>
88417
88418 #include <uapi/drm/drm.h>
88419@@ -133,17 +134,18 @@ void drm_err(const char *format, ...);
88420 /*@{*/
88421
88422 /* driver capabilities and requirements mask */
88423-#define DRIVER_USE_AGP 0x1
88424-#define DRIVER_PCI_DMA 0x8
88425-#define DRIVER_SG 0x10
88426-#define DRIVER_HAVE_DMA 0x20
88427-#define DRIVER_HAVE_IRQ 0x40
88428-#define DRIVER_IRQ_SHARED 0x80
88429-#define DRIVER_GEM 0x1000
88430-#define DRIVER_MODESET 0x2000
88431-#define DRIVER_PRIME 0x4000
88432-#define DRIVER_RENDER 0x8000
88433-#define DRIVER_ATOMIC 0x10000
88434+#define DRIVER_USE_AGP 0x1
88435+#define DRIVER_PCI_DMA 0x8
88436+#define DRIVER_SG 0x10
88437+#define DRIVER_HAVE_DMA 0x20
88438+#define DRIVER_HAVE_IRQ 0x40
88439+#define DRIVER_IRQ_SHARED 0x80
88440+#define DRIVER_GEM 0x1000
88441+#define DRIVER_MODESET 0x2000
88442+#define DRIVER_PRIME 0x4000
88443+#define DRIVER_RENDER 0x8000
88444+#define DRIVER_ATOMIC 0x10000
88445+#define DRIVER_KMS_LEGACY_CONTEXT 0x20000
88446
88447 /***********************************************************************/
88448 /** \name Macros to make printk easier */
88449@@ -224,10 +226,12 @@ void drm_err(const char *format, ...);
88450 * \param cmd command.
88451 * \param arg argument.
88452 */
88453-typedef int drm_ioctl_t(struct drm_device *dev, void *data,
88454+typedef int (* const drm_ioctl_t)(struct drm_device *dev, void *data,
88455+ struct drm_file *file_priv);
88456+typedef int (* drm_ioctl_no_const_t)(struct drm_device *dev, void *data,
88457 struct drm_file *file_priv);
88458
88459-typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
88460+typedef int (* const drm_ioctl_compat_t)(struct file *filp, unsigned int cmd,
88461 unsigned long arg);
88462
88463 #define DRM_IOCTL_NR(n) _IOC_NR(n)
88464@@ -243,10 +247,10 @@ typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
88465 struct drm_ioctl_desc {
88466 unsigned int cmd;
88467 int flags;
88468- drm_ioctl_t *func;
88469+ drm_ioctl_t func;
88470 unsigned int cmd_drv;
88471 const char *name;
88472-};
88473+} __do_const;
88474
88475 /**
88476 * Creates a driver or general drm_ioctl_desc array entry for the given
88477@@ -632,7 +636,8 @@ struct drm_info_list {
88478 int (*show)(struct seq_file*, void*); /** show callback */
88479 u32 driver_features; /**< Required driver features for this entry */
88480 void *data;
88481-};
88482+} __do_const;
88483+typedef struct drm_info_list __no_const drm_info_list_no_const;
88484
88485 /**
88486 * debugfs node structure. This structure represents a debugfs file.
88487@@ -716,7 +721,7 @@ struct drm_device {
88488
88489 /** \name Usage Counters */
88490 /*@{ */
88491- int open_count; /**< Outstanding files open, protected by drm_global_mutex. */
88492+ local_t open_count; /**< Outstanding files open, protected by drm_global_mutex. */
88493 spinlock_t buf_lock; /**< For drm_device::buf_use and a few other things. */
88494 int buf_use; /**< Buffers in use -- cannot alloc */
88495 atomic_t buf_alloc; /**< Buffer allocation in progress */
88496diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
88497index c250a22..59d2094 100644
88498--- a/include/drm/drm_crtc_helper.h
88499+++ b/include/drm/drm_crtc_helper.h
88500@@ -160,7 +160,7 @@ struct drm_encoder_helper_funcs {
88501 int (*atomic_check)(struct drm_encoder *encoder,
88502 struct drm_crtc_state *crtc_state,
88503 struct drm_connector_state *conn_state);
88504-};
88505+} __no_const;
88506
88507 /**
88508 * struct drm_connector_helper_funcs - helper operations for connectors
88509diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
88510index d016dc5..3951fe0 100644
88511--- a/include/drm/i915_pciids.h
88512+++ b/include/drm/i915_pciids.h
88513@@ -37,7 +37,7 @@
88514 */
88515 #define INTEL_VGA_DEVICE(id, info) { \
88516 0x8086, id, \
88517- ~0, ~0, \
88518+ PCI_ANY_ID, PCI_ANY_ID, \
88519 0x030000, 0xff0000, \
88520 (unsigned long) info }
88521
88522diff --git a/include/drm/ttm/ttm_memory.h b/include/drm/ttm/ttm_memory.h
88523index 72dcbe8..8db58d7 100644
88524--- a/include/drm/ttm/ttm_memory.h
88525+++ b/include/drm/ttm/ttm_memory.h
88526@@ -48,7 +48,7 @@
88527
88528 struct ttm_mem_shrink {
88529 int (*do_shrink) (struct ttm_mem_shrink *);
88530-};
88531+} __no_const;
88532
88533 /**
88534 * struct ttm_mem_global - Global memory accounting structure.
88535diff --git a/include/drm/ttm/ttm_page_alloc.h b/include/drm/ttm/ttm_page_alloc.h
88536index 49a8284..9643967 100644
88537--- a/include/drm/ttm/ttm_page_alloc.h
88538+++ b/include/drm/ttm/ttm_page_alloc.h
88539@@ -80,6 +80,7 @@ void ttm_dma_page_alloc_fini(void);
88540 */
88541 extern int ttm_dma_page_alloc_debugfs(struct seq_file *m, void *data);
88542
88543+struct device;
88544 extern int ttm_dma_populate(struct ttm_dma_tt *ttm_dma, struct device *dev);
88545 extern void ttm_dma_unpopulate(struct ttm_dma_tt *ttm_dma, struct device *dev);
88546
88547diff --git a/include/keys/asymmetric-subtype.h b/include/keys/asymmetric-subtype.h
88548index 4b840e8..155d235 100644
88549--- a/include/keys/asymmetric-subtype.h
88550+++ b/include/keys/asymmetric-subtype.h
88551@@ -37,7 +37,7 @@ struct asymmetric_key_subtype {
88552 /* Verify the signature on a key of this subtype (optional) */
88553 int (*verify_signature)(const struct key *key,
88554 const struct public_key_signature *sig);
88555-};
88556+} __do_const;
88557
88558 /**
88559 * asymmetric_key_subtype - Get the subtype from an asymmetric key
88560diff --git a/include/linux/atmdev.h b/include/linux/atmdev.h
88561index c1da539..1dcec55 100644
88562--- a/include/linux/atmdev.h
88563+++ b/include/linux/atmdev.h
88564@@ -28,7 +28,7 @@ struct compat_atm_iobuf {
88565 #endif
88566
88567 struct k_atm_aal_stats {
88568-#define __HANDLE_ITEM(i) atomic_t i
88569+#define __HANDLE_ITEM(i) atomic_unchecked_t i
88570 __AAL_STAT_ITEMS
88571 #undef __HANDLE_ITEM
88572 };
88573@@ -200,7 +200,7 @@ struct atmdev_ops { /* only send is required */
88574 int (*change_qos)(struct atm_vcc *vcc,struct atm_qos *qos,int flags);
88575 int (*proc_read)(struct atm_dev *dev,loff_t *pos,char *page);
88576 struct module *owner;
88577-};
88578+} __do_const ;
88579
88580 struct atmphy_ops {
88581 int (*start)(struct atm_dev *dev);
88582diff --git a/include/linux/atomic.h b/include/linux/atomic.h
88583index 5b08a85..60922fb 100644
88584--- a/include/linux/atomic.h
88585+++ b/include/linux/atomic.h
88586@@ -12,7 +12,7 @@
88587 * Atomically adds @a to @v, so long as @v was not already @u.
88588 * Returns non-zero if @v was not @u, and zero otherwise.
88589 */
88590-static inline int atomic_add_unless(atomic_t *v, int a, int u)
88591+static inline int __intentional_overflow(-1) atomic_add_unless(atomic_t *v, int a, int u)
88592 {
88593 return __atomic_add_unless(v, a, u) != u;
88594 }
88595diff --git a/include/linux/audit.h b/include/linux/audit.h
88596index c2e7e3a..8bfc0e1 100644
88597--- a/include/linux/audit.h
88598+++ b/include/linux/audit.h
88599@@ -223,7 +223,7 @@ static inline void audit_ptrace(struct task_struct *t)
88600 extern unsigned int audit_serial(void);
88601 extern int auditsc_get_stamp(struct audit_context *ctx,
88602 struct timespec *t, unsigned int *serial);
88603-extern int audit_set_loginuid(kuid_t loginuid);
88604+extern int __intentional_overflow(-1) audit_set_loginuid(kuid_t loginuid);
88605
88606 static inline kuid_t audit_get_loginuid(struct task_struct *tsk)
88607 {
88608diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h
88609index 576e463..28fd926 100644
88610--- a/include/linux/binfmts.h
88611+++ b/include/linux/binfmts.h
88612@@ -44,7 +44,7 @@ struct linux_binprm {
88613 unsigned interp_flags;
88614 unsigned interp_data;
88615 unsigned long loader, exec;
88616-};
88617+} __randomize_layout;
88618
88619 #define BINPRM_FLAGS_ENFORCE_NONDUMP_BIT 0
88620 #define BINPRM_FLAGS_ENFORCE_NONDUMP (1 << BINPRM_FLAGS_ENFORCE_NONDUMP_BIT)
88621@@ -77,8 +77,10 @@ struct linux_binfmt {
88622 int (*load_binary)(struct linux_binprm *);
88623 int (*load_shlib)(struct file *);
88624 int (*core_dump)(struct coredump_params *cprm);
88625+ void (*handle_mprotect)(struct vm_area_struct *vma, unsigned long newflags);
88626+ void (*handle_mmap)(struct file *);
88627 unsigned long min_coredump; /* minimal dump size */
88628-};
88629+} __do_const __randomize_layout;
88630
88631 extern void __register_binfmt(struct linux_binfmt *fmt, int insert);
88632
88633diff --git a/include/linux/bitmap.h b/include/linux/bitmap.h
88634index dbfbf49..10be372 100644
88635--- a/include/linux/bitmap.h
88636+++ b/include/linux/bitmap.h
88637@@ -299,7 +299,7 @@ static inline int bitmap_full(const unsigned long *src, unsigned int nbits)
88638 return __bitmap_full(src, nbits);
88639 }
88640
88641-static inline int bitmap_weight(const unsigned long *src, unsigned int nbits)
88642+static inline int __intentional_overflow(-1) bitmap_weight(const unsigned long *src, unsigned int nbits)
88643 {
88644 if (small_const_nbits(nbits))
88645 return hweight_long(*src & BITMAP_LAST_WORD_MASK(nbits));
88646diff --git a/include/linux/bitops.h b/include/linux/bitops.h
88647index 5d858e0..336c1d9 100644
88648--- a/include/linux/bitops.h
88649+++ b/include/linux/bitops.h
88650@@ -105,7 +105,7 @@ static inline __u64 ror64(__u64 word, unsigned int shift)
88651 * @word: value to rotate
88652 * @shift: bits to roll
88653 */
88654-static inline __u32 rol32(__u32 word, unsigned int shift)
88655+static inline __u32 __intentional_overflow(-1) rol32(__u32 word, unsigned int shift)
88656 {
88657 return (word << shift) | (word >> (32 - shift));
88658 }
88659@@ -115,7 +115,7 @@ static inline __u32 rol32(__u32 word, unsigned int shift)
88660 * @word: value to rotate
88661 * @shift: bits to roll
88662 */
88663-static inline __u32 ror32(__u32 word, unsigned int shift)
88664+static inline __u32 __intentional_overflow(-1) ror32(__u32 word, unsigned int shift)
88665 {
88666 return (word >> shift) | (word << (32 - shift));
88667 }
88668@@ -171,7 +171,7 @@ static inline __s32 sign_extend32(__u32 value, int index)
88669 return (__s32)(value << shift) >> shift;
88670 }
88671
88672-static inline unsigned fls_long(unsigned long l)
88673+static inline unsigned __intentional_overflow(-1) fls_long(unsigned long l)
88674 {
88675 if (sizeof(l) == 4)
88676 return fls(l);
88677diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
88678index 7f9a516..8889453 100644
88679--- a/include/linux/blkdev.h
88680+++ b/include/linux/blkdev.h
88681@@ -1616,7 +1616,7 @@ struct block_device_operations {
88682 /* this callback is with swap_lock and sometimes page table lock held */
88683 void (*swap_slot_free_notify) (struct block_device *, unsigned long);
88684 struct module *owner;
88685-};
88686+} __do_const;
88687
88688 extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
88689 unsigned long);
88690diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h
88691index afc1343..9735539 100644
88692--- a/include/linux/blktrace_api.h
88693+++ b/include/linux/blktrace_api.h
88694@@ -25,7 +25,7 @@ struct blk_trace {
88695 struct dentry *dropped_file;
88696 struct dentry *msg_file;
88697 struct list_head running_list;
88698- atomic_t dropped;
88699+ atomic_unchecked_t dropped;
88700 };
88701
88702 extern int blk_trace_ioctl(struct block_device *, unsigned, char __user *);
88703diff --git a/include/linux/cache.h b/include/linux/cache.h
88704index 17e7e82..1d7da26 100644
88705--- a/include/linux/cache.h
88706+++ b/include/linux/cache.h
88707@@ -16,6 +16,14 @@
88708 #define __read_mostly
88709 #endif
88710
88711+#ifndef __read_only
88712+#ifdef CONFIG_PAX_KERNEXEC
88713+#error KERNEXEC requires __read_only
88714+#else
88715+#define __read_only __read_mostly
88716+#endif
88717+#endif
88718+
88719 #ifndef ____cacheline_aligned
88720 #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
88721 #endif
88722diff --git a/include/linux/capability.h b/include/linux/capability.h
88723index aa93e5e..985a1b0 100644
88724--- a/include/linux/capability.h
88725+++ b/include/linux/capability.h
88726@@ -214,9 +214,14 @@ extern bool has_ns_capability_noaudit(struct task_struct *t,
88727 extern bool capable(int cap);
88728 extern bool ns_capable(struct user_namespace *ns, int cap);
88729 extern bool capable_wrt_inode_uidgid(const struct inode *inode, int cap);
88730+extern bool capable_wrt_inode_uidgid_nolog(const struct inode *inode, int cap);
88731 extern bool file_ns_capable(const struct file *file, struct user_namespace *ns, int cap);
88732+extern bool capable_nolog(int cap);
88733+extern bool ns_capable_nolog(struct user_namespace *ns, int cap);
88734
88735 /* audit system wants to get cap info from files as well */
88736 extern int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data *cpu_caps);
88737
88738+extern int is_privileged_binary(const struct dentry *dentry);
88739+
88740 #endif /* !_LINUX_CAPABILITY_H */
88741diff --git a/include/linux/cdrom.h b/include/linux/cdrom.h
88742index 8609d57..86e4d79 100644
88743--- a/include/linux/cdrom.h
88744+++ b/include/linux/cdrom.h
88745@@ -87,7 +87,6 @@ struct cdrom_device_ops {
88746
88747 /* driver specifications */
88748 const int capability; /* capability flags */
88749- int n_minors; /* number of active minor devices */
88750 /* handle uniform packets for scsi type devices (scsi,atapi) */
88751 int (*generic_packet) (struct cdrom_device_info *,
88752 struct packet_command *);
88753diff --git a/include/linux/cleancache.h b/include/linux/cleancache.h
88754index 4ce9056..86caac6 100644
88755--- a/include/linux/cleancache.h
88756+++ b/include/linux/cleancache.h
88757@@ -31,7 +31,7 @@ struct cleancache_ops {
88758 void (*invalidate_page)(int, struct cleancache_filekey, pgoff_t);
88759 void (*invalidate_inode)(int, struct cleancache_filekey);
88760 void (*invalidate_fs)(int);
88761-};
88762+} __no_const;
88763
88764 extern struct cleancache_ops *
88765 cleancache_register_ops(struct cleancache_ops *ops);
88766diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
88767index 5591ea7..61b77ce 100644
88768--- a/include/linux/clk-provider.h
88769+++ b/include/linux/clk-provider.h
88770@@ -195,6 +195,7 @@ struct clk_ops {
88771 void (*init)(struct clk_hw *hw);
88772 int (*debug_init)(struct clk_hw *hw, struct dentry *dentry);
88773 };
88774+typedef struct clk_ops __no_const clk_ops_no_const;
88775
88776 /**
88777 * struct clk_init_data - holds init data that's common to all clocks and is
88778diff --git a/include/linux/compat.h b/include/linux/compat.h
88779index ab25814..d1540d1 100644
88780--- a/include/linux/compat.h
88781+++ b/include/linux/compat.h
88782@@ -316,7 +316,7 @@ compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr,
88783 compat_size_t __user *len_ptr);
88784
88785 asmlinkage long compat_sys_ipc(u32, int, int, u32, compat_uptr_t, u32);
88786-asmlinkage long compat_sys_shmat(int shmid, compat_uptr_t shmaddr, int shmflg);
88787+asmlinkage long compat_sys_shmat(int shmid, compat_uptr_t shmaddr, int shmflg) __intentional_overflow(0);
88788 asmlinkage long compat_sys_semctl(int semid, int semnum, int cmd, int arg);
88789 asmlinkage long compat_sys_msgsnd(int msqid, compat_uptr_t msgp,
88790 compat_ssize_t msgsz, int msgflg);
88791@@ -325,7 +325,7 @@ asmlinkage long compat_sys_msgrcv(int msqid, compat_uptr_t msgp,
88792 long compat_sys_msgctl(int first, int second, void __user *uptr);
88793 long compat_sys_shmctl(int first, int second, void __user *uptr);
88794 long compat_sys_semtimedop(int semid, struct sembuf __user *tsems,
88795- unsigned nsems, const struct compat_timespec __user *timeout);
88796+ compat_long_t nsems, const struct compat_timespec __user *timeout);
88797 asmlinkage long compat_sys_keyctl(u32 option,
88798 u32 arg2, u32 arg3, u32 arg4, u32 arg5);
88799 asmlinkage long compat_sys_ustat(unsigned dev, struct compat_ustat __user *u32);
88800@@ -439,7 +439,7 @@ extern int compat_ptrace_request(struct task_struct *child,
88801 extern long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
88802 compat_ulong_t addr, compat_ulong_t data);
88803 asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,
88804- compat_long_t addr, compat_long_t data);
88805+ compat_ulong_t addr, compat_ulong_t data);
88806
88807 asmlinkage long compat_sys_lookup_dcookie(u32, u32, char __user *, compat_size_t);
88808 /*
88809diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h
88810index cdf13ca..ba5e086 100644
88811--- a/include/linux/compiler-gcc.h
88812+++ b/include/linux/compiler-gcc.h
88813@@ -94,8 +94,8 @@
88814 */
88815 #define __pure __attribute__((pure))
88816 #define __aligned(x) __attribute__((aligned(x)))
88817-#define __printf(a, b) __attribute__((format(printf, a, b)))
88818-#define __scanf(a, b) __attribute__((format(scanf, a, b)))
88819+#define __printf(a, b) __attribute__((format(printf, a, b))) __nocapture(a, b)
88820+#define __scanf(a, b) __attribute__((format(scanf, a, b))) __nocapture(a, b)
88821 #define noinline __attribute__((noinline))
88822 #define __attribute_const__ __attribute__((__const__))
88823 #define __maybe_unused __attribute__((unused))
88824diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h
88825index 769e198..7ee7cb5 100644
88826--- a/include/linux/compiler-gcc4.h
88827+++ b/include/linux/compiler-gcc4.h
88828@@ -39,9 +39,38 @@
88829 # define __compiletime_warning(message) __attribute__((warning(message)))
88830 # define __compiletime_error(message) __attribute__((error(message)))
88831 #endif /* __CHECKER__ */
88832+
88833+#define __alloc_size(...) __attribute((alloc_size(__VA_ARGS__)))
88834+#define __bos(ptr, arg) __builtin_object_size((ptr), (arg))
88835+#define __bos0(ptr) __bos((ptr), 0)
88836+#define __bos1(ptr) __bos((ptr), 1)
88837 #endif /* GCC_VERSION >= 40300 */
88838
88839 #if GCC_VERSION >= 40500
88840+
88841+#ifdef RANDSTRUCT_PLUGIN
88842+#define __randomize_layout __attribute__((randomize_layout))
88843+#define __no_randomize_layout __attribute__((no_randomize_layout))
88844+#endif
88845+
88846+#ifdef CONSTIFY_PLUGIN
88847+#define __no_const __attribute__((no_const))
88848+#define __do_const __attribute__((do_const))
88849+#endif
88850+
88851+#ifdef SIZE_OVERFLOW_PLUGIN
88852+#define __size_overflow(...) __attribute__((size_overflow(__VA_ARGS__)))
88853+#define __intentional_overflow(...) __attribute__((intentional_overflow(__VA_ARGS__)))
88854+#endif
88855+
88856+#ifdef LATENT_ENTROPY_PLUGIN
88857+#define __latent_entropy __attribute__((latent_entropy))
88858+#endif
88859+
88860+#ifdef INITIFY_PLUGIN
88861+#define __nocapture(...) __attribute__((nocapture(__VA_ARGS__)))
88862+#endif
88863+
88864 /*
88865 * Mark a position in code as unreachable. This can be used to
88866 * suppress control flow warnings after asm blocks that transfer
88867diff --git a/include/linux/compiler-gcc5.h b/include/linux/compiler-gcc5.h
88868index efee493..8aa8f6b 100644
88869--- a/include/linux/compiler-gcc5.h
88870+++ b/include/linux/compiler-gcc5.h
88871@@ -28,6 +28,34 @@
88872 # define __compiletime_error(message) __attribute__((error(message)))
88873 #endif /* __CHECKER__ */
88874
88875+#define __alloc_size(...) __attribute((alloc_size(__VA_ARGS__)))
88876+#define __bos(ptr, arg) __builtin_object_size((ptr), (arg))
88877+#define __bos0(ptr) __bos((ptr), 0)
88878+#define __bos1(ptr) __bos((ptr), 1)
88879+
88880+#ifdef RANDSTRUCT_PLUGIN
88881+#define __randomize_layout __attribute__((randomize_layout))
88882+#define __no_randomize_layout __attribute__((no_randomize_layout))
88883+#endif
88884+
88885+#ifdef CONSTIFY_PLUGIN
88886+#define __no_const __attribute__((no_const))
88887+#define __do_const __attribute__((do_const))
88888+#endif
88889+
88890+#ifdef SIZE_OVERFLOW_PLUGIN
88891+#define __size_overflow(...) __attribute__((size_overflow(__VA_ARGS__)))
88892+#define __intentional_overflow(...) __attribute__((intentional_overflow(__VA_ARGS__)))
88893+#endif
88894+
88895+#ifdef LATENT_ENTROPY_PLUGIN
88896+#define __latent_entropy __attribute__((latent_entropy))
88897+#endif
88898+
88899+#ifdef INITIFY_PLUGIN
88900+#define __nocapture(...) __attribute__((nocapture(__VA_ARGS__)))
88901+#endif
88902+
88903 /*
88904 * Mark a position in code as unreachable. This can be used to
88905 * suppress control flow warnings after asm blocks that transfer
88906diff --git a/include/linux/compiler.h b/include/linux/compiler.h
88907index 1b45e4a..eff29a7 100644
88908--- a/include/linux/compiler.h
88909+++ b/include/linux/compiler.h
88910@@ -5,11 +5,14 @@
88911
88912 #ifdef __CHECKER__
88913 # define __user __attribute__((noderef, address_space(1)))
88914+# define __force_user __force __user
88915 # define __kernel __attribute__((address_space(0)))
88916+# define __force_kernel __force __kernel
88917 # define __safe __attribute__((safe))
88918 # define __force __attribute__((force))
88919 # define __nocast __attribute__((nocast))
88920 # define __iomem __attribute__((noderef, address_space(2)))
88921+# define __force_iomem __force __iomem
88922 # define __must_hold(x) __attribute__((context(x,1,1)))
88923 # define __acquires(x) __attribute__((context(x,0,1)))
88924 # define __releases(x) __attribute__((context(x,1,0)))
88925@@ -17,20 +20,37 @@
88926 # define __release(x) __context__(x,-1)
88927 # define __cond_lock(x,c) ((c) ? ({ __acquire(x); 1; }) : 0)
88928 # define __percpu __attribute__((noderef, address_space(3)))
88929+# define __force_percpu __force __percpu
88930 #ifdef CONFIG_SPARSE_RCU_POINTER
88931 # define __rcu __attribute__((noderef, address_space(4)))
88932+# define __force_rcu __force __rcu
88933 #else
88934 # define __rcu
88935+# define __force_rcu
88936 #endif
88937 extern void __chk_user_ptr(const volatile void __user *);
88938 extern void __chk_io_ptr(const volatile void __iomem *);
88939 #else
88940-# define __user
88941-# define __kernel
88942+# ifdef CHECKER_PLUGIN
88943+//# define __user
88944+//# define __force_user
88945+//# define __kernel
88946+//# define __force_kernel
88947+# else
88948+# ifdef STRUCTLEAK_PLUGIN
88949+# define __user __attribute__((user))
88950+# else
88951+# define __user
88952+# endif
88953+# define __force_user
88954+# define __kernel
88955+# define __force_kernel
88956+# endif
88957 # define __safe
88958 # define __force
88959 # define __nocast
88960 # define __iomem
88961+# define __force_iomem
88962 # define __chk_user_ptr(x) (void)0
88963 # define __chk_io_ptr(x) (void)0
88964 # define __builtin_warning(x, y...) (1)
88965@@ -41,7 +61,9 @@ extern void __chk_io_ptr(const volatile void __iomem *);
88966 # define __release(x) (void)0
88967 # define __cond_lock(x,c) (c)
88968 # define __percpu
88969+# define __force_percpu
88970 # define __rcu
88971+# define __force_rcu
88972 #endif
88973
88974 /* Indirect macros required for expanded argument pasting, eg. __LINE__. */
88975@@ -205,32 +227,32 @@ static __always_inline void data_access_exceeds_word_size(void)
88976 static __always_inline void __read_once_size(const volatile void *p, void *res, int size)
88977 {
88978 switch (size) {
88979- case 1: *(__u8 *)res = *(volatile __u8 *)p; break;
88980- case 2: *(__u16 *)res = *(volatile __u16 *)p; break;
88981- case 4: *(__u32 *)res = *(volatile __u32 *)p; break;
88982+ case 1: *(__u8 *)res = *(const volatile __u8 *)p; break;
88983+ case 2: *(__u16 *)res = *(const volatile __u16 *)p; break;
88984+ case 4: *(__u32 *)res = *(const volatile __u32 *)p; break;
88985 #ifdef CONFIG_64BIT
88986- case 8: *(__u64 *)res = *(volatile __u64 *)p; break;
88987+ case 8: *(__u64 *)res = *(const volatile __u64 *)p; break;
88988 #endif
88989 default:
88990 barrier();
88991- __builtin_memcpy((void *)res, (const void *)p, size);
88992+ __builtin_memcpy(res, (const void *)p, size);
88993 data_access_exceeds_word_size();
88994 barrier();
88995 }
88996 }
88997
88998-static __always_inline void __write_once_size(volatile void *p, void *res, int size)
88999+static __always_inline void __write_once_size(volatile void *p, const void *res, int size)
89000 {
89001 switch (size) {
89002- case 1: *(volatile __u8 *)p = *(__u8 *)res; break;
89003- case 2: *(volatile __u16 *)p = *(__u16 *)res; break;
89004- case 4: *(volatile __u32 *)p = *(__u32 *)res; break;
89005+ case 1: *(volatile __u8 *)p = *(const __u8 *)res; break;
89006+ case 2: *(volatile __u16 *)p = *(const __u16 *)res; break;
89007+ case 4: *(volatile __u32 *)p = *(const __u32 *)res; break;
89008 #ifdef CONFIG_64BIT
89009- case 8: *(volatile __u64 *)p = *(__u64 *)res; break;
89010+ case 8: *(volatile __u64 *)p = *(const __u64 *)res; break;
89011 #endif
89012 default:
89013 barrier();
89014- __builtin_memcpy((void *)p, (const void *)res, size);
89015+ __builtin_memcpy((void *)p, res, size);
89016 data_access_exceeds_word_size();
89017 barrier();
89018 }
89019@@ -364,6 +386,38 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s
89020 # define __attribute_const__ /* unimplemented */
89021 #endif
89022
89023+#ifndef __randomize_layout
89024+# define __randomize_layout
89025+#endif
89026+
89027+#ifndef __no_randomize_layout
89028+# define __no_randomize_layout
89029+#endif
89030+
89031+#ifndef __no_const
89032+# define __no_const
89033+#endif
89034+
89035+#ifndef __do_const
89036+# define __do_const
89037+#endif
89038+
89039+#ifndef __size_overflow
89040+# define __size_overflow(...)
89041+#endif
89042+
89043+#ifndef __intentional_overflow
89044+# define __intentional_overflow(...)
89045+#endif
89046+
89047+#ifndef __latent_entropy
89048+# define __latent_entropy
89049+#endif
89050+
89051+#ifndef __nocapture
89052+# define __nocapture(...)
89053+#endif
89054+
89055 /*
89056 * Tell gcc if a function is cold. The compiler will assume any path
89057 * directly leading to the call is unlikely.
89058@@ -373,6 +427,22 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s
89059 #define __cold
89060 #endif
89061
89062+#ifndef __alloc_size
89063+#define __alloc_size(...)
89064+#endif
89065+
89066+#ifndef __bos
89067+#define __bos(ptr, arg)
89068+#endif
89069+
89070+#ifndef __bos0
89071+#define __bos0(ptr)
89072+#endif
89073+
89074+#ifndef __bos1
89075+#define __bos1(ptr)
89076+#endif
89077+
89078 /* Simple shorthand for a section definition */
89079 #ifndef __section
89080 # define __section(S) __attribute__ ((__section__(#S)))
89081@@ -387,6 +457,8 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s
89082 # define __same_type(a, b) __builtin_types_compatible_p(typeof(a), typeof(b))
89083 #endif
89084
89085+#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))
89086+
89087 /* Is this type a native word size -- useful for atomic operations */
89088 #ifndef __native_word
89089 # define __native_word(t) (sizeof(t) == sizeof(char) || sizeof(t) == sizeof(short) || sizeof(t) == sizeof(int) || sizeof(t) == sizeof(long))
89090@@ -466,8 +538,9 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s
89091 */
89092 #define __ACCESS_ONCE(x) ({ \
89093 __maybe_unused typeof(x) __var = (__force typeof(x)) 0; \
89094- (volatile typeof(x) *)&(x); })
89095+ (volatile const typeof(x) *)&(x); })
89096 #define ACCESS_ONCE(x) (*__ACCESS_ONCE(x))
89097+#define ACCESS_ONCE_RW(x) (*(volatile typeof(x) *)&(x))
89098
89099 /* Ignore/forbid kprobes attach on very low level functions marked by this attribute: */
89100 #ifdef CONFIG_KPROBES
89101diff --git a/include/linux/completion.h b/include/linux/completion.h
89102index 5d5aaae..0ea9b84 100644
89103--- a/include/linux/completion.h
89104+++ b/include/linux/completion.h
89105@@ -90,16 +90,16 @@ static inline void reinit_completion(struct completion *x)
89106
89107 extern void wait_for_completion(struct completion *);
89108 extern void wait_for_completion_io(struct completion *);
89109-extern int wait_for_completion_interruptible(struct completion *x);
89110-extern int wait_for_completion_killable(struct completion *x);
89111+extern int wait_for_completion_interruptible(struct completion *x) __intentional_overflow(-1);
89112+extern int wait_for_completion_killable(struct completion *x) __intentional_overflow(-1);
89113 extern unsigned long wait_for_completion_timeout(struct completion *x,
89114- unsigned long timeout);
89115+ unsigned long timeout) __intentional_overflow(-1);
89116 extern unsigned long wait_for_completion_io_timeout(struct completion *x,
89117- unsigned long timeout);
89118+ unsigned long timeout) __intentional_overflow(-1);
89119 extern long wait_for_completion_interruptible_timeout(
89120- struct completion *x, unsigned long timeout);
89121+ struct completion *x, unsigned long timeout) __intentional_overflow(-1);
89122 extern long wait_for_completion_killable_timeout(
89123- struct completion *x, unsigned long timeout);
89124+ struct completion *x, unsigned long timeout) __intentional_overflow(-1);
89125 extern bool try_wait_for_completion(struct completion *x);
89126 extern bool completion_done(struct completion *x);
89127
89128diff --git a/include/linux/configfs.h b/include/linux/configfs.h
89129index 34025df..d94bbbc 100644
89130--- a/include/linux/configfs.h
89131+++ b/include/linux/configfs.h
89132@@ -125,7 +125,7 @@ struct configfs_attribute {
89133 const char *ca_name;
89134 struct module *ca_owner;
89135 umode_t ca_mode;
89136-};
89137+} __do_const;
89138
89139 /*
89140 * Users often need to create attribute structures for their configurable
89141diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
89142index 2ee4888..0451f5e 100644
89143--- a/include/linux/cpufreq.h
89144+++ b/include/linux/cpufreq.h
89145@@ -207,6 +207,7 @@ struct global_attr {
89146 ssize_t (*store)(struct kobject *a, struct attribute *b,
89147 const char *c, size_t count);
89148 };
89149+typedef struct global_attr __no_const global_attr_no_const;
89150
89151 #define define_one_global_ro(_name) \
89152 static struct global_attr _name = \
89153@@ -278,7 +279,7 @@ struct cpufreq_driver {
89154 bool boost_supported;
89155 bool boost_enabled;
89156 int (*set_boost)(int state);
89157-};
89158+} __do_const;
89159
89160 /* flags */
89161 #define CPUFREQ_STICKY (1 << 0) /* driver isn't removed even if
89162diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h
89163index 9c5e892..feb34e0 100644
89164--- a/include/linux/cpuidle.h
89165+++ b/include/linux/cpuidle.h
89166@@ -59,7 +59,8 @@ struct cpuidle_state {
89167 void (*enter_freeze) (struct cpuidle_device *dev,
89168 struct cpuidle_driver *drv,
89169 int index);
89170-};
89171+} __do_const;
89172+typedef struct cpuidle_state __no_const cpuidle_state_no_const;
89173
89174 /* Idle State Flags */
89175 #define CPUIDLE_FLAG_COUPLED (0x02) /* state applies to multiple cpus */
89176@@ -227,7 +228,7 @@ struct cpuidle_governor {
89177 void (*reflect) (struct cpuidle_device *dev, int index);
89178
89179 struct module *owner;
89180-};
89181+} __do_const;
89182
89183 #ifdef CONFIG_CPU_IDLE
89184 extern int cpuidle_register_governor(struct cpuidle_governor *gov);
89185diff --git a/include/linux/cpumask.h b/include/linux/cpumask.h
89186index 086549a..a572d94 100644
89187--- a/include/linux/cpumask.h
89188+++ b/include/linux/cpumask.h
89189@@ -126,17 +126,17 @@ static inline unsigned int cpumask_first(const struct cpumask *srcp)
89190 }
89191
89192 /* Valid inputs for n are -1 and 0. */
89193-static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
89194+static inline unsigned int __intentional_overflow(-1) cpumask_next(int n, const struct cpumask *srcp)
89195 {
89196 return n+1;
89197 }
89198
89199-static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
89200+static inline unsigned int __intentional_overflow(-1) cpumask_next_zero(int n, const struct cpumask *srcp)
89201 {
89202 return n+1;
89203 }
89204
89205-static inline unsigned int cpumask_next_and(int n,
89206+static inline unsigned int __intentional_overflow(-1) cpumask_next_and(int n,
89207 const struct cpumask *srcp,
89208 const struct cpumask *andp)
89209 {
89210@@ -182,7 +182,7 @@ static inline unsigned int cpumask_first(const struct cpumask *srcp)
89211 *
89212 * Returns >= nr_cpu_ids if no further cpus set.
89213 */
89214-static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
89215+static inline unsigned int __intentional_overflow(-1) cpumask_next(int n, const struct cpumask *srcp)
89216 {
89217 /* -1 is a legal arg here. */
89218 if (n != -1)
89219@@ -197,7 +197,7 @@ static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
89220 *
89221 * Returns >= nr_cpu_ids if no further cpus unset.
89222 */
89223-static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
89224+static inline unsigned int __intentional_overflow(-1) cpumask_next_zero(int n, const struct cpumask *srcp)
89225 {
89226 /* -1 is a legal arg here. */
89227 if (n != -1)
89228@@ -205,7 +205,7 @@ static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
89229 return find_next_zero_bit(cpumask_bits(srcp), nr_cpumask_bits, n+1);
89230 }
89231
89232-int cpumask_next_and(int n, const struct cpumask *, const struct cpumask *);
89233+int cpumask_next_and(int n, const struct cpumask *, const struct cpumask *) __intentional_overflow(-1);
89234 int cpumask_any_but(const struct cpumask *mask, unsigned int cpu);
89235 int cpumask_set_cpu_local_first(int i, int numa_node, cpumask_t *dstp);
89236
89237@@ -472,7 +472,7 @@ static inline bool cpumask_full(const struct cpumask *srcp)
89238 * cpumask_weight - Count of bits in *srcp
89239 * @srcp: the cpumask to count bits (< nr_cpu_ids) in.
89240 */
89241-static inline unsigned int cpumask_weight(const struct cpumask *srcp)
89242+static inline unsigned int __intentional_overflow(-1) cpumask_weight(const struct cpumask *srcp)
89243 {
89244 return bitmap_weight(cpumask_bits(srcp), nr_cpumask_bits);
89245 }
89246diff --git a/include/linux/cred.h b/include/linux/cred.h
89247index 2fb2ca2..d6a3340 100644
89248--- a/include/linux/cred.h
89249+++ b/include/linux/cred.h
89250@@ -35,7 +35,7 @@ struct group_info {
89251 int nblocks;
89252 kgid_t small_block[NGROUPS_SMALL];
89253 kgid_t *blocks[0];
89254-};
89255+} __randomize_layout;
89256
89257 /**
89258 * get_group_info - Get a reference to a group info structure
89259@@ -137,7 +137,7 @@ struct cred {
89260 struct user_namespace *user_ns; /* user_ns the caps and keyrings are relative to. */
89261 struct group_info *group_info; /* supplementary groups for euid/fsgid */
89262 struct rcu_head rcu; /* RCU deletion hook */
89263-};
89264+} __randomize_layout;
89265
89266 extern void __put_cred(struct cred *);
89267 extern void exit_creds(struct task_struct *);
89268@@ -195,6 +195,9 @@ static inline void validate_creds_for_do_exit(struct task_struct *tsk)
89269 static inline void validate_process_creds(void)
89270 {
89271 }
89272+static inline void validate_task_creds(struct task_struct *task)
89273+{
89274+}
89275 #endif
89276
89277 /**
89278@@ -332,6 +335,7 @@ static inline void put_cred(const struct cred *_cred)
89279
89280 #define task_uid(task) (task_cred_xxx((task), uid))
89281 #define task_euid(task) (task_cred_xxx((task), euid))
89282+#define task_securebits(task) (task_cred_xxx((task), securebits))
89283
89284 #define current_cred_xxx(xxx) \
89285 ({ \
89286diff --git a/include/linux/crypto.h b/include/linux/crypto.h
89287index fb5ef16..05d1e59 100644
89288--- a/include/linux/crypto.h
89289+++ b/include/linux/crypto.h
89290@@ -626,7 +626,7 @@ struct cipher_tfm {
89291 const u8 *key, unsigned int keylen);
89292 void (*cit_encrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
89293 void (*cit_decrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
89294-};
89295+} __no_const;
89296
89297 struct hash_tfm {
89298 int (*init)(struct hash_desc *desc);
89299@@ -647,13 +647,13 @@ struct compress_tfm {
89300 int (*cot_decompress)(struct crypto_tfm *tfm,
89301 const u8 *src, unsigned int slen,
89302 u8 *dst, unsigned int *dlen);
89303-};
89304+} __no_const;
89305
89306 struct rng_tfm {
89307 int (*rng_gen_random)(struct crypto_rng *tfm, u8 *rdata,
89308 unsigned int dlen);
89309 int (*rng_reset)(struct crypto_rng *tfm, u8 *seed, unsigned int slen);
89310-};
89311+} __no_const;
89312
89313 #define crt_ablkcipher crt_u.ablkcipher
89314 #define crt_aead crt_u.aead
89315diff --git a/include/linux/ctype.h b/include/linux/ctype.h
89316index 653589e..4ef254a 100644
89317--- a/include/linux/ctype.h
89318+++ b/include/linux/ctype.h
89319@@ -56,7 +56,7 @@ static inline unsigned char __toupper(unsigned char c)
89320 * Fast implementation of tolower() for internal usage. Do not use in your
89321 * code.
89322 */
89323-static inline char _tolower(const char c)
89324+static inline unsigned char _tolower(const unsigned char c)
89325 {
89326 return c | 0x20;
89327 }
89328diff --git a/include/linux/dcache.h b/include/linux/dcache.h
89329index d835879..c8e5b92 100644
89330--- a/include/linux/dcache.h
89331+++ b/include/linux/dcache.h
89332@@ -123,6 +123,9 @@ struct dentry {
89333 unsigned long d_time; /* used by d_revalidate */
89334 void *d_fsdata; /* fs-specific data */
89335
89336+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
89337+ atomic_t chroot_refcnt; /* tracks use of directory in chroot */
89338+#endif
89339 struct list_head d_lru; /* LRU list */
89340 struct list_head d_child; /* child of parent list */
89341 struct list_head d_subdirs; /* our children */
89342@@ -133,7 +136,7 @@ struct dentry {
89343 struct hlist_node d_alias; /* inode alias list */
89344 struct rcu_head d_rcu;
89345 } d_u;
89346-};
89347+} __randomize_layout;
89348
89349 /*
89350 * dentry->d_lock spinlock nesting subclasses:
89351@@ -319,7 +322,7 @@ extern struct dentry *__d_lookup_rcu(const struct dentry *parent,
89352
89353 static inline unsigned d_count(const struct dentry *dentry)
89354 {
89355- return dentry->d_lockref.count;
89356+ return __lockref_read(&dentry->d_lockref);
89357 }
89358
89359 /*
89360@@ -347,7 +350,7 @@ extern char *dentry_path(struct dentry *, char *, int);
89361 static inline struct dentry *dget_dlock(struct dentry *dentry)
89362 {
89363 if (dentry)
89364- dentry->d_lockref.count++;
89365+ __lockref_inc(&dentry->d_lockref);
89366 return dentry;
89367 }
89368
89369diff --git a/include/linux/decompress/mm.h b/include/linux/decompress/mm.h
89370index 7925bf0..d5143d2 100644
89371--- a/include/linux/decompress/mm.h
89372+++ b/include/linux/decompress/mm.h
89373@@ -77,7 +77,7 @@ static void free(void *where)
89374 * warnings when not needed (indeed large_malloc / large_free are not
89375 * needed by inflate */
89376
89377-#define malloc(a) kmalloc(a, GFP_KERNEL)
89378+#define malloc(a) kmalloc((a), GFP_KERNEL)
89379 #define free(a) kfree(a)
89380
89381 #define large_malloc(a) vmalloc(a)
89382diff --git a/include/linux/devfreq.h b/include/linux/devfreq.h
89383index ce447f0..83c66bd 100644
89384--- a/include/linux/devfreq.h
89385+++ b/include/linux/devfreq.h
89386@@ -114,7 +114,7 @@ struct devfreq_governor {
89387 int (*get_target_freq)(struct devfreq *this, unsigned long *freq);
89388 int (*event_handler)(struct devfreq *devfreq,
89389 unsigned int event, void *data);
89390-};
89391+} __do_const;
89392
89393 /**
89394 * struct devfreq - Device devfreq structure
89395diff --git a/include/linux/device.h b/include/linux/device.h
89396index 0eb8ee2..c603b6a 100644
89397--- a/include/linux/device.h
89398+++ b/include/linux/device.h
89399@@ -311,7 +311,7 @@ struct subsys_interface {
89400 struct list_head node;
89401 int (*add_dev)(struct device *dev, struct subsys_interface *sif);
89402 int (*remove_dev)(struct device *dev, struct subsys_interface *sif);
89403-};
89404+} __do_const;
89405
89406 int subsys_interface_register(struct subsys_interface *sif);
89407 void subsys_interface_unregister(struct subsys_interface *sif);
89408@@ -507,7 +507,7 @@ struct device_type {
89409 void (*release)(struct device *dev);
89410
89411 const struct dev_pm_ops *pm;
89412-};
89413+} __do_const;
89414
89415 /* interface for exporting device attributes */
89416 struct device_attribute {
89417@@ -517,11 +517,12 @@ struct device_attribute {
89418 ssize_t (*store)(struct device *dev, struct device_attribute *attr,
89419 const char *buf, size_t count);
89420 };
89421+typedef struct device_attribute __no_const device_attribute_no_const;
89422
89423 struct dev_ext_attribute {
89424 struct device_attribute attr;
89425 void *var;
89426-};
89427+} __do_const;
89428
89429 ssize_t device_show_ulong(struct device *dev, struct device_attribute *attr,
89430 char *buf);
89431diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
89432index c3007cb..43efc8c 100644
89433--- a/include/linux/dma-mapping.h
89434+++ b/include/linux/dma-mapping.h
89435@@ -60,7 +60,7 @@ struct dma_map_ops {
89436 u64 (*get_required_mask)(struct device *dev);
89437 #endif
89438 int is_phys;
89439-};
89440+} __do_const;
89441
89442 #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
89443
89444diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
89445index b6997a0..108be6c 100644
89446--- a/include/linux/dmaengine.h
89447+++ b/include/linux/dmaengine.h
89448@@ -1133,9 +1133,9 @@ struct dma_pinned_list {
89449 struct dma_pinned_list *dma_pin_iovec_pages(struct iovec *iov, size_t len);
89450 void dma_unpin_iovec_pages(struct dma_pinned_list* pinned_list);
89451
89452-dma_cookie_t dma_memcpy_to_iovec(struct dma_chan *chan, struct iovec *iov,
89453+dma_cookie_t __intentional_overflow(0) dma_memcpy_to_iovec(struct dma_chan *chan, struct iovec *iov,
89454 struct dma_pinned_list *pinned_list, unsigned char *kdata, size_t len);
89455-dma_cookie_t dma_memcpy_pg_to_iovec(struct dma_chan *chan, struct iovec *iov,
89456+dma_cookie_t __intentional_overflow(0) dma_memcpy_pg_to_iovec(struct dma_chan *chan, struct iovec *iov,
89457 struct dma_pinned_list *pinned_list, struct page *page,
89458 unsigned int offset, size_t len);
89459
89460diff --git a/include/linux/efi.h b/include/linux/efi.h
89461index cf7e431..d239dce 100644
89462--- a/include/linux/efi.h
89463+++ b/include/linux/efi.h
89464@@ -1056,6 +1056,7 @@ struct efivar_operations {
89465 efi_set_variable_nonblocking_t *set_variable_nonblocking;
89466 efi_query_variable_store_t *query_variable_store;
89467 };
89468+typedef struct efivar_operations __no_const efivar_operations_no_const;
89469
89470 struct efivars {
89471 /*
89472diff --git a/include/linux/elf.h b/include/linux/elf.h
89473index 20fa8d8..3d0dd18 100644
89474--- a/include/linux/elf.h
89475+++ b/include/linux/elf.h
89476@@ -29,6 +29,7 @@ extern Elf32_Dyn _DYNAMIC [];
89477 #define elf_note elf32_note
89478 #define elf_addr_t Elf32_Off
89479 #define Elf_Half Elf32_Half
89480+#define elf_dyn Elf32_Dyn
89481
89482 #else
89483
89484@@ -39,6 +40,7 @@ extern Elf64_Dyn _DYNAMIC [];
89485 #define elf_note elf64_note
89486 #define elf_addr_t Elf64_Off
89487 #define Elf_Half Elf64_Half
89488+#define elf_dyn Elf64_Dyn
89489
89490 #endif
89491
89492diff --git a/include/linux/err.h b/include/linux/err.h
89493index a729120..6ede2c9 100644
89494--- a/include/linux/err.h
89495+++ b/include/linux/err.h
89496@@ -20,12 +20,12 @@
89497
89498 #define IS_ERR_VALUE(x) unlikely((x) >= (unsigned long)-MAX_ERRNO)
89499
89500-static inline void * __must_check ERR_PTR(long error)
89501+static inline void * __must_check __intentional_overflow(-1) ERR_PTR(long error)
89502 {
89503 return (void *) error;
89504 }
89505
89506-static inline long __must_check PTR_ERR(__force const void *ptr)
89507+static inline long __must_check __intentional_overflow(-1) PTR_ERR(__force const void *ptr)
89508 {
89509 return (long) ptr;
89510 }
89511diff --git a/include/linux/extcon.h b/include/linux/extcon.h
89512index 36f49c4..a2a1f4c 100644
89513--- a/include/linux/extcon.h
89514+++ b/include/linux/extcon.h
89515@@ -135,7 +135,7 @@ struct extcon_dev {
89516 /* /sys/class/extcon/.../mutually_exclusive/... */
89517 struct attribute_group attr_g_muex;
89518 struct attribute **attrs_muex;
89519- struct device_attribute *d_attrs_muex;
89520+ device_attribute_no_const *d_attrs_muex;
89521 };
89522
89523 /**
89524diff --git a/include/linux/fb.h b/include/linux/fb.h
89525index 043f328..180ccbf 100644
89526--- a/include/linux/fb.h
89527+++ b/include/linux/fb.h
89528@@ -305,7 +305,8 @@ struct fb_ops {
89529 /* called at KDB enter and leave time to prepare the console */
89530 int (*fb_debug_enter)(struct fb_info *info);
89531 int (*fb_debug_leave)(struct fb_info *info);
89532-};
89533+} __do_const;
89534+typedef struct fb_ops __no_const fb_ops_no_const;
89535
89536 #ifdef CONFIG_FB_TILEBLITTING
89537 #define FB_TILE_CURSOR_NONE 0
89538diff --git a/include/linux/fdtable.h b/include/linux/fdtable.h
89539index 230f87b..1fd0485 100644
89540--- a/include/linux/fdtable.h
89541+++ b/include/linux/fdtable.h
89542@@ -100,7 +100,7 @@ struct files_struct *get_files_struct(struct task_struct *);
89543 void put_files_struct(struct files_struct *fs);
89544 void reset_files_struct(struct files_struct *);
89545 int unshare_files(struct files_struct **);
89546-struct files_struct *dup_fd(struct files_struct *, int *);
89547+struct files_struct *dup_fd(struct files_struct *, int *) __latent_entropy;
89548 void do_close_on_exec(struct files_struct *);
89549 int iterate_fd(struct files_struct *, unsigned,
89550 int (*)(const void *, struct file *, unsigned),
89551diff --git a/include/linux/frontswap.h b/include/linux/frontswap.h
89552index 8293262..2b3b8bd 100644
89553--- a/include/linux/frontswap.h
89554+++ b/include/linux/frontswap.h
89555@@ -11,7 +11,7 @@ struct frontswap_ops {
89556 int (*load)(unsigned, pgoff_t, struct page *);
89557 void (*invalidate_page)(unsigned, pgoff_t);
89558 void (*invalidate_area)(unsigned);
89559-};
89560+} __no_const;
89561
89562 extern bool frontswap_enabled;
89563 extern struct frontswap_ops *
89564diff --git a/include/linux/fs.h b/include/linux/fs.h
89565index 52cc449..31f35cb 100644
89566--- a/include/linux/fs.h
89567+++ b/include/linux/fs.h
89568@@ -410,7 +410,7 @@ struct address_space {
89569 spinlock_t private_lock; /* for use by the address_space */
89570 struct list_head private_list; /* ditto */
89571 void *private_data; /* ditto */
89572-} __attribute__((aligned(sizeof(long))));
89573+} __attribute__((aligned(sizeof(long)))) __randomize_layout;
89574 /*
89575 * On most architectures that alignment is already the case; but
89576 * must be enforced here for CRIS, to let the least significant bit
89577@@ -453,7 +453,7 @@ struct block_device {
89578 int bd_fsfreeze_count;
89579 /* Mutex for freeze */
89580 struct mutex bd_fsfreeze_mutex;
89581-};
89582+} __randomize_layout;
89583
89584 /*
89585 * Radix-tree tags, for tagging dirty and writeback pages within the pagecache
89586@@ -639,7 +639,7 @@ struct inode {
89587 #endif
89588
89589 void *i_private; /* fs or device private pointer */
89590-};
89591+} __randomize_layout;
89592
89593 static inline int inode_unhashed(struct inode *inode)
89594 {
89595@@ -834,7 +834,7 @@ struct file {
89596 struct list_head f_tfile_llink;
89597 #endif /* #ifdef CONFIG_EPOLL */
89598 struct address_space *f_mapping;
89599-} __attribute__((aligned(4))); /* lest something weird decides that 2 is OK */
89600+} __attribute__((aligned(4))) __randomize_layout; /* lest something weird decides that 2 is OK */
89601
89602 struct file_handle {
89603 __u32 handle_bytes;
89604@@ -962,7 +962,7 @@ struct file_lock {
89605 int state; /* state of grant or error if -ve */
89606 } afs;
89607 } fl_u;
89608-};
89609+} __randomize_layout;
89610
89611 struct file_lock_context {
89612 spinlock_t flc_lock;
89613@@ -1316,7 +1316,7 @@ struct super_block {
89614 * Indicates how deep in a filesystem stack this SB is
89615 */
89616 int s_stack_depth;
89617-};
89618+} __randomize_layout;
89619
89620 extern struct timespec current_fs_time(struct super_block *sb);
89621
89622@@ -1570,7 +1570,8 @@ struct file_operations {
89623 #ifndef CONFIG_MMU
89624 unsigned (*mmap_capabilities)(struct file *);
89625 #endif
89626-};
89627+} __do_const __randomize_layout;
89628+typedef struct file_operations __no_const file_operations_no_const;
89629
89630 struct inode_operations {
89631 struct dentry * (*lookup) (struct inode *,struct dentry *, unsigned int);
89632@@ -2269,7 +2270,7 @@ extern int register_chrdev_region(dev_t, unsigned, const char *);
89633 extern int __register_chrdev(unsigned int major, unsigned int baseminor,
89634 unsigned int count, const char *name,
89635 const struct file_operations *fops);
89636-extern void __unregister_chrdev(unsigned int major, unsigned int baseminor,
89637+extern __nocapture(4) void __unregister_chrdev(unsigned int major, unsigned int baseminor,
89638 unsigned int count, const char *name);
89639 extern void unregister_chrdev_region(dev_t, unsigned);
89640 extern void chrdev_show(struct seq_file *,off_t);
89641@@ -2918,4 +2919,14 @@ static inline bool dir_relax(struct inode *inode)
89642 return !IS_DEADDIR(inode);
89643 }
89644
89645+static inline bool is_sidechannel_device(const struct inode *inode)
89646+{
89647+#ifdef CONFIG_GRKERNSEC_DEVICE_SIDECHANNEL
89648+ umode_t mode = inode->i_mode;
89649+ return ((S_ISCHR(mode) || S_ISBLK(mode)) && (mode & (S_IROTH | S_IWOTH)));
89650+#else
89651+ return false;
89652+#endif
89653+}
89654+
89655 #endif /* _LINUX_FS_H */
89656diff --git a/include/linux/fs_struct.h b/include/linux/fs_struct.h
89657index 0efc3e6..fd23610 100644
89658--- a/include/linux/fs_struct.h
89659+++ b/include/linux/fs_struct.h
89660@@ -6,13 +6,13 @@
89661 #include <linux/seqlock.h>
89662
89663 struct fs_struct {
89664- int users;
89665+ atomic_t users;
89666 spinlock_t lock;
89667 seqcount_t seq;
89668 int umask;
89669 int in_exec;
89670 struct path root, pwd;
89671-};
89672+} __randomize_layout;
89673
89674 extern struct kmem_cache *fs_cachep;
89675
89676diff --git a/include/linux/fscache-cache.h b/include/linux/fscache-cache.h
89677index 7714849..a4a5c7a 100644
89678--- a/include/linux/fscache-cache.h
89679+++ b/include/linux/fscache-cache.h
89680@@ -113,7 +113,7 @@ struct fscache_operation {
89681 fscache_operation_release_t release;
89682 };
89683
89684-extern atomic_t fscache_op_debug_id;
89685+extern atomic_unchecked_t fscache_op_debug_id;
89686 extern void fscache_op_work_func(struct work_struct *work);
89687
89688 extern void fscache_enqueue_operation(struct fscache_operation *);
89689@@ -135,7 +135,7 @@ static inline void fscache_operation_init(struct fscache_operation *op,
89690 INIT_WORK(&op->work, fscache_op_work_func);
89691 atomic_set(&op->usage, 1);
89692 op->state = FSCACHE_OP_ST_INITIALISED;
89693- op->debug_id = atomic_inc_return(&fscache_op_debug_id);
89694+ op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
89695 op->processor = processor;
89696 op->release = release;
89697 INIT_LIST_HEAD(&op->pend_link);
89698diff --git a/include/linux/fscache.h b/include/linux/fscache.h
89699index 115bb81..e7b812b 100644
89700--- a/include/linux/fscache.h
89701+++ b/include/linux/fscache.h
89702@@ -152,7 +152,7 @@ struct fscache_cookie_def {
89703 * - this is mandatory for any object that may have data
89704 */
89705 void (*now_uncached)(void *cookie_netfs_data);
89706-};
89707+} __do_const;
89708
89709 /*
89710 * fscache cached network filesystem type
89711diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h
89712index 7ee1774..72505b8 100644
89713--- a/include/linux/fsnotify.h
89714+++ b/include/linux/fsnotify.h
89715@@ -197,6 +197,9 @@ static inline void fsnotify_access(struct file *file)
89716 struct inode *inode = file_inode(file);
89717 __u32 mask = FS_ACCESS;
89718
89719+ if (is_sidechannel_device(inode))
89720+ return;
89721+
89722 if (S_ISDIR(inode->i_mode))
89723 mask |= FS_ISDIR;
89724
89725@@ -215,6 +218,9 @@ static inline void fsnotify_modify(struct file *file)
89726 struct inode *inode = file_inode(file);
89727 __u32 mask = FS_MODIFY;
89728
89729+ if (is_sidechannel_device(inode))
89730+ return;
89731+
89732 if (S_ISDIR(inode->i_mode))
89733 mask |= FS_ISDIR;
89734
89735@@ -317,7 +323,7 @@ static inline void fsnotify_change(struct dentry *dentry, unsigned int ia_valid)
89736 */
89737 static inline const unsigned char *fsnotify_oldname_init(const unsigned char *name)
89738 {
89739- return kstrdup(name, GFP_KERNEL);
89740+ return (const unsigned char *)kstrdup((const char *)name, GFP_KERNEL);
89741 }
89742
89743 /*
89744diff --git a/include/linux/genhd.h b/include/linux/genhd.h
89745index ec274e0..e678159 100644
89746--- a/include/linux/genhd.h
89747+++ b/include/linux/genhd.h
89748@@ -194,7 +194,7 @@ struct gendisk {
89749 struct kobject *slave_dir;
89750
89751 struct timer_rand_state *random;
89752- atomic_t sync_io; /* RAID */
89753+ atomic_unchecked_t sync_io; /* RAID */
89754 struct disk_events *ev;
89755 #ifdef CONFIG_BLK_DEV_INTEGRITY
89756 struct blk_integrity *integrity;
89757@@ -435,7 +435,7 @@ extern void disk_flush_events(struct gendisk *disk, unsigned int mask);
89758 extern unsigned int disk_clear_events(struct gendisk *disk, unsigned int mask);
89759
89760 /* drivers/char/random.c */
89761-extern void add_disk_randomness(struct gendisk *disk);
89762+extern void add_disk_randomness(struct gendisk *disk) __latent_entropy;
89763 extern void rand_initialize_disk(struct gendisk *disk);
89764
89765 static inline sector_t get_start_sect(struct block_device *bdev)
89766diff --git a/include/linux/genl_magic_func.h b/include/linux/genl_magic_func.h
89767index 667c311..abac2a7 100644
89768--- a/include/linux/genl_magic_func.h
89769+++ b/include/linux/genl_magic_func.h
89770@@ -246,7 +246,7 @@ const char *CONCAT_(GENL_MAGIC_FAMILY, _genl_cmd_to_str)(__u8 cmd)
89771 },
89772
89773 #define ZZZ_genl_ops CONCAT_(GENL_MAGIC_FAMILY, _genl_ops)
89774-static struct genl_ops ZZZ_genl_ops[] __read_mostly = {
89775+static struct genl_ops ZZZ_genl_ops[] = {
89776 #include GENL_MAGIC_INCLUDE_FILE
89777 };
89778
89779diff --git a/include/linux/gfp.h b/include/linux/gfp.h
89780index eb6fafe..9360779 100644
89781--- a/include/linux/gfp.h
89782+++ b/include/linux/gfp.h
89783@@ -35,6 +35,13 @@ struct vm_area_struct;
89784 #define ___GFP_NO_KSWAPD 0x400000u
89785 #define ___GFP_OTHER_NODE 0x800000u
89786 #define ___GFP_WRITE 0x1000000u
89787+
89788+#ifdef CONFIG_PAX_USERCOPY_SLABS
89789+#define ___GFP_USERCOPY 0x2000000u
89790+#else
89791+#define ___GFP_USERCOPY 0
89792+#endif
89793+
89794 /* If the above are modified, __GFP_BITS_SHIFT may need updating */
89795
89796 /*
89797@@ -92,6 +99,7 @@ struct vm_area_struct;
89798 #define __GFP_NO_KSWAPD ((__force gfp_t)___GFP_NO_KSWAPD)
89799 #define __GFP_OTHER_NODE ((__force gfp_t)___GFP_OTHER_NODE) /* On behalf of other node */
89800 #define __GFP_WRITE ((__force gfp_t)___GFP_WRITE) /* Allocator intends to dirty page */
89801+#define __GFP_USERCOPY ((__force gfp_t)___GFP_USERCOPY)/* Allocator intends to copy page to/from userland */
89802
89803 /*
89804 * This may seem redundant, but it's a way of annotating false positives vs.
89805@@ -99,7 +107,7 @@ struct vm_area_struct;
89806 */
89807 #define __GFP_NOTRACK_FALSE_POSITIVE (__GFP_NOTRACK)
89808
89809-#define __GFP_BITS_SHIFT 25 /* Room for N __GFP_FOO bits */
89810+#define __GFP_BITS_SHIFT 26 /* Room for N __GFP_FOO bits */
89811 #define __GFP_BITS_MASK ((__force gfp_t)((1 << __GFP_BITS_SHIFT) - 1))
89812
89813 /* This equals 0, but use constants in case they ever change */
89814@@ -154,6 +162,8 @@ struct vm_area_struct;
89815 /* 4GB DMA on some platforms */
89816 #define GFP_DMA32 __GFP_DMA32
89817
89818+#define GFP_USERCOPY __GFP_USERCOPY
89819+
89820 /* Convert GFP flags to their corresponding migrate type */
89821 static inline int gfpflags_to_migratetype(const gfp_t gfp_flags)
89822 {
89823diff --git a/include/linux/gracl.h b/include/linux/gracl.h
89824new file mode 100644
89825index 0000000..91858e4
89826--- /dev/null
89827+++ b/include/linux/gracl.h
89828@@ -0,0 +1,342 @@
89829+#ifndef GR_ACL_H
89830+#define GR_ACL_H
89831+
89832+#include <linux/grdefs.h>
89833+#include <linux/resource.h>
89834+#include <linux/capability.h>
89835+#include <linux/dcache.h>
89836+#include <asm/resource.h>
89837+
89838+/* Major status information */
89839+
89840+#define GR_VERSION "grsecurity 3.1"
89841+#define GRSECURITY_VERSION 0x3100
89842+
89843+enum {
89844+ GR_SHUTDOWN = 0,
89845+ GR_ENABLE = 1,
89846+ GR_SPROLE = 2,
89847+ GR_OLDRELOAD = 3,
89848+ GR_SEGVMOD = 4,
89849+ GR_STATUS = 5,
89850+ GR_UNSPROLE = 6,
89851+ GR_PASSSET = 7,
89852+ GR_SPROLEPAM = 8,
89853+ GR_RELOAD = 9,
89854+};
89855+
89856+/* Password setup definitions
89857+ * kernel/grhash.c */
89858+enum {
89859+ GR_PW_LEN = 128,
89860+ GR_SALT_LEN = 16,
89861+ GR_SHA_LEN = 32,
89862+};
89863+
89864+enum {
89865+ GR_SPROLE_LEN = 64,
89866+};
89867+
89868+enum {
89869+ GR_NO_GLOB = 0,
89870+ GR_REG_GLOB,
89871+ GR_CREATE_GLOB
89872+};
89873+
89874+#define GR_NLIMITS 32
89875+
89876+/* Begin Data Structures */
89877+
89878+struct sprole_pw {
89879+ unsigned char *rolename;
89880+ unsigned char salt[GR_SALT_LEN];
89881+ unsigned char sum[GR_SHA_LEN]; /* 256-bit SHA hash of the password */
89882+};
89883+
89884+struct name_entry {
89885+ __u32 key;
89886+ u64 inode;
89887+ dev_t device;
89888+ char *name;
89889+ __u16 len;
89890+ __u8 deleted;
89891+ struct name_entry *prev;
89892+ struct name_entry *next;
89893+};
89894+
89895+struct inodev_entry {
89896+ struct name_entry *nentry;
89897+ struct inodev_entry *prev;
89898+ struct inodev_entry *next;
89899+};
89900+
89901+struct acl_role_db {
89902+ struct acl_role_label **r_hash;
89903+ __u32 r_size;
89904+};
89905+
89906+struct inodev_db {
89907+ struct inodev_entry **i_hash;
89908+ __u32 i_size;
89909+};
89910+
89911+struct name_db {
89912+ struct name_entry **n_hash;
89913+ __u32 n_size;
89914+};
89915+
89916+struct crash_uid {
89917+ uid_t uid;
89918+ unsigned long expires;
89919+};
89920+
89921+struct gr_hash_struct {
89922+ void **table;
89923+ void **nametable;
89924+ void *first;
89925+ __u32 table_size;
89926+ __u32 used_size;
89927+ int type;
89928+};
89929+
89930+/* Userspace Grsecurity ACL data structures */
89931+
89932+struct acl_subject_label {
89933+ char *filename;
89934+ u64 inode;
89935+ dev_t device;
89936+ __u32 mode;
89937+ kernel_cap_t cap_mask;
89938+ kernel_cap_t cap_lower;
89939+ kernel_cap_t cap_invert_audit;
89940+
89941+ struct rlimit res[GR_NLIMITS];
89942+ __u32 resmask;
89943+
89944+ __u8 user_trans_type;
89945+ __u8 group_trans_type;
89946+ uid_t *user_transitions;
89947+ gid_t *group_transitions;
89948+ __u16 user_trans_num;
89949+ __u16 group_trans_num;
89950+
89951+ __u32 sock_families[2];
89952+ __u32 ip_proto[8];
89953+ __u32 ip_type;
89954+ struct acl_ip_label **ips;
89955+ __u32 ip_num;
89956+ __u32 inaddr_any_override;
89957+
89958+ __u32 crashes;
89959+ unsigned long expires;
89960+
89961+ struct acl_subject_label *parent_subject;
89962+ struct gr_hash_struct *hash;
89963+ struct acl_subject_label *prev;
89964+ struct acl_subject_label *next;
89965+
89966+ struct acl_object_label **obj_hash;
89967+ __u32 obj_hash_size;
89968+ __u16 pax_flags;
89969+};
89970+
89971+struct role_allowed_ip {
89972+ __u32 addr;
89973+ __u32 netmask;
89974+
89975+ struct role_allowed_ip *prev;
89976+ struct role_allowed_ip *next;
89977+};
89978+
89979+struct role_transition {
89980+ char *rolename;
89981+
89982+ struct role_transition *prev;
89983+ struct role_transition *next;
89984+};
89985+
89986+struct acl_role_label {
89987+ char *rolename;
89988+ uid_t uidgid;
89989+ __u16 roletype;
89990+
89991+ __u16 auth_attempts;
89992+ unsigned long expires;
89993+
89994+ struct acl_subject_label *root_label;
89995+ struct gr_hash_struct *hash;
89996+
89997+ struct acl_role_label *prev;
89998+ struct acl_role_label *next;
89999+
90000+ struct role_transition *transitions;
90001+ struct role_allowed_ip *allowed_ips;
90002+ uid_t *domain_children;
90003+ __u16 domain_child_num;
90004+
90005+ umode_t umask;
90006+
90007+ struct acl_subject_label **subj_hash;
90008+ __u32 subj_hash_size;
90009+};
90010+
90011+struct user_acl_role_db {
90012+ struct acl_role_label **r_table;
90013+ __u32 num_pointers; /* Number of allocations to track */
90014+ __u32 num_roles; /* Number of roles */
90015+ __u32 num_domain_children; /* Number of domain children */
90016+ __u32 num_subjects; /* Number of subjects */
90017+ __u32 num_objects; /* Number of objects */
90018+};
90019+
90020+struct acl_object_label {
90021+ char *filename;
90022+ u64 inode;
90023+ dev_t device;
90024+ __u32 mode;
90025+
90026+ struct acl_subject_label *nested;
90027+ struct acl_object_label *globbed;
90028+
90029+ /* next two structures not used */
90030+
90031+ struct acl_object_label *prev;
90032+ struct acl_object_label *next;
90033+};
90034+
90035+struct acl_ip_label {
90036+ char *iface;
90037+ __u32 addr;
90038+ __u32 netmask;
90039+ __u16 low, high;
90040+ __u8 mode;
90041+ __u32 type;
90042+ __u32 proto[8];
90043+
90044+ /* next two structures not used */
90045+
90046+ struct acl_ip_label *prev;
90047+ struct acl_ip_label *next;
90048+};
90049+
90050+struct gr_arg {
90051+ struct user_acl_role_db role_db;
90052+ unsigned char pw[GR_PW_LEN];
90053+ unsigned char salt[GR_SALT_LEN];
90054+ unsigned char sum[GR_SHA_LEN];
90055+ unsigned char sp_role[GR_SPROLE_LEN];
90056+ struct sprole_pw *sprole_pws;
90057+ dev_t segv_device;
90058+ u64 segv_inode;
90059+ uid_t segv_uid;
90060+ __u16 num_sprole_pws;
90061+ __u16 mode;
90062+};
90063+
90064+struct gr_arg_wrapper {
90065+ struct gr_arg *arg;
90066+ __u32 version;
90067+ __u32 size;
90068+};
90069+
90070+struct subject_map {
90071+ struct acl_subject_label *user;
90072+ struct acl_subject_label *kernel;
90073+ struct subject_map *prev;
90074+ struct subject_map *next;
90075+};
90076+
90077+struct acl_subj_map_db {
90078+ struct subject_map **s_hash;
90079+ __u32 s_size;
90080+};
90081+
90082+struct gr_policy_state {
90083+ struct sprole_pw **acl_special_roles;
90084+ __u16 num_sprole_pws;
90085+ struct acl_role_label *kernel_role;
90086+ struct acl_role_label *role_list;
90087+ struct acl_role_label *default_role;
90088+ struct acl_role_db acl_role_set;
90089+ struct acl_subj_map_db subj_map_set;
90090+ struct name_db name_set;
90091+ struct inodev_db inodev_set;
90092+};
90093+
90094+struct gr_alloc_state {
90095+ unsigned long alloc_stack_next;
90096+ unsigned long alloc_stack_size;
90097+ void **alloc_stack;
90098+};
90099+
90100+struct gr_reload_state {
90101+ struct gr_policy_state oldpolicy;
90102+ struct gr_alloc_state oldalloc;
90103+ struct gr_policy_state newpolicy;
90104+ struct gr_alloc_state newalloc;
90105+ struct gr_policy_state *oldpolicy_ptr;
90106+ struct gr_alloc_state *oldalloc_ptr;
90107+ unsigned char oldmode;
90108+};
90109+
90110+/* End Data Structures Section */
90111+
90112+/* Hash functions generated by empirical testing by Brad Spengler
90113+ Makes good use of the low bits of the inode. Generally 0-1 times
90114+ in loop for successful match. 0-3 for unsuccessful match.
90115+ Shift/add algorithm with modulus of table size and an XOR*/
90116+
90117+static __inline__ unsigned int
90118+gr_rhash(const uid_t uid, const __u16 type, const unsigned int sz)
90119+{
90120+ return ((((uid + type) << (16 + type)) ^ uid) % sz);
90121+}
90122+
90123+ static __inline__ unsigned int
90124+gr_shash(const struct acl_subject_label *userp, const unsigned int sz)
90125+{
90126+ return ((const unsigned long)userp % sz);
90127+}
90128+
90129+static __inline__ unsigned int
90130+gr_fhash(const u64 ino, const dev_t dev, const unsigned int sz)
90131+{
90132+ unsigned int rem;
90133+ div_u64_rem((ino + dev) ^ ((ino << 13) + (ino << 23) + (dev << 9)), sz, &rem);
90134+ return rem;
90135+}
90136+
90137+static __inline__ unsigned int
90138+gr_nhash(const char *name, const __u16 len, const unsigned int sz)
90139+{
90140+ return full_name_hash((const unsigned char *)name, len) % sz;
90141+}
90142+
90143+#define FOR_EACH_SUBJECT_START(role,subj,iter) \
90144+ subj = NULL; \
90145+ iter = 0; \
90146+ while (iter < role->subj_hash_size) { \
90147+ if (subj == NULL) \
90148+ subj = role->subj_hash[iter]; \
90149+ if (subj == NULL) { \
90150+ iter++; \
90151+ continue; \
90152+ }
90153+
90154+#define FOR_EACH_SUBJECT_END(subj,iter) \
90155+ subj = subj->next; \
90156+ if (subj == NULL) \
90157+ iter++; \
90158+ }
90159+
90160+
90161+#define FOR_EACH_NESTED_SUBJECT_START(role,subj) \
90162+ subj = role->hash->first; \
90163+ while (subj != NULL) {
90164+
90165+#define FOR_EACH_NESTED_SUBJECT_END(subj) \
90166+ subj = subj->next; \
90167+ }
90168+
90169+#endif
90170+
90171diff --git a/include/linux/gracl_compat.h b/include/linux/gracl_compat.h
90172new file mode 100644
90173index 0000000..af64092
90174--- /dev/null
90175+++ b/include/linux/gracl_compat.h
90176@@ -0,0 +1,156 @@
90177+#ifndef GR_ACL_COMPAT_H
90178+#define GR_ACL_COMPAT_H
90179+
90180+#include <linux/resource.h>
90181+#include <asm/resource.h>
90182+
90183+struct sprole_pw_compat {
90184+ compat_uptr_t rolename;
90185+ unsigned char salt[GR_SALT_LEN];
90186+ unsigned char sum[GR_SHA_LEN];
90187+};
90188+
90189+struct gr_hash_struct_compat {
90190+ compat_uptr_t table;
90191+ compat_uptr_t nametable;
90192+ compat_uptr_t first;
90193+ __u32 table_size;
90194+ __u32 used_size;
90195+ int type;
90196+};
90197+
90198+struct acl_subject_label_compat {
90199+ compat_uptr_t filename;
90200+ compat_u64 inode;
90201+ __u32 device;
90202+ __u32 mode;
90203+ kernel_cap_t cap_mask;
90204+ kernel_cap_t cap_lower;
90205+ kernel_cap_t cap_invert_audit;
90206+
90207+ struct compat_rlimit res[GR_NLIMITS];
90208+ __u32 resmask;
90209+
90210+ __u8 user_trans_type;
90211+ __u8 group_trans_type;
90212+ compat_uptr_t user_transitions;
90213+ compat_uptr_t group_transitions;
90214+ __u16 user_trans_num;
90215+ __u16 group_trans_num;
90216+
90217+ __u32 sock_families[2];
90218+ __u32 ip_proto[8];
90219+ __u32 ip_type;
90220+ compat_uptr_t ips;
90221+ __u32 ip_num;
90222+ __u32 inaddr_any_override;
90223+
90224+ __u32 crashes;
90225+ compat_ulong_t expires;
90226+
90227+ compat_uptr_t parent_subject;
90228+ compat_uptr_t hash;
90229+ compat_uptr_t prev;
90230+ compat_uptr_t next;
90231+
90232+ compat_uptr_t obj_hash;
90233+ __u32 obj_hash_size;
90234+ __u16 pax_flags;
90235+};
90236+
90237+struct role_allowed_ip_compat {
90238+ __u32 addr;
90239+ __u32 netmask;
90240+
90241+ compat_uptr_t prev;
90242+ compat_uptr_t next;
90243+};
90244+
90245+struct role_transition_compat {
90246+ compat_uptr_t rolename;
90247+
90248+ compat_uptr_t prev;
90249+ compat_uptr_t next;
90250+};
90251+
90252+struct acl_role_label_compat {
90253+ compat_uptr_t rolename;
90254+ uid_t uidgid;
90255+ __u16 roletype;
90256+
90257+ __u16 auth_attempts;
90258+ compat_ulong_t expires;
90259+
90260+ compat_uptr_t root_label;
90261+ compat_uptr_t hash;
90262+
90263+ compat_uptr_t prev;
90264+ compat_uptr_t next;
90265+
90266+ compat_uptr_t transitions;
90267+ compat_uptr_t allowed_ips;
90268+ compat_uptr_t domain_children;
90269+ __u16 domain_child_num;
90270+
90271+ umode_t umask;
90272+
90273+ compat_uptr_t subj_hash;
90274+ __u32 subj_hash_size;
90275+};
90276+
90277+struct user_acl_role_db_compat {
90278+ compat_uptr_t r_table;
90279+ __u32 num_pointers;
90280+ __u32 num_roles;
90281+ __u32 num_domain_children;
90282+ __u32 num_subjects;
90283+ __u32 num_objects;
90284+};
90285+
90286+struct acl_object_label_compat {
90287+ compat_uptr_t filename;
90288+ compat_u64 inode;
90289+ __u32 device;
90290+ __u32 mode;
90291+
90292+ compat_uptr_t nested;
90293+ compat_uptr_t globbed;
90294+
90295+ compat_uptr_t prev;
90296+ compat_uptr_t next;
90297+};
90298+
90299+struct acl_ip_label_compat {
90300+ compat_uptr_t iface;
90301+ __u32 addr;
90302+ __u32 netmask;
90303+ __u16 low, high;
90304+ __u8 mode;
90305+ __u32 type;
90306+ __u32 proto[8];
90307+
90308+ compat_uptr_t prev;
90309+ compat_uptr_t next;
90310+};
90311+
90312+struct gr_arg_compat {
90313+ struct user_acl_role_db_compat role_db;
90314+ unsigned char pw[GR_PW_LEN];
90315+ unsigned char salt[GR_SALT_LEN];
90316+ unsigned char sum[GR_SHA_LEN];
90317+ unsigned char sp_role[GR_SPROLE_LEN];
90318+ compat_uptr_t sprole_pws;
90319+ __u32 segv_device;
90320+ compat_u64 segv_inode;
90321+ uid_t segv_uid;
90322+ __u16 num_sprole_pws;
90323+ __u16 mode;
90324+};
90325+
90326+struct gr_arg_wrapper_compat {
90327+ compat_uptr_t arg;
90328+ __u32 version;
90329+ __u32 size;
90330+};
90331+
90332+#endif
90333diff --git a/include/linux/gralloc.h b/include/linux/gralloc.h
90334new file mode 100644
90335index 0000000..323ecf2
90336--- /dev/null
90337+++ b/include/linux/gralloc.h
90338@@ -0,0 +1,9 @@
90339+#ifndef __GRALLOC_H
90340+#define __GRALLOC_H
90341+
90342+void acl_free_all(void);
90343+int acl_alloc_stack_init(unsigned long size);
90344+void *acl_alloc(unsigned long len);
90345+void *acl_alloc_num(unsigned long num, unsigned long len);
90346+
90347+#endif
90348diff --git a/include/linux/grdefs.h b/include/linux/grdefs.h
90349new file mode 100644
90350index 0000000..be66033
90351--- /dev/null
90352+++ b/include/linux/grdefs.h
90353@@ -0,0 +1,140 @@
90354+#ifndef GRDEFS_H
90355+#define GRDEFS_H
90356+
90357+/* Begin grsecurity status declarations */
90358+
90359+enum {
90360+ GR_READY = 0x01,
90361+ GR_STATUS_INIT = 0x00 // disabled state
90362+};
90363+
90364+/* Begin ACL declarations */
90365+
90366+/* Role flags */
90367+
90368+enum {
90369+ GR_ROLE_USER = 0x0001,
90370+ GR_ROLE_GROUP = 0x0002,
90371+ GR_ROLE_DEFAULT = 0x0004,
90372+ GR_ROLE_SPECIAL = 0x0008,
90373+ GR_ROLE_AUTH = 0x0010,
90374+ GR_ROLE_NOPW = 0x0020,
90375+ GR_ROLE_GOD = 0x0040,
90376+ GR_ROLE_LEARN = 0x0080,
90377+ GR_ROLE_TPE = 0x0100,
90378+ GR_ROLE_DOMAIN = 0x0200,
90379+ GR_ROLE_PAM = 0x0400,
90380+ GR_ROLE_PERSIST = 0x0800
90381+};
90382+
90383+/* ACL Subject and Object mode flags */
90384+enum {
90385+ GR_DELETED = 0x80000000
90386+};
90387+
90388+/* ACL Object-only mode flags */
90389+enum {
90390+ GR_READ = 0x00000001,
90391+ GR_APPEND = 0x00000002,
90392+ GR_WRITE = 0x00000004,
90393+ GR_EXEC = 0x00000008,
90394+ GR_FIND = 0x00000010,
90395+ GR_INHERIT = 0x00000020,
90396+ GR_SETID = 0x00000040,
90397+ GR_CREATE = 0x00000080,
90398+ GR_DELETE = 0x00000100,
90399+ GR_LINK = 0x00000200,
90400+ GR_AUDIT_READ = 0x00000400,
90401+ GR_AUDIT_APPEND = 0x00000800,
90402+ GR_AUDIT_WRITE = 0x00001000,
90403+ GR_AUDIT_EXEC = 0x00002000,
90404+ GR_AUDIT_FIND = 0x00004000,
90405+ GR_AUDIT_INHERIT= 0x00008000,
90406+ GR_AUDIT_SETID = 0x00010000,
90407+ GR_AUDIT_CREATE = 0x00020000,
90408+ GR_AUDIT_DELETE = 0x00040000,
90409+ GR_AUDIT_LINK = 0x00080000,
90410+ GR_PTRACERD = 0x00100000,
90411+ GR_NOPTRACE = 0x00200000,
90412+ GR_SUPPRESS = 0x00400000,
90413+ GR_NOLEARN = 0x00800000,
90414+ GR_INIT_TRANSFER= 0x01000000
90415+};
90416+
90417+#define GR_AUDITS (GR_AUDIT_READ | GR_AUDIT_WRITE | GR_AUDIT_APPEND | GR_AUDIT_EXEC | \
90418+ GR_AUDIT_FIND | GR_AUDIT_INHERIT | GR_AUDIT_SETID | \
90419+ GR_AUDIT_CREATE | GR_AUDIT_DELETE | GR_AUDIT_LINK)
90420+
90421+/* ACL subject-only mode flags */
90422+enum {
90423+ GR_KILL = 0x00000001,
90424+ GR_VIEW = 0x00000002,
90425+ GR_PROTECTED = 0x00000004,
90426+ GR_LEARN = 0x00000008,
90427+ GR_OVERRIDE = 0x00000010,
90428+ /* just a placeholder, this mode is only used in userspace */
90429+ GR_DUMMY = 0x00000020,
90430+ GR_PROTSHM = 0x00000040,
90431+ GR_KILLPROC = 0x00000080,
90432+ GR_KILLIPPROC = 0x00000100,
90433+ /* just a placeholder, this mode is only used in userspace */
90434+ GR_NOTROJAN = 0x00000200,
90435+ GR_PROTPROCFD = 0x00000400,
90436+ GR_PROCACCT = 0x00000800,
90437+ GR_RELAXPTRACE = 0x00001000,
90438+ //GR_NESTED = 0x00002000,
90439+ GR_INHERITLEARN = 0x00004000,
90440+ GR_PROCFIND = 0x00008000,
90441+ GR_POVERRIDE = 0x00010000,
90442+ GR_KERNELAUTH = 0x00020000,
90443+ GR_ATSECURE = 0x00040000,
90444+ GR_SHMEXEC = 0x00080000
90445+};
90446+
90447+enum {
90448+ GR_PAX_ENABLE_SEGMEXEC = 0x0001,
90449+ GR_PAX_ENABLE_PAGEEXEC = 0x0002,
90450+ GR_PAX_ENABLE_MPROTECT = 0x0004,
90451+ GR_PAX_ENABLE_RANDMMAP = 0x0008,
90452+ GR_PAX_ENABLE_EMUTRAMP = 0x0010,
90453+ GR_PAX_DISABLE_SEGMEXEC = 0x0100,
90454+ GR_PAX_DISABLE_PAGEEXEC = 0x0200,
90455+ GR_PAX_DISABLE_MPROTECT = 0x0400,
90456+ GR_PAX_DISABLE_RANDMMAP = 0x0800,
90457+ GR_PAX_DISABLE_EMUTRAMP = 0x1000,
90458+};
90459+
90460+enum {
90461+ GR_ID_USER = 0x01,
90462+ GR_ID_GROUP = 0x02,
90463+};
90464+
90465+enum {
90466+ GR_ID_ALLOW = 0x01,
90467+ GR_ID_DENY = 0x02,
90468+};
90469+
90470+#define GR_CRASH_RES 31
90471+#define GR_UIDTABLE_MAX 500
90472+
90473+/* begin resource learning section */
90474+enum {
90475+ GR_RLIM_CPU_BUMP = 60,
90476+ GR_RLIM_FSIZE_BUMP = 50000,
90477+ GR_RLIM_DATA_BUMP = 10000,
90478+ GR_RLIM_STACK_BUMP = 1000,
90479+ GR_RLIM_CORE_BUMP = 10000,
90480+ GR_RLIM_RSS_BUMP = 500000,
90481+ GR_RLIM_NPROC_BUMP = 1,
90482+ GR_RLIM_NOFILE_BUMP = 5,
90483+ GR_RLIM_MEMLOCK_BUMP = 50000,
90484+ GR_RLIM_AS_BUMP = 500000,
90485+ GR_RLIM_LOCKS_BUMP = 2,
90486+ GR_RLIM_SIGPENDING_BUMP = 5,
90487+ GR_RLIM_MSGQUEUE_BUMP = 10000,
90488+ GR_RLIM_NICE_BUMP = 1,
90489+ GR_RLIM_RTPRIO_BUMP = 1,
90490+ GR_RLIM_RTTIME_BUMP = 1000000
90491+};
90492+
90493+#endif
90494diff --git a/include/linux/grinternal.h b/include/linux/grinternal.h
90495new file mode 100644
90496index 0000000..fb1de5d
90497--- /dev/null
90498+++ b/include/linux/grinternal.h
90499@@ -0,0 +1,230 @@
90500+#ifndef __GRINTERNAL_H
90501+#define __GRINTERNAL_H
90502+
90503+#ifdef CONFIG_GRKERNSEC
90504+
90505+#include <linux/fs.h>
90506+#include <linux/mnt_namespace.h>
90507+#include <linux/nsproxy.h>
90508+#include <linux/gracl.h>
90509+#include <linux/grdefs.h>
90510+#include <linux/grmsg.h>
90511+
90512+void gr_add_learn_entry(const char *fmt, ...)
90513+ __attribute__ ((format (printf, 1, 2)));
90514+__u32 gr_search_file(const struct dentry *dentry, const __u32 mode,
90515+ const struct vfsmount *mnt);
90516+__u32 gr_check_create(const struct dentry *new_dentry,
90517+ const struct dentry *parent,
90518+ const struct vfsmount *mnt, const __u32 mode);
90519+int gr_check_protected_task(const struct task_struct *task);
90520+__u32 to_gr_audit(const __u32 reqmode);
90521+int gr_set_acls(const int type);
90522+int gr_acl_is_enabled(void);
90523+char gr_roletype_to_char(void);
90524+
90525+void gr_handle_alertkill(struct task_struct *task);
90526+char *gr_to_filename(const struct dentry *dentry,
90527+ const struct vfsmount *mnt);
90528+char *gr_to_filename1(const struct dentry *dentry,
90529+ const struct vfsmount *mnt);
90530+char *gr_to_filename2(const struct dentry *dentry,
90531+ const struct vfsmount *mnt);
90532+char *gr_to_filename3(const struct dentry *dentry,
90533+ const struct vfsmount *mnt);
90534+
90535+extern int grsec_enable_ptrace_readexec;
90536+extern int grsec_enable_harden_ptrace;
90537+extern int grsec_enable_link;
90538+extern int grsec_enable_fifo;
90539+extern int grsec_enable_execve;
90540+extern int grsec_enable_shm;
90541+extern int grsec_enable_execlog;
90542+extern int grsec_enable_signal;
90543+extern int grsec_enable_audit_ptrace;
90544+extern int grsec_enable_forkfail;
90545+extern int grsec_enable_time;
90546+extern int grsec_enable_rofs;
90547+extern int grsec_deny_new_usb;
90548+extern int grsec_enable_chroot_shmat;
90549+extern int grsec_enable_chroot_mount;
90550+extern int grsec_enable_chroot_double;
90551+extern int grsec_enable_chroot_pivot;
90552+extern int grsec_enable_chroot_chdir;
90553+extern int grsec_enable_chroot_chmod;
90554+extern int grsec_enable_chroot_mknod;
90555+extern int grsec_enable_chroot_fchdir;
90556+extern int grsec_enable_chroot_nice;
90557+extern int grsec_enable_chroot_execlog;
90558+extern int grsec_enable_chroot_caps;
90559+extern int grsec_enable_chroot_rename;
90560+extern int grsec_enable_chroot_sysctl;
90561+extern int grsec_enable_chroot_unix;
90562+extern int grsec_enable_symlinkown;
90563+extern kgid_t grsec_symlinkown_gid;
90564+extern int grsec_enable_tpe;
90565+extern kgid_t grsec_tpe_gid;
90566+extern int grsec_enable_tpe_all;
90567+extern int grsec_enable_tpe_invert;
90568+extern int grsec_enable_socket_all;
90569+extern kgid_t grsec_socket_all_gid;
90570+extern int grsec_enable_socket_client;
90571+extern kgid_t grsec_socket_client_gid;
90572+extern int grsec_enable_socket_server;
90573+extern kgid_t grsec_socket_server_gid;
90574+extern kgid_t grsec_audit_gid;
90575+extern int grsec_enable_group;
90576+extern int grsec_enable_log_rwxmaps;
90577+extern int grsec_enable_mount;
90578+extern int grsec_enable_chdir;
90579+extern int grsec_resource_logging;
90580+extern int grsec_enable_blackhole;
90581+extern int grsec_lastack_retries;
90582+extern int grsec_enable_brute;
90583+extern int grsec_enable_harden_ipc;
90584+extern int grsec_lock;
90585+
90586+extern spinlock_t grsec_alert_lock;
90587+extern unsigned long grsec_alert_wtime;
90588+extern unsigned long grsec_alert_fyet;
90589+
90590+extern spinlock_t grsec_audit_lock;
90591+
90592+extern rwlock_t grsec_exec_file_lock;
90593+
90594+#define gr_task_fullpath(tsk) ((tsk)->exec_file ? \
90595+ gr_to_filename2((tsk)->exec_file->f_path.dentry, \
90596+ (tsk)->exec_file->f_path.mnt) : "/")
90597+
90598+#define gr_parent_task_fullpath(tsk) ((tsk)->real_parent->exec_file ? \
90599+ gr_to_filename3((tsk)->real_parent->exec_file->f_path.dentry, \
90600+ (tsk)->real_parent->exec_file->f_path.mnt) : "/")
90601+
90602+#define gr_task_fullpath0(tsk) ((tsk)->exec_file ? \
90603+ gr_to_filename((tsk)->exec_file->f_path.dentry, \
90604+ (tsk)->exec_file->f_path.mnt) : "/")
90605+
90606+#define gr_parent_task_fullpath0(tsk) ((tsk)->real_parent->exec_file ? \
90607+ gr_to_filename1((tsk)->real_parent->exec_file->f_path.dentry, \
90608+ (tsk)->real_parent->exec_file->f_path.mnt) : "/")
90609+
90610+#define proc_is_chrooted(tsk_a) ((tsk_a)->gr_is_chrooted)
90611+
90612+#define have_same_root(tsk_a,tsk_b) ((tsk_a)->gr_chroot_dentry == (tsk_b)->gr_chroot_dentry)
90613+
90614+static inline bool gr_is_same_file(const struct file *file1, const struct file *file2)
90615+{
90616+ if (file1 && file2) {
90617+ const struct inode *inode1 = file1->f_path.dentry->d_inode;
90618+ const struct inode *inode2 = file2->f_path.dentry->d_inode;
90619+ if (inode1->i_ino == inode2->i_ino && inode1->i_sb->s_dev == inode2->i_sb->s_dev)
90620+ return true;
90621+ }
90622+
90623+ return false;
90624+}
90625+
90626+#define GR_CHROOT_CAPS {{ \
90627+ CAP_TO_MASK(CAP_LINUX_IMMUTABLE) | CAP_TO_MASK(CAP_NET_ADMIN) | \
90628+ CAP_TO_MASK(CAP_SYS_MODULE) | CAP_TO_MASK(CAP_SYS_RAWIO) | \
90629+ CAP_TO_MASK(CAP_SYS_PACCT) | CAP_TO_MASK(CAP_SYS_ADMIN) | \
90630+ CAP_TO_MASK(CAP_SYS_BOOT) | CAP_TO_MASK(CAP_SYS_TIME) | \
90631+ CAP_TO_MASK(CAP_NET_RAW) | CAP_TO_MASK(CAP_SYS_TTY_CONFIG) | \
90632+ CAP_TO_MASK(CAP_IPC_OWNER) | CAP_TO_MASK(CAP_SETFCAP), \
90633+ CAP_TO_MASK(CAP_SYSLOG) | CAP_TO_MASK(CAP_MAC_ADMIN) }}
90634+
90635+#define security_learn(normal_msg,args...) \
90636+({ \
90637+ read_lock(&grsec_exec_file_lock); \
90638+ gr_add_learn_entry(normal_msg "\n", ## args); \
90639+ read_unlock(&grsec_exec_file_lock); \
90640+})
90641+
90642+enum {
90643+ GR_DO_AUDIT,
90644+ GR_DONT_AUDIT,
90645+ /* used for non-audit messages that we shouldn't kill the task on */
90646+ GR_DONT_AUDIT_GOOD
90647+};
90648+
90649+enum {
90650+ GR_TTYSNIFF,
90651+ GR_RBAC,
90652+ GR_RBAC_STR,
90653+ GR_STR_RBAC,
90654+ GR_RBAC_MODE2,
90655+ GR_RBAC_MODE3,
90656+ GR_FILENAME,
90657+ GR_SYSCTL_HIDDEN,
90658+ GR_NOARGS,
90659+ GR_ONE_INT,
90660+ GR_ONE_INT_TWO_STR,
90661+ GR_ONE_STR,
90662+ GR_STR_INT,
90663+ GR_TWO_STR_INT,
90664+ GR_TWO_INT,
90665+ GR_TWO_U64,
90666+ GR_THREE_INT,
90667+ GR_FIVE_INT_TWO_STR,
90668+ GR_TWO_STR,
90669+ GR_THREE_STR,
90670+ GR_FOUR_STR,
90671+ GR_STR_FILENAME,
90672+ GR_FILENAME_STR,
90673+ GR_FILENAME_TWO_INT,
90674+ GR_FILENAME_TWO_INT_STR,
90675+ GR_TEXTREL,
90676+ GR_PTRACE,
90677+ GR_RESOURCE,
90678+ GR_CAP,
90679+ GR_SIG,
90680+ GR_SIG2,
90681+ GR_CRASH1,
90682+ GR_CRASH2,
90683+ GR_PSACCT,
90684+ GR_RWXMAP,
90685+ GR_RWXMAPVMA
90686+};
90687+
90688+#define gr_log_hidden_sysctl(audit, msg, str) gr_log_varargs(audit, msg, GR_SYSCTL_HIDDEN, str)
90689+#define gr_log_ttysniff(audit, msg, task) gr_log_varargs(audit, msg, GR_TTYSNIFF, task)
90690+#define gr_log_fs_rbac_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_RBAC, dentry, mnt)
90691+#define gr_log_fs_rbac_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_RBAC_STR, dentry, mnt, str)
90692+#define gr_log_fs_str_rbac(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_RBAC, str, dentry, mnt)
90693+#define gr_log_fs_rbac_mode2(audit, msg, dentry, mnt, str1, str2) gr_log_varargs(audit, msg, GR_RBAC_MODE2, dentry, mnt, str1, str2)
90694+#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)
90695+#define gr_log_fs_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_FILENAME, dentry, mnt)
90696+#define gr_log_noargs(audit, msg) gr_log_varargs(audit, msg, GR_NOARGS)
90697+#define gr_log_int(audit, msg, num) gr_log_varargs(audit, msg, GR_ONE_INT, num)
90698+#define gr_log_int_str2(audit, msg, num, str1, str2) gr_log_varargs(audit, msg, GR_ONE_INT_TWO_STR, num, str1, str2)
90699+#define gr_log_str(audit, msg, str) gr_log_varargs(audit, msg, GR_ONE_STR, str)
90700+#define gr_log_str_int(audit, msg, str, num) gr_log_varargs(audit, msg, GR_STR_INT, str, num)
90701+#define gr_log_int_int(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_INT, num1, num2)
90702+#define gr_log_two_u64(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_U64, num1, num2)
90703+#define gr_log_int3(audit, msg, num1, num2, num3) gr_log_varargs(audit, msg, GR_THREE_INT, num1, num2, num3)
90704+#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)
90705+#define gr_log_str_str(audit, msg, str1, str2) gr_log_varargs(audit, msg, GR_TWO_STR, str1, str2)
90706+#define gr_log_str2_int(audit, msg, str1, str2, num) gr_log_varargs(audit, msg, GR_TWO_STR_INT, str1, str2, num)
90707+#define gr_log_str3(audit, msg, str1, str2, str3) gr_log_varargs(audit, msg, GR_THREE_STR, str1, str2, str3)
90708+#define gr_log_str4(audit, msg, str1, str2, str3, str4) gr_log_varargs(audit, msg, GR_FOUR_STR, str1, str2, str3, str4)
90709+#define gr_log_str_fs(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_FILENAME, str, dentry, mnt)
90710+#define gr_log_fs_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_FILENAME_STR, dentry, mnt, str)
90711+#define gr_log_fs_int2(audit, msg, dentry, mnt, num1, num2) gr_log_varargs(audit, msg, GR_FILENAME_TWO_INT, dentry, mnt, num1, num2)
90712+#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)
90713+#define gr_log_textrel_ulong_ulong(audit, msg, file, ulong1, ulong2) gr_log_varargs(audit, msg, GR_TEXTREL, file, ulong1, ulong2)
90714+#define gr_log_ptrace(audit, msg, task) gr_log_varargs(audit, msg, GR_PTRACE, task)
90715+#define gr_log_res_ulong2_str(audit, msg, task, ulong1, str, ulong2) gr_log_varargs(audit, msg, GR_RESOURCE, task, ulong1, str, ulong2)
90716+#define gr_log_cap(audit, msg, task, str) gr_log_varargs(audit, msg, GR_CAP, task, str)
90717+#define gr_log_sig_addr(audit, msg, str, addr) gr_log_varargs(audit, msg, GR_SIG, str, addr)
90718+#define gr_log_sig_task(audit, msg, task, num) gr_log_varargs(audit, msg, GR_SIG2, task, num)
90719+#define gr_log_crash1(audit, msg, task, ulong) gr_log_varargs(audit, msg, GR_CRASH1, task, ulong)
90720+#define gr_log_crash2(audit, msg, task, ulong1) gr_log_varargs(audit, msg, GR_CRASH2, task, ulong1)
90721+#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)
90722+#define gr_log_rwxmap(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAP, str)
90723+#define gr_log_rwxmap_vma(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAPVMA, str)
90724+
90725+void gr_log_varargs(int audit, const char *msg, int argtypes, ...);
90726+
90727+#endif
90728+
90729+#endif
90730diff --git a/include/linux/grmsg.h b/include/linux/grmsg.h
90731new file mode 100644
90732index 0000000..26ef560
90733--- /dev/null
90734+++ b/include/linux/grmsg.h
90735@@ -0,0 +1,118 @@
90736+#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"
90737+#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"
90738+#define GR_PTRACE_ACL_MSG "denied ptrace of %.950s(%.16s:%d) by "
90739+#define GR_STOPMOD_MSG "denied modification of module state by "
90740+#define GR_ROFS_BLOCKWRITE_MSG "denied write to block device %.950s by "
90741+#define GR_ROFS_MOUNT_MSG "denied writable mount of %.950s by "
90742+#define GR_IOPERM_MSG "denied use of ioperm() by "
90743+#define GR_IOPL_MSG "denied use of iopl() by "
90744+#define GR_SHMAT_ACL_MSG "denied attach of shared memory of UID %u, PID %d, ID %u by "
90745+#define GR_UNIX_CHROOT_MSG "denied connect() to abstract AF_UNIX socket outside of chroot by "
90746+#define GR_SHMAT_CHROOT_MSG "denied attach of shared memory outside of chroot by "
90747+#define GR_MEM_READWRITE_MSG "denied access of range %Lx -> %Lx in /dev/mem by "
90748+#define GR_SYMLINK_MSG "not following symlink %.950s owned by %d.%d by "
90749+#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"
90750+#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"
90751+#define GR_HIDDEN_ACL_MSG "%s access to hidden file %.950s by "
90752+#define GR_OPEN_ACL_MSG "%s open of %.950s for%s%s by "
90753+#define GR_CREATE_ACL_MSG "%s create of %.950s for%s%s by "
90754+#define GR_FIFO_MSG "denied writing FIFO %.950s of %d.%d by "
90755+#define GR_MKNOD_CHROOT_MSG "denied mknod of %.950s from chroot by "
90756+#define GR_MKNOD_ACL_MSG "%s mknod of %.950s by "
90757+#define GR_UNIXCONNECT_ACL_MSG "%s connect() to the unix domain socket %.950s by "
90758+#define GR_TTYSNIFF_ACL_MSG "terminal being sniffed by IP:%pI4 %.480s[%.16s:%d], parent %.480s[%.16s:%d] against "
90759+#define GR_MKDIR_ACL_MSG "%s mkdir of %.950s by "
90760+#define GR_RMDIR_ACL_MSG "%s rmdir of %.950s by "
90761+#define GR_UNLINK_ACL_MSG "%s unlink of %.950s by "
90762+#define GR_SYMLINK_ACL_MSG "%s symlink from %.480s to %.480s by "
90763+#define GR_HARDLINK_MSG "denied hardlink of %.930s (owned by %d.%d) to %.30s for "
90764+#define GR_LINK_ACL_MSG "%s link of %.480s to %.480s by "
90765+#define GR_INHERIT_ACL_MSG "successful inherit of %.480s's ACL for %.480s by "
90766+#define GR_RENAME_ACL_MSG "%s rename of %.480s to %.480s by "
90767+#define GR_UNSAFESHARE_EXEC_ACL_MSG "denied exec with cloned fs of %.950s by "
90768+#define GR_PTRACE_EXEC_ACL_MSG "denied ptrace of %.950s by "
90769+#define GR_EXEC_ACL_MSG "%s execution of %.950s by "
90770+#define GR_EXEC_TPE_MSG "denied untrusted exec (due to %.70s) of %.950s by "
90771+#define GR_SEGVSTART_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning uid %u from login for %lu seconds"
90772+#define GR_SEGVNOSUID_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning execution for %lu seconds"
90773+#define GR_MOUNT_CHROOT_MSG "denied mount of %.256s as %.930s from chroot by "
90774+#define GR_PIVOT_CHROOT_MSG "denied pivot_root from chroot by "
90775+#define GR_TRUNCATE_ACL_MSG "%s truncate of %.950s by "
90776+#define GR_ATIME_ACL_MSG "%s access time change of %.950s by "
90777+#define GR_ACCESS_ACL_MSG "%s access of %.950s for%s%s%s by "
90778+#define GR_CHROOT_CHROOT_MSG "denied double chroot to %.950s by "
90779+#define GR_CHROOT_RENAME_MSG "denied bad rename of %.950s out of a chroot by "
90780+#define GR_CHMOD_CHROOT_MSG "denied chmod +s of %.950s by "
90781+#define GR_CHMOD_ACL_MSG "%s chmod of %.950s by "
90782+#define GR_CHROOT_FCHDIR_MSG "denied fchdir outside of chroot to %.950s by "
90783+#define GR_CHROOT_FHANDLE_MSG "denied use of file handles inside chroot by "
90784+#define GR_CHOWN_ACL_MSG "%s chown of %.950s by "
90785+#define GR_SETXATTR_ACL_MSG "%s setting extended attribute of %.950s by "
90786+#define GR_REMOVEXATTR_ACL_MSG "%s removing extended attribute of %.950s by "
90787+#define GR_WRITLIB_ACL_MSG "denied load of writable library %.950s by "
90788+#define GR_INITF_ACL_MSG "init_variables() failed %s by "
90789+#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"
90790+#define GR_DEV_ACL_MSG "/dev/grsec: %d bytes sent %d required, being fed garbage by "
90791+#define GR_SHUTS_ACL_MSG "shutdown auth success for "
90792+#define GR_SHUTF_ACL_MSG "shutdown auth failure for "
90793+#define GR_SHUTI_ACL_MSG "ignoring shutdown for disabled RBAC system for "
90794+#define GR_SEGVMODS_ACL_MSG "segvmod auth success for "
90795+#define GR_SEGVMODF_ACL_MSG "segvmod auth failure for "
90796+#define GR_SEGVMODI_ACL_MSG "ignoring segvmod for disabled RBAC system for "
90797+#define GR_ENABLE_ACL_MSG "%s RBAC system loaded by "
90798+#define GR_ENABLEF_ACL_MSG "unable to load %s for "
90799+#define GR_RELOADI_ACL_MSG "ignoring reload request for disabled RBAC system"
90800+#define GR_RELOAD_ACL_MSG "%s RBAC system reloaded by "
90801+#define GR_RELOADF_ACL_MSG "failed reload of %s for "
90802+#define GR_SPROLEI_ACL_MSG "ignoring change to special role for disabled RBAC system for "
90803+#define GR_SPROLES_ACL_MSG "successful change to special role %s (id %d) by "
90804+#define GR_SPROLEL_ACL_MSG "special role %s (id %d) exited by "
90805+#define GR_SPROLEF_ACL_MSG "special role %s failure for "
90806+#define GR_UNSPROLEI_ACL_MSG "ignoring unauth of special role for disabled RBAC system for "
90807+#define GR_UNSPROLES_ACL_MSG "successful unauth of special role %s (id %d) by "
90808+#define GR_INVMODE_ACL_MSG "invalid mode %d by "
90809+#define GR_PRIORITY_CHROOT_MSG "denied priority change of process (%.16s:%d) by "
90810+#define GR_FAILFORK_MSG "failed fork with errno %s by "
90811+#define GR_NICE_CHROOT_MSG "denied priority change by "
90812+#define GR_UNISIGLOG_MSG "%.32s occurred at %p in "
90813+#define GR_DUALSIGLOG_MSG "signal %d sent to " DEFAULTSECMSG " by "
90814+#define GR_SIG_ACL_MSG "denied send of signal %d to protected task " DEFAULTSECMSG " by "
90815+#define GR_SYSCTL_MSG "denied modification of grsecurity sysctl value : %.32s by "
90816+#define GR_SYSCTL_ACL_MSG "%s sysctl of %.950s for%s%s by "
90817+#define GR_TIME_MSG "time set by "
90818+#define GR_DEFACL_MSG "fatal: unable to find subject for (%.16s:%d), loaded by "
90819+#define GR_MMAP_ACL_MSG "%s executable mmap of %.950s by "
90820+#define GR_MPROTECT_ACL_MSG "%s executable mprotect of %.950s by "
90821+#define GR_SOCK_MSG "denied socket(%.16s,%.16s,%.16s) by "
90822+#define GR_SOCK_NOINET_MSG "denied socket(%.16s,%.16s,%d) by "
90823+#define GR_BIND_MSG "denied bind() by "
90824+#define GR_CONNECT_MSG "denied connect() by "
90825+#define GR_BIND_ACL_MSG "denied bind() to %pI4 port %u sock type %.16s protocol %.16s by "
90826+#define GR_CONNECT_ACL_MSG "denied connect() to %pI4 port %u sock type %.16s protocol %.16s by "
90827+#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"
90828+#define GR_EXEC_CHROOT_MSG "exec of %.980s within chroot by process "
90829+#define GR_CAP_ACL_MSG "use of %s denied for "
90830+#define GR_CAP_CHROOT_MSG "use of %s in chroot denied for "
90831+#define GR_CAP_ACL_MSG2 "use of %s permitted for "
90832+#define GR_USRCHANGE_ACL_MSG "change to uid %u denied for "
90833+#define GR_GRPCHANGE_ACL_MSG "change to gid %u denied for "
90834+#define GR_REMOUNT_AUDIT_MSG "remount of %.256s by "
90835+#define GR_UNMOUNT_AUDIT_MSG "unmount of %.256s by "
90836+#define GR_MOUNT_AUDIT_MSG "mount of %.256s to %.256s by "
90837+#define GR_CHDIR_AUDIT_MSG "chdir to %.980s by "
90838+#define GR_EXEC_AUDIT_MSG "exec of %.930s (%.128s) by "
90839+#define GR_RESOURCE_MSG "denied resource overstep by requesting %lu for %.16s against limit %lu for "
90840+#define GR_RWXMMAP_MSG "denied RWX mmap of %.950s by "
90841+#define GR_RWXMPROTECT_MSG "denied RWX mprotect of %.950s by "
90842+#define GR_TEXTREL_AUDIT_MSG "denied text relocation in %.950s, VMA:0x%08lx 0x%08lx by "
90843+#define GR_PTGNUSTACK_MSG "denied marking stack executable as requested by PT_GNU_STACK marking in %.950s by "
90844+#define GR_VM86_MSG "denied use of vm86 by "
90845+#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by "
90846+#define GR_PTRACE_READEXEC_MSG "denied ptrace of unreadable binary %.950s by "
90847+#define GR_INIT_TRANSFER_MSG "persistent special role transferred privilege to init by "
90848+#define GR_BADPROCPID_MSG "denied read of sensitive /proc/pid/%s entry via fd passed across exec by "
90849+#define GR_SYMLINKOWNER_MSG "denied following symlink %.950s since symlink owner %u does not match target owner %u, by "
90850+#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 "
90851+#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 "
90852+#define GR_IPC_DENIED_MSG "denied %s of overly-permissive IPC object with creator uid %u by "
90853+#define GR_MSRWRITE_MSG "denied write to CPU MSR by "
90854diff --git a/include/linux/grsecurity.h b/include/linux/grsecurity.h
90855new file mode 100644
90856index 0000000..63c1850
90857--- /dev/null
90858+++ b/include/linux/grsecurity.h
90859@@ -0,0 +1,250 @@
90860+#ifndef GR_SECURITY_H
90861+#define GR_SECURITY_H
90862+#include <linux/fs.h>
90863+#include <linux/fs_struct.h>
90864+#include <linux/binfmts.h>
90865+#include <linux/gracl.h>
90866+
90867+/* notify of brain-dead configs */
90868+#if defined(CONFIG_GRKERNSEC_PROC_USER) && defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
90869+#error "CONFIG_GRKERNSEC_PROC_USER and CONFIG_GRKERNSEC_PROC_USERGROUP cannot both be enabled."
90870+#endif
90871+#if defined(CONFIG_GRKERNSEC_PROC) && !defined(CONFIG_GRKERNSEC_PROC_USER) && !defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
90872+#error "CONFIG_GRKERNSEC_PROC enabled, but neither CONFIG_GRKERNSEC_PROC_USER nor CONFIG_GRKERNSEC_PROC_USERGROUP enabled"
90873+#endif
90874+#if defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_PAGEEXEC) && !defined(CONFIG_PAX_SEGMEXEC) && !defined(CONFIG_PAX_KERNEXEC)
90875+#error "CONFIG_PAX_NOEXEC enabled, but PAGEEXEC, SEGMEXEC, and KERNEXEC are disabled."
90876+#endif
90877+#if defined(CONFIG_PAX_ASLR) && !defined(CONFIG_PAX_RANDKSTACK) && !defined(CONFIG_PAX_RANDUSTACK) && !defined(CONFIG_PAX_RANDMMAP)
90878+#error "CONFIG_PAX_ASLR enabled, but RANDKSTACK, RANDUSTACK, and RANDMMAP are disabled."
90879+#endif
90880+#if defined(CONFIG_PAX) && !defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_ASLR)
90881+#error "CONFIG_PAX enabled, but no PaX options are enabled."
90882+#endif
90883+
90884+int gr_handle_new_usb(void);
90885+
90886+void gr_handle_brute_attach(int dumpable);
90887+void gr_handle_brute_check(void);
90888+void gr_handle_kernel_exploit(void);
90889+
90890+char gr_roletype_to_char(void);
90891+
90892+int gr_proc_is_restricted(void);
90893+
90894+int gr_acl_enable_at_secure(void);
90895+
90896+int gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs);
90897+int gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs);
90898+
90899+int gr_learn_cap(const struct task_struct *task, const struct cred *cred, const int cap);
90900+
90901+void gr_del_task_from_ip_table(struct task_struct *p);
90902+
90903+int gr_pid_is_chrooted(struct task_struct *p);
90904+int gr_handle_chroot_fowner(struct pid *pid, enum pid_type type);
90905+int gr_handle_chroot_nice(void);
90906+int gr_handle_chroot_sysctl(const int op);
90907+int gr_handle_chroot_setpriority(struct task_struct *p,
90908+ const int niceval);
90909+int gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt);
90910+int gr_chroot_fhandle(void);
90911+int gr_handle_chroot_chroot(const struct dentry *dentry,
90912+ const struct vfsmount *mnt);
90913+void gr_handle_chroot_chdir(const struct path *path);
90914+int gr_handle_chroot_chmod(const struct dentry *dentry,
90915+ const struct vfsmount *mnt, const int mode);
90916+int gr_handle_chroot_mknod(const struct dentry *dentry,
90917+ const struct vfsmount *mnt, const int mode);
90918+int gr_handle_chroot_mount(const struct dentry *dentry,
90919+ const struct vfsmount *mnt,
90920+ const char *dev_name);
90921+int gr_handle_chroot_pivot(void);
90922+int gr_handle_chroot_unix(const pid_t pid);
90923+
90924+int gr_handle_rawio(const struct inode *inode);
90925+
90926+void gr_handle_ioperm(void);
90927+void gr_handle_iopl(void);
90928+void gr_handle_msr_write(void);
90929+
90930+umode_t gr_acl_umask(void);
90931+
90932+int gr_tpe_allow(const struct file *file);
90933+
90934+void gr_set_chroot_entries(struct task_struct *task, const struct path *path);
90935+void gr_clear_chroot_entries(struct task_struct *task);
90936+
90937+void gr_log_forkfail(const int retval);
90938+void gr_log_timechange(void);
90939+void gr_log_signal(const int sig, const void *addr, const struct task_struct *t);
90940+void gr_log_chdir(const struct dentry *dentry,
90941+ const struct vfsmount *mnt);
90942+void gr_log_chroot_exec(const struct dentry *dentry,
90943+ const struct vfsmount *mnt);
90944+void gr_log_remount(const char *devname, const int retval);
90945+void gr_log_unmount(const char *devname, const int retval);
90946+void gr_log_mount(const char *from, struct path *to, const int retval);
90947+void gr_log_textrel(struct vm_area_struct *vma);
90948+void gr_log_ptgnustack(struct file *file);
90949+void gr_log_rwxmmap(struct file *file);
90950+void gr_log_rwxmprotect(struct vm_area_struct *vma);
90951+
90952+int gr_handle_follow_link(const struct inode *parent,
90953+ const struct inode *inode,
90954+ const struct dentry *dentry,
90955+ const struct vfsmount *mnt);
90956+int gr_handle_fifo(const struct dentry *dentry,
90957+ const struct vfsmount *mnt,
90958+ const struct dentry *dir, const int flag,
90959+ const int acc_mode);
90960+int gr_handle_hardlink(const struct dentry *dentry,
90961+ const struct vfsmount *mnt,
90962+ struct inode *inode,
90963+ const int mode, const struct filename *to);
90964+
90965+int gr_is_capable(const int cap);
90966+int gr_is_capable_nolog(const int cap);
90967+int gr_task_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
90968+int gr_task_is_capable_nolog(const struct task_struct *task, const int cap);
90969+
90970+void gr_copy_label(struct task_struct *tsk);
90971+void gr_handle_crash(struct task_struct *task, const int sig);
90972+int gr_handle_signal(const struct task_struct *p, const int sig);
90973+int gr_check_crash_uid(const kuid_t uid);
90974+int gr_check_protected_task(const struct task_struct *task);
90975+int gr_check_protected_task_fowner(struct pid *pid, enum pid_type type);
90976+int gr_acl_handle_mmap(const struct file *file,
90977+ const unsigned long prot);
90978+int gr_acl_handle_mprotect(const struct file *file,
90979+ const unsigned long prot);
90980+int gr_check_hidden_task(const struct task_struct *tsk);
90981+__u32 gr_acl_handle_truncate(const struct dentry *dentry,
90982+ const struct vfsmount *mnt);
90983+__u32 gr_acl_handle_utime(const struct dentry *dentry,
90984+ const struct vfsmount *mnt);
90985+__u32 gr_acl_handle_access(const struct dentry *dentry,
90986+ const struct vfsmount *mnt, const int fmode);
90987+__u32 gr_acl_handle_chmod(const struct dentry *dentry,
90988+ const struct vfsmount *mnt, umode_t *mode);
90989+__u32 gr_acl_handle_chown(const struct dentry *dentry,
90990+ const struct vfsmount *mnt);
90991+__u32 gr_acl_handle_setxattr(const struct dentry *dentry,
90992+ const struct vfsmount *mnt);
90993+__u32 gr_acl_handle_removexattr(const struct dentry *dentry,
90994+ const struct vfsmount *mnt);
90995+int gr_handle_ptrace(struct task_struct *task, const long request);
90996+int gr_handle_proc_ptrace(struct task_struct *task);
90997+__u32 gr_acl_handle_execve(const struct dentry *dentry,
90998+ const struct vfsmount *mnt);
90999+int gr_check_crash_exec(const struct file *filp);
91000+int gr_acl_is_enabled(void);
91001+void gr_set_role_label(struct task_struct *task, const kuid_t uid,
91002+ const kgid_t gid);
91003+int gr_set_proc_label(const struct dentry *dentry,
91004+ const struct vfsmount *mnt,
91005+ const int unsafe_flags);
91006+__u32 gr_acl_handle_hidden_file(const struct dentry *dentry,
91007+ const struct vfsmount *mnt);
91008+__u32 gr_acl_handle_open(const struct dentry *dentry,
91009+ const struct vfsmount *mnt, int acc_mode);
91010+__u32 gr_acl_handle_creat(const struct dentry *dentry,
91011+ const struct dentry *p_dentry,
91012+ const struct vfsmount *p_mnt,
91013+ int open_flags, int acc_mode, const int imode);
91014+void gr_handle_create(const struct dentry *dentry,
91015+ const struct vfsmount *mnt);
91016+void gr_handle_proc_create(const struct dentry *dentry,
91017+ const struct inode *inode);
91018+__u32 gr_acl_handle_mknod(const struct dentry *new_dentry,
91019+ const struct dentry *parent_dentry,
91020+ const struct vfsmount *parent_mnt,
91021+ const int mode);
91022+__u32 gr_acl_handle_mkdir(const struct dentry *new_dentry,
91023+ const struct dentry *parent_dentry,
91024+ const struct vfsmount *parent_mnt);
91025+__u32 gr_acl_handle_rmdir(const struct dentry *dentry,
91026+ const struct vfsmount *mnt);
91027+void gr_handle_delete(const u64 ino, const dev_t dev);
91028+__u32 gr_acl_handle_unlink(const struct dentry *dentry,
91029+ const struct vfsmount *mnt);
91030+__u32 gr_acl_handle_symlink(const struct dentry *new_dentry,
91031+ const struct dentry *parent_dentry,
91032+ const struct vfsmount *parent_mnt,
91033+ const struct filename *from);
91034+__u32 gr_acl_handle_link(const struct dentry *new_dentry,
91035+ const struct dentry *parent_dentry,
91036+ const struct vfsmount *parent_mnt,
91037+ const struct dentry *old_dentry,
91038+ const struct vfsmount *old_mnt, const struct filename *to);
91039+int gr_handle_symlink_owner(const struct path *link, const struct inode *target);
91040+int gr_acl_handle_rename(struct dentry *new_dentry,
91041+ struct dentry *parent_dentry,
91042+ const struct vfsmount *parent_mnt,
91043+ struct dentry *old_dentry,
91044+ struct inode *old_parent_inode,
91045+ struct vfsmount *old_mnt, const struct filename *newname, unsigned int flags);
91046+void gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
91047+ struct dentry *old_dentry,
91048+ struct dentry *new_dentry,
91049+ struct vfsmount *mnt, const __u8 replace, unsigned int flags);
91050+__u32 gr_check_link(const struct dentry *new_dentry,
91051+ const struct dentry *parent_dentry,
91052+ const struct vfsmount *parent_mnt,
91053+ const struct dentry *old_dentry,
91054+ const struct vfsmount *old_mnt);
91055+int gr_acl_handle_filldir(const struct file *file, const char *name,
91056+ const unsigned int namelen, const u64 ino);
91057+
91058+__u32 gr_acl_handle_unix(const struct dentry *dentry,
91059+ const struct vfsmount *mnt);
91060+void gr_acl_handle_exit(void);
91061+void gr_acl_handle_psacct(struct task_struct *task, const long code);
91062+int gr_acl_handle_procpidmem(const struct task_struct *task);
91063+int gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags);
91064+int gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode);
91065+void gr_audit_ptrace(struct task_struct *task);
91066+dev_t gr_get_dev_from_dentry(struct dentry *dentry);
91067+u64 gr_get_ino_from_dentry(struct dentry *dentry);
91068+void gr_put_exec_file(struct task_struct *task);
91069+
91070+int gr_ptrace_readexec(struct file *file, int unsafe_flags);
91071+
91072+void gr_inc_chroot_refcnts(struct dentry *dentry, struct vfsmount *mnt);
91073+void gr_dec_chroot_refcnts(struct dentry *dentry, struct vfsmount *mnt);
91074+int gr_bad_chroot_rename(struct dentry *olddentry, struct vfsmount *oldmnt,
91075+ struct dentry *newdentry, struct vfsmount *newmnt);
91076+
91077+#ifdef CONFIG_GRKERNSEC_RESLOG
91078+extern void gr_log_resource(const struct task_struct *task, const int res,
91079+ const unsigned long wanted, const int gt);
91080+#else
91081+static inline void gr_log_resource(const struct task_struct *task, const int res,
91082+ const unsigned long wanted, const int gt)
91083+{
91084+}
91085+#endif
91086+
91087+#ifdef CONFIG_GRKERNSEC
91088+void task_grsec_rbac(struct seq_file *m, struct task_struct *p);
91089+void gr_handle_vm86(void);
91090+void gr_handle_mem_readwrite(u64 from, u64 to);
91091+
91092+void gr_log_badprocpid(const char *entry);
91093+
91094+extern int grsec_enable_dmesg;
91095+extern int grsec_disable_privio;
91096+
91097+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
91098+extern kgid_t grsec_proc_gid;
91099+#endif
91100+
91101+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
91102+extern int grsec_enable_chroot_findtask;
91103+#endif
91104+#ifdef CONFIG_GRKERNSEC_SETXID
91105+extern int grsec_enable_setxid;
91106+#endif
91107+#endif
91108+
91109+#endif
91110diff --git a/include/linux/grsock.h b/include/linux/grsock.h
91111new file mode 100644
91112index 0000000..e7ffaaf
91113--- /dev/null
91114+++ b/include/linux/grsock.h
91115@@ -0,0 +1,19 @@
91116+#ifndef __GRSOCK_H
91117+#define __GRSOCK_H
91118+
91119+extern void gr_attach_curr_ip(const struct sock *sk);
91120+extern int gr_handle_sock_all(const int family, const int type,
91121+ const int protocol);
91122+extern int gr_handle_sock_server(const struct sockaddr *sck);
91123+extern int gr_handle_sock_server_other(const struct sock *sck);
91124+extern int gr_handle_sock_client(const struct sockaddr *sck);
91125+extern int gr_search_connect(struct socket * sock,
91126+ struct sockaddr_in * addr);
91127+extern int gr_search_bind(struct socket * sock,
91128+ struct sockaddr_in * addr);
91129+extern int gr_search_listen(struct socket * sock);
91130+extern int gr_search_accept(struct socket * sock);
91131+extern int gr_search_socket(const int domain, const int type,
91132+ const int protocol);
91133+
91134+#endif
91135diff --git a/include/linux/highmem.h b/include/linux/highmem.h
91136index 9286a46..373f27f 100644
91137--- a/include/linux/highmem.h
91138+++ b/include/linux/highmem.h
91139@@ -189,6 +189,18 @@ static inline void clear_highpage(struct page *page)
91140 kunmap_atomic(kaddr);
91141 }
91142
91143+static inline void sanitize_highpage(struct page *page)
91144+{
91145+ void *kaddr;
91146+ unsigned long flags;
91147+
91148+ local_irq_save(flags);
91149+ kaddr = kmap_atomic(page);
91150+ clear_page(kaddr);
91151+ kunmap_atomic(kaddr);
91152+ local_irq_restore(flags);
91153+}
91154+
91155 static inline void zero_user_segments(struct page *page,
91156 unsigned start1, unsigned end1,
91157 unsigned start2, unsigned end2)
91158diff --git a/include/linux/hwmon-sysfs.h b/include/linux/hwmon-sysfs.h
91159index 1c7b89a..7dda400 100644
91160--- a/include/linux/hwmon-sysfs.h
91161+++ b/include/linux/hwmon-sysfs.h
91162@@ -25,7 +25,8 @@
91163 struct sensor_device_attribute{
91164 struct device_attribute dev_attr;
91165 int index;
91166-};
91167+} __do_const;
91168+typedef struct sensor_device_attribute __no_const sensor_device_attribute_no_const;
91169 #define to_sensor_dev_attr(_dev_attr) \
91170 container_of(_dev_attr, struct sensor_device_attribute, dev_attr)
91171
91172@@ -41,7 +42,8 @@ struct sensor_device_attribute_2 {
91173 struct device_attribute dev_attr;
91174 u8 index;
91175 u8 nr;
91176-};
91177+} __do_const;
91178+typedef struct sensor_device_attribute_2 __no_const sensor_device_attribute_2_no_const;
91179 #define to_sensor_dev_attr_2(_dev_attr) \
91180 container_of(_dev_attr, struct sensor_device_attribute_2, dev_attr)
91181
91182diff --git a/include/linux/i2c.h b/include/linux/i2c.h
91183index f17da50..2f8b203 100644
91184--- a/include/linux/i2c.h
91185+++ b/include/linux/i2c.h
91186@@ -409,6 +409,7 @@ struct i2c_algorithm {
91187 int (*unreg_slave)(struct i2c_client *client);
91188 #endif
91189 };
91190+typedef struct i2c_algorithm __no_const i2c_algorithm_no_const;
91191
91192 /**
91193 * struct i2c_bus_recovery_info - I2C bus recovery information
91194diff --git a/include/linux/if_pppox.h b/include/linux/if_pppox.h
91195index aff7ad8..3942bbd 100644
91196--- a/include/linux/if_pppox.h
91197+++ b/include/linux/if_pppox.h
91198@@ -76,7 +76,7 @@ struct pppox_proto {
91199 int (*ioctl)(struct socket *sock, unsigned int cmd,
91200 unsigned long arg);
91201 struct module *owner;
91202-};
91203+} __do_const;
91204
91205 extern int register_pppox_proto(int proto_num, const struct pppox_proto *pp);
91206 extern void unregister_pppox_proto(int proto_num);
91207diff --git a/include/linux/init.h b/include/linux/init.h
91208index 2df8e8d..3e1280d 100644
91209--- a/include/linux/init.h
91210+++ b/include/linux/init.h
91211@@ -37,9 +37,17 @@
91212 * section.
91213 */
91214
91215+#define add_init_latent_entropy __latent_entropy
91216+
91217+#ifdef CONFIG_MEMORY_HOTPLUG
91218+#define add_meminit_latent_entropy
91219+#else
91220+#define add_meminit_latent_entropy __latent_entropy
91221+#endif
91222+
91223 /* These are for everybody (although not all archs will actually
91224 discard it in modules) */
91225-#define __init __section(.init.text) __cold notrace
91226+#define __init __section(.init.text) __cold notrace add_init_latent_entropy
91227 #define __initdata __section(.init.data)
91228 #define __initconst __constsection(.init.rodata)
91229 #define __exitdata __section(.exit.data)
91230@@ -100,7 +108,7 @@
91231 #define __cpuexitconst
91232
91233 /* Used for MEMORY_HOTPLUG */
91234-#define __meminit __section(.meminit.text) __cold notrace
91235+#define __meminit __section(.meminit.text) __cold notrace add_meminit_latent_entropy
91236 #define __meminitdata __section(.meminit.data)
91237 #define __meminitconst __constsection(.meminit.rodata)
91238 #define __memexit __section(.memexit.text) __exitused __cold notrace
91239diff --git a/include/linux/init_task.h b/include/linux/init_task.h
91240index 696d223..6d6b39f 100644
91241--- a/include/linux/init_task.h
91242+++ b/include/linux/init_task.h
91243@@ -158,6 +158,12 @@ extern struct task_group root_task_group;
91244
91245 #define INIT_TASK_COMM "swapper"
91246
91247+#ifdef CONFIG_X86
91248+#define INIT_TASK_THREAD_INFO .tinfo = INIT_THREAD_INFO,
91249+#else
91250+#define INIT_TASK_THREAD_INFO
91251+#endif
91252+
91253 #ifdef CONFIG_RT_MUTEXES
91254 # define INIT_RT_MUTEXES(tsk) \
91255 .pi_waiters = RB_ROOT, \
91256@@ -224,6 +230,7 @@ extern struct task_group root_task_group;
91257 RCU_POINTER_INITIALIZER(cred, &init_cred), \
91258 .comm = INIT_TASK_COMM, \
91259 .thread = INIT_THREAD, \
91260+ INIT_TASK_THREAD_INFO \
91261 .fs = &init_fs, \
91262 .files = &init_files, \
91263 .signal = &init_signals, \
91264diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
91265index 2e88580..f6a99a0 100644
91266--- a/include/linux/interrupt.h
91267+++ b/include/linux/interrupt.h
91268@@ -420,8 +420,8 @@ extern const char * const softirq_to_name[NR_SOFTIRQS];
91269
91270 struct softirq_action
91271 {
91272- void (*action)(struct softirq_action *);
91273-};
91274+ void (*action)(void);
91275+} __no_const;
91276
91277 asmlinkage void do_softirq(void);
91278 asmlinkage void __do_softirq(void);
91279@@ -435,7 +435,7 @@ static inline void do_softirq_own_stack(void)
91280 }
91281 #endif
91282
91283-extern void open_softirq(int nr, void (*action)(struct softirq_action *));
91284+extern void open_softirq(int nr, void (*action)(void));
91285 extern void softirq_init(void);
91286 extern void __raise_softirq_irqoff(unsigned int nr);
91287
91288diff --git a/include/linux/iommu.h b/include/linux/iommu.h
91289index 38daa45..4de4317 100644
91290--- a/include/linux/iommu.h
91291+++ b/include/linux/iommu.h
91292@@ -147,7 +147,7 @@ struct iommu_ops {
91293
91294 unsigned long pgsize_bitmap;
91295 void *priv;
91296-};
91297+} __do_const;
91298
91299 #define IOMMU_GROUP_NOTIFY_ADD_DEVICE 1 /* Device added */
91300 #define IOMMU_GROUP_NOTIFY_DEL_DEVICE 2 /* Pre Device removed */
91301diff --git a/include/linux/ioport.h b/include/linux/ioport.h
91302index 2c525022..345b106 100644
91303--- a/include/linux/ioport.h
91304+++ b/include/linux/ioport.h
91305@@ -161,7 +161,7 @@ struct resource *lookup_resource(struct resource *root, resource_size_t start);
91306 int adjust_resource(struct resource *res, resource_size_t start,
91307 resource_size_t size);
91308 resource_size_t resource_alignment(struct resource *res);
91309-static inline resource_size_t resource_size(const struct resource *res)
91310+static inline resource_size_t __intentional_overflow(-1) resource_size(const struct resource *res)
91311 {
91312 return res->end - res->start + 1;
91313 }
91314diff --git a/include/linux/ipc_namespace.h b/include/linux/ipc_namespace.h
91315index 1eee6bc..9cf4912 100644
91316--- a/include/linux/ipc_namespace.h
91317+++ b/include/linux/ipc_namespace.h
91318@@ -60,7 +60,7 @@ struct ipc_namespace {
91319 struct user_namespace *user_ns;
91320
91321 struct ns_common ns;
91322-};
91323+} __randomize_layout;
91324
91325 extern struct ipc_namespace init_ipc_ns;
91326 extern atomic_t nr_ipc_ns;
91327diff --git a/include/linux/irq.h b/include/linux/irq.h
91328index d09ec7a..f373eb5 100644
91329--- a/include/linux/irq.h
91330+++ b/include/linux/irq.h
91331@@ -364,7 +364,8 @@ struct irq_chip {
91332 void (*irq_write_msi_msg)(struct irq_data *data, struct msi_msg *msg);
91333
91334 unsigned long flags;
91335-};
91336+} __do_const;
91337+typedef struct irq_chip __no_const irq_chip_no_const;
91338
91339 /*
91340 * irq_chip specific flags
91341diff --git a/include/linux/irqchip/arm-gic.h b/include/linux/irqchip/arm-gic.h
91342index 71d706d..817cdec 100644
91343--- a/include/linux/irqchip/arm-gic.h
91344+++ b/include/linux/irqchip/arm-gic.h
91345@@ -95,7 +95,7 @@
91346
91347 struct device_node;
91348
91349-extern struct irq_chip gic_arch_extn;
91350+extern irq_chip_no_const gic_arch_extn;
91351
91352 void gic_init_bases(unsigned int, int, void __iomem *, void __iomem *,
91353 u32 offset, struct device_node *);
91354diff --git a/include/linux/irqdesc.h b/include/linux/irqdesc.h
91355index dd1109f..4f4fdda 100644
91356--- a/include/linux/irqdesc.h
91357+++ b/include/linux/irqdesc.h
91358@@ -61,7 +61,7 @@ struct irq_desc {
91359 unsigned int irq_count; /* For detecting broken IRQs */
91360 unsigned long last_unhandled; /* Aging timer for unhandled count */
91361 unsigned int irqs_unhandled;
91362- atomic_t threads_handled;
91363+ atomic_unchecked_t threads_handled;
91364 int threads_handled_last;
91365 raw_spinlock_t lock;
91366 struct cpumask *percpu_enabled;
91367diff --git a/include/linux/irqdomain.h b/include/linux/irqdomain.h
91368index 676d730..8d3a1ad 100644
91369--- a/include/linux/irqdomain.h
91370+++ b/include/linux/irqdomain.h
91371@@ -40,6 +40,7 @@ struct device_node;
91372 struct irq_domain;
91373 struct of_device_id;
91374 struct irq_chip;
91375+typedef struct irq_chip __no_const irq_chip_no_const;
91376 struct irq_data;
91377
91378 /* Number of irqs reserved for a legacy isa controller */
91379diff --git a/include/linux/jiffies.h b/include/linux/jiffies.h
91380index c367cbd..c9b79e6 100644
91381--- a/include/linux/jiffies.h
91382+++ b/include/linux/jiffies.h
91383@@ -280,20 +280,20 @@ extern unsigned long preset_lpj;
91384 /*
91385 * Convert various time units to each other:
91386 */
91387-extern unsigned int jiffies_to_msecs(const unsigned long j);
91388-extern unsigned int jiffies_to_usecs(const unsigned long j);
91389+extern unsigned int jiffies_to_msecs(const unsigned long j) __intentional_overflow(-1);
91390+extern unsigned int jiffies_to_usecs(const unsigned long j) __intentional_overflow(-1);
91391
91392-static inline u64 jiffies_to_nsecs(const unsigned long j)
91393+static inline u64 __intentional_overflow(-1) jiffies_to_nsecs(const unsigned long j)
91394 {
91395 return (u64)jiffies_to_usecs(j) * NSEC_PER_USEC;
91396 }
91397
91398-extern unsigned long msecs_to_jiffies(const unsigned int m);
91399-extern unsigned long usecs_to_jiffies(const unsigned int u);
91400+extern unsigned long msecs_to_jiffies(const unsigned int m) __intentional_overflow(-1);
91401+extern unsigned long usecs_to_jiffies(const unsigned int u) __intentional_overflow(-1);
91402 extern unsigned long timespec_to_jiffies(const struct timespec *value);
91403 extern void jiffies_to_timespec(const unsigned long jiffies,
91404- struct timespec *value);
91405-extern unsigned long timeval_to_jiffies(const struct timeval *value);
91406+ struct timespec *value) __intentional_overflow(-1);
91407+extern unsigned long timeval_to_jiffies(const struct timeval *value) __intentional_overflow(-1);
91408 extern void jiffies_to_timeval(const unsigned long jiffies,
91409 struct timeval *value);
91410
91411diff --git a/include/linux/kallsyms.h b/include/linux/kallsyms.h
91412index 6883e19..e854fcb 100644
91413--- a/include/linux/kallsyms.h
91414+++ b/include/linux/kallsyms.h
91415@@ -15,7 +15,8 @@
91416
91417 struct module;
91418
91419-#ifdef CONFIG_KALLSYMS
91420+#if !defined(__INCLUDED_BY_HIDESYM) || !defined(CONFIG_KALLSYMS)
91421+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
91422 /* Lookup the address for a symbol. Returns 0 if not found. */
91423 unsigned long kallsyms_lookup_name(const char *name);
91424
91425@@ -106,6 +107,21 @@ static inline int lookup_symbol_attrs(unsigned long addr, unsigned long *size, u
91426 /* Stupid that this does nothing, but I didn't create this mess. */
91427 #define __print_symbol(fmt, addr)
91428 #endif /*CONFIG_KALLSYMS*/
91429+#else /* when included by kallsyms.c, vsnprintf.c, kprobes.c, or
91430+ arch/x86/kernel/dumpstack.c, with HIDESYM enabled */
91431+extern unsigned long kallsyms_lookup_name(const char *name);
91432+extern void __print_symbol(const char *fmt, unsigned long address);
91433+extern int sprint_backtrace(char *buffer, unsigned long address);
91434+extern int sprint_symbol(char *buffer, unsigned long address);
91435+extern int sprint_symbol_no_offset(char *buffer, unsigned long address);
91436+const char *kallsyms_lookup(unsigned long addr,
91437+ unsigned long *symbolsize,
91438+ unsigned long *offset,
91439+ char **modname, char *namebuf);
91440+extern int kallsyms_lookup_size_offset(unsigned long addr,
91441+ unsigned long *symbolsize,
91442+ unsigned long *offset);
91443+#endif
91444
91445 /* This macro allows us to keep printk typechecking */
91446 static __printf(1, 2)
91447diff --git a/include/linux/kernel.h b/include/linux/kernel.h
91448index d6d630d..feea1f5 100644
91449--- a/include/linux/kernel.h
91450+++ b/include/linux/kernel.h
91451@@ -378,7 +378,7 @@ static inline int __must_check kstrtos32_from_user(const char __user *s, size_t
91452 /* Obsolete, do not use. Use kstrto<foo> instead */
91453
91454 extern unsigned long simple_strtoul(const char *,char **,unsigned int);
91455-extern long simple_strtol(const char *,char **,unsigned int);
91456+extern long simple_strtol(const char *,char **,unsigned int) __intentional_overflow(-1);
91457 extern unsigned long long simple_strtoull(const char *,char **,unsigned int);
91458 extern long long simple_strtoll(const char *,char **,unsigned int);
91459
91460diff --git a/include/linux/key-type.h b/include/linux/key-type.h
91461index ff9f1d3..6712be5 100644
91462--- a/include/linux/key-type.h
91463+++ b/include/linux/key-type.h
91464@@ -152,7 +152,7 @@ struct key_type {
91465 /* internal fields */
91466 struct list_head link; /* link in types list */
91467 struct lock_class_key lock_class; /* key->sem lock class */
91468-};
91469+} __do_const;
91470
91471 extern struct key_type key_type_keyring;
91472
91473diff --git a/include/linux/kgdb.h b/include/linux/kgdb.h
91474index e465bb1..19f605fd 100644
91475--- a/include/linux/kgdb.h
91476+++ b/include/linux/kgdb.h
91477@@ -52,7 +52,7 @@ extern int kgdb_connected;
91478 extern int kgdb_io_module_registered;
91479
91480 extern atomic_t kgdb_setting_breakpoint;
91481-extern atomic_t kgdb_cpu_doing_single_step;
91482+extern atomic_unchecked_t kgdb_cpu_doing_single_step;
91483
91484 extern struct task_struct *kgdb_usethread;
91485 extern struct task_struct *kgdb_contthread;
91486@@ -254,7 +254,7 @@ struct kgdb_arch {
91487 void (*correct_hw_break)(void);
91488
91489 void (*enable_nmi)(bool on);
91490-};
91491+} __do_const;
91492
91493 /**
91494 * struct kgdb_io - Describe the interface for an I/O driver to talk with KGDB.
91495@@ -279,7 +279,7 @@ struct kgdb_io {
91496 void (*pre_exception) (void);
91497 void (*post_exception) (void);
91498 int is_console;
91499-};
91500+} __do_const;
91501
91502 extern struct kgdb_arch arch_kgdb_ops;
91503
91504diff --git a/include/linux/kmemleak.h b/include/linux/kmemleak.h
91505index e705467..a92471d 100644
91506--- a/include/linux/kmemleak.h
91507+++ b/include/linux/kmemleak.h
91508@@ -27,7 +27,7 @@
91509
91510 extern void kmemleak_init(void) __ref;
91511 extern void kmemleak_alloc(const void *ptr, size_t size, int min_count,
91512- gfp_t gfp) __ref;
91513+ gfp_t gfp) __ref __size_overflow(2);
91514 extern void kmemleak_alloc_percpu(const void __percpu *ptr, size_t size) __ref;
91515 extern void kmemleak_free(const void *ptr) __ref;
91516 extern void kmemleak_free_part(const void *ptr, size_t size) __ref;
91517@@ -62,7 +62,7 @@ static inline void kmemleak_erase(void **ptr)
91518 static inline void kmemleak_init(void)
91519 {
91520 }
91521-static inline void kmemleak_alloc(const void *ptr, size_t size, int min_count,
91522+static inline void __size_overflow(2) kmemleak_alloc(const void *ptr, size_t size, int min_count,
91523 gfp_t gfp)
91524 {
91525 }
91526diff --git a/include/linux/kmod.h b/include/linux/kmod.h
91527index 0555cc6..40116ce 100644
91528--- a/include/linux/kmod.h
91529+++ b/include/linux/kmod.h
91530@@ -34,6 +34,8 @@ extern char modprobe_path[]; /* for sysctl */
91531 * usually useless though. */
91532 extern __printf(2, 3)
91533 int __request_module(bool wait, const char *name, ...);
91534+extern __printf(3, 4)
91535+int ___request_module(bool wait, char *param_name, const char *name, ...);
91536 #define request_module(mod...) __request_module(true, mod)
91537 #define request_module_nowait(mod...) __request_module(false, mod)
91538 #define try_then_request_module(x, mod...) \
91539@@ -57,6 +59,9 @@ struct subprocess_info {
91540 struct work_struct work;
91541 struct completion *complete;
91542 char *path;
91543+#ifdef CONFIG_GRKERNSEC
91544+ char *origpath;
91545+#endif
91546 char **argv;
91547 char **envp;
91548 int wait;
91549diff --git a/include/linux/kobject.h b/include/linux/kobject.h
91550index 2d61b90..a1d0a13 100644
91551--- a/include/linux/kobject.h
91552+++ b/include/linux/kobject.h
91553@@ -118,7 +118,7 @@ struct kobj_type {
91554 struct attribute **default_attrs;
91555 const struct kobj_ns_type_operations *(*child_ns_type)(struct kobject *kobj);
91556 const void *(*namespace)(struct kobject *kobj);
91557-};
91558+} __do_const;
91559
91560 struct kobj_uevent_env {
91561 char *argv[3];
91562@@ -142,6 +142,7 @@ struct kobj_attribute {
91563 ssize_t (*store)(struct kobject *kobj, struct kobj_attribute *attr,
91564 const char *buf, size_t count);
91565 };
91566+typedef struct kobj_attribute __no_const kobj_attribute_no_const;
91567
91568 extern const struct sysfs_ops kobj_sysfs_ops;
91569
91570@@ -169,7 +170,7 @@ struct kset {
91571 spinlock_t list_lock;
91572 struct kobject kobj;
91573 const struct kset_uevent_ops *uevent_ops;
91574-};
91575+} __randomize_layout;
91576
91577 extern void kset_init(struct kset *kset);
91578 extern int __must_check kset_register(struct kset *kset);
91579diff --git a/include/linux/kobject_ns.h b/include/linux/kobject_ns.h
91580index df32d25..fb52e27 100644
91581--- a/include/linux/kobject_ns.h
91582+++ b/include/linux/kobject_ns.h
91583@@ -44,7 +44,7 @@ struct kobj_ns_type_operations {
91584 const void *(*netlink_ns)(struct sock *sk);
91585 const void *(*initial_ns)(void);
91586 void (*drop_ns)(void *);
91587-};
91588+} __do_const;
91589
91590 int kobj_ns_type_register(const struct kobj_ns_type_operations *ops);
91591 int kobj_ns_type_registered(enum kobj_ns_type type);
91592diff --git a/include/linux/kref.h b/include/linux/kref.h
91593index 484604d..0f6c5b6 100644
91594--- a/include/linux/kref.h
91595+++ b/include/linux/kref.h
91596@@ -68,7 +68,7 @@ static inline void kref_get(struct kref *kref)
91597 static inline int kref_sub(struct kref *kref, unsigned int count,
91598 void (*release)(struct kref *kref))
91599 {
91600- WARN_ON(release == NULL);
91601+ BUG_ON(release == NULL);
91602
91603 if (atomic_sub_and_test((int) count, &kref->refcount)) {
91604 release(kref);
91605diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
91606index d12b210..d91fd76 100644
91607--- a/include/linux/kvm_host.h
91608+++ b/include/linux/kvm_host.h
91609@@ -455,7 +455,7 @@ static inline void kvm_irqfd_exit(void)
91610 {
91611 }
91612 #endif
91613-int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
91614+int kvm_init(const void *opaque, unsigned vcpu_size, unsigned vcpu_align,
91615 struct module *module);
91616 void kvm_exit(void);
91617
91618@@ -633,7 +633,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,
91619 struct kvm_guest_debug *dbg);
91620 int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run);
91621
91622-int kvm_arch_init(void *opaque);
91623+int kvm_arch_init(const void *opaque);
91624 void kvm_arch_exit(void);
91625
91626 int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
91627diff --git a/include/linux/libata.h b/include/linux/libata.h
91628index f8994b4..c1dec7a 100644
91629--- a/include/linux/libata.h
91630+++ b/include/linux/libata.h
91631@@ -989,7 +989,7 @@ struct ata_port_operations {
91632 * fields must be pointers.
91633 */
91634 const struct ata_port_operations *inherits;
91635-};
91636+} __do_const;
91637
91638 struct ata_port_info {
91639 unsigned long flags;
91640diff --git a/include/linux/linkage.h b/include/linux/linkage.h
91641index a6a42dd..6c5ebce 100644
91642--- a/include/linux/linkage.h
91643+++ b/include/linux/linkage.h
91644@@ -36,6 +36,7 @@
91645 #endif
91646
91647 #define __page_aligned_data __section(.data..page_aligned) __aligned(PAGE_SIZE)
91648+#define __page_aligned_rodata __read_only __aligned(PAGE_SIZE)
91649 #define __page_aligned_bss __section(.bss..page_aligned) __aligned(PAGE_SIZE)
91650
91651 /*
91652diff --git a/include/linux/list.h b/include/linux/list.h
91653index feb773c..98f3075 100644
91654--- a/include/linux/list.h
91655+++ b/include/linux/list.h
91656@@ -113,6 +113,19 @@ extern void __list_del_entry(struct list_head *entry);
91657 extern void list_del(struct list_head *entry);
91658 #endif
91659
91660+extern void __pax_list_add(struct list_head *new,
91661+ struct list_head *prev,
91662+ struct list_head *next);
91663+static inline void pax_list_add(struct list_head *new, struct list_head *head)
91664+{
91665+ __pax_list_add(new, head, head->next);
91666+}
91667+static inline void pax_list_add_tail(struct list_head *new, struct list_head *head)
91668+{
91669+ __pax_list_add(new, head->prev, head);
91670+}
91671+extern void pax_list_del(struct list_head *entry);
91672+
91673 /**
91674 * list_replace - replace old entry by new one
91675 * @old : the element to be replaced
91676@@ -146,6 +159,8 @@ static inline void list_del_init(struct list_head *entry)
91677 INIT_LIST_HEAD(entry);
91678 }
91679
91680+extern void pax_list_del_init(struct list_head *entry);
91681+
91682 /**
91683 * list_move - delete from one list and add as another's head
91684 * @list: the entry to move
91685diff --git a/include/linux/lockref.h b/include/linux/lockref.h
91686index b10b122..d37b3de 100644
91687--- a/include/linux/lockref.h
91688+++ b/include/linux/lockref.h
91689@@ -28,7 +28,7 @@ struct lockref {
91690 #endif
91691 struct {
91692 spinlock_t lock;
91693- int count;
91694+ atomic_t count;
91695 };
91696 };
91697 };
91698@@ -43,9 +43,29 @@ extern void lockref_mark_dead(struct lockref *);
91699 extern int lockref_get_not_dead(struct lockref *);
91700
91701 /* Must be called under spinlock for reliable results */
91702-static inline int __lockref_is_dead(const struct lockref *l)
91703+static inline int __lockref_is_dead(const struct lockref *lockref)
91704 {
91705- return ((int)l->count < 0);
91706+ return atomic_read(&lockref->count) < 0;
91707+}
91708+
91709+static inline int __lockref_read(const struct lockref *lockref)
91710+{
91711+ return atomic_read(&lockref->count);
91712+}
91713+
91714+static inline void __lockref_set(struct lockref *lockref, int count)
91715+{
91716+ atomic_set(&lockref->count, count);
91717+}
91718+
91719+static inline void __lockref_inc(struct lockref *lockref)
91720+{
91721+ atomic_inc(&lockref->count);
91722+}
91723+
91724+static inline void __lockref_dec(struct lockref *lockref)
91725+{
91726+ atomic_dec(&lockref->count);
91727 }
91728
91729 #endif /* __LINUX_LOCKREF_H */
91730diff --git a/include/linux/math64.h b/include/linux/math64.h
91731index c45c089..298841c 100644
91732--- a/include/linux/math64.h
91733+++ b/include/linux/math64.h
91734@@ -15,7 +15,7 @@
91735 * This is commonly provided by 32bit archs to provide an optimized 64bit
91736 * divide.
91737 */
91738-static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
91739+static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
91740 {
91741 *remainder = dividend % divisor;
91742 return dividend / divisor;
91743@@ -42,7 +42,7 @@ static inline u64 div64_u64_rem(u64 dividend, u64 divisor, u64 *remainder)
91744 /**
91745 * div64_u64 - unsigned 64bit divide with 64bit divisor
91746 */
91747-static inline u64 div64_u64(u64 dividend, u64 divisor)
91748+static inline u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor)
91749 {
91750 return dividend / divisor;
91751 }
91752@@ -61,7 +61,7 @@ static inline s64 div64_s64(s64 dividend, s64 divisor)
91753 #define div64_ul(x, y) div_u64((x), (y))
91754
91755 #ifndef div_u64_rem
91756-static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
91757+static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
91758 {
91759 *remainder = do_div(dividend, divisor);
91760 return dividend;
91761@@ -77,7 +77,7 @@ extern u64 div64_u64_rem(u64 dividend, u64 divisor, u64 *remainder);
91762 #endif
91763
91764 #ifndef div64_u64
91765-extern u64 div64_u64(u64 dividend, u64 divisor);
91766+extern u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor);
91767 #endif
91768
91769 #ifndef div64_s64
91770@@ -94,7 +94,7 @@ extern s64 div64_s64(s64 dividend, s64 divisor);
91771 * divide.
91772 */
91773 #ifndef div_u64
91774-static inline u64 div_u64(u64 dividend, u32 divisor)
91775+static inline u64 __intentional_overflow(-1) div_u64(u64 dividend, u32 divisor)
91776 {
91777 u32 remainder;
91778 return div_u64_rem(dividend, divisor, &remainder);
91779diff --git a/include/linux/mempolicy.h b/include/linux/mempolicy.h
91780index 3d385c8..deacb6a 100644
91781--- a/include/linux/mempolicy.h
91782+++ b/include/linux/mempolicy.h
91783@@ -91,6 +91,10 @@ static inline struct mempolicy *mpol_dup(struct mempolicy *pol)
91784 }
91785
91786 #define vma_policy(vma) ((vma)->vm_policy)
91787+static inline void set_vma_policy(struct vm_area_struct *vma, struct mempolicy *pol)
91788+{
91789+ vma->vm_policy = pol;
91790+}
91791
91792 static inline void mpol_get(struct mempolicy *pol)
91793 {
91794@@ -229,6 +233,9 @@ static inline void mpol_free_shared_policy(struct shared_policy *p)
91795 }
91796
91797 #define vma_policy(vma) NULL
91798+static inline void set_vma_policy(struct vm_area_struct *vma, struct mempolicy *pol)
91799+{
91800+}
91801
91802 static inline int
91803 vma_dup_policy(struct vm_area_struct *src, struct vm_area_struct *dst)
91804diff --git a/include/linux/mm.h b/include/linux/mm.h
91805index 47a9392..ef645bc 100644
91806--- a/include/linux/mm.h
91807+++ b/include/linux/mm.h
91808@@ -135,6 +135,11 @@ extern unsigned int kobjsize(const void *objp);
91809
91810 #define VM_DONTCOPY 0x00020000 /* Do not copy this vma on fork */
91811 #define VM_DONTEXPAND 0x00040000 /* Cannot expand with mremap() */
91812+
91813+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
91814+#define VM_PAGEEXEC 0x00080000 /* vma->vm_page_prot needs special handling */
91815+#endif
91816+
91817 #define VM_ACCOUNT 0x00100000 /* Is a VM accounted object */
91818 #define VM_NORESERVE 0x00200000 /* should the VM suppress accounting */
91819 #define VM_HUGETLB 0x00400000 /* Huge TLB Page VM */
91820@@ -254,8 +259,8 @@ struct vm_operations_struct {
91821 /* called by access_process_vm when get_user_pages() fails, typically
91822 * for use by special VMAs that can switch between memory and hardware
91823 */
91824- int (*access)(struct vm_area_struct *vma, unsigned long addr,
91825- void *buf, int len, int write);
91826+ ssize_t (*access)(struct vm_area_struct *vma, unsigned long addr,
91827+ void *buf, size_t len, int write);
91828
91829 /* Called by the /proc/PID/maps code to ask the vma whether it
91830 * has a special name. Returning non-NULL will also cause this
91831@@ -293,6 +298,7 @@ struct vm_operations_struct {
91832 struct page *(*find_special_page)(struct vm_area_struct *vma,
91833 unsigned long addr);
91834 };
91835+typedef struct vm_operations_struct __no_const vm_operations_struct_no_const;
91836
91837 struct mmu_gather;
91838 struct inode;
91839@@ -1213,8 +1219,8 @@ int follow_pfn(struct vm_area_struct *vma, unsigned long address,
91840 unsigned long *pfn);
91841 int follow_phys(struct vm_area_struct *vma, unsigned long address,
91842 unsigned int flags, unsigned long *prot, resource_size_t *phys);
91843-int generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
91844- void *buf, int len, int write);
91845+ssize_t generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
91846+ void *buf, size_t len, int write);
91847
91848 static inline void unmap_shared_mapping_range(struct address_space *mapping,
91849 loff_t const holebegin, loff_t const holelen)
91850@@ -1254,9 +1260,9 @@ static inline int fixup_user_fault(struct task_struct *tsk,
91851 }
91852 #endif
91853
91854-extern int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write);
91855-extern int access_remote_vm(struct mm_struct *mm, unsigned long addr,
91856- void *buf, int len, int write);
91857+extern ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, size_t len, int write);
91858+extern ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
91859+ void *buf, size_t len, int write);
91860
91861 long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
91862 unsigned long start, unsigned long nr_pages,
91863@@ -1299,34 +1305,6 @@ int set_page_dirty_lock(struct page *page);
91864 int clear_page_dirty_for_io(struct page *page);
91865 int get_cmdline(struct task_struct *task, char *buffer, int buflen);
91866
91867-/* Is the vma a continuation of the stack vma above it? */
91868-static inline int vma_growsdown(struct vm_area_struct *vma, unsigned long addr)
91869-{
91870- return vma && (vma->vm_end == addr) && (vma->vm_flags & VM_GROWSDOWN);
91871-}
91872-
91873-static inline int stack_guard_page_start(struct vm_area_struct *vma,
91874- unsigned long addr)
91875-{
91876- return (vma->vm_flags & VM_GROWSDOWN) &&
91877- (vma->vm_start == addr) &&
91878- !vma_growsdown(vma->vm_prev, addr);
91879-}
91880-
91881-/* Is the vma a continuation of the stack vma below it? */
91882-static inline int vma_growsup(struct vm_area_struct *vma, unsigned long addr)
91883-{
91884- return vma && (vma->vm_start == addr) && (vma->vm_flags & VM_GROWSUP);
91885-}
91886-
91887-static inline int stack_guard_page_end(struct vm_area_struct *vma,
91888- unsigned long addr)
91889-{
91890- return (vma->vm_flags & VM_GROWSUP) &&
91891- (vma->vm_end == addr) &&
91892- !vma_growsup(vma->vm_next, addr);
91893-}
91894-
91895 extern struct task_struct *task_of_stack(struct task_struct *task,
91896 struct vm_area_struct *vma, bool in_group);
91897
91898@@ -1449,8 +1427,15 @@ static inline int __pud_alloc(struct mm_struct *mm, pgd_t *pgd,
91899 {
91900 return 0;
91901 }
91902+
91903+static inline int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd,
91904+ unsigned long address)
91905+{
91906+ return 0;
91907+}
91908 #else
91909 int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address);
91910+int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address);
91911 #endif
91912
91913 #if defined(__PAGETABLE_PMD_FOLDED) || !defined(CONFIG_MMU)
91914@@ -1460,6 +1445,12 @@ static inline int __pmd_alloc(struct mm_struct *mm, pud_t *pud,
91915 return 0;
91916 }
91917
91918+static inline int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud,
91919+ unsigned long address)
91920+{
91921+ return 0;
91922+}
91923+
91924 static inline void mm_nr_pmds_init(struct mm_struct *mm) {}
91925
91926 static inline unsigned long mm_nr_pmds(struct mm_struct *mm)
91927@@ -1472,6 +1463,7 @@ static inline void mm_dec_nr_pmds(struct mm_struct *mm) {}
91928
91929 #else
91930 int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address);
91931+int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address);
91932
91933 static inline void mm_nr_pmds_init(struct mm_struct *mm)
91934 {
91935@@ -1509,11 +1501,23 @@ static inline pud_t *pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long a
91936 NULL: pud_offset(pgd, address);
91937 }
91938
91939+static inline pud_t *pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
91940+{
91941+ return (unlikely(pgd_none(*pgd)) && __pud_alloc_kernel(mm, pgd, address))?
91942+ NULL: pud_offset(pgd, address);
91943+}
91944+
91945 static inline pmd_t *pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
91946 {
91947 return (unlikely(pud_none(*pud)) && __pmd_alloc(mm, pud, address))?
91948 NULL: pmd_offset(pud, address);
91949 }
91950+
91951+static inline pmd_t *pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address)
91952+{
91953+ return (unlikely(pud_none(*pud)) && __pmd_alloc_kernel(mm, pud, address))?
91954+ NULL: pmd_offset(pud, address);
91955+}
91956 #endif /* CONFIG_MMU && !__ARCH_HAS_4LEVEL_HACK */
91957
91958 #if USE_SPLIT_PTE_PTLOCKS
91959@@ -1890,12 +1894,23 @@ extern struct vm_area_struct *copy_vma(struct vm_area_struct **,
91960 bool *need_rmap_locks);
91961 extern void exit_mmap(struct mm_struct *);
91962
91963+#if defined(CONFIG_GRKERNSEC) && (defined(CONFIG_GRKERNSEC_RESLOG) || !defined(CONFIG_GRKERNSEC_NO_RBAC))
91964+extern void gr_learn_resource(const struct task_struct *task, const int res,
91965+ const unsigned long wanted, const int gt);
91966+#else
91967+static inline void gr_learn_resource(const struct task_struct *task, const int res,
91968+ const unsigned long wanted, const int gt)
91969+{
91970+}
91971+#endif
91972+
91973 static inline int check_data_rlimit(unsigned long rlim,
91974 unsigned long new,
91975 unsigned long start,
91976 unsigned long end_data,
91977 unsigned long start_data)
91978 {
91979+ gr_learn_resource(current, RLIMIT_DATA, (new - start) + (end_data - start_data), 1);
91980 if (rlim < RLIM_INFINITY) {
91981 if (((new - start) + (end_data - start_data)) > rlim)
91982 return -ENOSPC;
91983@@ -1920,7 +1935,7 @@ extern int install_special_mapping(struct mm_struct *mm,
91984 unsigned long addr, unsigned long len,
91985 unsigned long flags, struct page **pages);
91986
91987-extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);
91988+extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long) __intentional_overflow(-1);
91989
91990 extern unsigned long mmap_region(struct file *file, unsigned long addr,
91991 unsigned long len, vm_flags_t vm_flags, unsigned long pgoff);
91992@@ -1928,6 +1943,7 @@ extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
91993 unsigned long len, unsigned long prot, unsigned long flags,
91994 unsigned long pgoff, unsigned long *populate);
91995 extern int do_munmap(struct mm_struct *, unsigned long, size_t);
91996+extern int __do_munmap(struct mm_struct *, unsigned long, size_t);
91997
91998 #ifdef CONFIG_MMU
91999 extern int __mm_populate(unsigned long addr, unsigned long len,
92000@@ -1956,10 +1972,11 @@ struct vm_unmapped_area_info {
92001 unsigned long high_limit;
92002 unsigned long align_mask;
92003 unsigned long align_offset;
92004+ unsigned long threadstack_offset;
92005 };
92006
92007-extern unsigned long unmapped_area(struct vm_unmapped_area_info *info);
92008-extern unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info);
92009+extern unsigned long unmapped_area(const struct vm_unmapped_area_info *info);
92010+extern unsigned long unmapped_area_topdown(const struct vm_unmapped_area_info *info);
92011
92012 /*
92013 * Search for an unmapped address range.
92014@@ -1971,7 +1988,7 @@ extern unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info);
92015 * - satisfies (begin_addr & align_mask) == (align_offset & align_mask)
92016 */
92017 static inline unsigned long
92018-vm_unmapped_area(struct vm_unmapped_area_info *info)
92019+vm_unmapped_area(const struct vm_unmapped_area_info *info)
92020 {
92021 if (!(info->flags & VM_UNMAPPED_AREA_TOPDOWN))
92022 return unmapped_area(info);
92023@@ -2033,6 +2050,10 @@ extern struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long add
92024 extern struct vm_area_struct * find_vma_prev(struct mm_struct * mm, unsigned long addr,
92025 struct vm_area_struct **pprev);
92026
92027+extern struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma);
92028+extern __must_check long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma);
92029+extern void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl);
92030+
92031 /* Look up the first VMA which intersects the interval start_addr..end_addr-1,
92032 NULL if none. Assume start_addr < end_addr. */
92033 static inline struct vm_area_struct * find_vma_intersection(struct mm_struct * mm, unsigned long start_addr, unsigned long end_addr)
92034@@ -2062,10 +2083,10 @@ static inline struct vm_area_struct *find_exact_vma(struct mm_struct *mm,
92035 }
92036
92037 #ifdef CONFIG_MMU
92038-pgprot_t vm_get_page_prot(unsigned long vm_flags);
92039+pgprot_t vm_get_page_prot(vm_flags_t vm_flags);
92040 void vma_set_page_prot(struct vm_area_struct *vma);
92041 #else
92042-static inline pgprot_t vm_get_page_prot(unsigned long vm_flags)
92043+static inline pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
92044 {
92045 return __pgprot(0);
92046 }
92047@@ -2127,6 +2148,11 @@ void vm_stat_account(struct mm_struct *, unsigned long, struct file *, long);
92048 static inline void vm_stat_account(struct mm_struct *mm,
92049 unsigned long flags, struct file *file, long pages)
92050 {
92051+
92052+#ifdef CONFIG_PAX_RANDMMAP
92053+ if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
92054+#endif
92055+
92056 mm->total_vm += pages;
92057 }
92058 #endif /* CONFIG_PROC_FS */
92059@@ -2229,7 +2255,7 @@ extern int unpoison_memory(unsigned long pfn);
92060 extern int sysctl_memory_failure_early_kill;
92061 extern int sysctl_memory_failure_recovery;
92062 extern void shake_page(struct page *p, int access);
92063-extern atomic_long_t num_poisoned_pages;
92064+extern atomic_long_unchecked_t num_poisoned_pages;
92065 extern int soft_offline_page(struct page *page, int flags);
92066
92067 #if defined(CONFIG_TRANSPARENT_HUGEPAGE) || defined(CONFIG_HUGETLBFS)
92068@@ -2280,5 +2306,11 @@ void __init setup_nr_node_ids(void);
92069 static inline void setup_nr_node_ids(void) {}
92070 #endif
92071
92072+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
92073+extern void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot);
92074+#else
92075+static inline void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot) {}
92076+#endif
92077+
92078 #endif /* __KERNEL__ */
92079 #endif /* _LINUX_MM_H */
92080diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
92081index 199a03a..7328440 100644
92082--- a/include/linux/mm_types.h
92083+++ b/include/linux/mm_types.h
92084@@ -313,7 +313,9 @@ struct vm_area_struct {
92085 #ifdef CONFIG_NUMA
92086 struct mempolicy *vm_policy; /* NUMA policy for the VMA */
92087 #endif
92088-};
92089+
92090+ struct vm_area_struct *vm_mirror;/* PaX: mirror vma or NULL */
92091+} __randomize_layout;
92092
92093 struct core_thread {
92094 struct task_struct *task;
92095@@ -464,7 +466,25 @@ struct mm_struct {
92096 /* address of the bounds directory */
92097 void __user *bd_addr;
92098 #endif
92099-};
92100+
92101+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
92102+ unsigned long pax_flags;
92103+#endif
92104+
92105+#ifdef CONFIG_PAX_DLRESOLVE
92106+ unsigned long call_dl_resolve;
92107+#endif
92108+
92109+#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
92110+ unsigned long call_syscall;
92111+#endif
92112+
92113+#ifdef CONFIG_PAX_ASLR
92114+ unsigned long delta_mmap; /* randomized offset */
92115+ unsigned long delta_stack; /* randomized offset */
92116+#endif
92117+
92118+} __randomize_layout;
92119
92120 static inline void mm_init_cpumask(struct mm_struct *mm)
92121 {
92122diff --git a/include/linux/mmc/core.h b/include/linux/mmc/core.h
92123index 160448f..7b332b7 100644
92124--- a/include/linux/mmc/core.h
92125+++ b/include/linux/mmc/core.h
92126@@ -79,7 +79,7 @@ struct mmc_command {
92127 #define mmc_cmd_type(cmd) ((cmd)->flags & MMC_CMD_MASK)
92128
92129 unsigned int retries; /* max number of retries */
92130- unsigned int error; /* command error */
92131+ int error; /* command error */
92132
92133 /*
92134 * Standard errno values are used for errors, but some have specific
92135diff --git a/include/linux/mmiotrace.h b/include/linux/mmiotrace.h
92136index c5d5278..f0b68c8 100644
92137--- a/include/linux/mmiotrace.h
92138+++ b/include/linux/mmiotrace.h
92139@@ -46,7 +46,7 @@ extern int kmmio_handler(struct pt_regs *regs, unsigned long addr);
92140 /* Called from ioremap.c */
92141 extern void mmiotrace_ioremap(resource_size_t offset, unsigned long size,
92142 void __iomem *addr);
92143-extern void mmiotrace_iounmap(volatile void __iomem *addr);
92144+extern void mmiotrace_iounmap(const volatile void __iomem *addr);
92145
92146 /* For anyone to insert markers. Remember trailing newline. */
92147 extern __printf(1, 2) int mmiotrace_printk(const char *fmt, ...);
92148@@ -66,7 +66,7 @@ static inline void mmiotrace_ioremap(resource_size_t offset,
92149 {
92150 }
92151
92152-static inline void mmiotrace_iounmap(volatile void __iomem *addr)
92153+static inline void mmiotrace_iounmap(const volatile void __iomem *addr)
92154 {
92155 }
92156
92157diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
92158index 2782df4..abe756e 100644
92159--- a/include/linux/mmzone.h
92160+++ b/include/linux/mmzone.h
92161@@ -526,7 +526,7 @@ struct zone {
92162
92163 ZONE_PADDING(_pad3_)
92164 /* Zone statistics */
92165- atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
92166+ atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
92167 } ____cacheline_internodealigned_in_smp;
92168
92169 enum zone_flags {
92170diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
92171index e530533..c9620c7 100644
92172--- a/include/linux/mod_devicetable.h
92173+++ b/include/linux/mod_devicetable.h
92174@@ -139,7 +139,7 @@ struct usb_device_id {
92175 #define USB_DEVICE_ID_MATCH_INT_PROTOCOL 0x0200
92176 #define USB_DEVICE_ID_MATCH_INT_NUMBER 0x0400
92177
92178-#define HID_ANY_ID (~0)
92179+#define HID_ANY_ID (~0U)
92180 #define HID_BUS_ANY 0xffff
92181 #define HID_GROUP_ANY 0x0000
92182
92183@@ -470,7 +470,7 @@ struct dmi_system_id {
92184 const char *ident;
92185 struct dmi_strmatch matches[4];
92186 void *driver_data;
92187-};
92188+} __do_const;
92189 /*
92190 * struct dmi_device_id appears during expansion of
92191 * "MODULE_DEVICE_TABLE(dmi, x)". Compiler doesn't look inside it
92192diff --git a/include/linux/module.h b/include/linux/module.h
92193index b03485b..a26974f 100644
92194--- a/include/linux/module.h
92195+++ b/include/linux/module.h
92196@@ -17,9 +17,11 @@
92197 #include <linux/moduleparam.h>
92198 #include <linux/jump_label.h>
92199 #include <linux/export.h>
92200+#include <linux/fs.h>
92201
92202 #include <linux/percpu.h>
92203 #include <asm/module.h>
92204+#include <asm/pgtable.h>
92205
92206 /* In stripped ARM and x86-64 modules, ~ is surprisingly rare. */
92207 #define MODULE_SIG_STRING "~Module signature appended~\n"
92208@@ -42,7 +44,7 @@ struct module_kobject {
92209 struct kobject *drivers_dir;
92210 struct module_param_attrs *mp;
92211 struct completion *kobj_completion;
92212-};
92213+} __randomize_layout;
92214
92215 struct module_attribute {
92216 struct attribute attr;
92217@@ -54,12 +56,13 @@ struct module_attribute {
92218 int (*test)(struct module *);
92219 void (*free)(struct module *);
92220 };
92221+typedef struct module_attribute __no_const module_attribute_no_const;
92222
92223 struct module_version_attribute {
92224 struct module_attribute mattr;
92225 const char *module_name;
92226 const char *version;
92227-} __attribute__ ((__aligned__(sizeof(void *))));
92228+} __do_const __attribute__ ((__aligned__(sizeof(void *))));
92229
92230 extern ssize_t __modver_version_show(struct module_attribute *,
92231 struct module_kobject *, char *);
92232@@ -221,7 +224,7 @@ struct module {
92233
92234 /* Sysfs stuff. */
92235 struct module_kobject mkobj;
92236- struct module_attribute *modinfo_attrs;
92237+ module_attribute_no_const *modinfo_attrs;
92238 const char *version;
92239 const char *srcversion;
92240 struct kobject *holders_dir;
92241@@ -270,19 +273,16 @@ struct module {
92242 int (*init)(void);
92243
92244 /* If this is non-NULL, vfree after init() returns */
92245- void *module_init;
92246+ void *module_init_rx, *module_init_rw;
92247
92248 /* Here is the actual code + data, vfree'd on unload. */
92249- void *module_core;
92250+ void *module_core_rx, *module_core_rw;
92251
92252 /* Here are the sizes of the init and core sections */
92253- unsigned int init_size, core_size;
92254+ unsigned int init_size_rw, core_size_rw;
92255
92256 /* The size of the executable code in each section. */
92257- unsigned int init_text_size, core_text_size;
92258-
92259- /* Size of RO sections of the module (text+rodata) */
92260- unsigned int init_ro_size, core_ro_size;
92261+ unsigned int init_size_rx, core_size_rx;
92262
92263 /* Arch-specific module values */
92264 struct mod_arch_specific arch;
92265@@ -338,6 +338,10 @@ struct module {
92266 #ifdef CONFIG_EVENT_TRACING
92267 struct ftrace_event_call **trace_events;
92268 unsigned int num_trace_events;
92269+ struct file_operations trace_id;
92270+ struct file_operations trace_enable;
92271+ struct file_operations trace_format;
92272+ struct file_operations trace_filter;
92273 #endif
92274 #ifdef CONFIG_FTRACE_MCOUNT_RECORD
92275 unsigned int num_ftrace_callsites;
92276@@ -365,7 +369,7 @@ struct module {
92277 ctor_fn_t *ctors;
92278 unsigned int num_ctors;
92279 #endif
92280-};
92281+} __randomize_layout;
92282 #ifndef MODULE_ARCH_INIT
92283 #define MODULE_ARCH_INIT {}
92284 #endif
92285@@ -386,18 +390,48 @@ bool is_module_address(unsigned long addr);
92286 bool is_module_percpu_address(unsigned long addr);
92287 bool is_module_text_address(unsigned long addr);
92288
92289+static inline int within_module_range(unsigned long addr, void *start, unsigned long size)
92290+{
92291+
92292+#ifdef CONFIG_PAX_KERNEXEC
92293+ if (ktla_ktva(addr) >= (unsigned long)start &&
92294+ ktla_ktva(addr) < (unsigned long)start + size)
92295+ return 1;
92296+#endif
92297+
92298+ return ((void *)addr >= start && (void *)addr < start + size);
92299+}
92300+
92301+static inline int within_module_core_rx(unsigned long addr, const struct module *mod)
92302+{
92303+ return within_module_range(addr, mod->module_core_rx, mod->core_size_rx);
92304+}
92305+
92306+static inline int within_module_core_rw(unsigned long addr, const struct module *mod)
92307+{
92308+ return within_module_range(addr, mod->module_core_rw, mod->core_size_rw);
92309+}
92310+
92311+static inline int within_module_init_rx(unsigned long addr, const struct module *mod)
92312+{
92313+ return within_module_range(addr, mod->module_init_rx, mod->init_size_rx);
92314+}
92315+
92316+static inline int within_module_init_rw(unsigned long addr, const struct module *mod)
92317+{
92318+ return within_module_range(addr, mod->module_init_rw, mod->init_size_rw);
92319+}
92320+
92321 static inline bool within_module_core(unsigned long addr,
92322 const struct module *mod)
92323 {
92324- return (unsigned long)mod->module_core <= addr &&
92325- addr < (unsigned long)mod->module_core + mod->core_size;
92326+ return within_module_core_rx(addr, mod) || within_module_core_rw(addr, mod);
92327 }
92328
92329 static inline bool within_module_init(unsigned long addr,
92330 const struct module *mod)
92331 {
92332- return (unsigned long)mod->module_init <= addr &&
92333- addr < (unsigned long)mod->module_init + mod->init_size;
92334+ return within_module_init_rx(addr, mod) || within_module_init_rw(addr, mod);
92335 }
92336
92337 static inline bool within_module(unsigned long addr, const struct module *mod)
92338diff --git a/include/linux/moduleloader.h b/include/linux/moduleloader.h
92339index 4d0cb9b..3169ac7 100644
92340--- a/include/linux/moduleloader.h
92341+++ b/include/linux/moduleloader.h
92342@@ -25,9 +25,21 @@ unsigned int arch_mod_section_prepend(struct module *mod, unsigned int section);
92343 sections. Returns NULL on failure. */
92344 void *module_alloc(unsigned long size);
92345
92346+#ifdef CONFIG_PAX_KERNEXEC
92347+void *module_alloc_exec(unsigned long size);
92348+#else
92349+#define module_alloc_exec(x) module_alloc(x)
92350+#endif
92351+
92352 /* Free memory returned from module_alloc. */
92353 void module_memfree(void *module_region);
92354
92355+#ifdef CONFIG_PAX_KERNEXEC
92356+void module_memfree_exec(void *module_region);
92357+#else
92358+#define module_memfree_exec(x) module_memfree((x))
92359+#endif
92360+
92361 /*
92362 * Apply the given relocation to the (simplified) ELF. Return -error
92363 * or 0.
92364@@ -45,8 +57,10 @@ static inline int apply_relocate(Elf_Shdr *sechdrs,
92365 unsigned int relsec,
92366 struct module *me)
92367 {
92368+#ifdef CONFIG_MODULES
92369 printk(KERN_ERR "module %s: REL relocation unsupported\n",
92370 module_name(me));
92371+#endif
92372 return -ENOEXEC;
92373 }
92374 #endif
92375@@ -68,8 +82,10 @@ static inline int apply_relocate_add(Elf_Shdr *sechdrs,
92376 unsigned int relsec,
92377 struct module *me)
92378 {
92379+#ifdef CONFIG_MODULES
92380 printk(KERN_ERR "module %s: REL relocation unsupported\n",
92381 module_name(me));
92382+#endif
92383 return -ENOEXEC;
92384 }
92385 #endif
92386diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h
92387index 1c9effa..1160bdd 100644
92388--- a/include/linux/moduleparam.h
92389+++ b/include/linux/moduleparam.h
92390@@ -323,7 +323,7 @@ static inline void __kernel_param_unlock(void)
92391 * @len is usually just sizeof(string).
92392 */
92393 #define module_param_string(name, string, len, perm) \
92394- static const struct kparam_string __param_string_##name \
92395+ static const struct kparam_string __param_string_##name __used \
92396 = { len, string }; \
92397 __module_param_call(MODULE_PARAM_PREFIX, name, \
92398 &param_ops_string, \
92399@@ -467,7 +467,7 @@ extern int param_set_bint(const char *val, const struct kernel_param *kp);
92400 */
92401 #define module_param_array_named(name, array, type, nump, perm) \
92402 param_check_##type(name, &(array)[0]); \
92403- static const struct kparam_array __param_arr_##name \
92404+ static const struct kparam_array __param_arr_##name __used \
92405 = { .max = ARRAY_SIZE(array), .num = nump, \
92406 .ops = &param_ops_##type, \
92407 .elemsize = sizeof(array[0]), .elem = array }; \
92408diff --git a/include/linux/mount.h b/include/linux/mount.h
92409index 564beee..653be6f 100644
92410--- a/include/linux/mount.h
92411+++ b/include/linux/mount.h
92412@@ -67,7 +67,7 @@ struct vfsmount {
92413 struct dentry *mnt_root; /* root of the mounted tree */
92414 struct super_block *mnt_sb; /* pointer to superblock */
92415 int mnt_flags;
92416-};
92417+} __randomize_layout;
92418
92419 struct file; /* forward dec */
92420 struct path;
92421diff --git a/include/linux/namei.h b/include/linux/namei.h
92422index c899077..b9a2010 100644
92423--- a/include/linux/namei.h
92424+++ b/include/linux/namei.h
92425@@ -71,8 +71,8 @@ extern struct dentry *lock_rename(struct dentry *, struct dentry *);
92426 extern void unlock_rename(struct dentry *, struct dentry *);
92427
92428 extern void nd_jump_link(struct nameidata *nd, struct path *path);
92429-extern void nd_set_link(struct nameidata *nd, char *path);
92430-extern char *nd_get_link(struct nameidata *nd);
92431+extern void nd_set_link(struct nameidata *nd, const char *path);
92432+extern const char *nd_get_link(const struct nameidata *nd);
92433
92434 static inline void nd_terminate_link(void *name, size_t len, size_t maxlen)
92435 {
92436diff --git a/include/linux/net.h b/include/linux/net.h
92437index 17d8339..81656c0 100644
92438--- a/include/linux/net.h
92439+++ b/include/linux/net.h
92440@@ -192,7 +192,7 @@ struct net_proto_family {
92441 int (*create)(struct net *net, struct socket *sock,
92442 int protocol, int kern);
92443 struct module *owner;
92444-};
92445+} __do_const;
92446
92447 struct iovec;
92448 struct kvec;
92449diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
92450index 2787388..1dd8e88 100644
92451--- a/include/linux/netdevice.h
92452+++ b/include/linux/netdevice.h
92453@@ -1198,6 +1198,7 @@ struct net_device_ops {
92454 u8 state);
92455 #endif
92456 };
92457+typedef struct net_device_ops __no_const net_device_ops_no_const;
92458
92459 /**
92460 * enum net_device_priv_flags - &struct net_device priv_flags
92461@@ -1546,10 +1547,10 @@ struct net_device {
92462
92463 struct net_device_stats stats;
92464
92465- atomic_long_t rx_dropped;
92466- atomic_long_t tx_dropped;
92467+ atomic_long_unchecked_t rx_dropped;
92468+ atomic_long_unchecked_t tx_dropped;
92469
92470- atomic_t carrier_changes;
92471+ atomic_unchecked_t carrier_changes;
92472
92473 #ifdef CONFIG_WIRELESS_EXT
92474 const struct iw_handler_def * wireless_handlers;
92475diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
92476index 2517ece..0bbfcfb 100644
92477--- a/include/linux/netfilter.h
92478+++ b/include/linux/netfilter.h
92479@@ -85,7 +85,7 @@ struct nf_sockopt_ops {
92480 #endif
92481 /* Use the module struct to lock set/get code in place */
92482 struct module *owner;
92483-};
92484+} __do_const;
92485
92486 /* Function to register/unregister hook points. */
92487 int nf_register_hook(struct nf_hook_ops *reg);
92488diff --git a/include/linux/netfilter/nfnetlink.h b/include/linux/netfilter/nfnetlink.h
92489index e955d47..04a5338 100644
92490--- a/include/linux/netfilter/nfnetlink.h
92491+++ b/include/linux/netfilter/nfnetlink.h
92492@@ -19,7 +19,7 @@ struct nfnl_callback {
92493 const struct nlattr * const cda[]);
92494 const struct nla_policy *policy; /* netlink attribute policy */
92495 const u_int16_t attr_count; /* number of nlattr's */
92496-};
92497+} __do_const;
92498
92499 struct nfnetlink_subsystem {
92500 const char *name;
92501diff --git a/include/linux/netfilter/xt_gradm.h b/include/linux/netfilter/xt_gradm.h
92502new file mode 100644
92503index 0000000..33f4af8
92504--- /dev/null
92505+++ b/include/linux/netfilter/xt_gradm.h
92506@@ -0,0 +1,9 @@
92507+#ifndef _LINUX_NETFILTER_XT_GRADM_H
92508+#define _LINUX_NETFILTER_XT_GRADM_H 1
92509+
92510+struct xt_gradm_mtinfo {
92511+ __u16 flags;
92512+ __u16 invflags;
92513+};
92514+
92515+#endif
92516diff --git a/include/linux/nls.h b/include/linux/nls.h
92517index 520681b..2b7fabb 100644
92518--- a/include/linux/nls.h
92519+++ b/include/linux/nls.h
92520@@ -31,7 +31,7 @@ struct nls_table {
92521 const unsigned char *charset2upper;
92522 struct module *owner;
92523 struct nls_table *next;
92524-};
92525+} __do_const;
92526
92527 /* this value hold the maximum octet of charset */
92528 #define NLS_MAX_CHARSET_SIZE 6 /* for UTF-8 */
92529@@ -46,7 +46,7 @@ enum utf16_endian {
92530 /* nls_base.c */
92531 extern int __register_nls(struct nls_table *, struct module *);
92532 extern int unregister_nls(struct nls_table *);
92533-extern struct nls_table *load_nls(char *);
92534+extern struct nls_table *load_nls(const char *);
92535 extern void unload_nls(struct nls_table *);
92536 extern struct nls_table *load_nls_default(void);
92537 #define register_nls(nls) __register_nls((nls), THIS_MODULE)
92538diff --git a/include/linux/notifier.h b/include/linux/notifier.h
92539index d14a4c3..a078786 100644
92540--- a/include/linux/notifier.h
92541+++ b/include/linux/notifier.h
92542@@ -54,7 +54,8 @@ struct notifier_block {
92543 notifier_fn_t notifier_call;
92544 struct notifier_block __rcu *next;
92545 int priority;
92546-};
92547+} __do_const;
92548+typedef struct notifier_block __no_const notifier_block_no_const;
92549
92550 struct atomic_notifier_head {
92551 spinlock_t lock;
92552diff --git a/include/linux/oprofile.h b/include/linux/oprofile.h
92553index b2a0f15..4d7da32 100644
92554--- a/include/linux/oprofile.h
92555+++ b/include/linux/oprofile.h
92556@@ -138,9 +138,9 @@ int oprofilefs_create_ulong(struct dentry * root,
92557 int oprofilefs_create_ro_ulong(struct dentry * root,
92558 char const * name, ulong * val);
92559
92560-/** Create a file for read-only access to an atomic_t. */
92561+/** Create a file for read-only access to an atomic_unchecked_t. */
92562 int oprofilefs_create_ro_atomic(struct dentry * root,
92563- char const * name, atomic_t * val);
92564+ char const * name, atomic_unchecked_t * val);
92565
92566 /** create a directory */
92567 struct dentry *oprofilefs_mkdir(struct dentry *parent, char const *name);
92568diff --git a/include/linux/padata.h b/include/linux/padata.h
92569index 4386946..f50c615 100644
92570--- a/include/linux/padata.h
92571+++ b/include/linux/padata.h
92572@@ -129,7 +129,7 @@ struct parallel_data {
92573 struct padata_serial_queue __percpu *squeue;
92574 atomic_t reorder_objects;
92575 atomic_t refcnt;
92576- atomic_t seq_nr;
92577+ atomic_unchecked_t seq_nr;
92578 struct padata_cpumask cpumask;
92579 spinlock_t lock ____cacheline_aligned;
92580 unsigned int processed;
92581diff --git a/include/linux/path.h b/include/linux/path.h
92582index d137218..be0c176 100644
92583--- a/include/linux/path.h
92584+++ b/include/linux/path.h
92585@@ -1,13 +1,15 @@
92586 #ifndef _LINUX_PATH_H
92587 #define _LINUX_PATH_H
92588
92589+#include <linux/compiler.h>
92590+
92591 struct dentry;
92592 struct vfsmount;
92593
92594 struct path {
92595 struct vfsmount *mnt;
92596 struct dentry *dentry;
92597-};
92598+} __randomize_layout;
92599
92600 extern void path_get(const struct path *);
92601 extern void path_put(const struct path *);
92602diff --git a/include/linux/pci_hotplug.h b/include/linux/pci_hotplug.h
92603index 8c78950..0d74ed9 100644
92604--- a/include/linux/pci_hotplug.h
92605+++ b/include/linux/pci_hotplug.h
92606@@ -71,7 +71,8 @@ struct hotplug_slot_ops {
92607 int (*get_latch_status) (struct hotplug_slot *slot, u8 *value);
92608 int (*get_adapter_status) (struct hotplug_slot *slot, u8 *value);
92609 int (*reset_slot) (struct hotplug_slot *slot, int probe);
92610-};
92611+} __do_const;
92612+typedef struct hotplug_slot_ops __no_const hotplug_slot_ops_no_const;
92613
92614 /**
92615 * struct hotplug_slot_info - used to notify the hotplug pci core of the state of the slot
92616diff --git a/include/linux/percpu.h b/include/linux/percpu.h
92617index caebf2a..4c3ae9d 100644
92618--- a/include/linux/percpu.h
92619+++ b/include/linux/percpu.h
92620@@ -34,7 +34,7 @@
92621 * preallocate for this. Keep PERCPU_DYNAMIC_RESERVE equal to or
92622 * larger than PERCPU_DYNAMIC_EARLY_SIZE.
92623 */
92624-#define PERCPU_DYNAMIC_EARLY_SLOTS 128
92625+#define PERCPU_DYNAMIC_EARLY_SLOTS 256
92626 #define PERCPU_DYNAMIC_EARLY_SIZE (12 << 10)
92627
92628 /*
92629diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
92630index 2b62198..2b74233 100644
92631--- a/include/linux/perf_event.h
92632+++ b/include/linux/perf_event.h
92633@@ -343,8 +343,8 @@ struct perf_event {
92634
92635 enum perf_event_active_state state;
92636 unsigned int attach_state;
92637- local64_t count;
92638- atomic64_t child_count;
92639+ local64_t count; /* PaX: fix it one day */
92640+ atomic64_unchecked_t child_count;
92641
92642 /*
92643 * These are the total time in nanoseconds that the event
92644@@ -395,8 +395,8 @@ struct perf_event {
92645 * These accumulate total time (in nanoseconds) that children
92646 * events have been enabled and running, respectively.
92647 */
92648- atomic64_t child_total_time_enabled;
92649- atomic64_t child_total_time_running;
92650+ atomic64_unchecked_t child_total_time_enabled;
92651+ atomic64_unchecked_t child_total_time_running;
92652
92653 /*
92654 * Protect attach/detach and child_list:
92655@@ -752,7 +752,7 @@ static inline void perf_callchain_store(struct perf_callchain_entry *entry, u64
92656 entry->ip[entry->nr++] = ip;
92657 }
92658
92659-extern int sysctl_perf_event_paranoid;
92660+extern int sysctl_perf_event_legitimately_concerned;
92661 extern int sysctl_perf_event_mlock;
92662 extern int sysctl_perf_event_sample_rate;
92663 extern int sysctl_perf_cpu_time_max_percent;
92664@@ -767,19 +767,24 @@ extern int perf_cpu_time_max_percent_handler(struct ctl_table *table, int write,
92665 loff_t *ppos);
92666
92667
92668+static inline bool perf_paranoid_any(void)
92669+{
92670+ return sysctl_perf_event_legitimately_concerned > 2;
92671+}
92672+
92673 static inline bool perf_paranoid_tracepoint_raw(void)
92674 {
92675- return sysctl_perf_event_paranoid > -1;
92676+ return sysctl_perf_event_legitimately_concerned > -1;
92677 }
92678
92679 static inline bool perf_paranoid_cpu(void)
92680 {
92681- return sysctl_perf_event_paranoid > 0;
92682+ return sysctl_perf_event_legitimately_concerned > 0;
92683 }
92684
92685 static inline bool perf_paranoid_kernel(void)
92686 {
92687- return sysctl_perf_event_paranoid > 1;
92688+ return sysctl_perf_event_legitimately_concerned > 1;
92689 }
92690
92691 extern void perf_event_init(void);
92692@@ -912,7 +917,7 @@ struct perf_pmu_events_attr {
92693 struct device_attribute attr;
92694 u64 id;
92695 const char *event_str;
92696-};
92697+} __do_const;
92698
92699 ssize_t perf_event_sysfs_show(struct device *dev, struct device_attribute *attr,
92700 char *page);
92701diff --git a/include/linux/pid_namespace.h b/include/linux/pid_namespace.h
92702index 918b117..7af374b7 100644
92703--- a/include/linux/pid_namespace.h
92704+++ b/include/linux/pid_namespace.h
92705@@ -45,7 +45,7 @@ struct pid_namespace {
92706 int hide_pid;
92707 int reboot; /* group exit code if this pidns was rebooted */
92708 struct ns_common ns;
92709-};
92710+} __randomize_layout;
92711
92712 extern struct pid_namespace init_pid_ns;
92713
92714diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h
92715index eb8b8ac..62649e1 100644
92716--- a/include/linux/pipe_fs_i.h
92717+++ b/include/linux/pipe_fs_i.h
92718@@ -47,10 +47,10 @@ struct pipe_inode_info {
92719 struct mutex mutex;
92720 wait_queue_head_t wait;
92721 unsigned int nrbufs, curbuf, buffers;
92722- unsigned int readers;
92723- unsigned int writers;
92724- unsigned int files;
92725- unsigned int waiting_writers;
92726+ atomic_t readers;
92727+ atomic_t writers;
92728+ atomic_t files;
92729+ atomic_t waiting_writers;
92730 unsigned int r_counter;
92731 unsigned int w_counter;
92732 struct page *tmp_page;
92733diff --git a/include/linux/pm.h b/include/linux/pm.h
92734index e2f1be6..78a0506 100644
92735--- a/include/linux/pm.h
92736+++ b/include/linux/pm.h
92737@@ -608,6 +608,7 @@ struct dev_pm_domain {
92738 struct dev_pm_ops ops;
92739 void (*detach)(struct device *dev, bool power_off);
92740 };
92741+typedef struct dev_pm_domain __no_const dev_pm_domain_no_const;
92742
92743 /*
92744 * The PM_EVENT_ messages are also used by drivers implementing the legacy
92745diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h
92746index 080e778..cbdaef7 100644
92747--- a/include/linux/pm_domain.h
92748+++ b/include/linux/pm_domain.h
92749@@ -39,11 +39,11 @@ struct gpd_dev_ops {
92750 int (*save_state)(struct device *dev);
92751 int (*restore_state)(struct device *dev);
92752 bool (*active_wakeup)(struct device *dev);
92753-};
92754+} __no_const;
92755
92756 struct gpd_cpuidle_data {
92757 unsigned int saved_exit_latency;
92758- struct cpuidle_state *idle_state;
92759+ cpuidle_state_no_const *idle_state;
92760 };
92761
92762 struct generic_pm_domain {
92763diff --git a/include/linux/pm_runtime.h b/include/linux/pm_runtime.h
92764index 30e84d4..22278b4 100644
92765--- a/include/linux/pm_runtime.h
92766+++ b/include/linux/pm_runtime.h
92767@@ -115,7 +115,7 @@ static inline bool pm_runtime_callbacks_present(struct device *dev)
92768
92769 static inline void pm_runtime_mark_last_busy(struct device *dev)
92770 {
92771- ACCESS_ONCE(dev->power.last_busy) = jiffies;
92772+ ACCESS_ONCE_RW(dev->power.last_busy) = jiffies;
92773 }
92774
92775 static inline bool pm_runtime_is_irq_safe(struct device *dev)
92776diff --git a/include/linux/pnp.h b/include/linux/pnp.h
92777index 6512e9c..ec27fa2 100644
92778--- a/include/linux/pnp.h
92779+++ b/include/linux/pnp.h
92780@@ -298,7 +298,7 @@ static inline void pnp_set_drvdata(struct pnp_dev *pdev, void *data)
92781 struct pnp_fixup {
92782 char id[7];
92783 void (*quirk_function) (struct pnp_dev * dev); /* fixup function */
92784-};
92785+} __do_const;
92786
92787 /* config parameters */
92788 #define PNP_CONFIG_NORMAL 0x0001
92789diff --git a/include/linux/poison.h b/include/linux/poison.h
92790index 2110a81..13a11bb 100644
92791--- a/include/linux/poison.h
92792+++ b/include/linux/poison.h
92793@@ -19,8 +19,8 @@
92794 * under normal circumstances, used to verify that nobody uses
92795 * non-initialized list entries.
92796 */
92797-#define LIST_POISON1 ((void *) 0x00100100 + POISON_POINTER_DELTA)
92798-#define LIST_POISON2 ((void *) 0x00200200 + POISON_POINTER_DELTA)
92799+#define LIST_POISON1 ((void *) (long)0xFFFFFF01)
92800+#define LIST_POISON2 ((void *) (long)0xFFFFFF02)
92801
92802 /********** include/linux/timer.h **********/
92803 /*
92804diff --git a/include/linux/power/smartreflex.h b/include/linux/power/smartreflex.h
92805index d8b187c3..9a9257a 100644
92806--- a/include/linux/power/smartreflex.h
92807+++ b/include/linux/power/smartreflex.h
92808@@ -238,7 +238,7 @@ struct omap_sr_class_data {
92809 int (*notify)(struct omap_sr *sr, u32 status);
92810 u8 notify_flags;
92811 u8 class_type;
92812-};
92813+} __do_const;
92814
92815 /**
92816 * struct omap_sr_nvalue_table - Smartreflex n-target value info
92817diff --git a/include/linux/ppp-comp.h b/include/linux/ppp-comp.h
92818index 4ea1d37..80f4b33 100644
92819--- a/include/linux/ppp-comp.h
92820+++ b/include/linux/ppp-comp.h
92821@@ -84,7 +84,7 @@ struct compressor {
92822 struct module *owner;
92823 /* Extra skb space needed by the compressor algorithm */
92824 unsigned int comp_extra;
92825-};
92826+} __do_const;
92827
92828 /*
92829 * The return value from decompress routine is the length of the
92830diff --git a/include/linux/preempt.h b/include/linux/preempt.h
92831index de83b4e..c4b997d 100644
92832--- a/include/linux/preempt.h
92833+++ b/include/linux/preempt.h
92834@@ -27,11 +27,16 @@ extern void preempt_count_sub(int val);
92835 #define preempt_count_dec_and_test() __preempt_count_dec_and_test()
92836 #endif
92837
92838+#define raw_preempt_count_add(val) __preempt_count_add(val)
92839+#define raw_preempt_count_sub(val) __preempt_count_sub(val)
92840+
92841 #define __preempt_count_inc() __preempt_count_add(1)
92842 #define __preempt_count_dec() __preempt_count_sub(1)
92843
92844 #define preempt_count_inc() preempt_count_add(1)
92845+#define raw_preempt_count_inc() raw_preempt_count_add(1)
92846 #define preempt_count_dec() preempt_count_sub(1)
92847+#define raw_preempt_count_dec() raw_preempt_count_sub(1)
92848
92849 #ifdef CONFIG_PREEMPT_COUNT
92850
92851@@ -41,6 +46,12 @@ do { \
92852 barrier(); \
92853 } while (0)
92854
92855+#define raw_preempt_disable() \
92856+do { \
92857+ raw_preempt_count_inc(); \
92858+ barrier(); \
92859+} while (0)
92860+
92861 #define sched_preempt_enable_no_resched() \
92862 do { \
92863 barrier(); \
92864@@ -49,6 +60,12 @@ do { \
92865
92866 #define preempt_enable_no_resched() sched_preempt_enable_no_resched()
92867
92868+#define raw_preempt_enable_no_resched() \
92869+do { \
92870+ barrier(); \
92871+ raw_preempt_count_dec(); \
92872+} while (0)
92873+
92874 #ifdef CONFIG_PREEMPT
92875 #define preempt_enable() \
92876 do { \
92877@@ -113,8 +130,10 @@ do { \
92878 * region.
92879 */
92880 #define preempt_disable() barrier()
92881+#define raw_preempt_disable() barrier()
92882 #define sched_preempt_enable_no_resched() barrier()
92883 #define preempt_enable_no_resched() barrier()
92884+#define raw_preempt_enable_no_resched() barrier()
92885 #define preempt_enable() barrier()
92886 #define preempt_check_resched() do { } while (0)
92887
92888@@ -128,11 +147,13 @@ do { \
92889 /*
92890 * Modules have no business playing preemption tricks.
92891 */
92892+#ifndef CONFIG_PAX_KERNEXEC
92893 #undef sched_preempt_enable_no_resched
92894 #undef preempt_enable_no_resched
92895 #undef preempt_enable_no_resched_notrace
92896 #undef preempt_check_resched
92897 #endif
92898+#endif
92899
92900 #define preempt_set_need_resched() \
92901 do { \
92902diff --git a/include/linux/printk.h b/include/linux/printk.h
92903index baa3f97..168cff1 100644
92904--- a/include/linux/printk.h
92905+++ b/include/linux/printk.h
92906@@ -121,6 +121,7 @@ void early_printk(const char *s, ...) { }
92907 #endif
92908
92909 typedef int(*printk_func_t)(const char *fmt, va_list args);
92910+extern int kptr_restrict;
92911
92912 #ifdef CONFIG_PRINTK
92913 asmlinkage __printf(5, 0)
92914@@ -156,7 +157,6 @@ extern bool printk_timed_ratelimit(unsigned long *caller_jiffies,
92915
92916 extern int printk_delay_msec;
92917 extern int dmesg_restrict;
92918-extern int kptr_restrict;
92919
92920 extern void wake_up_klogd(void);
92921
92922diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
92923index b97bf2e..f14c92d4 100644
92924--- a/include/linux/proc_fs.h
92925+++ b/include/linux/proc_fs.h
92926@@ -17,8 +17,11 @@ extern void proc_flush_task(struct task_struct *);
92927 extern struct proc_dir_entry *proc_symlink(const char *,
92928 struct proc_dir_entry *, const char *);
92929 extern struct proc_dir_entry *proc_mkdir(const char *, struct proc_dir_entry *);
92930+extern struct proc_dir_entry *proc_mkdir_restrict(const char *, struct proc_dir_entry *);
92931 extern struct proc_dir_entry *proc_mkdir_data(const char *, umode_t,
92932 struct proc_dir_entry *, void *);
92933+extern struct proc_dir_entry *proc_mkdir_data_restrict(const char *, umode_t,
92934+ struct proc_dir_entry *, void *);
92935 extern struct proc_dir_entry *proc_mkdir_mode(const char *, umode_t,
92936 struct proc_dir_entry *);
92937
92938@@ -34,6 +37,19 @@ static inline struct proc_dir_entry *proc_create(
92939 return proc_create_data(name, mode, parent, proc_fops, NULL);
92940 }
92941
92942+static inline struct proc_dir_entry *proc_create_grsec(const char *name, umode_t mode,
92943+ struct proc_dir_entry *parent, const struct file_operations *proc_fops)
92944+{
92945+#ifdef CONFIG_GRKERNSEC_PROC_USER
92946+ return proc_create_data(name, S_IRUSR, parent, proc_fops, NULL);
92947+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
92948+ return proc_create_data(name, S_IRUSR | S_IRGRP, parent, proc_fops, NULL);
92949+#else
92950+ return proc_create_data(name, mode, parent, proc_fops, NULL);
92951+#endif
92952+}
92953+
92954+
92955 extern void proc_set_size(struct proc_dir_entry *, loff_t);
92956 extern void proc_set_user(struct proc_dir_entry *, kuid_t, kgid_t);
92957 extern void *PDE_DATA(const struct inode *);
92958@@ -56,8 +72,12 @@ static inline struct proc_dir_entry *proc_symlink(const char *name,
92959 struct proc_dir_entry *parent,const char *dest) { return NULL;}
92960 static inline struct proc_dir_entry *proc_mkdir(const char *name,
92961 struct proc_dir_entry *parent) {return NULL;}
92962+static inline struct proc_dir_entry *proc_mkdir_restrict(const char *name,
92963+ struct proc_dir_entry *parent) { return NULL; }
92964 static inline struct proc_dir_entry *proc_mkdir_data(const char *name,
92965 umode_t mode, struct proc_dir_entry *parent, void *data) { return NULL; }
92966+static inline struct proc_dir_entry *proc_mkdir_data_restrict(const char *name,
92967+ umode_t mode, struct proc_dir_entry *parent, void *data) { return NULL; }
92968 static inline struct proc_dir_entry *proc_mkdir_mode(const char *name,
92969 umode_t mode, struct proc_dir_entry *parent) { return NULL; }
92970 #define proc_create(name, mode, parent, proc_fops) ({NULL;})
92971@@ -79,7 +99,7 @@ struct net;
92972 static inline struct proc_dir_entry *proc_net_mkdir(
92973 struct net *net, const char *name, struct proc_dir_entry *parent)
92974 {
92975- return proc_mkdir_data(name, 0, parent, net);
92976+ return proc_mkdir_data_restrict(name, 0, parent, net);
92977 }
92978
92979 #endif /* _LINUX_PROC_FS_H */
92980diff --git a/include/linux/proc_ns.h b/include/linux/proc_ns.h
92981index 42dfc61..8113a99 100644
92982--- a/include/linux/proc_ns.h
92983+++ b/include/linux/proc_ns.h
92984@@ -16,7 +16,7 @@ struct proc_ns_operations {
92985 struct ns_common *(*get)(struct task_struct *task);
92986 void (*put)(struct ns_common *ns);
92987 int (*install)(struct nsproxy *nsproxy, struct ns_common *ns);
92988-};
92989+} __do_const __randomize_layout;
92990
92991 extern const struct proc_ns_operations netns_operations;
92992 extern const struct proc_ns_operations utsns_operations;
92993diff --git a/include/linux/quota.h b/include/linux/quota.h
92994index d534e8e..782e604 100644
92995--- a/include/linux/quota.h
92996+++ b/include/linux/quota.h
92997@@ -75,7 +75,7 @@ struct kqid { /* Type in which we store the quota identifier */
92998
92999 extern bool qid_eq(struct kqid left, struct kqid right);
93000 extern bool qid_lt(struct kqid left, struct kqid right);
93001-extern qid_t from_kqid(struct user_namespace *to, struct kqid qid);
93002+extern qid_t from_kqid(struct user_namespace *to, struct kqid qid) __intentional_overflow(-1);
93003 extern qid_t from_kqid_munged(struct user_namespace *to, struct kqid qid);
93004 extern bool qid_valid(struct kqid qid);
93005
93006diff --git a/include/linux/random.h b/include/linux/random.h
93007index b05856e..0a9f14e 100644
93008--- a/include/linux/random.h
93009+++ b/include/linux/random.h
93010@@ -9,9 +9,19 @@
93011 #include <uapi/linux/random.h>
93012
93013 extern void add_device_randomness(const void *, unsigned int);
93014+
93015+static inline void add_latent_entropy(void)
93016+{
93017+
93018+#ifdef LATENT_ENTROPY_PLUGIN
93019+ add_device_randomness((const void *)&latent_entropy, sizeof(latent_entropy));
93020+#endif
93021+
93022+}
93023+
93024 extern void add_input_randomness(unsigned int type, unsigned int code,
93025- unsigned int value);
93026-extern void add_interrupt_randomness(int irq, int irq_flags);
93027+ unsigned int value) __latent_entropy;
93028+extern void add_interrupt_randomness(int irq, int irq_flags) __latent_entropy;
93029
93030 extern void get_random_bytes(void *buf, int nbytes);
93031 extern void get_random_bytes_arch(void *buf, int nbytes);
93032@@ -22,10 +32,10 @@ extern int random_int_secret_init(void);
93033 extern const struct file_operations random_fops, urandom_fops;
93034 #endif
93035
93036-unsigned int get_random_int(void);
93037+unsigned int __intentional_overflow(-1) get_random_int(void);
93038 unsigned long randomize_range(unsigned long start, unsigned long end, unsigned long len);
93039
93040-u32 prandom_u32(void);
93041+u32 prandom_u32(void) __intentional_overflow(-1);
93042 void prandom_bytes(void *buf, size_t nbytes);
93043 void prandom_seed(u32 seed);
93044 void prandom_reseed_late(void);
93045@@ -37,6 +47,11 @@ struct rnd_state {
93046 u32 prandom_u32_state(struct rnd_state *state);
93047 void prandom_bytes_state(struct rnd_state *state, void *buf, size_t nbytes);
93048
93049+static inline unsigned long __intentional_overflow(-1) pax_get_random_long(void)
93050+{
93051+ return prandom_u32() + (sizeof(long) > 4 ? (unsigned long)prandom_u32() << 32 : 0);
93052+}
93053+
93054 /**
93055 * prandom_u32_max - returns a pseudo-random number in interval [0, ep_ro)
93056 * @ep_ro: right open interval endpoint
93057@@ -49,7 +64,7 @@ void prandom_bytes_state(struct rnd_state *state, void *buf, size_t nbytes);
93058 *
93059 * Returns: pseudo-random number in interval [0, ep_ro)
93060 */
93061-static inline u32 prandom_u32_max(u32 ep_ro)
93062+static inline u32 __intentional_overflow(-1) prandom_u32_max(u32 ep_ro)
93063 {
93064 return (u32)(((u64) prandom_u32() * ep_ro) >> 32);
93065 }
93066diff --git a/include/linux/rbtree_augmented.h b/include/linux/rbtree_augmented.h
93067index 378c5ee..aa84a47 100644
93068--- a/include/linux/rbtree_augmented.h
93069+++ b/include/linux/rbtree_augmented.h
93070@@ -90,7 +90,9 @@ rbname ## _rotate(struct rb_node *rb_old, struct rb_node *rb_new) \
93071 old->rbaugmented = rbcompute(old); \
93072 } \
93073 rbstatic const struct rb_augment_callbacks rbname = { \
93074- rbname ## _propagate, rbname ## _copy, rbname ## _rotate \
93075+ .propagate = rbname ## _propagate, \
93076+ .copy = rbname ## _copy, \
93077+ .rotate = rbname ## _rotate \
93078 };
93079
93080
93081diff --git a/include/linux/rculist.h b/include/linux/rculist.h
93082index a18b16f..2683096 100644
93083--- a/include/linux/rculist.h
93084+++ b/include/linux/rculist.h
93085@@ -29,8 +29,8 @@
93086 */
93087 static inline void INIT_LIST_HEAD_RCU(struct list_head *list)
93088 {
93089- ACCESS_ONCE(list->next) = list;
93090- ACCESS_ONCE(list->prev) = list;
93091+ ACCESS_ONCE_RW(list->next) = list;
93092+ ACCESS_ONCE_RW(list->prev) = list;
93093 }
93094
93095 /*
93096@@ -59,6 +59,9 @@ void __list_add_rcu(struct list_head *new,
93097 struct list_head *prev, struct list_head *next);
93098 #endif
93099
93100+void __pax_list_add_rcu(struct list_head *new,
93101+ struct list_head *prev, struct list_head *next);
93102+
93103 /**
93104 * list_add_rcu - add a new entry to rcu-protected list
93105 * @new: new entry to be added
93106@@ -80,6 +83,11 @@ static inline void list_add_rcu(struct list_head *new, struct list_head *head)
93107 __list_add_rcu(new, head, head->next);
93108 }
93109
93110+static inline void pax_list_add_rcu(struct list_head *new, struct list_head *head)
93111+{
93112+ __pax_list_add_rcu(new, head, head->next);
93113+}
93114+
93115 /**
93116 * list_add_tail_rcu - add a new entry to rcu-protected list
93117 * @new: new entry to be added
93118@@ -102,6 +110,12 @@ static inline void list_add_tail_rcu(struct list_head *new,
93119 __list_add_rcu(new, head->prev, head);
93120 }
93121
93122+static inline void pax_list_add_tail_rcu(struct list_head *new,
93123+ struct list_head *head)
93124+{
93125+ __pax_list_add_rcu(new, head->prev, head);
93126+}
93127+
93128 /**
93129 * list_del_rcu - deletes entry from list without re-initialization
93130 * @entry: the element to delete from the list.
93131@@ -132,6 +146,8 @@ static inline void list_del_rcu(struct list_head *entry)
93132 entry->prev = LIST_POISON2;
93133 }
93134
93135+extern void pax_list_del_rcu(struct list_head *entry);
93136+
93137 /**
93138 * hlist_del_init_rcu - deletes entry from hash list with re-initialization
93139 * @n: the element to delete from the hash list.
93140diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
93141index 7809749..1cd9315 100644
93142--- a/include/linux/rcupdate.h
93143+++ b/include/linux/rcupdate.h
93144@@ -333,7 +333,7 @@ extern struct srcu_struct tasks_rcu_exit_srcu;
93145 do { \
93146 rcu_all_qs(); \
93147 if (ACCESS_ONCE((t)->rcu_tasks_holdout)) \
93148- ACCESS_ONCE((t)->rcu_tasks_holdout) = false; \
93149+ ACCESS_ONCE_RW((t)->rcu_tasks_holdout) = false; \
93150 } while (0)
93151 #else /* #ifdef CONFIG_TASKS_RCU */
93152 #define TASKS_RCU(x) do { } while (0)
93153diff --git a/include/linux/reboot.h b/include/linux/reboot.h
93154index 67fc8fc..a90f7d8 100644
93155--- a/include/linux/reboot.h
93156+++ b/include/linux/reboot.h
93157@@ -47,9 +47,9 @@ extern void do_kernel_restart(char *cmd);
93158 */
93159
93160 extern void migrate_to_reboot_cpu(void);
93161-extern void machine_restart(char *cmd);
93162-extern void machine_halt(void);
93163-extern void machine_power_off(void);
93164+extern void machine_restart(char *cmd) __noreturn;
93165+extern void machine_halt(void) __noreturn;
93166+extern void machine_power_off(void) __noreturn;
93167
93168 extern void machine_shutdown(void);
93169 struct pt_regs;
93170@@ -60,9 +60,9 @@ extern void machine_crash_shutdown(struct pt_regs *);
93171 */
93172
93173 extern void kernel_restart_prepare(char *cmd);
93174-extern void kernel_restart(char *cmd);
93175-extern void kernel_halt(void);
93176-extern void kernel_power_off(void);
93177+extern void kernel_restart(char *cmd) __noreturn;
93178+extern void kernel_halt(void) __noreturn;
93179+extern void kernel_power_off(void) __noreturn;
93180
93181 extern int C_A_D; /* for sysctl */
93182 void ctrl_alt_del(void);
93183@@ -76,7 +76,7 @@ extern int orderly_poweroff(bool force);
93184 * Emergency restart, callable from an interrupt handler.
93185 */
93186
93187-extern void emergency_restart(void);
93188+extern void emergency_restart(void) __noreturn;
93189 #include <asm/emergency-restart.h>
93190
93191 #endif /* _LINUX_REBOOT_H */
93192diff --git a/include/linux/regset.h b/include/linux/regset.h
93193index 8e0c9fe..ac4d221 100644
93194--- a/include/linux/regset.h
93195+++ b/include/linux/regset.h
93196@@ -161,7 +161,8 @@ struct user_regset {
93197 unsigned int align;
93198 unsigned int bias;
93199 unsigned int core_note_type;
93200-};
93201+} __do_const;
93202+typedef struct user_regset __no_const user_regset_no_const;
93203
93204 /**
93205 * struct user_regset_view - available regsets
93206diff --git a/include/linux/relay.h b/include/linux/relay.h
93207index d7c8359..818daf5 100644
93208--- a/include/linux/relay.h
93209+++ b/include/linux/relay.h
93210@@ -157,7 +157,7 @@ struct rchan_callbacks
93211 * The callback should return 0 if successful, negative if not.
93212 */
93213 int (*remove_buf_file)(struct dentry *dentry);
93214-};
93215+} __no_const;
93216
93217 /*
93218 * CONFIG_RELAY kernel API, kernel/relay.c
93219diff --git a/include/linux/rio.h b/include/linux/rio.h
93220index 6bda06f..bf39a9b 100644
93221--- a/include/linux/rio.h
93222+++ b/include/linux/rio.h
93223@@ -358,7 +358,7 @@ struct rio_ops {
93224 int (*map_inb)(struct rio_mport *mport, dma_addr_t lstart,
93225 u64 rstart, u32 size, u32 flags);
93226 void (*unmap_inb)(struct rio_mport *mport, dma_addr_t lstart);
93227-};
93228+} __no_const;
93229
93230 #define RIO_RESOURCE_MEM 0x00000100
93231 #define RIO_RESOURCE_DOORBELL 0x00000200
93232diff --git a/include/linux/rmap.h b/include/linux/rmap.h
93233index c4c559a..6ba9a26 100644
93234--- a/include/linux/rmap.h
93235+++ b/include/linux/rmap.h
93236@@ -154,8 +154,8 @@ static inline void anon_vma_unlock_read(struct anon_vma *anon_vma)
93237 void anon_vma_init(void); /* create anon_vma_cachep */
93238 int anon_vma_prepare(struct vm_area_struct *);
93239 void unlink_anon_vmas(struct vm_area_struct *);
93240-int anon_vma_clone(struct vm_area_struct *, struct vm_area_struct *);
93241-int anon_vma_fork(struct vm_area_struct *, struct vm_area_struct *);
93242+int anon_vma_clone(struct vm_area_struct *, const struct vm_area_struct *);
93243+int anon_vma_fork(struct vm_area_struct *, const struct vm_area_struct *);
93244
93245 static inline void anon_vma_merge(struct vm_area_struct *vma,
93246 struct vm_area_struct *next)
93247diff --git a/include/linux/scatterlist.h b/include/linux/scatterlist.h
93248index ed8f9e70..2e627f2 100644
93249--- a/include/linux/scatterlist.h
93250+++ b/include/linux/scatterlist.h
93251@@ -1,6 +1,7 @@
93252 #ifndef _LINUX_SCATTERLIST_H
93253 #define _LINUX_SCATTERLIST_H
93254
93255+#include <linux/sched.h>
93256 #include <linux/string.h>
93257 #include <linux/bug.h>
93258 #include <linux/mm.h>
93259@@ -111,10 +112,17 @@ static inline struct page *sg_page(struct scatterlist *sg)
93260 static inline void sg_set_buf(struct scatterlist *sg, const void *buf,
93261 unsigned int buflen)
93262 {
93263+ const void *realbuf = buf;
93264+
93265+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
93266+ if (object_starts_on_stack(buf))
93267+ realbuf = buf - current->stack + current->lowmem_stack;
93268+#endif
93269+
93270 #ifdef CONFIG_DEBUG_SG
93271- BUG_ON(!virt_addr_valid(buf));
93272+ BUG_ON(!virt_addr_valid(realbuf));
93273 #endif
93274- sg_set_page(sg, virt_to_page(buf), buflen, offset_in_page(buf));
93275+ sg_set_page(sg, virt_to_page(realbuf), buflen, offset_in_page(realbuf));
93276 }
93277
93278 /*
93279diff --git a/include/linux/sched.h b/include/linux/sched.h
93280index 51348f7..8c8b0ba 100644
93281--- a/include/linux/sched.h
93282+++ b/include/linux/sched.h
93283@@ -133,6 +133,7 @@ struct fs_struct;
93284 struct perf_event_context;
93285 struct blk_plug;
93286 struct filename;
93287+struct linux_binprm;
93288
93289 #define VMACACHE_BITS 2
93290 #define VMACACHE_SIZE (1U << VMACACHE_BITS)
93291@@ -420,7 +421,7 @@ extern char __sched_text_start[], __sched_text_end[];
93292 extern int in_sched_functions(unsigned long addr);
93293
93294 #define MAX_SCHEDULE_TIMEOUT LONG_MAX
93295-extern signed long schedule_timeout(signed long timeout);
93296+extern signed long schedule_timeout(signed long timeout) __intentional_overflow(-1);
93297 extern signed long schedule_timeout_interruptible(signed long timeout);
93298 extern signed long schedule_timeout_killable(signed long timeout);
93299 extern signed long schedule_timeout_uninterruptible(signed long timeout);
93300@@ -438,6 +439,19 @@ struct nsproxy;
93301 struct user_namespace;
93302
93303 #ifdef CONFIG_MMU
93304+
93305+#ifdef CONFIG_GRKERNSEC_RAND_THREADSTACK
93306+extern unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags);
93307+#else
93308+static inline unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags)
93309+{
93310+ return 0;
93311+}
93312+#endif
93313+
93314+extern bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len, unsigned long offset);
93315+extern unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len, unsigned long offset);
93316+
93317 extern void arch_pick_mmap_layout(struct mm_struct *mm);
93318 extern unsigned long
93319 arch_get_unmapped_area(struct file *, unsigned long, unsigned long,
93320@@ -736,6 +750,17 @@ struct signal_struct {
93321 #ifdef CONFIG_TASKSTATS
93322 struct taskstats *stats;
93323 #endif
93324+
93325+#ifdef CONFIG_GRKERNSEC
93326+ u32 curr_ip;
93327+ u32 saved_ip;
93328+ u32 gr_saddr;
93329+ u32 gr_daddr;
93330+ u16 gr_sport;
93331+ u16 gr_dport;
93332+ u8 used_accept:1;
93333+#endif
93334+
93335 #ifdef CONFIG_AUDIT
93336 unsigned audit_tty;
93337 unsigned audit_tty_log_passwd;
93338@@ -762,7 +787,7 @@ struct signal_struct {
93339 struct mutex cred_guard_mutex; /* guard against foreign influences on
93340 * credential calculations
93341 * (notably. ptrace) */
93342-};
93343+} __randomize_layout;
93344
93345 /*
93346 * Bits in flags field of signal_struct.
93347@@ -815,6 +840,14 @@ struct user_struct {
93348 struct key *session_keyring; /* UID's default session keyring */
93349 #endif
93350
93351+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
93352+ unsigned char kernel_banned;
93353+#endif
93354+#ifdef CONFIG_GRKERNSEC_BRUTE
93355+ unsigned char suid_banned;
93356+ unsigned long suid_ban_expires;
93357+#endif
93358+
93359 /* Hash table maintenance information */
93360 struct hlist_node uidhash_node;
93361 kuid_t uid;
93362@@ -822,7 +855,7 @@ struct user_struct {
93363 #ifdef CONFIG_PERF_EVENTS
93364 atomic_long_t locked_vm;
93365 #endif
93366-};
93367+} __randomize_layout;
93368
93369 extern int uids_sysfs_init(void);
93370
93371@@ -1286,6 +1319,9 @@ enum perf_event_task_context {
93372 struct task_struct {
93373 volatile long state; /* -1 unrunnable, 0 runnable, >0 stopped */
93374 void *stack;
93375+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
93376+ void *lowmem_stack;
93377+#endif
93378 atomic_t usage;
93379 unsigned int flags; /* per process flags, defined below */
93380 unsigned int ptrace;
93381@@ -1419,8 +1455,8 @@ struct task_struct {
93382 struct list_head thread_node;
93383
93384 struct completion *vfork_done; /* for vfork() */
93385- int __user *set_child_tid; /* CLONE_CHILD_SETTID */
93386- int __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
93387+ pid_t __user *set_child_tid; /* CLONE_CHILD_SETTID */
93388+ pid_t __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
93389
93390 cputime_t utime, stime, utimescaled, stimescaled;
93391 cputime_t gtime;
93392@@ -1445,11 +1481,6 @@ struct task_struct {
93393 struct task_cputime cputime_expires;
93394 struct list_head cpu_timers[3];
93395
93396-/* process credentials */
93397- const struct cred __rcu *real_cred; /* objective and real subjective task
93398- * credentials (COW) */
93399- const struct cred __rcu *cred; /* effective (overridable) subjective task
93400- * credentials (COW) */
93401 char comm[TASK_COMM_LEN]; /* executable name excluding path
93402 - access with [gs]et_task_comm (which lock
93403 it with task_lock())
93404@@ -1467,6 +1498,10 @@ struct task_struct {
93405 #endif
93406 /* CPU-specific state of this task */
93407 struct thread_struct thread;
93408+/* thread_info moved to task_struct */
93409+#ifdef CONFIG_X86
93410+ struct thread_info tinfo;
93411+#endif
93412 /* filesystem information */
93413 struct fs_struct *fs;
93414 /* open file information */
93415@@ -1541,6 +1576,10 @@ struct task_struct {
93416 gfp_t lockdep_reclaim_gfp;
93417 #endif
93418
93419+/* process credentials */
93420+ const struct cred __rcu *real_cred; /* objective and real subjective task
93421+ * credentials (COW) */
93422+
93423 /* journalling filesystem info */
93424 void *journal_info;
93425
93426@@ -1579,6 +1618,10 @@ struct task_struct {
93427 /* cg_list protected by css_set_lock and tsk->alloc_lock */
93428 struct list_head cg_list;
93429 #endif
93430+
93431+ const struct cred __rcu *cred; /* effective (overridable) subjective task
93432+ * credentials (COW) */
93433+
93434 #ifdef CONFIG_FUTEX
93435 struct robust_list_head __user *robust_list;
93436 #ifdef CONFIG_COMPAT
93437@@ -1690,7 +1733,7 @@ struct task_struct {
93438 * Number of functions that haven't been traced
93439 * because of depth overrun.
93440 */
93441- atomic_t trace_overrun;
93442+ atomic_unchecked_t trace_overrun;
93443 /* Pause for the tracing */
93444 atomic_t tracing_graph_pause;
93445 #endif
93446@@ -1718,7 +1761,78 @@ struct task_struct {
93447 #ifdef CONFIG_DEBUG_ATOMIC_SLEEP
93448 unsigned long task_state_change;
93449 #endif
93450-};
93451+
93452+#ifdef CONFIG_GRKERNSEC
93453+ /* grsecurity */
93454+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
93455+ u64 exec_id;
93456+#endif
93457+#ifdef CONFIG_GRKERNSEC_SETXID
93458+ const struct cred *delayed_cred;
93459+#endif
93460+ struct dentry *gr_chroot_dentry;
93461+ struct acl_subject_label *acl;
93462+ struct acl_subject_label *tmpacl;
93463+ struct acl_role_label *role;
93464+ struct file *exec_file;
93465+ unsigned long brute_expires;
93466+ u16 acl_role_id;
93467+ u8 inherited;
93468+ /* is this the task that authenticated to the special role */
93469+ u8 acl_sp_role;
93470+ u8 is_writable;
93471+ u8 brute;
93472+ u8 gr_is_chrooted;
93473+#endif
93474+
93475+} __randomize_layout;
93476+
93477+#define MF_PAX_PAGEEXEC 0x01000000 /* Paging based non-executable pages */
93478+#define MF_PAX_EMUTRAMP 0x02000000 /* Emulate trampolines */
93479+#define MF_PAX_MPROTECT 0x04000000 /* Restrict mprotect() */
93480+#define MF_PAX_RANDMMAP 0x08000000 /* Randomize mmap() base */
93481+/*#define MF_PAX_RANDEXEC 0x10000000*/ /* Randomize ET_EXEC base */
93482+#define MF_PAX_SEGMEXEC 0x20000000 /* Segmentation based non-executable pages */
93483+
93484+#ifdef CONFIG_PAX_SOFTMODE
93485+extern int pax_softmode;
93486+#endif
93487+
93488+extern int pax_check_flags(unsigned long *);
93489+#define PAX_PARSE_FLAGS_FALLBACK (~0UL)
93490+
93491+/* if tsk != current then task_lock must be held on it */
93492+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
93493+static inline unsigned long pax_get_flags(struct task_struct *tsk)
93494+{
93495+ if (likely(tsk->mm))
93496+ return tsk->mm->pax_flags;
93497+ else
93498+ return 0UL;
93499+}
93500+
93501+/* if tsk != current then task_lock must be held on it */
93502+static inline long pax_set_flags(struct task_struct *tsk, unsigned long flags)
93503+{
93504+ if (likely(tsk->mm)) {
93505+ tsk->mm->pax_flags = flags;
93506+ return 0;
93507+ }
93508+ return -EINVAL;
93509+}
93510+#endif
93511+
93512+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
93513+extern void pax_set_initial_flags(struct linux_binprm *bprm);
93514+#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
93515+extern void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
93516+#endif
93517+
93518+struct path;
93519+extern char *pax_get_path(const struct path *path, char *buf, int buflen);
93520+extern void pax_report_fault(struct pt_regs *regs, void *pc, void *sp);
93521+extern void pax_report_insns(struct pt_regs *regs, void *pc, void *sp);
93522+extern void pax_report_refcount_overflow(struct pt_regs *regs);
93523
93524 /* Future-safe accessor for struct task_struct's cpus_allowed. */
93525 #define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed)
93526@@ -1801,7 +1915,7 @@ struct pid_namespace;
93527 pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type,
93528 struct pid_namespace *ns);
93529
93530-static inline pid_t task_pid_nr(struct task_struct *tsk)
93531+static inline pid_t task_pid_nr(const struct task_struct *tsk)
93532 {
93533 return tsk->pid;
93534 }
93535@@ -2169,6 +2283,25 @@ extern u64 sched_clock_cpu(int cpu);
93536
93537 extern void sched_clock_init(void);
93538
93539+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
93540+static inline void populate_stack(void)
93541+{
93542+ struct task_struct *curtask = current;
93543+ int c;
93544+ int *ptr = curtask->stack;
93545+ int *end = curtask->stack + THREAD_SIZE;
93546+
93547+ while (ptr < end) {
93548+ c = *(volatile int *)ptr;
93549+ ptr += PAGE_SIZE/sizeof(int);
93550+ }
93551+}
93552+#else
93553+static inline void populate_stack(void)
93554+{
93555+}
93556+#endif
93557+
93558 #ifndef CONFIG_HAVE_UNSTABLE_SCHED_CLOCK
93559 static inline void sched_clock_tick(void)
93560 {
93561@@ -2302,7 +2435,9 @@ void yield(void);
93562 extern struct exec_domain default_exec_domain;
93563
93564 union thread_union {
93565+#ifndef CONFIG_X86
93566 struct thread_info thread_info;
93567+#endif
93568 unsigned long stack[THREAD_SIZE/sizeof(long)];
93569 };
93570
93571@@ -2335,6 +2470,7 @@ extern struct pid_namespace init_pid_ns;
93572 */
93573
93574 extern struct task_struct *find_task_by_vpid(pid_t nr);
93575+extern struct task_struct *find_task_by_vpid_unrestricted(pid_t nr);
93576 extern struct task_struct *find_task_by_pid_ns(pid_t nr,
93577 struct pid_namespace *ns);
93578
93579@@ -2499,7 +2635,7 @@ extern void __cleanup_sighand(struct sighand_struct *);
93580 extern void exit_itimers(struct signal_struct *);
93581 extern void flush_itimer_signals(void);
93582
93583-extern void do_group_exit(int);
93584+extern __noreturn void do_group_exit(int);
93585
93586 extern int do_execve(struct filename *,
93587 const char __user * const __user *,
93588@@ -2720,9 +2856,9 @@ static inline unsigned long *end_of_stack(struct task_struct *p)
93589 #define task_stack_end_corrupted(task) \
93590 (*(end_of_stack(task)) != STACK_END_MAGIC)
93591
93592-static inline int object_is_on_stack(void *obj)
93593+static inline int object_starts_on_stack(const void *obj)
93594 {
93595- void *stack = task_stack_page(current);
93596+ const void *stack = task_stack_page(current);
93597
93598 return (obj >= stack) && (obj < (stack + THREAD_SIZE));
93599 }
93600diff --git a/include/linux/sched/sysctl.h b/include/linux/sched/sysctl.h
93601index 596a0e0..bea77ec 100644
93602--- a/include/linux/sched/sysctl.h
93603+++ b/include/linux/sched/sysctl.h
93604@@ -34,6 +34,7 @@ enum { sysctl_hung_task_timeout_secs = 0 };
93605 #define DEFAULT_MAX_MAP_COUNT (USHRT_MAX - MAPCOUNT_ELF_CORE_MARGIN)
93606
93607 extern int sysctl_max_map_count;
93608+extern unsigned long sysctl_heap_stack_gap;
93609
93610 extern unsigned int sysctl_sched_latency;
93611 extern unsigned int sysctl_sched_min_granularity;
93612diff --git a/include/linux/security.h b/include/linux/security.h
93613index a1b7dbd..036f47f 100644
93614--- a/include/linux/security.h
93615+++ b/include/linux/security.h
93616@@ -27,6 +27,7 @@
93617 #include <linux/slab.h>
93618 #include <linux/err.h>
93619 #include <linux/string.h>
93620+#include <linux/grsecurity.h>
93621
93622 struct linux_binprm;
93623 struct cred;
93624@@ -116,8 +117,6 @@ struct seq_file;
93625
93626 extern int cap_netlink_send(struct sock *sk, struct sk_buff *skb);
93627
93628-void reset_security_ops(void);
93629-
93630 #ifdef CONFIG_MMU
93631 extern unsigned long mmap_min_addr;
93632 extern unsigned long dac_mmap_min_addr;
93633@@ -1756,7 +1755,7 @@ struct security_operations {
93634 struct audit_context *actx);
93635 void (*audit_rule_free) (void *lsmrule);
93636 #endif /* CONFIG_AUDIT */
93637-};
93638+} __randomize_layout;
93639
93640 /* prototypes */
93641 extern int security_init(void);
93642diff --git a/include/linux/semaphore.h b/include/linux/semaphore.h
93643index dc368b8..e895209 100644
93644--- a/include/linux/semaphore.h
93645+++ b/include/linux/semaphore.h
93646@@ -37,7 +37,7 @@ static inline void sema_init(struct semaphore *sem, int val)
93647 }
93648
93649 extern void down(struct semaphore *sem);
93650-extern int __must_check down_interruptible(struct semaphore *sem);
93651+extern int __must_check down_interruptible(struct semaphore *sem) __intentional_overflow(-1);
93652 extern int __must_check down_killable(struct semaphore *sem);
93653 extern int __must_check down_trylock(struct semaphore *sem);
93654 extern int __must_check down_timeout(struct semaphore *sem, long jiffies);
93655diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h
93656index afbb1fd..e1d205d 100644
93657--- a/include/linux/seq_file.h
93658+++ b/include/linux/seq_file.h
93659@@ -27,6 +27,9 @@ struct seq_file {
93660 struct mutex lock;
93661 const struct seq_operations *op;
93662 int poll_event;
93663+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
93664+ u64 exec_id;
93665+#endif
93666 #ifdef CONFIG_USER_NS
93667 struct user_namespace *user_ns;
93668 #endif
93669@@ -39,6 +42,7 @@ struct seq_operations {
93670 void * (*next) (struct seq_file *m, void *v, loff_t *pos);
93671 int (*show) (struct seq_file *m, void *v);
93672 };
93673+typedef struct seq_operations __no_const seq_operations_no_const;
93674
93675 #define SEQ_SKIP 1
93676
93677@@ -111,6 +115,7 @@ void seq_pad(struct seq_file *m, char c);
93678
93679 char *mangle_path(char *s, const char *p, const char *esc);
93680 int seq_open(struct file *, const struct seq_operations *);
93681+int seq_open_restrict(struct file *, const struct seq_operations *);
93682 ssize_t seq_read(struct file *, char __user *, size_t, loff_t *);
93683 loff_t seq_lseek(struct file *, loff_t, int);
93684 int seq_release(struct inode *, struct file *);
93685@@ -128,6 +133,7 @@ int seq_path_root(struct seq_file *m, const struct path *path,
93686 const struct path *root, const char *esc);
93687
93688 int single_open(struct file *, int (*)(struct seq_file *, void *), void *);
93689+int single_open_restrict(struct file *, int (*)(struct seq_file *, void *), void *);
93690 int single_open_size(struct file *, int (*)(struct seq_file *, void *), void *, size_t);
93691 int single_release(struct inode *, struct file *);
93692 void *__seq_open_private(struct file *, const struct seq_operations *, int);
93693diff --git a/include/linux/shm.h b/include/linux/shm.h
93694index 6fb8016..ab4465e 100644
93695--- a/include/linux/shm.h
93696+++ b/include/linux/shm.h
93697@@ -22,6 +22,10 @@ struct shmid_kernel /* private to the kernel */
93698 /* The task created the shm object. NULL if the task is dead. */
93699 struct task_struct *shm_creator;
93700 struct list_head shm_clist; /* list by creator */
93701+#ifdef CONFIG_GRKERNSEC
93702+ u64 shm_createtime;
93703+ pid_t shm_lapid;
93704+#endif
93705 };
93706
93707 /* shm_mode upper byte flags */
93708diff --git a/include/linux/signal.h b/include/linux/signal.h
93709index ab1e039..ad4229e 100644
93710--- a/include/linux/signal.h
93711+++ b/include/linux/signal.h
93712@@ -289,7 +289,7 @@ static inline void allow_signal(int sig)
93713 * know it'll be handled, so that they don't get converted to
93714 * SIGKILL or just silently dropped.
93715 */
93716- kernel_sigaction(sig, (__force __sighandler_t)2);
93717+ kernel_sigaction(sig, (__force_user __sighandler_t)2);
93718 }
93719
93720 static inline void disallow_signal(int sig)
93721diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
93722index bdccc4b..e9f8670 100644
93723--- a/include/linux/skbuff.h
93724+++ b/include/linux/skbuff.h
93725@@ -771,7 +771,7 @@ struct sk_buff *__alloc_skb(unsigned int size, gfp_t priority, int flags,
93726 int node);
93727 struct sk_buff *__build_skb(void *data, unsigned int frag_size);
93728 struct sk_buff *build_skb(void *data, unsigned int frag_size);
93729-static inline struct sk_buff *alloc_skb(unsigned int size,
93730+static inline struct sk_buff * __intentional_overflow(0) alloc_skb(unsigned int size,
93731 gfp_t priority)
93732 {
93733 return __alloc_skb(size, priority, 0, NUMA_NO_NODE);
93734@@ -1967,7 +1967,7 @@ static inline u32 skb_inner_network_header_len(const struct sk_buff *skb)
93735 return skb->inner_transport_header - skb->inner_network_header;
93736 }
93737
93738-static inline int skb_network_offset(const struct sk_buff *skb)
93739+static inline int __intentional_overflow(0) skb_network_offset(const struct sk_buff *skb)
93740 {
93741 return skb_network_header(skb) - skb->data;
93742 }
93743@@ -2027,7 +2027,7 @@ static inline int pskb_network_may_pull(struct sk_buff *skb, unsigned int len)
93744 * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
93745 */
93746 #ifndef NET_SKB_PAD
93747-#define NET_SKB_PAD max(32, L1_CACHE_BYTES)
93748+#define NET_SKB_PAD max(_AC(32,UL), L1_CACHE_BYTES)
93749 #endif
93750
93751 int ___pskb_trim(struct sk_buff *skb, unsigned int len);
93752@@ -2669,9 +2669,9 @@ struct sk_buff *skb_recv_datagram(struct sock *sk, unsigned flags, int noblock,
93753 int *err);
93754 unsigned int datagram_poll(struct file *file, struct socket *sock,
93755 struct poll_table_struct *wait);
93756-int skb_copy_datagram_iter(const struct sk_buff *from, int offset,
93757+int __intentional_overflow(0) skb_copy_datagram_iter(const struct sk_buff *from, int offset,
93758 struct iov_iter *to, int size);
93759-static inline int skb_copy_datagram_msg(const struct sk_buff *from, int offset,
93760+static inline int __intentional_overflow(2,4) skb_copy_datagram_msg(const struct sk_buff *from, int offset,
93761 struct msghdr *msg, int size)
93762 {
93763 return skb_copy_datagram_iter(from, offset, &msg->msg_iter, size);
93764@@ -3193,6 +3193,9 @@ static inline void nf_reset(struct sk_buff *skb)
93765 nf_bridge_put(skb->nf_bridge);
93766 skb->nf_bridge = NULL;
93767 #endif
93768+#if IS_ENABLED(CONFIG_NETFILTER_XT_TARGET_TRACE)
93769+ skb->nf_trace = 0;
93770+#endif
93771 }
93772
93773 static inline void nf_reset_trace(struct sk_buff *skb)
93774diff --git a/include/linux/slab.h b/include/linux/slab.h
93775index 76f1fee..d95e6d2 100644
93776--- a/include/linux/slab.h
93777+++ b/include/linux/slab.h
93778@@ -14,15 +14,29 @@
93779 #include <linux/gfp.h>
93780 #include <linux/types.h>
93781 #include <linux/workqueue.h>
93782-
93783+#include <linux/err.h>
93784
93785 /*
93786 * Flags to pass to kmem_cache_create().
93787 * The ones marked DEBUG are only valid if CONFIG_SLAB_DEBUG is set.
93788 */
93789 #define SLAB_DEBUG_FREE 0x00000100UL /* DEBUG: Perform (expensive) checks on free */
93790+
93791+#ifdef CONFIG_PAX_USERCOPY_SLABS
93792+#define SLAB_USERCOPY 0x00000200UL /* PaX: Allow copying objs to/from userland */
93793+#else
93794+#define SLAB_USERCOPY 0x00000000UL
93795+#endif
93796+
93797 #define SLAB_RED_ZONE 0x00000400UL /* DEBUG: Red zone objs in a cache */
93798 #define SLAB_POISON 0x00000800UL /* DEBUG: Poison objects */
93799+
93800+#ifdef CONFIG_PAX_MEMORY_SANITIZE
93801+#define SLAB_NO_SANITIZE 0x00001000UL /* PaX: Do not sanitize objs on free */
93802+#else
93803+#define SLAB_NO_SANITIZE 0x00000000UL
93804+#endif
93805+
93806 #define SLAB_HWCACHE_ALIGN 0x00002000UL /* Align objs on cache lines */
93807 #define SLAB_CACHE_DMA 0x00004000UL /* Use GFP_DMA memory */
93808 #define SLAB_STORE_USER 0x00010000UL /* DEBUG: Store the last owner for bug hunting */
93809@@ -98,10 +112,13 @@
93810 * ZERO_SIZE_PTR can be passed to kfree though in the same way that NULL can.
93811 * Both make kfree a no-op.
93812 */
93813-#define ZERO_SIZE_PTR ((void *)16)
93814+#define ZERO_SIZE_PTR \
93815+({ \
93816+ BUILD_BUG_ON(!(MAX_ERRNO & ~PAGE_MASK));\
93817+ (void *)(-MAX_ERRNO-1L); \
93818+})
93819
93820-#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) <= \
93821- (unsigned long)ZERO_SIZE_PTR)
93822+#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) - 1 >= (unsigned long)ZERO_SIZE_PTR - 1)
93823
93824 #include <linux/kmemleak.h>
93825 #include <linux/kasan.h>
93826@@ -143,6 +160,8 @@ void * __must_check krealloc(const void *, size_t, gfp_t);
93827 void kfree(const void *);
93828 void kzfree(const void *);
93829 size_t ksize(const void *);
93830+const char *check_heap_object(const void *ptr, unsigned long n);
93831+bool is_usercopy_object(const void *ptr);
93832
93833 /*
93834 * Some archs want to perform DMA into kmalloc caches and need a guaranteed
93835@@ -235,6 +254,10 @@ extern struct kmem_cache *kmalloc_caches[KMALLOC_SHIFT_HIGH + 1];
93836 extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
93837 #endif
93838
93839+#ifdef CONFIG_PAX_USERCOPY_SLABS
93840+extern struct kmem_cache *kmalloc_usercopy_caches[KMALLOC_SHIFT_HIGH + 1];
93841+#endif
93842+
93843 /*
93844 * Figure out which kmalloc slab an allocation of a certain size
93845 * belongs to.
93846@@ -243,7 +266,7 @@ extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
93847 * 2 = 120 .. 192 bytes
93848 * n = 2^(n-1) .. 2^n -1
93849 */
93850-static __always_inline int kmalloc_index(size_t size)
93851+static __always_inline __size_overflow(1) int kmalloc_index(size_t size)
93852 {
93853 if (!size)
93854 return 0;
93855@@ -286,15 +309,15 @@ static __always_inline int kmalloc_index(size_t size)
93856 }
93857 #endif /* !CONFIG_SLOB */
93858
93859-void *__kmalloc(size_t size, gfp_t flags);
93860+void *__kmalloc(size_t size, gfp_t flags) __alloc_size(1) __size_overflow(1);
93861 void *kmem_cache_alloc(struct kmem_cache *, gfp_t flags);
93862 void kmem_cache_free(struct kmem_cache *, void *);
93863
93864 #ifdef CONFIG_NUMA
93865-void *__kmalloc_node(size_t size, gfp_t flags, int node);
93866+void *__kmalloc_node(size_t size, gfp_t flags, int node) __alloc_size(1) __size_overflow(1);
93867 void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node);
93868 #else
93869-static __always_inline void *__kmalloc_node(size_t size, gfp_t flags, int node)
93870+static __always_inline void * __size_overflow(1) __kmalloc_node(size_t size, gfp_t flags, int node)
93871 {
93872 return __kmalloc(size, flags);
93873 }
93874diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h
93875index 33d0490..70a6313 100644
93876--- a/include/linux/slab_def.h
93877+++ b/include/linux/slab_def.h
93878@@ -40,7 +40,7 @@ struct kmem_cache {
93879 /* 4) cache creation/removal */
93880 const char *name;
93881 struct list_head list;
93882- int refcount;
93883+ atomic_t refcount;
93884 int object_size;
93885 int align;
93886
93887@@ -56,10 +56,14 @@ struct kmem_cache {
93888 unsigned long node_allocs;
93889 unsigned long node_frees;
93890 unsigned long node_overflow;
93891- atomic_t allochit;
93892- atomic_t allocmiss;
93893- atomic_t freehit;
93894- atomic_t freemiss;
93895+ atomic_unchecked_t allochit;
93896+ atomic_unchecked_t allocmiss;
93897+ atomic_unchecked_t freehit;
93898+ atomic_unchecked_t freemiss;
93899+#ifdef CONFIG_PAX_MEMORY_SANITIZE
93900+ atomic_unchecked_t sanitized;
93901+ atomic_unchecked_t not_sanitized;
93902+#endif
93903
93904 /*
93905 * If debugging is enabled, then the allocator can add additional
93906diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h
93907index 3388511..6252f90 100644
93908--- a/include/linux/slub_def.h
93909+++ b/include/linux/slub_def.h
93910@@ -74,7 +74,7 @@ struct kmem_cache {
93911 struct kmem_cache_order_objects max;
93912 struct kmem_cache_order_objects min;
93913 gfp_t allocflags; /* gfp flags to use on each alloc */
93914- int refcount; /* Refcount for slab cache destroy */
93915+ atomic_t refcount; /* Refcount for slab cache destroy */
93916 void (*ctor)(void *);
93917 int inuse; /* Offset to metadata */
93918 int align; /* Alignment */
93919diff --git a/include/linux/smp.h b/include/linux/smp.h
93920index be91db2..3f23232 100644
93921--- a/include/linux/smp.h
93922+++ b/include/linux/smp.h
93923@@ -183,7 +183,9 @@ static inline void smp_init(void) { }
93924 #endif
93925
93926 #define get_cpu() ({ preempt_disable(); smp_processor_id(); })
93927+#define raw_get_cpu() ({ raw_preempt_disable(); raw_smp_processor_id(); })
93928 #define put_cpu() preempt_enable()
93929+#define raw_put_cpu_no_resched() raw_preempt_enable_no_resched()
93930
93931 /*
93932 * Callback to arch code if there's nosmp or maxcpus=0 on the
93933diff --git a/include/linux/sock_diag.h b/include/linux/sock_diag.h
93934index 46cca4c..3323536 100644
93935--- a/include/linux/sock_diag.h
93936+++ b/include/linux/sock_diag.h
93937@@ -11,7 +11,7 @@ struct sock;
93938 struct sock_diag_handler {
93939 __u8 family;
93940 int (*dump)(struct sk_buff *skb, struct nlmsghdr *nlh);
93941-};
93942+} __do_const;
93943
93944 int sock_diag_register(const struct sock_diag_handler *h);
93945 void sock_diag_unregister(const struct sock_diag_handler *h);
93946diff --git a/include/linux/sonet.h b/include/linux/sonet.h
93947index 680f9a3..f13aeb0 100644
93948--- a/include/linux/sonet.h
93949+++ b/include/linux/sonet.h
93950@@ -7,7 +7,7 @@
93951 #include <uapi/linux/sonet.h>
93952
93953 struct k_sonet_stats {
93954-#define __HANDLE_ITEM(i) atomic_t i
93955+#define __HANDLE_ITEM(i) atomic_unchecked_t i
93956 __SONET_ITEMS
93957 #undef __HANDLE_ITEM
93958 };
93959diff --git a/include/linux/sunrpc/addr.h b/include/linux/sunrpc/addr.h
93960index 07d8e53..dc934c9 100644
93961--- a/include/linux/sunrpc/addr.h
93962+++ b/include/linux/sunrpc/addr.h
93963@@ -23,9 +23,9 @@ static inline unsigned short rpc_get_port(const struct sockaddr *sap)
93964 {
93965 switch (sap->sa_family) {
93966 case AF_INET:
93967- return ntohs(((struct sockaddr_in *)sap)->sin_port);
93968+ return ntohs(((const struct sockaddr_in *)sap)->sin_port);
93969 case AF_INET6:
93970- return ntohs(((struct sockaddr_in6 *)sap)->sin6_port);
93971+ return ntohs(((const struct sockaddr_in6 *)sap)->sin6_port);
93972 }
93973 return 0;
93974 }
93975@@ -58,7 +58,7 @@ static inline bool __rpc_cmp_addr4(const struct sockaddr *sap1,
93976 static inline bool __rpc_copy_addr4(struct sockaddr *dst,
93977 const struct sockaddr *src)
93978 {
93979- const struct sockaddr_in *ssin = (struct sockaddr_in *) src;
93980+ const struct sockaddr_in *ssin = (const struct sockaddr_in *) src;
93981 struct sockaddr_in *dsin = (struct sockaddr_in *) dst;
93982
93983 dsin->sin_family = ssin->sin_family;
93984@@ -164,7 +164,7 @@ static inline u32 rpc_get_scope_id(const struct sockaddr *sa)
93985 if (sa->sa_family != AF_INET6)
93986 return 0;
93987
93988- return ((struct sockaddr_in6 *) sa)->sin6_scope_id;
93989+ return ((const struct sockaddr_in6 *) sa)->sin6_scope_id;
93990 }
93991
93992 #endif /* _LINUX_SUNRPC_ADDR_H */
93993diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
93994index 598ba80..d90cba6 100644
93995--- a/include/linux/sunrpc/clnt.h
93996+++ b/include/linux/sunrpc/clnt.h
93997@@ -100,7 +100,7 @@ struct rpc_procinfo {
93998 unsigned int p_timer; /* Which RTT timer to use */
93999 u32 p_statidx; /* Which procedure to account */
94000 const char * p_name; /* name of procedure */
94001-};
94002+} __do_const;
94003
94004 #ifdef __KERNEL__
94005
94006diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
94007index fae6fb9..023fbcd 100644
94008--- a/include/linux/sunrpc/svc.h
94009+++ b/include/linux/sunrpc/svc.h
94010@@ -420,7 +420,7 @@ struct svc_procedure {
94011 unsigned int pc_count; /* call count */
94012 unsigned int pc_cachetype; /* cache info (NFS) */
94013 unsigned int pc_xdrressize; /* maximum size of XDR reply */
94014-};
94015+} __do_const;
94016
94017 /*
94018 * Function prototypes.
94019diff --git a/include/linux/sunrpc/svc_rdma.h b/include/linux/sunrpc/svc_rdma.h
94020index df8edf8..d140fec 100644
94021--- a/include/linux/sunrpc/svc_rdma.h
94022+++ b/include/linux/sunrpc/svc_rdma.h
94023@@ -53,15 +53,15 @@ extern unsigned int svcrdma_ord;
94024 extern unsigned int svcrdma_max_requests;
94025 extern unsigned int svcrdma_max_req_size;
94026
94027-extern atomic_t rdma_stat_recv;
94028-extern atomic_t rdma_stat_read;
94029-extern atomic_t rdma_stat_write;
94030-extern atomic_t rdma_stat_sq_starve;
94031-extern atomic_t rdma_stat_rq_starve;
94032-extern atomic_t rdma_stat_rq_poll;
94033-extern atomic_t rdma_stat_rq_prod;
94034-extern atomic_t rdma_stat_sq_poll;
94035-extern atomic_t rdma_stat_sq_prod;
94036+extern atomic_unchecked_t rdma_stat_recv;
94037+extern atomic_unchecked_t rdma_stat_read;
94038+extern atomic_unchecked_t rdma_stat_write;
94039+extern atomic_unchecked_t rdma_stat_sq_starve;
94040+extern atomic_unchecked_t rdma_stat_rq_starve;
94041+extern atomic_unchecked_t rdma_stat_rq_poll;
94042+extern atomic_unchecked_t rdma_stat_rq_prod;
94043+extern atomic_unchecked_t rdma_stat_sq_poll;
94044+extern atomic_unchecked_t rdma_stat_sq_prod;
94045
94046 /*
94047 * Contexts are built when an RDMA request is created and are a
94048diff --git a/include/linux/sunrpc/svcauth.h b/include/linux/sunrpc/svcauth.h
94049index 8d71d65..f79586e 100644
94050--- a/include/linux/sunrpc/svcauth.h
94051+++ b/include/linux/sunrpc/svcauth.h
94052@@ -120,7 +120,7 @@ struct auth_ops {
94053 int (*release)(struct svc_rqst *rq);
94054 void (*domain_release)(struct auth_domain *);
94055 int (*set_client)(struct svc_rqst *rq);
94056-};
94057+} __do_const;
94058
94059 #define SVC_GARBAGE 1
94060 #define SVC_SYSERR 2
94061diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
94062index e7a018e..49f8b17 100644
94063--- a/include/linux/swiotlb.h
94064+++ b/include/linux/swiotlb.h
94065@@ -60,7 +60,8 @@ extern void
94066
94067 extern void
94068 swiotlb_free_coherent(struct device *hwdev, size_t size,
94069- void *vaddr, dma_addr_t dma_handle);
94070+ void *vaddr, dma_addr_t dma_handle,
94071+ struct dma_attrs *attrs);
94072
94073 extern dma_addr_t swiotlb_map_page(struct device *dev, struct page *page,
94074 unsigned long offset, size_t size,
94075diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
94076index 76d1e38..200776e 100644
94077--- a/include/linux/syscalls.h
94078+++ b/include/linux/syscalls.h
94079@@ -102,7 +102,12 @@ union bpf_attr;
94080 #define __TYPE_IS_L(t) (__same_type((t)0, 0L))
94081 #define __TYPE_IS_UL(t) (__same_type((t)0, 0UL))
94082 #define __TYPE_IS_LL(t) (__same_type((t)0, 0LL) || __same_type((t)0, 0ULL))
94083-#define __SC_LONG(t, a) __typeof(__builtin_choose_expr(__TYPE_IS_LL(t), 0LL, 0L)) a
94084+#define __SC_LONG(t, a) __typeof__( \
94085+ __builtin_choose_expr( \
94086+ sizeof(t) > sizeof(int), \
94087+ (t) 0, \
94088+ __builtin_choose_expr(__type_is_unsigned(t), 0UL, 0L) \
94089+ )) a
94090 #define __SC_CAST(t, a) (t) a
94091 #define __SC_ARGS(t, a) a
94092 #define __SC_TEST(t, a) (void)BUILD_BUG_ON_ZERO(!__TYPE_IS_LL(t) && sizeof(t) > sizeof(long))
94093@@ -384,11 +389,11 @@ asmlinkage long sys_sync(void);
94094 asmlinkage long sys_fsync(unsigned int fd);
94095 asmlinkage long sys_fdatasync(unsigned int fd);
94096 asmlinkage long sys_bdflush(int func, long data);
94097-asmlinkage long sys_mount(char __user *dev_name, char __user *dir_name,
94098- char __user *type, unsigned long flags,
94099+asmlinkage long sys_mount(const char __user *dev_name, const char __user *dir_name,
94100+ const char __user *type, unsigned long flags,
94101 void __user *data);
94102-asmlinkage long sys_umount(char __user *name, int flags);
94103-asmlinkage long sys_oldumount(char __user *name);
94104+asmlinkage long sys_umount(const char __user *name, int flags);
94105+asmlinkage long sys_oldumount(const char __user *name);
94106 asmlinkage long sys_truncate(const char __user *path, long length);
94107 asmlinkage long sys_ftruncate(unsigned int fd, unsigned long length);
94108 asmlinkage long sys_stat(const char __user *filename,
94109@@ -604,7 +609,7 @@ asmlinkage long sys_getsockname(int, struct sockaddr __user *, int __user *);
94110 asmlinkage long sys_getpeername(int, struct sockaddr __user *, int __user *);
94111 asmlinkage long sys_send(int, void __user *, size_t, unsigned);
94112 asmlinkage long sys_sendto(int, void __user *, size_t, unsigned,
94113- struct sockaddr __user *, int);
94114+ struct sockaddr __user *, int) __intentional_overflow(0);
94115 asmlinkage long sys_sendmsg(int fd, struct user_msghdr __user *msg, unsigned flags);
94116 asmlinkage long sys_sendmmsg(int fd, struct mmsghdr __user *msg,
94117 unsigned int vlen, unsigned flags);
94118@@ -663,10 +668,10 @@ asmlinkage long sys_msgctl(int msqid, int cmd, struct msqid_ds __user *buf);
94119
94120 asmlinkage long sys_semget(key_t key, int nsems, int semflg);
94121 asmlinkage long sys_semop(int semid, struct sembuf __user *sops,
94122- unsigned nsops);
94123+ long nsops);
94124 asmlinkage long sys_semctl(int semid, int semnum, int cmd, unsigned long arg);
94125 asmlinkage long sys_semtimedop(int semid, struct sembuf __user *sops,
94126- unsigned nsops,
94127+ long nsops,
94128 const struct timespec __user *timeout);
94129 asmlinkage long sys_shmat(int shmid, char __user *shmaddr, int shmflg);
94130 asmlinkage long sys_shmget(key_t key, size_t size, int flag);
94131diff --git a/include/linux/syscore_ops.h b/include/linux/syscore_ops.h
94132index 27b3b0b..e093dd9 100644
94133--- a/include/linux/syscore_ops.h
94134+++ b/include/linux/syscore_ops.h
94135@@ -16,7 +16,7 @@ struct syscore_ops {
94136 int (*suspend)(void);
94137 void (*resume)(void);
94138 void (*shutdown)(void);
94139-};
94140+} __do_const;
94141
94142 extern void register_syscore_ops(struct syscore_ops *ops);
94143 extern void unregister_syscore_ops(struct syscore_ops *ops);
94144diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
94145index b7361f8..341a15a 100644
94146--- a/include/linux/sysctl.h
94147+++ b/include/linux/sysctl.h
94148@@ -39,6 +39,8 @@ typedef int proc_handler (struct ctl_table *ctl, int write,
94149
94150 extern int proc_dostring(struct ctl_table *, int,
94151 void __user *, size_t *, loff_t *);
94152+extern int proc_dostring_modpriv(struct ctl_table *, int,
94153+ void __user *, size_t *, loff_t *);
94154 extern int proc_dointvec(struct ctl_table *, int,
94155 void __user *, size_t *, loff_t *);
94156 extern int proc_dointvec_minmax(struct ctl_table *, int,
94157@@ -113,7 +115,8 @@ struct ctl_table
94158 struct ctl_table_poll *poll;
94159 void *extra1;
94160 void *extra2;
94161-};
94162+} __do_const __randomize_layout;
94163+typedef struct ctl_table __no_const ctl_table_no_const;
94164
94165 struct ctl_node {
94166 struct rb_node node;
94167diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h
94168index ddad161..a3efd26 100644
94169--- a/include/linux/sysfs.h
94170+++ b/include/linux/sysfs.h
94171@@ -34,7 +34,8 @@ struct attribute {
94172 struct lock_class_key *key;
94173 struct lock_class_key skey;
94174 #endif
94175-};
94176+} __do_const;
94177+typedef struct attribute __no_const attribute_no_const;
94178
94179 /**
94180 * sysfs_attr_init - initialize a dynamically allocated sysfs attribute
94181@@ -63,7 +64,8 @@ struct attribute_group {
94182 struct attribute *, int);
94183 struct attribute **attrs;
94184 struct bin_attribute **bin_attrs;
94185-};
94186+} __do_const;
94187+typedef struct attribute_group __no_const attribute_group_no_const;
94188
94189 /**
94190 * Use these macros to make defining attributes easier. See include/linux/device.h
94191@@ -137,7 +139,8 @@ struct bin_attribute {
94192 char *, loff_t, size_t);
94193 int (*mmap)(struct file *, struct kobject *, struct bin_attribute *attr,
94194 struct vm_area_struct *vma);
94195-};
94196+} __do_const;
94197+typedef struct bin_attribute __no_const bin_attribute_no_const;
94198
94199 /**
94200 * sysfs_bin_attr_init - initialize a dynamically allocated bin_attribute
94201diff --git a/include/linux/sysrq.h b/include/linux/sysrq.h
94202index 387fa7d..3fcde6b 100644
94203--- a/include/linux/sysrq.h
94204+++ b/include/linux/sysrq.h
94205@@ -16,6 +16,7 @@
94206
94207 #include <linux/errno.h>
94208 #include <linux/types.h>
94209+#include <linux/compiler.h>
94210
94211 /* Possible values of bitmask for enabling sysrq functions */
94212 /* 0x0001 is reserved for enable everything */
94213@@ -33,7 +34,7 @@ struct sysrq_key_op {
94214 char *help_msg;
94215 char *action_msg;
94216 int enable_mask;
94217-};
94218+} __do_const;
94219
94220 #ifdef CONFIG_MAGIC_SYSRQ
94221
94222diff --git a/include/linux/thread_info.h b/include/linux/thread_info.h
94223index ff307b5..f1a4468 100644
94224--- a/include/linux/thread_info.h
94225+++ b/include/linux/thread_info.h
94226@@ -145,6 +145,13 @@ static inline bool test_and_clear_restore_sigmask(void)
94227 #error "no set_restore_sigmask() provided and default one won't work"
94228 #endif
94229
94230+extern void __check_object_size(const void *ptr, unsigned long n, bool to_user, bool const_size);
94231+
94232+static inline void check_object_size(const void *ptr, unsigned long n, bool to_user)
94233+{
94234+ __check_object_size(ptr, n, to_user, __builtin_constant_p(n));
94235+}
94236+
94237 #endif /* __KERNEL__ */
94238
94239 #endif /* _LINUX_THREAD_INFO_H */
94240diff --git a/include/linux/tty.h b/include/linux/tty.h
94241index 790752a..36d9b54 100644
94242--- a/include/linux/tty.h
94243+++ b/include/linux/tty.h
94244@@ -225,7 +225,7 @@ struct tty_port {
94245 const struct tty_port_operations *ops; /* Port operations */
94246 spinlock_t lock; /* Lock protecting tty field */
94247 int blocked_open; /* Waiting to open */
94248- int count; /* Usage count */
94249+ atomic_t count; /* Usage count */
94250 wait_queue_head_t open_wait; /* Open waiters */
94251 wait_queue_head_t close_wait; /* Close waiters */
94252 wait_queue_head_t delta_msr_wait; /* Modem status change */
94253@@ -313,7 +313,7 @@ struct tty_struct {
94254 /* If the tty has a pending do_SAK, queue it here - akpm */
94255 struct work_struct SAK_work;
94256 struct tty_port *port;
94257-};
94258+} __randomize_layout;
94259
94260 /* Each of a tty's open files has private_data pointing to tty_file_private */
94261 struct tty_file_private {
94262@@ -572,7 +572,7 @@ extern int tty_port_open(struct tty_port *port,
94263 struct tty_struct *tty, struct file *filp);
94264 static inline int tty_port_users(struct tty_port *port)
94265 {
94266- return port->count + port->blocked_open;
94267+ return atomic_read(&port->count) + port->blocked_open;
94268 }
94269
94270 extern int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc);
94271diff --git a/include/linux/tty_driver.h b/include/linux/tty_driver.h
94272index 92e337c..f46757b 100644
94273--- a/include/linux/tty_driver.h
94274+++ b/include/linux/tty_driver.h
94275@@ -291,7 +291,7 @@ struct tty_operations {
94276 void (*poll_put_char)(struct tty_driver *driver, int line, char ch);
94277 #endif
94278 const struct file_operations *proc_fops;
94279-};
94280+} __do_const __randomize_layout;
94281
94282 struct tty_driver {
94283 int magic; /* magic number for this structure */
94284@@ -325,7 +325,7 @@ struct tty_driver {
94285
94286 const struct tty_operations *ops;
94287 struct list_head tty_drivers;
94288-};
94289+} __randomize_layout;
94290
94291 extern struct list_head tty_drivers;
94292
94293diff --git a/include/linux/tty_ldisc.h b/include/linux/tty_ldisc.h
94294index 00c9d68..bc0188b 100644
94295--- a/include/linux/tty_ldisc.h
94296+++ b/include/linux/tty_ldisc.h
94297@@ -215,7 +215,7 @@ struct tty_ldisc_ops {
94298
94299 struct module *owner;
94300
94301- int refcount;
94302+ atomic_t refcount;
94303 };
94304
94305 struct tty_ldisc {
94306diff --git a/include/linux/types.h b/include/linux/types.h
94307index 6747247..fc7ec8b 100644
94308--- a/include/linux/types.h
94309+++ b/include/linux/types.h
94310@@ -174,10 +174,26 @@ typedef struct {
94311 int counter;
94312 } atomic_t;
94313
94314+#ifdef CONFIG_PAX_REFCOUNT
94315+typedef struct {
94316+ int counter;
94317+} atomic_unchecked_t;
94318+#else
94319+typedef atomic_t atomic_unchecked_t;
94320+#endif
94321+
94322 #ifdef CONFIG_64BIT
94323 typedef struct {
94324 long counter;
94325 } atomic64_t;
94326+
94327+#ifdef CONFIG_PAX_REFCOUNT
94328+typedef struct {
94329+ long counter;
94330+} atomic64_unchecked_t;
94331+#else
94332+typedef atomic64_t atomic64_unchecked_t;
94333+#endif
94334 #endif
94335
94336 struct list_head {
94337diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h
94338index ecd3319..8a36ded 100644
94339--- a/include/linux/uaccess.h
94340+++ b/include/linux/uaccess.h
94341@@ -75,11 +75,11 @@ static inline unsigned long __copy_from_user_nocache(void *to,
94342 long ret; \
94343 mm_segment_t old_fs = get_fs(); \
94344 \
94345- set_fs(KERNEL_DS); \
94346 pagefault_disable(); \
94347- ret = __copy_from_user_inatomic(&(retval), (__force typeof(retval) __user *)(addr), sizeof(retval)); \
94348- pagefault_enable(); \
94349+ set_fs(KERNEL_DS); \
94350+ ret = __copy_from_user_inatomic(&(retval), (typeof(retval) __force_user *)(addr), sizeof(retval)); \
94351 set_fs(old_fs); \
94352+ pagefault_enable(); \
94353 ret; \
94354 })
94355
94356diff --git a/include/linux/uidgid.h b/include/linux/uidgid.h
94357index 2d1f9b6..d7a9fce 100644
94358--- a/include/linux/uidgid.h
94359+++ b/include/linux/uidgid.h
94360@@ -175,4 +175,9 @@ static inline bool kgid_has_mapping(struct user_namespace *ns, kgid_t gid)
94361
94362 #endif /* CONFIG_USER_NS */
94363
94364+#define GR_GLOBAL_UID(x) from_kuid_munged(&init_user_ns, (x))
94365+#define GR_GLOBAL_GID(x) from_kgid_munged(&init_user_ns, (x))
94366+#define gr_is_global_root(x) uid_eq((x), GLOBAL_ROOT_UID)
94367+#define gr_is_global_nonroot(x) (!uid_eq((x), GLOBAL_ROOT_UID))
94368+
94369 #endif /* _LINUX_UIDGID_H */
94370diff --git a/include/linux/uio_driver.h b/include/linux/uio_driver.h
94371index 32c0e83..671eb35 100644
94372--- a/include/linux/uio_driver.h
94373+++ b/include/linux/uio_driver.h
94374@@ -67,7 +67,7 @@ struct uio_device {
94375 struct module *owner;
94376 struct device *dev;
94377 int minor;
94378- atomic_t event;
94379+ atomic_unchecked_t event;
94380 struct fasync_struct *async_queue;
94381 wait_queue_head_t wait;
94382 struct uio_info *info;
94383diff --git a/include/linux/unaligned/access_ok.h b/include/linux/unaligned/access_ok.h
94384index 99c1b4d..562e6f3 100644
94385--- a/include/linux/unaligned/access_ok.h
94386+++ b/include/linux/unaligned/access_ok.h
94387@@ -4,34 +4,34 @@
94388 #include <linux/kernel.h>
94389 #include <asm/byteorder.h>
94390
94391-static inline u16 get_unaligned_le16(const void *p)
94392+static inline u16 __intentional_overflow(-1) get_unaligned_le16(const void *p)
94393 {
94394- return le16_to_cpup((__le16 *)p);
94395+ return le16_to_cpup((const __le16 *)p);
94396 }
94397
94398-static inline u32 get_unaligned_le32(const void *p)
94399+static inline u32 __intentional_overflow(-1) get_unaligned_le32(const void *p)
94400 {
94401- return le32_to_cpup((__le32 *)p);
94402+ return le32_to_cpup((const __le32 *)p);
94403 }
94404
94405-static inline u64 get_unaligned_le64(const void *p)
94406+static inline u64 __intentional_overflow(-1) get_unaligned_le64(const void *p)
94407 {
94408- return le64_to_cpup((__le64 *)p);
94409+ return le64_to_cpup((const __le64 *)p);
94410 }
94411
94412-static inline u16 get_unaligned_be16(const void *p)
94413+static inline u16 __intentional_overflow(-1) get_unaligned_be16(const void *p)
94414 {
94415- return be16_to_cpup((__be16 *)p);
94416+ return be16_to_cpup((const __be16 *)p);
94417 }
94418
94419-static inline u32 get_unaligned_be32(const void *p)
94420+static inline u32 __intentional_overflow(-1) get_unaligned_be32(const void *p)
94421 {
94422- return be32_to_cpup((__be32 *)p);
94423+ return be32_to_cpup((const __be32 *)p);
94424 }
94425
94426-static inline u64 get_unaligned_be64(const void *p)
94427+static inline u64 __intentional_overflow(-1) get_unaligned_be64(const void *p)
94428 {
94429- return be64_to_cpup((__be64 *)p);
94430+ return be64_to_cpup((const __be64 *)p);
94431 }
94432
94433 static inline void put_unaligned_le16(u16 val, void *p)
94434diff --git a/include/linux/usb.h b/include/linux/usb.h
94435index 447fe29..9fc875f 100644
94436--- a/include/linux/usb.h
94437+++ b/include/linux/usb.h
94438@@ -592,7 +592,7 @@ struct usb_device {
94439 int maxchild;
94440
94441 u32 quirks;
94442- atomic_t urbnum;
94443+ atomic_unchecked_t urbnum;
94444
94445 unsigned long active_duration;
94446
94447@@ -1676,7 +1676,7 @@ void usb_buffer_unmap_sg(const struct usb_device *dev, int is_in,
94448
94449 extern int usb_control_msg(struct usb_device *dev, unsigned int pipe,
94450 __u8 request, __u8 requesttype, __u16 value, __u16 index,
94451- void *data, __u16 size, int timeout);
94452+ void *data, __u16 size, int timeout) __intentional_overflow(-1);
94453 extern int usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
94454 void *data, int len, int *actual_length, int timeout);
94455 extern int usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
94456diff --git a/include/linux/usb/renesas_usbhs.h b/include/linux/usb/renesas_usbhs.h
94457index 9fd9e48..e2c5f35 100644
94458--- a/include/linux/usb/renesas_usbhs.h
94459+++ b/include/linux/usb/renesas_usbhs.h
94460@@ -39,7 +39,7 @@ enum {
94461 */
94462 struct renesas_usbhs_driver_callback {
94463 int (*notify_hotplug)(struct platform_device *pdev);
94464-};
94465+} __no_const;
94466
94467 /*
94468 * callback functions for platform
94469diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h
94470index 8297e5b..0dfae27 100644
94471--- a/include/linux/user_namespace.h
94472+++ b/include/linux/user_namespace.h
94473@@ -39,7 +39,7 @@ struct user_namespace {
94474 struct key *persistent_keyring_register;
94475 struct rw_semaphore persistent_keyring_register_sem;
94476 #endif
94477-};
94478+} __randomize_layout;
94479
94480 extern struct user_namespace init_user_ns;
94481
94482diff --git a/include/linux/utsname.h b/include/linux/utsname.h
94483index 5093f58..c103e58 100644
94484--- a/include/linux/utsname.h
94485+++ b/include/linux/utsname.h
94486@@ -25,7 +25,7 @@ struct uts_namespace {
94487 struct new_utsname name;
94488 struct user_namespace *user_ns;
94489 struct ns_common ns;
94490-};
94491+} __randomize_layout;
94492 extern struct uts_namespace init_uts_ns;
94493
94494 #ifdef CONFIG_UTS_NS
94495diff --git a/include/linux/vermagic.h b/include/linux/vermagic.h
94496index 6f8fbcf..4efc177 100644
94497--- a/include/linux/vermagic.h
94498+++ b/include/linux/vermagic.h
94499@@ -25,9 +25,42 @@
94500 #define MODULE_ARCH_VERMAGIC ""
94501 #endif
94502
94503+#ifdef CONFIG_PAX_REFCOUNT
94504+#define MODULE_PAX_REFCOUNT "REFCOUNT "
94505+#else
94506+#define MODULE_PAX_REFCOUNT ""
94507+#endif
94508+
94509+#ifdef CONSTIFY_PLUGIN
94510+#define MODULE_CONSTIFY_PLUGIN "CONSTIFY_PLUGIN "
94511+#else
94512+#define MODULE_CONSTIFY_PLUGIN ""
94513+#endif
94514+
94515+#ifdef STACKLEAK_PLUGIN
94516+#define MODULE_STACKLEAK_PLUGIN "STACKLEAK_PLUGIN "
94517+#else
94518+#define MODULE_STACKLEAK_PLUGIN ""
94519+#endif
94520+
94521+#ifdef RANDSTRUCT_PLUGIN
94522+#include <generated/randomize_layout_hash.h>
94523+#define MODULE_RANDSTRUCT_PLUGIN "RANDSTRUCT_PLUGIN_" RANDSTRUCT_HASHED_SEED
94524+#else
94525+#define MODULE_RANDSTRUCT_PLUGIN
94526+#endif
94527+
94528+#ifdef CONFIG_GRKERNSEC
94529+#define MODULE_GRSEC "GRSEC "
94530+#else
94531+#define MODULE_GRSEC ""
94532+#endif
94533+
94534 #define VERMAGIC_STRING \
94535 UTS_RELEASE " " \
94536 MODULE_VERMAGIC_SMP MODULE_VERMAGIC_PREEMPT \
94537 MODULE_VERMAGIC_MODULE_UNLOAD MODULE_VERMAGIC_MODVERSIONS \
94538- MODULE_ARCH_VERMAGIC
94539+ MODULE_ARCH_VERMAGIC \
94540+ MODULE_PAX_REFCOUNT MODULE_CONSTIFY_PLUGIN MODULE_STACKLEAK_PLUGIN \
94541+ MODULE_GRSEC MODULE_RANDSTRUCT_PLUGIN
94542
94543diff --git a/include/linux/vga_switcheroo.h b/include/linux/vga_switcheroo.h
94544index b483abd..af305ad 100644
94545--- a/include/linux/vga_switcheroo.h
94546+++ b/include/linux/vga_switcheroo.h
94547@@ -63,9 +63,9 @@ int vga_switcheroo_get_client_state(struct pci_dev *dev);
94548
94549 void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic);
94550
94551-int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain);
94552+int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain);
94553 void vga_switcheroo_fini_domain_pm_ops(struct device *dev);
94554-int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain);
94555+int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain);
94556 #else
94557
94558 static inline void vga_switcheroo_unregister_client(struct pci_dev *dev) {}
94559@@ -82,9 +82,9 @@ static inline int vga_switcheroo_get_client_state(struct pci_dev *dev) { return
94560
94561 static inline void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic) {}
94562
94563-static inline int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; }
94564+static inline int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain) { return -EINVAL; }
94565 static inline void vga_switcheroo_fini_domain_pm_ops(struct device *dev) {}
94566-static inline int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; }
94567+static inline int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain) { return -EINVAL; }
94568
94569 #endif
94570 #endif /* _LINUX_VGA_SWITCHEROO_H_ */
94571diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
94572index 0ec5983..cc61051 100644
94573--- a/include/linux/vmalloc.h
94574+++ b/include/linux/vmalloc.h
94575@@ -18,6 +18,11 @@ struct vm_area_struct; /* vma defining user mapping in mm_types.h */
94576 #define VM_UNINITIALIZED 0x00000020 /* vm_struct is not fully initialized */
94577 #define VM_NO_GUARD 0x00000040 /* don't add guard page */
94578 #define VM_KASAN 0x00000080 /* has allocated kasan shadow memory */
94579+
94580+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
94581+#define VM_KERNEXEC 0x00000100 /* allocate from executable kernel memory range */
94582+#endif
94583+
94584 /* bits [20..32] reserved for arch specific ioremap internals */
94585
94586 /*
94587@@ -86,6 +91,10 @@ extern void *vmap(struct page **pages, unsigned int count,
94588 unsigned long flags, pgprot_t prot);
94589 extern void vunmap(const void *addr);
94590
94591+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
94592+extern void unmap_process_stacks(struct task_struct *task);
94593+#endif
94594+
94595 extern int remap_vmalloc_range_partial(struct vm_area_struct *vma,
94596 unsigned long uaddr, void *kaddr,
94597 unsigned long size);
94598@@ -150,7 +159,7 @@ extern void free_vm_area(struct vm_struct *area);
94599
94600 /* for /dev/kmem */
94601 extern long vread(char *buf, char *addr, unsigned long count);
94602-extern long vwrite(char *buf, char *addr, unsigned long count);
94603+extern long vwrite(char *buf, char *addr, unsigned long count) __size_overflow(3);
94604
94605 /*
94606 * Internals. Dont't use..
94607diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h
94608index 82e7db7..f8ce3d0 100644
94609--- a/include/linux/vmstat.h
94610+++ b/include/linux/vmstat.h
94611@@ -108,18 +108,18 @@ static inline void vm_events_fold_cpu(int cpu)
94612 /*
94613 * Zone based page accounting with per cpu differentials.
94614 */
94615-extern atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
94616+extern atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
94617
94618 static inline void zone_page_state_add(long x, struct zone *zone,
94619 enum zone_stat_item item)
94620 {
94621- atomic_long_add(x, &zone->vm_stat[item]);
94622- atomic_long_add(x, &vm_stat[item]);
94623+ atomic_long_add_unchecked(x, &zone->vm_stat[item]);
94624+ atomic_long_add_unchecked(x, &vm_stat[item]);
94625 }
94626
94627-static inline unsigned long global_page_state(enum zone_stat_item item)
94628+static inline unsigned long __intentional_overflow(-1) global_page_state(enum zone_stat_item item)
94629 {
94630- long x = atomic_long_read(&vm_stat[item]);
94631+ long x = atomic_long_read_unchecked(&vm_stat[item]);
94632 #ifdef CONFIG_SMP
94633 if (x < 0)
94634 x = 0;
94635@@ -127,10 +127,10 @@ static inline unsigned long global_page_state(enum zone_stat_item item)
94636 return x;
94637 }
94638
94639-static inline unsigned long zone_page_state(struct zone *zone,
94640+static inline unsigned long __intentional_overflow(-1) zone_page_state(struct zone *zone,
94641 enum zone_stat_item item)
94642 {
94643- long x = atomic_long_read(&zone->vm_stat[item]);
94644+ long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
94645 #ifdef CONFIG_SMP
94646 if (x < 0)
94647 x = 0;
94648@@ -147,7 +147,7 @@ static inline unsigned long zone_page_state(struct zone *zone,
94649 static inline unsigned long zone_page_state_snapshot(struct zone *zone,
94650 enum zone_stat_item item)
94651 {
94652- long x = atomic_long_read(&zone->vm_stat[item]);
94653+ long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
94654
94655 #ifdef CONFIG_SMP
94656 int cpu;
94657@@ -234,14 +234,14 @@ static inline void __mod_zone_page_state(struct zone *zone,
94658
94659 static inline void __inc_zone_state(struct zone *zone, enum zone_stat_item item)
94660 {
94661- atomic_long_inc(&zone->vm_stat[item]);
94662- atomic_long_inc(&vm_stat[item]);
94663+ atomic_long_inc_unchecked(&zone->vm_stat[item]);
94664+ atomic_long_inc_unchecked(&vm_stat[item]);
94665 }
94666
94667 static inline void __dec_zone_state(struct zone *zone, enum zone_stat_item item)
94668 {
94669- atomic_long_dec(&zone->vm_stat[item]);
94670- atomic_long_dec(&vm_stat[item]);
94671+ atomic_long_dec_unchecked(&zone->vm_stat[item]);
94672+ atomic_long_dec_unchecked(&vm_stat[item]);
94673 }
94674
94675 static inline void __inc_zone_page_state(struct page *page,
94676diff --git a/include/linux/xattr.h b/include/linux/xattr.h
94677index 91b0a68..0e9adf6 100644
94678--- a/include/linux/xattr.h
94679+++ b/include/linux/xattr.h
94680@@ -28,7 +28,7 @@ struct xattr_handler {
94681 size_t size, int handler_flags);
94682 int (*set)(struct dentry *dentry, const char *name, const void *buffer,
94683 size_t size, int flags, int handler_flags);
94684-};
94685+} __do_const;
94686
94687 struct xattr {
94688 const char *name;
94689@@ -37,6 +37,9 @@ struct xattr {
94690 };
94691
94692 ssize_t xattr_getsecurity(struct inode *, const char *, void *, size_t);
94693+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
94694+ssize_t pax_getxattr(struct dentry *, void *, size_t);
94695+#endif
94696 ssize_t vfs_getxattr(struct dentry *, const char *, void *, size_t);
94697 ssize_t vfs_listxattr(struct dentry *d, char *list, size_t size);
94698 int __vfs_setxattr_noperm(struct dentry *, const char *, const void *, size_t, int);
94699diff --git a/include/linux/zlib.h b/include/linux/zlib.h
94700index 92dbbd3..13ab0b3 100644
94701--- a/include/linux/zlib.h
94702+++ b/include/linux/zlib.h
94703@@ -31,6 +31,7 @@
94704 #define _ZLIB_H
94705
94706 #include <linux/zconf.h>
94707+#include <linux/compiler.h>
94708
94709 /* zlib deflate based on ZLIB_VERSION "1.1.3" */
94710 /* zlib inflate based on ZLIB_VERSION "1.2.3" */
94711@@ -179,7 +180,7 @@ typedef z_stream *z_streamp;
94712
94713 /* basic functions */
94714
94715-extern int zlib_deflate_workspacesize (int windowBits, int memLevel);
94716+extern int zlib_deflate_workspacesize (int windowBits, int memLevel) __intentional_overflow(0);
94717 /*
94718 Returns the number of bytes that needs to be allocated for a per-
94719 stream workspace with the specified parameters. A pointer to this
94720diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
94721index 3e4fddf..5ec9104 100644
94722--- a/include/media/v4l2-dev.h
94723+++ b/include/media/v4l2-dev.h
94724@@ -75,7 +75,7 @@ struct v4l2_file_operations {
94725 int (*mmap) (struct file *, struct vm_area_struct *);
94726 int (*open) (struct file *);
94727 int (*release) (struct file *);
94728-};
94729+} __do_const;
94730
94731 /*
94732 * Newer version of video_device, handled by videodev2.c
94733diff --git a/include/media/v4l2-device.h b/include/media/v4l2-device.h
94734index ffb69da..040393e 100644
94735--- a/include/media/v4l2-device.h
94736+++ b/include/media/v4l2-device.h
94737@@ -95,7 +95,7 @@ int __must_check v4l2_device_register(struct device *dev, struct v4l2_device *v4
94738 this function returns 0. If the name ends with a digit (e.g. cx18),
94739 then the name will be set to cx18-0 since cx180 looks really odd. */
94740 int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename,
94741- atomic_t *instance);
94742+ atomic_unchecked_t *instance);
94743
94744 /* Set v4l2_dev->dev to NULL. Call when the USB parent disconnects.
94745 Since the parent disappears this ensures that v4l2_dev doesn't have an
94746diff --git a/include/net/9p/transport.h b/include/net/9p/transport.h
94747index 2a25dec..bf6dd8a 100644
94748--- a/include/net/9p/transport.h
94749+++ b/include/net/9p/transport.h
94750@@ -62,7 +62,7 @@ struct p9_trans_module {
94751 int (*cancelled)(struct p9_client *, struct p9_req_t *req);
94752 int (*zc_request)(struct p9_client *, struct p9_req_t *,
94753 char *, char *, int , int, int, int);
94754-};
94755+} __do_const;
94756
94757 void v9fs_register_trans(struct p9_trans_module *m);
94758 void v9fs_unregister_trans(struct p9_trans_module *m);
94759diff --git a/include/net/af_unix.h b/include/net/af_unix.h
94760index a175ba4..196eb8242 100644
94761--- a/include/net/af_unix.h
94762+++ b/include/net/af_unix.h
94763@@ -36,7 +36,7 @@ struct unix_skb_parms {
94764 u32 secid; /* Security ID */
94765 #endif
94766 u32 consumed;
94767-};
94768+} __randomize_layout;
94769
94770 #define UNIXCB(skb) (*(struct unix_skb_parms *)&((skb)->cb))
94771 #define UNIXSID(skb) (&UNIXCB((skb)).secid)
94772diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
94773index 2239a37..a83461f 100644
94774--- a/include/net/bluetooth/l2cap.h
94775+++ b/include/net/bluetooth/l2cap.h
94776@@ -609,7 +609,7 @@ struct l2cap_ops {
94777 struct sk_buff *(*alloc_skb) (struct l2cap_chan *chan,
94778 unsigned long hdr_len,
94779 unsigned long len, int nb);
94780-};
94781+} __do_const;
94782
94783 struct l2cap_conn {
94784 struct hci_conn *hcon;
94785diff --git a/include/net/bonding.h b/include/net/bonding.h
94786index fda6fee..dbdf83c 100644
94787--- a/include/net/bonding.h
94788+++ b/include/net/bonding.h
94789@@ -665,7 +665,7 @@ extern struct rtnl_link_ops bond_link_ops;
94790
94791 static inline void bond_tx_drop(struct net_device *dev, struct sk_buff *skb)
94792 {
94793- atomic_long_inc(&dev->tx_dropped);
94794+ atomic_long_inc_unchecked(&dev->tx_dropped);
94795 dev_kfree_skb_any(skb);
94796 }
94797
94798diff --git a/include/net/caif/cfctrl.h b/include/net/caif/cfctrl.h
94799index f2ae33d..c457cf0 100644
94800--- a/include/net/caif/cfctrl.h
94801+++ b/include/net/caif/cfctrl.h
94802@@ -52,7 +52,7 @@ struct cfctrl_rsp {
94803 void (*radioset_rsp)(void);
94804 void (*reject_rsp)(struct cflayer *layer, u8 linkid,
94805 struct cflayer *client_layer);
94806-};
94807+} __no_const;
94808
94809 /* Link Setup Parameters for CAIF-Links. */
94810 struct cfctrl_link_param {
94811@@ -101,8 +101,8 @@ struct cfctrl_request_info {
94812 struct cfctrl {
94813 struct cfsrvl serv;
94814 struct cfctrl_rsp res;
94815- atomic_t req_seq_no;
94816- atomic_t rsp_seq_no;
94817+ atomic_unchecked_t req_seq_no;
94818+ atomic_unchecked_t rsp_seq_no;
94819 struct list_head list;
94820 /* Protects from simultaneous access to first_req list */
94821 spinlock_t info_list_lock;
94822diff --git a/include/net/flow.h b/include/net/flow.h
94823index 8109a15..504466d 100644
94824--- a/include/net/flow.h
94825+++ b/include/net/flow.h
94826@@ -231,6 +231,6 @@ void flow_cache_fini(struct net *net);
94827
94828 void flow_cache_flush(struct net *net);
94829 void flow_cache_flush_deferred(struct net *net);
94830-extern atomic_t flow_cache_genid;
94831+extern atomic_unchecked_t flow_cache_genid;
94832
94833 #endif
94834diff --git a/include/net/genetlink.h b/include/net/genetlink.h
94835index 0574abd..0f16881 100644
94836--- a/include/net/genetlink.h
94837+++ b/include/net/genetlink.h
94838@@ -130,7 +130,7 @@ struct genl_ops {
94839 u8 cmd;
94840 u8 internal_flags;
94841 u8 flags;
94842-};
94843+} __do_const;
94844
94845 int __genl_register_family(struct genl_family *family);
94846
94847diff --git a/include/net/gro_cells.h b/include/net/gro_cells.h
94848index 0f712c0..cd762c4 100644
94849--- a/include/net/gro_cells.h
94850+++ b/include/net/gro_cells.h
94851@@ -27,7 +27,7 @@ static inline void gro_cells_receive(struct gro_cells *gcells, struct sk_buff *s
94852 cell = this_cpu_ptr(gcells->cells);
94853
94854 if (skb_queue_len(&cell->napi_skbs) > netdev_max_backlog) {
94855- atomic_long_inc(&dev->rx_dropped);
94856+ atomic_long_inc_unchecked(&dev->rx_dropped);
94857 kfree_skb(skb);
94858 return;
94859 }
94860diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h
94861index 9fe865c..43735aa 100644
94862--- a/include/net/inet_connection_sock.h
94863+++ b/include/net/inet_connection_sock.h
94864@@ -63,7 +63,7 @@ struct inet_connection_sock_af_ops {
94865 int (*bind_conflict)(const struct sock *sk,
94866 const struct inet_bind_bucket *tb, bool relax);
94867 void (*mtu_reduced)(struct sock *sk);
94868-};
94869+} __do_const;
94870
94871 /** inet_connection_sock - INET connection oriented sock
94872 *
94873diff --git a/include/net/inetpeer.h b/include/net/inetpeer.h
94874index 80479ab..0c3f647 100644
94875--- a/include/net/inetpeer.h
94876+++ b/include/net/inetpeer.h
94877@@ -47,7 +47,7 @@ struct inet_peer {
94878 */
94879 union {
94880 struct {
94881- atomic_t rid; /* Frag reception counter */
94882+ atomic_unchecked_t rid; /* Frag reception counter */
94883 };
94884 struct rcu_head rcu;
94885 struct inet_peer *gc_next;
94886diff --git a/include/net/ip.h b/include/net/ip.h
94887index 6cc1eaf..14059b0 100644
94888--- a/include/net/ip.h
94889+++ b/include/net/ip.h
94890@@ -317,7 +317,7 @@ static inline unsigned int ip_skb_dst_mtu(const struct sk_buff *skb)
94891 }
94892 }
94893
94894-u32 ip_idents_reserve(u32 hash, int segs);
94895+u32 ip_idents_reserve(u32 hash, int segs) __intentional_overflow(-1);
94896 void __ip_select_ident(struct iphdr *iph, int segs);
94897
94898 static inline void ip_select_ident_segs(struct sk_buff *skb, struct sock *sk, int segs)
94899diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
94900index 5bd120e4..03fb812 100644
94901--- a/include/net/ip_fib.h
94902+++ b/include/net/ip_fib.h
94903@@ -170,7 +170,7 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh);
94904
94905 #define FIB_RES_SADDR(net, res) \
94906 ((FIB_RES_NH(res).nh_saddr_genid == \
94907- atomic_read(&(net)->ipv4.dev_addr_genid)) ? \
94908+ atomic_read_unchecked(&(net)->ipv4.dev_addr_genid)) ? \
94909 FIB_RES_NH(res).nh_saddr : \
94910 fib_info_update_nh_saddr((net), &FIB_RES_NH(res)))
94911 #define FIB_RES_GW(res) (FIB_RES_NH(res).nh_gw)
94912diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
94913index 615b20b..fd4cbd8 100644
94914--- a/include/net/ip_vs.h
94915+++ b/include/net/ip_vs.h
94916@@ -534,7 +534,7 @@ struct ip_vs_conn {
94917 struct ip_vs_conn *control; /* Master control connection */
94918 atomic_t n_control; /* Number of controlled ones */
94919 struct ip_vs_dest *dest; /* real server */
94920- atomic_t in_pkts; /* incoming packet counter */
94921+ atomic_unchecked_t in_pkts; /* incoming packet counter */
94922
94923 /* Packet transmitter for different forwarding methods. If it
94924 * mangles the packet, it must return NF_DROP or better NF_STOLEN,
94925@@ -682,7 +682,7 @@ struct ip_vs_dest {
94926 __be16 port; /* port number of the server */
94927 union nf_inet_addr addr; /* IP address of the server */
94928 volatile unsigned int flags; /* dest status flags */
94929- atomic_t conn_flags; /* flags to copy to conn */
94930+ atomic_unchecked_t conn_flags; /* flags to copy to conn */
94931 atomic_t weight; /* server weight */
94932
94933 atomic_t refcnt; /* reference counter */
94934@@ -928,11 +928,11 @@ struct netns_ipvs {
94935 /* ip_vs_lblc */
94936 int sysctl_lblc_expiration;
94937 struct ctl_table_header *lblc_ctl_header;
94938- struct ctl_table *lblc_ctl_table;
94939+ ctl_table_no_const *lblc_ctl_table;
94940 /* ip_vs_lblcr */
94941 int sysctl_lblcr_expiration;
94942 struct ctl_table_header *lblcr_ctl_header;
94943- struct ctl_table *lblcr_ctl_table;
94944+ ctl_table_no_const *lblcr_ctl_table;
94945 /* ip_vs_est */
94946 struct list_head est_list; /* estimator list */
94947 spinlock_t est_lock;
94948diff --git a/include/net/irda/ircomm_tty.h b/include/net/irda/ircomm_tty.h
94949index 8d4f588..2e37ad2 100644
94950--- a/include/net/irda/ircomm_tty.h
94951+++ b/include/net/irda/ircomm_tty.h
94952@@ -33,6 +33,7 @@
94953 #include <linux/termios.h>
94954 #include <linux/timer.h>
94955 #include <linux/tty.h> /* struct tty_struct */
94956+#include <asm/local.h>
94957
94958 #include <net/irda/irias_object.h>
94959 #include <net/irda/ircomm_core.h>
94960diff --git a/include/net/iucv/af_iucv.h b/include/net/iucv/af_iucv.h
94961index 714cc9a..ea05f3e 100644
94962--- a/include/net/iucv/af_iucv.h
94963+++ b/include/net/iucv/af_iucv.h
94964@@ -149,7 +149,7 @@ struct iucv_skb_cb {
94965 struct iucv_sock_list {
94966 struct hlist_head head;
94967 rwlock_t lock;
94968- atomic_t autobind_name;
94969+ atomic_unchecked_t autobind_name;
94970 };
94971
94972 unsigned int iucv_sock_poll(struct file *file, struct socket *sock,
94973diff --git a/include/net/llc_c_ac.h b/include/net/llc_c_ac.h
94974index f3be818..bf46196 100644
94975--- a/include/net/llc_c_ac.h
94976+++ b/include/net/llc_c_ac.h
94977@@ -87,7 +87,7 @@
94978 #define LLC_CONN_AC_STOP_SENDACK_TMR 70
94979 #define LLC_CONN_AC_START_SENDACK_TMR_IF_NOT_RUNNING 71
94980
94981-typedef int (*llc_conn_action_t)(struct sock *sk, struct sk_buff *skb);
94982+typedef int (* const llc_conn_action_t)(struct sock *sk, struct sk_buff *skb);
94983
94984 int llc_conn_ac_clear_remote_busy(struct sock *sk, struct sk_buff *skb);
94985 int llc_conn_ac_conn_ind(struct sock *sk, struct sk_buff *skb);
94986diff --git a/include/net/llc_c_ev.h b/include/net/llc_c_ev.h
94987index 3948cf1..83b28c4 100644
94988--- a/include/net/llc_c_ev.h
94989+++ b/include/net/llc_c_ev.h
94990@@ -125,8 +125,8 @@ static __inline__ struct llc_conn_state_ev *llc_conn_ev(struct sk_buff *skb)
94991 return (struct llc_conn_state_ev *)skb->cb;
94992 }
94993
94994-typedef int (*llc_conn_ev_t)(struct sock *sk, struct sk_buff *skb);
94995-typedef int (*llc_conn_ev_qfyr_t)(struct sock *sk, struct sk_buff *skb);
94996+typedef int (* const llc_conn_ev_t)(struct sock *sk, struct sk_buff *skb);
94997+typedef int (* const llc_conn_ev_qfyr_t)(struct sock *sk, struct sk_buff *skb);
94998
94999 int llc_conn_ev_conn_req(struct sock *sk, struct sk_buff *skb);
95000 int llc_conn_ev_data_req(struct sock *sk, struct sk_buff *skb);
95001diff --git a/include/net/llc_c_st.h b/include/net/llc_c_st.h
95002index 48f3f89..0e92c50 100644
95003--- a/include/net/llc_c_st.h
95004+++ b/include/net/llc_c_st.h
95005@@ -37,7 +37,7 @@ struct llc_conn_state_trans {
95006 u8 next_state;
95007 const llc_conn_ev_qfyr_t *ev_qualifiers;
95008 const llc_conn_action_t *ev_actions;
95009-};
95010+} __do_const;
95011
95012 struct llc_conn_state {
95013 u8 current_state;
95014diff --git a/include/net/llc_s_ac.h b/include/net/llc_s_ac.h
95015index a61b98c..aade1eb 100644
95016--- a/include/net/llc_s_ac.h
95017+++ b/include/net/llc_s_ac.h
95018@@ -23,7 +23,7 @@
95019 #define SAP_ACT_TEST_IND 9
95020
95021 /* All action functions must look like this */
95022-typedef int (*llc_sap_action_t)(struct llc_sap *sap, struct sk_buff *skb);
95023+typedef int (* const llc_sap_action_t)(struct llc_sap *sap, struct sk_buff *skb);
95024
95025 int llc_sap_action_unitdata_ind(struct llc_sap *sap, struct sk_buff *skb);
95026 int llc_sap_action_send_ui(struct llc_sap *sap, struct sk_buff *skb);
95027diff --git a/include/net/llc_s_st.h b/include/net/llc_s_st.h
95028index c4359e2..76dbc4a 100644
95029--- a/include/net/llc_s_st.h
95030+++ b/include/net/llc_s_st.h
95031@@ -20,7 +20,7 @@ struct llc_sap_state_trans {
95032 llc_sap_ev_t ev;
95033 u8 next_state;
95034 const llc_sap_action_t *ev_actions;
95035-};
95036+} __do_const;
95037
95038 struct llc_sap_state {
95039 u8 curr_state;
95040diff --git a/include/net/mac80211.h b/include/net/mac80211.h
95041index d52914b..2b13cec 100644
95042--- a/include/net/mac80211.h
95043+++ b/include/net/mac80211.h
95044@@ -4915,7 +4915,7 @@ struct rate_control_ops {
95045 void (*remove_sta_debugfs)(void *priv, void *priv_sta);
95046
95047 u32 (*get_expected_throughput)(void *priv_sta);
95048-};
95049+} __do_const;
95050
95051 static inline int rate_supported(struct ieee80211_sta *sta,
95052 enum ieee80211_band band,
95053diff --git a/include/net/neighbour.h b/include/net/neighbour.h
95054index 76f7084..8f36e39 100644
95055--- a/include/net/neighbour.h
95056+++ b/include/net/neighbour.h
95057@@ -163,7 +163,7 @@ struct neigh_ops {
95058 void (*error_report)(struct neighbour *, struct sk_buff *);
95059 int (*output)(struct neighbour *, struct sk_buff *);
95060 int (*connected_output)(struct neighbour *, struct sk_buff *);
95061-};
95062+} __do_const;
95063
95064 struct pneigh_entry {
95065 struct pneigh_entry *next;
95066@@ -217,7 +217,7 @@ struct neigh_table {
95067 struct neigh_statistics __percpu *stats;
95068 struct neigh_hash_table __rcu *nht;
95069 struct pneigh_entry **phash_buckets;
95070-};
95071+} __randomize_layout;
95072
95073 enum {
95074 NEIGH_ARP_TABLE = 0,
95075diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
95076index 36faf49..6927638 100644
95077--- a/include/net/net_namespace.h
95078+++ b/include/net/net_namespace.h
95079@@ -131,8 +131,8 @@ struct net {
95080 struct netns_ipvs *ipvs;
95081 #endif
95082 struct sock *diag_nlsk;
95083- atomic_t fnhe_genid;
95084-};
95085+ atomic_unchecked_t fnhe_genid;
95086+} __randomize_layout;
95087
95088 #include <linux/seq_file_net.h>
95089
95090@@ -288,7 +288,11 @@ static inline struct net *read_pnet(struct net * const *pnet)
95091 #define __net_init __init
95092 #define __net_exit __exit_refok
95093 #define __net_initdata __initdata
95094+#ifdef CONSTIFY_PLUGIN
95095 #define __net_initconst __initconst
95096+#else
95097+#define __net_initconst __initdata
95098+#endif
95099 #endif
95100
95101 int peernet2id(struct net *net, struct net *peer);
95102@@ -301,7 +305,7 @@ struct pernet_operations {
95103 void (*exit_batch)(struct list_head *net_exit_list);
95104 int *id;
95105 size_t size;
95106-};
95107+} __do_const;
95108
95109 /*
95110 * Use these carefully. If you implement a network device and it
95111@@ -349,12 +353,12 @@ static inline void unregister_net_sysctl_table(struct ctl_table_header *header)
95112
95113 static inline int rt_genid_ipv4(struct net *net)
95114 {
95115- return atomic_read(&net->ipv4.rt_genid);
95116+ return atomic_read_unchecked(&net->ipv4.rt_genid);
95117 }
95118
95119 static inline void rt_genid_bump_ipv4(struct net *net)
95120 {
95121- atomic_inc(&net->ipv4.rt_genid);
95122+ atomic_inc_unchecked(&net->ipv4.rt_genid);
95123 }
95124
95125 extern void (*__fib6_flush_trees)(struct net *net);
95126@@ -381,12 +385,12 @@ static inline void rt_genid_bump_all(struct net *net)
95127
95128 static inline int fnhe_genid(struct net *net)
95129 {
95130- return atomic_read(&net->fnhe_genid);
95131+ return atomic_read_unchecked(&net->fnhe_genid);
95132 }
95133
95134 static inline void fnhe_genid_bump(struct net *net)
95135 {
95136- atomic_inc(&net->fnhe_genid);
95137+ atomic_inc_unchecked(&net->fnhe_genid);
95138 }
95139
95140 #endif /* __NET_NET_NAMESPACE_H */
95141diff --git a/include/net/netlink.h b/include/net/netlink.h
95142index e010ee8..405b9f4 100644
95143--- a/include/net/netlink.h
95144+++ b/include/net/netlink.h
95145@@ -518,7 +518,7 @@ static inline void nlmsg_trim(struct sk_buff *skb, const void *mark)
95146 {
95147 if (mark) {
95148 WARN_ON((unsigned char *) mark < skb->data);
95149- skb_trim(skb, (unsigned char *) mark - skb->data);
95150+ skb_trim(skb, (const unsigned char *) mark - skb->data);
95151 }
95152 }
95153
95154diff --git a/include/net/netns/conntrack.h b/include/net/netns/conntrack.h
95155index 29d6a94..235d3d84 100644
95156--- a/include/net/netns/conntrack.h
95157+++ b/include/net/netns/conntrack.h
95158@@ -14,10 +14,10 @@ struct nf_conntrack_ecache;
95159 struct nf_proto_net {
95160 #ifdef CONFIG_SYSCTL
95161 struct ctl_table_header *ctl_table_header;
95162- struct ctl_table *ctl_table;
95163+ ctl_table_no_const *ctl_table;
95164 #ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT
95165 struct ctl_table_header *ctl_compat_header;
95166- struct ctl_table *ctl_compat_table;
95167+ ctl_table_no_const *ctl_compat_table;
95168 #endif
95169 #endif
95170 unsigned int users;
95171@@ -60,7 +60,7 @@ struct nf_ip_net {
95172 struct nf_icmp_net icmpv6;
95173 #if defined(CONFIG_SYSCTL) && defined(CONFIG_NF_CONNTRACK_PROC_COMPAT)
95174 struct ctl_table_header *ctl_table_header;
95175- struct ctl_table *ctl_table;
95176+ ctl_table_no_const *ctl_table;
95177 #endif
95178 };
95179
95180diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
95181index dbe2254..ed0c151 100644
95182--- a/include/net/netns/ipv4.h
95183+++ b/include/net/netns/ipv4.h
95184@@ -87,7 +87,7 @@ struct netns_ipv4 {
95185
95186 struct ping_group_range ping_group_range;
95187
95188- atomic_t dev_addr_genid;
95189+ atomic_unchecked_t dev_addr_genid;
95190
95191 #ifdef CONFIG_SYSCTL
95192 unsigned long *sysctl_local_reserved_ports;
95193@@ -101,6 +101,6 @@ struct netns_ipv4 {
95194 struct fib_rules_ops *mr_rules_ops;
95195 #endif
95196 #endif
95197- atomic_t rt_genid;
95198+ atomic_unchecked_t rt_genid;
95199 };
95200 #endif
95201diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h
95202index 69ae41f..4f94868 100644
95203--- a/include/net/netns/ipv6.h
95204+++ b/include/net/netns/ipv6.h
95205@@ -75,8 +75,8 @@ struct netns_ipv6 {
95206 struct fib_rules_ops *mr6_rules_ops;
95207 #endif
95208 #endif
95209- atomic_t dev_addr_genid;
95210- atomic_t fib6_sernum;
95211+ atomic_unchecked_t dev_addr_genid;
95212+ atomic_unchecked_t fib6_sernum;
95213 };
95214
95215 #if IS_ENABLED(CONFIG_NF_DEFRAG_IPV6)
95216diff --git a/include/net/netns/xfrm.h b/include/net/netns/xfrm.h
95217index 730d82a..045f2c4 100644
95218--- a/include/net/netns/xfrm.h
95219+++ b/include/net/netns/xfrm.h
95220@@ -78,7 +78,7 @@ struct netns_xfrm {
95221
95222 /* flow cache part */
95223 struct flow_cache flow_cache_global;
95224- atomic_t flow_cache_genid;
95225+ atomic_unchecked_t flow_cache_genid;
95226 struct list_head flow_cache_gc_list;
95227 spinlock_t flow_cache_gc_lock;
95228 struct work_struct flow_cache_gc_work;
95229diff --git a/include/net/ping.h b/include/net/ping.h
95230index cc16d41..664f40b 100644
95231--- a/include/net/ping.h
95232+++ b/include/net/ping.h
95233@@ -54,7 +54,7 @@ struct ping_iter_state {
95234
95235 extern struct proto ping_prot;
95236 #if IS_ENABLED(CONFIG_IPV6)
95237-extern struct pingv6_ops pingv6_ops;
95238+extern struct pingv6_ops *pingv6_ops;
95239 #endif
95240
95241 struct pingfakehdr {
95242diff --git a/include/net/protocol.h b/include/net/protocol.h
95243index d6fcc1f..ca277058 100644
95244--- a/include/net/protocol.h
95245+++ b/include/net/protocol.h
95246@@ -49,7 +49,7 @@ struct net_protocol {
95247 * socket lookup?
95248 */
95249 icmp_strict_tag_validation:1;
95250-};
95251+} __do_const;
95252
95253 #if IS_ENABLED(CONFIG_IPV6)
95254 struct inet6_protocol {
95255@@ -62,7 +62,7 @@ struct inet6_protocol {
95256 u8 type, u8 code, int offset,
95257 __be32 info);
95258 unsigned int flags; /* INET6_PROTO_xxx */
95259-};
95260+} __do_const;
95261
95262 #define INET6_PROTO_NOPOLICY 0x1
95263 #define INET6_PROTO_FINAL 0x2
95264diff --git a/include/net/rtnetlink.h b/include/net/rtnetlink.h
95265index 6c6d539..af70817 100644
95266--- a/include/net/rtnetlink.h
95267+++ b/include/net/rtnetlink.h
95268@@ -95,7 +95,7 @@ struct rtnl_link_ops {
95269 const struct net_device *dev,
95270 const struct net_device *slave_dev);
95271 struct net *(*get_link_net)(const struct net_device *dev);
95272-};
95273+} __do_const;
95274
95275 int __rtnl_link_register(struct rtnl_link_ops *ops);
95276 void __rtnl_link_unregister(struct rtnl_link_ops *ops);
95277diff --git a/include/net/sctp/checksum.h b/include/net/sctp/checksum.h
95278index 4a5b9a3..ca27d73 100644
95279--- a/include/net/sctp/checksum.h
95280+++ b/include/net/sctp/checksum.h
95281@@ -61,8 +61,8 @@ static inline __le32 sctp_compute_cksum(const struct sk_buff *skb,
95282 unsigned int offset)
95283 {
95284 struct sctphdr *sh = sctp_hdr(skb);
95285- __le32 ret, old = sh->checksum;
95286- const struct skb_checksum_ops ops = {
95287+ __le32 ret, old = sh->checksum;
95288+ static const struct skb_checksum_ops ops = {
95289 .update = sctp_csum_update,
95290 .combine = sctp_csum_combine,
95291 };
95292diff --git a/include/net/sctp/sm.h b/include/net/sctp/sm.h
95293index 487ef34..d457f98 100644
95294--- a/include/net/sctp/sm.h
95295+++ b/include/net/sctp/sm.h
95296@@ -80,7 +80,7 @@ typedef void (sctp_timer_event_t) (unsigned long);
95297 typedef struct {
95298 sctp_state_fn_t *fn;
95299 const char *name;
95300-} sctp_sm_table_entry_t;
95301+} __do_const sctp_sm_table_entry_t;
95302
95303 /* A naming convention of "sctp_sf_xxx" applies to all the state functions
95304 * currently in use.
95305@@ -292,7 +292,7 @@ __u32 sctp_generate_tag(const struct sctp_endpoint *);
95306 __u32 sctp_generate_tsn(const struct sctp_endpoint *);
95307
95308 /* Extern declarations for major data structures. */
95309-extern sctp_timer_event_t *sctp_timer_events[SCTP_NUM_TIMEOUT_TYPES];
95310+extern sctp_timer_event_t * const sctp_timer_events[SCTP_NUM_TIMEOUT_TYPES];
95311
95312
95313 /* Get the size of a DATA chunk payload. */
95314diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
95315index 2bb2fcf..d17c291 100644
95316--- a/include/net/sctp/structs.h
95317+++ b/include/net/sctp/structs.h
95318@@ -509,7 +509,7 @@ struct sctp_pf {
95319 void (*to_sk_saddr)(union sctp_addr *, struct sock *sk);
95320 void (*to_sk_daddr)(union sctp_addr *, struct sock *sk);
95321 struct sctp_af *af;
95322-};
95323+} __do_const;
95324
95325
95326 /* Structure to track chunk fragments that have been acked, but peer
95327diff --git a/include/net/sock.h b/include/net/sock.h
95328index e4079c2..79c5d3a 100644
95329--- a/include/net/sock.h
95330+++ b/include/net/sock.h
95331@@ -362,7 +362,7 @@ struct sock {
95332 unsigned int sk_napi_id;
95333 unsigned int sk_ll_usec;
95334 #endif
95335- atomic_t sk_drops;
95336+ atomic_unchecked_t sk_drops;
95337 int sk_rcvbuf;
95338
95339 struct sk_filter __rcu *sk_filter;
95340@@ -1039,7 +1039,7 @@ struct proto {
95341 void (*destroy_cgroup)(struct mem_cgroup *memcg);
95342 struct cg_proto *(*proto_cgroup)(struct mem_cgroup *memcg);
95343 #endif
95344-};
95345+} __randomize_layout;
95346
95347 /*
95348 * Bits in struct cg_proto.flags
95349@@ -1212,7 +1212,7 @@ static inline void memcg_memory_allocated_sub(struct cg_proto *prot,
95350 page_counter_uncharge(&prot->memory_allocated, amt);
95351 }
95352
95353-static inline long
95354+static inline long __intentional_overflow(-1)
95355 sk_memory_allocated(const struct sock *sk)
95356 {
95357 struct proto *prot = sk->sk_prot;
95358@@ -1778,7 +1778,7 @@ static inline void sk_nocaps_add(struct sock *sk, netdev_features_t flags)
95359 }
95360
95361 static inline int skb_do_copy_data_nocache(struct sock *sk, struct sk_buff *skb,
95362- struct iov_iter *from, char *to,
95363+ struct iov_iter *from, unsigned char *to,
95364 int copy, int offset)
95365 {
95366 if (skb->ip_summed == CHECKSUM_NONE) {
95367@@ -2025,7 +2025,7 @@ static inline void sk_stream_moderate_sndbuf(struct sock *sk)
95368 }
95369 }
95370
95371-struct sk_buff *sk_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp);
95372+struct sk_buff * __intentional_overflow(0) sk_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp);
95373
95374 /**
95375 * sk_page_frag - return an appropriate page_frag
95376diff --git a/include/net/tcp.h b/include/net/tcp.h
95377index 8d6b983..5813205 100644
95378--- a/include/net/tcp.h
95379+++ b/include/net/tcp.h
95380@@ -516,7 +516,7 @@ void tcp_retransmit_timer(struct sock *sk);
95381 void tcp_xmit_retransmit_queue(struct sock *);
95382 void tcp_simple_retransmit(struct sock *);
95383 int tcp_trim_head(struct sock *, struct sk_buff *, u32);
95384-int tcp_fragment(struct sock *, struct sk_buff *, u32, unsigned int, gfp_t);
95385+int __intentional_overflow(3) tcp_fragment(struct sock *, struct sk_buff *, u32, unsigned int, gfp_t);
95386
95387 void tcp_send_probe0(struct sock *);
95388 void tcp_send_partial(struct sock *);
95389@@ -694,8 +694,8 @@ static inline u32 tcp_skb_timestamp(const struct sk_buff *skb)
95390 * If this grows please adjust skbuff.h:skbuff->cb[xxx] size appropriately.
95391 */
95392 struct tcp_skb_cb {
95393- __u32 seq; /* Starting sequence number */
95394- __u32 end_seq; /* SEQ + FIN + SYN + datalen */
95395+ __u32 seq __intentional_overflow(0); /* Starting sequence number */
95396+ __u32 end_seq __intentional_overflow(0); /* SEQ + FIN + SYN + datalen */
95397 union {
95398 /* Note : tcp_tw_isn is used in input path only
95399 * (isn chosen by tcp_timewait_state_process())
95400@@ -720,7 +720,7 @@ struct tcp_skb_cb {
95401
95402 __u8 ip_dsfield; /* IPv4 tos or IPv6 dsfield */
95403 /* 1 byte hole */
95404- __u32 ack_seq; /* Sequence number ACK'd */
95405+ __u32 ack_seq __intentional_overflow(0); /* Sequence number ACK'd */
95406 union {
95407 struct inet_skb_parm h4;
95408 #if IS_ENABLED(CONFIG_IPV6)
95409diff --git a/include/net/xfrm.h b/include/net/xfrm.h
95410index dc4865e..152ee4c 100644
95411--- a/include/net/xfrm.h
95412+++ b/include/net/xfrm.h
95413@@ -285,7 +285,6 @@ struct xfrm_dst;
95414 struct xfrm_policy_afinfo {
95415 unsigned short family;
95416 struct dst_ops *dst_ops;
95417- void (*garbage_collect)(struct net *net);
95418 struct dst_entry *(*dst_lookup)(struct net *net, int tos,
95419 const xfrm_address_t *saddr,
95420 const xfrm_address_t *daddr);
95421@@ -303,7 +302,7 @@ struct xfrm_policy_afinfo {
95422 struct net_device *dev,
95423 const struct flowi *fl);
95424 struct dst_entry *(*blackhole_route)(struct net *net, struct dst_entry *orig);
95425-};
95426+} __do_const;
95427
95428 int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo);
95429 int xfrm_policy_unregister_afinfo(struct xfrm_policy_afinfo *afinfo);
95430@@ -342,7 +341,7 @@ struct xfrm_state_afinfo {
95431 int (*transport_finish)(struct sk_buff *skb,
95432 int async);
95433 void (*local_error)(struct sk_buff *skb, u32 mtu);
95434-};
95435+} __do_const;
95436
95437 int xfrm_state_register_afinfo(struct xfrm_state_afinfo *afinfo);
95438 int xfrm_state_unregister_afinfo(struct xfrm_state_afinfo *afinfo);
95439@@ -437,7 +436,7 @@ struct xfrm_mode {
95440 struct module *owner;
95441 unsigned int encap;
95442 int flags;
95443-};
95444+} __do_const;
95445
95446 /* Flags for xfrm_mode. */
95447 enum {
95448@@ -534,7 +533,7 @@ struct xfrm_policy {
95449 struct timer_list timer;
95450
95451 struct flow_cache_object flo;
95452- atomic_t genid;
95453+ atomic_unchecked_t genid;
95454 u32 priority;
95455 u32 index;
95456 struct xfrm_mark mark;
95457@@ -1167,6 +1166,7 @@ static inline void xfrm_sk_free_policy(struct sock *sk)
95458 }
95459
95460 void xfrm_garbage_collect(struct net *net);
95461+void xfrm_garbage_collect_deferred(struct net *net);
95462
95463 #else
95464
95465@@ -1205,6 +1205,9 @@ static inline int xfrm6_policy_check_reverse(struct sock *sk, int dir,
95466 static inline void xfrm_garbage_collect(struct net *net)
95467 {
95468 }
95469+static inline void xfrm_garbage_collect_deferred(struct net *net)
95470+{
95471+}
95472 #endif
95473
95474 static __inline__
95475diff --git a/include/rdma/iw_cm.h b/include/rdma/iw_cm.h
95476index 1017e0b..227aa4d 100644
95477--- a/include/rdma/iw_cm.h
95478+++ b/include/rdma/iw_cm.h
95479@@ -122,7 +122,7 @@ struct iw_cm_verbs {
95480 int backlog);
95481
95482 int (*destroy_listen)(struct iw_cm_id *cm_id);
95483-};
95484+} __no_const;
95485
95486 /**
95487 * iw_create_cm_id - Create an IW CM identifier.
95488diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h
95489index 93d14da..734b3d8 100644
95490--- a/include/scsi/libfc.h
95491+++ b/include/scsi/libfc.h
95492@@ -771,6 +771,7 @@ struct libfc_function_template {
95493 */
95494 void (*disc_stop_final) (struct fc_lport *);
95495 };
95496+typedef struct libfc_function_template __no_const libfc_function_template_no_const;
95497
95498 /**
95499 * struct fc_disc - Discovery context
95500@@ -875,7 +876,7 @@ struct fc_lport {
95501 struct fc_vport *vport;
95502
95503 /* Operational Information */
95504- struct libfc_function_template tt;
95505+ libfc_function_template_no_const tt;
95506 u8 link_up;
95507 u8 qfull;
95508 enum fc_lport_state state;
95509diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
95510index a4c9336..d6f8f34 100644
95511--- a/include/scsi/scsi_device.h
95512+++ b/include/scsi/scsi_device.h
95513@@ -185,9 +185,9 @@ struct scsi_device {
95514 unsigned int max_device_blocked; /* what device_blocked counts down from */
95515 #define SCSI_DEFAULT_DEVICE_BLOCKED 3
95516
95517- atomic_t iorequest_cnt;
95518- atomic_t iodone_cnt;
95519- atomic_t ioerr_cnt;
95520+ atomic_unchecked_t iorequest_cnt;
95521+ atomic_unchecked_t iodone_cnt;
95522+ atomic_unchecked_t ioerr_cnt;
95523
95524 struct device sdev_gendev,
95525 sdev_dev;
95526diff --git a/include/scsi/scsi_driver.h b/include/scsi/scsi_driver.h
95527index 891a658..fcd68df 100644
95528--- a/include/scsi/scsi_driver.h
95529+++ b/include/scsi/scsi_driver.h
95530@@ -14,7 +14,7 @@ struct scsi_driver {
95531 void (*rescan)(struct device *);
95532 int (*init_command)(struct scsi_cmnd *);
95533 void (*uninit_command)(struct scsi_cmnd *);
95534- int (*done)(struct scsi_cmnd *);
95535+ unsigned int (*done)(struct scsi_cmnd *);
95536 int (*eh_action)(struct scsi_cmnd *, int);
95537 };
95538 #define to_scsi_driver(drv) \
95539diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h
95540index 007a0bc..7188db8 100644
95541--- a/include/scsi/scsi_transport_fc.h
95542+++ b/include/scsi/scsi_transport_fc.h
95543@@ -756,7 +756,8 @@ struct fc_function_template {
95544 unsigned long show_host_system_hostname:1;
95545
95546 unsigned long disable_target_scan:1;
95547-};
95548+} __do_const;
95549+typedef struct fc_function_template __no_const fc_function_template_no_const;
95550
95551
95552 /**
95553diff --git a/include/sound/compress_driver.h b/include/sound/compress_driver.h
95554index f48089d..73abe48 100644
95555--- a/include/sound/compress_driver.h
95556+++ b/include/sound/compress_driver.h
95557@@ -130,7 +130,7 @@ struct snd_compr_ops {
95558 struct snd_compr_caps *caps);
95559 int (*get_codec_caps) (struct snd_compr_stream *stream,
95560 struct snd_compr_codec_caps *codec);
95561-};
95562+} __no_const;
95563
95564 /**
95565 * struct snd_compr: Compressed device
95566diff --git a/include/sound/soc.h b/include/sound/soc.h
95567index 0d1ade1..34e77d3 100644
95568--- a/include/sound/soc.h
95569+++ b/include/sound/soc.h
95570@@ -856,7 +856,7 @@ struct snd_soc_codec_driver {
95571 enum snd_soc_dapm_type, int);
95572
95573 bool ignore_pmdown_time; /* Doesn't benefit from pmdown delay */
95574-};
95575+} __do_const;
95576
95577 /* SoC platform interface */
95578 struct snd_soc_platform_driver {
95579@@ -883,7 +883,7 @@ struct snd_soc_platform_driver {
95580 const struct snd_compr_ops *compr_ops;
95581
95582 int (*bespoke_trigger)(struct snd_pcm_substream *, int);
95583-};
95584+} __do_const;
95585
95586 struct snd_soc_dai_link_component {
95587 const char *name;
95588diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
95589index 985ca4c..b55b54a 100644
95590--- a/include/target/target_core_base.h
95591+++ b/include/target/target_core_base.h
95592@@ -767,7 +767,7 @@ struct se_device {
95593 atomic_long_t write_bytes;
95594 /* Active commands on this virtual SE device */
95595 atomic_t simple_cmds;
95596- atomic_t dev_ordered_id;
95597+ atomic_unchecked_t dev_ordered_id;
95598 atomic_t dev_ordered_sync;
95599 atomic_t dev_qf_count;
95600 int export_count;
95601diff --git a/include/trace/events/fs.h b/include/trace/events/fs.h
95602new file mode 100644
95603index 0000000..fb634b7
95604--- /dev/null
95605+++ b/include/trace/events/fs.h
95606@@ -0,0 +1,53 @@
95607+#undef TRACE_SYSTEM
95608+#define TRACE_SYSTEM fs
95609+
95610+#if !defined(_TRACE_FS_H) || defined(TRACE_HEADER_MULTI_READ)
95611+#define _TRACE_FS_H
95612+
95613+#include <linux/fs.h>
95614+#include <linux/tracepoint.h>
95615+
95616+TRACE_EVENT(do_sys_open,
95617+
95618+ TP_PROTO(const char *filename, int flags, int mode),
95619+
95620+ TP_ARGS(filename, flags, mode),
95621+
95622+ TP_STRUCT__entry(
95623+ __string( filename, filename )
95624+ __field( int, flags )
95625+ __field( int, mode )
95626+ ),
95627+
95628+ TP_fast_assign(
95629+ __assign_str(filename, filename);
95630+ __entry->flags = flags;
95631+ __entry->mode = mode;
95632+ ),
95633+
95634+ TP_printk("\"%s\" %x %o",
95635+ __get_str(filename), __entry->flags, __entry->mode)
95636+);
95637+
95638+TRACE_EVENT(open_exec,
95639+
95640+ TP_PROTO(const char *filename),
95641+
95642+ TP_ARGS(filename),
95643+
95644+ TP_STRUCT__entry(
95645+ __string( filename, filename )
95646+ ),
95647+
95648+ TP_fast_assign(
95649+ __assign_str(filename, filename);
95650+ ),
95651+
95652+ TP_printk("\"%s\"",
95653+ __get_str(filename))
95654+);
95655+
95656+#endif /* _TRACE_FS_H */
95657+
95658+/* This part must be outside protection */
95659+#include <trace/define_trace.h>
95660diff --git a/include/trace/events/irq.h b/include/trace/events/irq.h
95661index 3608beb..df39d8a 100644
95662--- a/include/trace/events/irq.h
95663+++ b/include/trace/events/irq.h
95664@@ -36,7 +36,7 @@ struct softirq_action;
95665 */
95666 TRACE_EVENT(irq_handler_entry,
95667
95668- TP_PROTO(int irq, struct irqaction *action),
95669+ TP_PROTO(int irq, const struct irqaction *action),
95670
95671 TP_ARGS(irq, action),
95672
95673@@ -66,7 +66,7 @@ TRACE_EVENT(irq_handler_entry,
95674 */
95675 TRACE_EVENT(irq_handler_exit,
95676
95677- TP_PROTO(int irq, struct irqaction *action, int ret),
95678+ TP_PROTO(int irq, const struct irqaction *action, int ret),
95679
95680 TP_ARGS(irq, action, ret),
95681
95682diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h
95683index 6eed16b..3e05750 100644
95684--- a/include/uapi/drm/i915_drm.h
95685+++ b/include/uapi/drm/i915_drm.h
95686@@ -347,6 +347,7 @@ typedef struct drm_i915_irq_wait {
95687 #define I915_PARAM_HAS_COHERENT_PHYS_GTT 29
95688 #define I915_PARAM_MMAP_VERSION 30
95689 #define I915_PARAM_HAS_BSD2 31
95690+#define I915_PARAM_HAS_LEGACY_CONTEXT 35
95691
95692 typedef struct drm_i915_getparam {
95693 int param;
95694diff --git a/include/uapi/linux/a.out.h b/include/uapi/linux/a.out.h
95695index 7caf44c..23c6f27 100644
95696--- a/include/uapi/linux/a.out.h
95697+++ b/include/uapi/linux/a.out.h
95698@@ -39,6 +39,14 @@ enum machine_type {
95699 M_MIPS2 = 152 /* MIPS R6000/R4000 binary */
95700 };
95701
95702+/* Constants for the N_FLAGS field */
95703+#define F_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
95704+#define F_PAX_EMUTRAMP 2 /* Emulate trampolines */
95705+#define F_PAX_MPROTECT 4 /* Restrict mprotect() */
95706+#define F_PAX_RANDMMAP 8 /* Randomize mmap() base */
95707+/*#define F_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
95708+#define F_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
95709+
95710 #if !defined (N_MAGIC)
95711 #define N_MAGIC(exec) ((exec).a_info & 0xffff)
95712 #endif
95713diff --git a/include/uapi/linux/bcache.h b/include/uapi/linux/bcache.h
95714index 22b6ad3..aeba37e 100644
95715--- a/include/uapi/linux/bcache.h
95716+++ b/include/uapi/linux/bcache.h
95717@@ -5,6 +5,7 @@
95718 * Bcache on disk data structures
95719 */
95720
95721+#include <linux/compiler.h>
95722 #include <asm/types.h>
95723
95724 #define BITMASK(name, type, field, offset, size) \
95725@@ -20,8 +21,8 @@ static inline void SET_##name(type *k, __u64 v) \
95726 /* Btree keys - all units are in sectors */
95727
95728 struct bkey {
95729- __u64 high;
95730- __u64 low;
95731+ __u64 high __intentional_overflow(-1);
95732+ __u64 low __intentional_overflow(-1);
95733 __u64 ptr[];
95734 };
95735
95736diff --git a/include/uapi/linux/byteorder/little_endian.h b/include/uapi/linux/byteorder/little_endian.h
95737index d876736..ccce5c0 100644
95738--- a/include/uapi/linux/byteorder/little_endian.h
95739+++ b/include/uapi/linux/byteorder/little_endian.h
95740@@ -42,51 +42,51 @@
95741
95742 static inline __le64 __cpu_to_le64p(const __u64 *p)
95743 {
95744- return (__force __le64)*p;
95745+ return (__force const __le64)*p;
95746 }
95747-static inline __u64 __le64_to_cpup(const __le64 *p)
95748+static inline __u64 __intentional_overflow(-1) __le64_to_cpup(const __le64 *p)
95749 {
95750- return (__force __u64)*p;
95751+ return (__force const __u64)*p;
95752 }
95753 static inline __le32 __cpu_to_le32p(const __u32 *p)
95754 {
95755- return (__force __le32)*p;
95756+ return (__force const __le32)*p;
95757 }
95758 static inline __u32 __le32_to_cpup(const __le32 *p)
95759 {
95760- return (__force __u32)*p;
95761+ return (__force const __u32)*p;
95762 }
95763 static inline __le16 __cpu_to_le16p(const __u16 *p)
95764 {
95765- return (__force __le16)*p;
95766+ return (__force const __le16)*p;
95767 }
95768 static inline __u16 __le16_to_cpup(const __le16 *p)
95769 {
95770- return (__force __u16)*p;
95771+ return (__force const __u16)*p;
95772 }
95773 static inline __be64 __cpu_to_be64p(const __u64 *p)
95774 {
95775- return (__force __be64)__swab64p(p);
95776+ return (__force const __be64)__swab64p(p);
95777 }
95778 static inline __u64 __be64_to_cpup(const __be64 *p)
95779 {
95780- return __swab64p((__u64 *)p);
95781+ return __swab64p((const __u64 *)p);
95782 }
95783 static inline __be32 __cpu_to_be32p(const __u32 *p)
95784 {
95785- return (__force __be32)__swab32p(p);
95786+ return (__force const __be32)__swab32p(p);
95787 }
95788-static inline __u32 __be32_to_cpup(const __be32 *p)
95789+static inline __u32 __intentional_overflow(-1) __be32_to_cpup(const __be32 *p)
95790 {
95791- return __swab32p((__u32 *)p);
95792+ return __swab32p((const __u32 *)p);
95793 }
95794 static inline __be16 __cpu_to_be16p(const __u16 *p)
95795 {
95796- return (__force __be16)__swab16p(p);
95797+ return (__force const __be16)__swab16p(p);
95798 }
95799 static inline __u16 __be16_to_cpup(const __be16 *p)
95800 {
95801- return __swab16p((__u16 *)p);
95802+ return __swab16p((const __u16 *)p);
95803 }
95804 #define __cpu_to_le64s(x) do { (void)(x); } while (0)
95805 #define __le64_to_cpus(x) do { (void)(x); } while (0)
95806diff --git a/include/uapi/linux/elf.h b/include/uapi/linux/elf.h
95807index 71e1d0e..6cc9caf 100644
95808--- a/include/uapi/linux/elf.h
95809+++ b/include/uapi/linux/elf.h
95810@@ -37,6 +37,17 @@ typedef __s64 Elf64_Sxword;
95811 #define PT_GNU_EH_FRAME 0x6474e550
95812
95813 #define PT_GNU_STACK (PT_LOOS + 0x474e551)
95814+#define PT_GNU_RELRO (PT_LOOS + 0x474e552)
95815+
95816+#define PT_PAX_FLAGS (PT_LOOS + 0x5041580)
95817+
95818+/* Constants for the e_flags field */
95819+#define EF_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
95820+#define EF_PAX_EMUTRAMP 2 /* Emulate trampolines */
95821+#define EF_PAX_MPROTECT 4 /* Restrict mprotect() */
95822+#define EF_PAX_RANDMMAP 8 /* Randomize mmap() base */
95823+/*#define EF_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
95824+#define EF_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
95825
95826 /*
95827 * Extended Numbering
95828@@ -94,6 +105,8 @@ typedef __s64 Elf64_Sxword;
95829 #define DT_DEBUG 21
95830 #define DT_TEXTREL 22
95831 #define DT_JMPREL 23
95832+#define DT_FLAGS 30
95833+ #define DF_TEXTREL 0x00000004
95834 #define DT_ENCODING 32
95835 #define OLD_DT_LOOS 0x60000000
95836 #define DT_LOOS 0x6000000d
95837@@ -240,6 +253,19 @@ typedef struct elf64_hdr {
95838 #define PF_W 0x2
95839 #define PF_X 0x1
95840
95841+#define PF_PAGEEXEC (1U << 4) /* Enable PAGEEXEC */
95842+#define PF_NOPAGEEXEC (1U << 5) /* Disable PAGEEXEC */
95843+#define PF_SEGMEXEC (1U << 6) /* Enable SEGMEXEC */
95844+#define PF_NOSEGMEXEC (1U << 7) /* Disable SEGMEXEC */
95845+#define PF_MPROTECT (1U << 8) /* Enable MPROTECT */
95846+#define PF_NOMPROTECT (1U << 9) /* Disable MPROTECT */
95847+/*#define PF_RANDEXEC (1U << 10)*/ /* Enable RANDEXEC */
95848+/*#define PF_NORANDEXEC (1U << 11)*/ /* Disable RANDEXEC */
95849+#define PF_EMUTRAMP (1U << 12) /* Enable EMUTRAMP */
95850+#define PF_NOEMUTRAMP (1U << 13) /* Disable EMUTRAMP */
95851+#define PF_RANDMMAP (1U << 14) /* Enable RANDMMAP */
95852+#define PF_NORANDMMAP (1U << 15) /* Disable RANDMMAP */
95853+
95854 typedef struct elf32_phdr{
95855 Elf32_Word p_type;
95856 Elf32_Off p_offset;
95857@@ -332,6 +358,8 @@ typedef struct elf64_shdr {
95858 #define EI_OSABI 7
95859 #define EI_PAD 8
95860
95861+#define EI_PAX 14
95862+
95863 #define ELFMAG0 0x7f /* EI_MAG */
95864 #define ELFMAG1 'E'
95865 #define ELFMAG2 'L'
95866diff --git a/include/uapi/linux/personality.h b/include/uapi/linux/personality.h
95867index aa169c4..6a2771d 100644
95868--- a/include/uapi/linux/personality.h
95869+++ b/include/uapi/linux/personality.h
95870@@ -30,6 +30,7 @@ enum {
95871 #define PER_CLEAR_ON_SETID (READ_IMPLIES_EXEC | \
95872 ADDR_NO_RANDOMIZE | \
95873 ADDR_COMPAT_LAYOUT | \
95874+ ADDR_LIMIT_3GB | \
95875 MMAP_PAGE_ZERO)
95876
95877 /*
95878diff --git a/include/uapi/linux/screen_info.h b/include/uapi/linux/screen_info.h
95879index 7530e74..e714828 100644
95880--- a/include/uapi/linux/screen_info.h
95881+++ b/include/uapi/linux/screen_info.h
95882@@ -43,7 +43,8 @@ struct screen_info {
95883 __u16 pages; /* 0x32 */
95884 __u16 vesa_attributes; /* 0x34 */
95885 __u32 capabilities; /* 0x36 */
95886- __u8 _reserved[6]; /* 0x3a */
95887+ __u16 vesapm_size; /* 0x3a */
95888+ __u8 _reserved[4]; /* 0x3c */
95889 } __attribute__((packed));
95890
95891 #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */
95892diff --git a/include/uapi/linux/swab.h b/include/uapi/linux/swab.h
95893index 0e011eb..82681b1 100644
95894--- a/include/uapi/linux/swab.h
95895+++ b/include/uapi/linux/swab.h
95896@@ -43,7 +43,7 @@
95897 * ___swab16, ___swab32, ___swab64, ___swahw32, ___swahb32
95898 */
95899
95900-static inline __attribute_const__ __u16 __fswab16(__u16 val)
95901+static inline __intentional_overflow(-1) __attribute_const__ __u16 __fswab16(__u16 val)
95902 {
95903 #ifdef __HAVE_BUILTIN_BSWAP16__
95904 return __builtin_bswap16(val);
95905@@ -54,7 +54,7 @@ static inline __attribute_const__ __u16 __fswab16(__u16 val)
95906 #endif
95907 }
95908
95909-static inline __attribute_const__ __u32 __fswab32(__u32 val)
95910+static inline __intentional_overflow(-1) __attribute_const__ __u32 __fswab32(__u32 val)
95911 {
95912 #ifdef __HAVE_BUILTIN_BSWAP32__
95913 return __builtin_bswap32(val);
95914@@ -65,7 +65,7 @@ static inline __attribute_const__ __u32 __fswab32(__u32 val)
95915 #endif
95916 }
95917
95918-static inline __attribute_const__ __u64 __fswab64(__u64 val)
95919+static inline __intentional_overflow(-1) __attribute_const__ __u64 __fswab64(__u64 val)
95920 {
95921 #ifdef __HAVE_BUILTIN_BSWAP64__
95922 return __builtin_bswap64(val);
95923diff --git a/include/uapi/linux/xattr.h b/include/uapi/linux/xattr.h
95924index 1590c49..5eab462 100644
95925--- a/include/uapi/linux/xattr.h
95926+++ b/include/uapi/linux/xattr.h
95927@@ -73,5 +73,9 @@
95928 #define XATTR_POSIX_ACL_DEFAULT "posix_acl_default"
95929 #define XATTR_NAME_POSIX_ACL_DEFAULT XATTR_SYSTEM_PREFIX XATTR_POSIX_ACL_DEFAULT
95930
95931+/* User namespace */
95932+#define XATTR_PAX_PREFIX XATTR_USER_PREFIX "pax."
95933+#define XATTR_PAX_FLAGS_SUFFIX "flags"
95934+#define XATTR_NAME_PAX_FLAGS XATTR_PAX_PREFIX XATTR_PAX_FLAGS_SUFFIX
95935
95936 #endif /* _UAPI_LINUX_XATTR_H */
95937diff --git a/include/video/udlfb.h b/include/video/udlfb.h
95938index f9466fa..f4e2b81 100644
95939--- a/include/video/udlfb.h
95940+++ b/include/video/udlfb.h
95941@@ -53,10 +53,10 @@ struct dlfb_data {
95942 u32 pseudo_palette[256];
95943 int blank_mode; /*one of FB_BLANK_ */
95944 /* blit-only rendering path metrics, exposed through sysfs */
95945- atomic_t bytes_rendered; /* raw pixel-bytes driver asked to render */
95946- atomic_t bytes_identical; /* saved effort with backbuffer comparison */
95947- atomic_t bytes_sent; /* to usb, after compression including overhead */
95948- atomic_t cpu_kcycles_used; /* transpired during pixel processing */
95949+ atomic_unchecked_t bytes_rendered; /* raw pixel-bytes driver asked to render */
95950+ atomic_unchecked_t bytes_identical; /* saved effort with backbuffer comparison */
95951+ atomic_unchecked_t bytes_sent; /* to usb, after compression including overhead */
95952+ atomic_unchecked_t cpu_kcycles_used; /* transpired during pixel processing */
95953 };
95954
95955 #define NR_USB_REQUEST_I2C_SUB_IO 0x02
95956diff --git a/include/video/uvesafb.h b/include/video/uvesafb.h
95957index 30f5362..8ed8ac9 100644
95958--- a/include/video/uvesafb.h
95959+++ b/include/video/uvesafb.h
95960@@ -122,6 +122,7 @@ struct uvesafb_par {
95961 u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */
95962 u8 pmi_setpal; /* PMI for palette changes */
95963 u16 *pmi_base; /* protected mode interface location */
95964+ u8 *pmi_code; /* protected mode code location */
95965 void *pmi_start;
95966 void *pmi_pal;
95967 u8 *vbe_state_orig; /*
95968diff --git a/init/Kconfig b/init/Kconfig
95969index f5dbc6d..8259396 100644
95970--- a/init/Kconfig
95971+++ b/init/Kconfig
95972@@ -1136,6 +1136,7 @@ endif # CGROUPS
95973
95974 config CHECKPOINT_RESTORE
95975 bool "Checkpoint/restore support" if EXPERT
95976+ depends on !GRKERNSEC
95977 default n
95978 help
95979 Enables additional kernel features in a sake of checkpoint/restore.
95980@@ -1646,7 +1647,7 @@ config SLUB_DEBUG
95981
95982 config COMPAT_BRK
95983 bool "Disable heap randomization"
95984- default y
95985+ default n
95986 help
95987 Randomizing heap placement makes heap exploits harder, but it
95988 also breaks ancient binaries (including anything libc5 based).
95989@@ -1977,7 +1978,7 @@ config INIT_ALL_POSSIBLE
95990 config STOP_MACHINE
95991 bool
95992 default y
95993- depends on (SMP && MODULE_UNLOAD) || HOTPLUG_CPU
95994+ depends on (SMP && MODULE_UNLOAD) || HOTPLUG_CPU || GRKERNSEC
95995 help
95996 Need stop_machine() primitive.
95997
95998diff --git a/init/Makefile b/init/Makefile
95999index 7bc47ee..6da2dc7 100644
96000--- a/init/Makefile
96001+++ b/init/Makefile
96002@@ -2,6 +2,9 @@
96003 # Makefile for the linux kernel.
96004 #
96005
96006+ccflags-y := $(GCC_PLUGINS_CFLAGS)
96007+asflags-y := $(GCC_PLUGINS_AFLAGS)
96008+
96009 obj-y := main.o version.o mounts.o
96010 ifneq ($(CONFIG_BLK_DEV_INITRD),y)
96011 obj-y += noinitramfs.o
96012diff --git a/init/do_mounts.c b/init/do_mounts.c
96013index eb41008..f5dbbf9 100644
96014--- a/init/do_mounts.c
96015+++ b/init/do_mounts.c
96016@@ -360,11 +360,11 @@ static void __init get_fs_names(char *page)
96017 static int __init do_mount_root(char *name, char *fs, int flags, void *data)
96018 {
96019 struct super_block *s;
96020- int err = sys_mount(name, "/root", fs, flags, data);
96021+ int err = sys_mount((char __force_user *)name, (char __force_user *)"/root", (char __force_user *)fs, flags, (void __force_user *)data);
96022 if (err)
96023 return err;
96024
96025- sys_chdir("/root");
96026+ sys_chdir((const char __force_user *)"/root");
96027 s = current->fs->pwd.dentry->d_sb;
96028 ROOT_DEV = s->s_dev;
96029 printk(KERN_INFO
96030@@ -487,18 +487,18 @@ void __init change_floppy(char *fmt, ...)
96031 va_start(args, fmt);
96032 vsprintf(buf, fmt, args);
96033 va_end(args);
96034- fd = sys_open("/dev/root", O_RDWR | O_NDELAY, 0);
96035+ fd = sys_open((char __user *)"/dev/root", O_RDWR | O_NDELAY, 0);
96036 if (fd >= 0) {
96037 sys_ioctl(fd, FDEJECT, 0);
96038 sys_close(fd);
96039 }
96040 printk(KERN_NOTICE "VFS: Insert %s and press ENTER\n", buf);
96041- fd = sys_open("/dev/console", O_RDWR, 0);
96042+ fd = sys_open((__force const char __user *)"/dev/console", O_RDWR, 0);
96043 if (fd >= 0) {
96044 sys_ioctl(fd, TCGETS, (long)&termios);
96045 termios.c_lflag &= ~ICANON;
96046 sys_ioctl(fd, TCSETSF, (long)&termios);
96047- sys_read(fd, &c, 1);
96048+ sys_read(fd, (char __user *)&c, 1);
96049 termios.c_lflag |= ICANON;
96050 sys_ioctl(fd, TCSETSF, (long)&termios);
96051 sys_close(fd);
96052@@ -592,8 +592,8 @@ void __init prepare_namespace(void)
96053 mount_root();
96054 out:
96055 devtmpfs_mount("dev");
96056- sys_mount(".", "/", NULL, MS_MOVE, NULL);
96057- sys_chroot(".");
96058+ sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
96059+ sys_chroot((const char __force_user *)".");
96060 }
96061
96062 static bool is_tmpfs;
96063diff --git a/init/do_mounts.h b/init/do_mounts.h
96064index f5b978a..69dbfe8 100644
96065--- a/init/do_mounts.h
96066+++ b/init/do_mounts.h
96067@@ -15,15 +15,15 @@ extern int root_mountflags;
96068
96069 static inline int create_dev(char *name, dev_t dev)
96070 {
96071- sys_unlink(name);
96072- return sys_mknod(name, S_IFBLK|0600, new_encode_dev(dev));
96073+ sys_unlink((char __force_user *)name);
96074+ return sys_mknod((char __force_user *)name, S_IFBLK|0600, new_encode_dev(dev));
96075 }
96076
96077 #if BITS_PER_LONG == 32
96078 static inline u32 bstat(char *name)
96079 {
96080 struct stat64 stat;
96081- if (sys_stat64(name, &stat) != 0)
96082+ if (sys_stat64((char __force_user *)name, (struct stat64 __force_user *)&stat) != 0)
96083 return 0;
96084 if (!S_ISBLK(stat.st_mode))
96085 return 0;
96086@@ -35,7 +35,7 @@ static inline u32 bstat(char *name)
96087 static inline u32 bstat(char *name)
96088 {
96089 struct stat stat;
96090- if (sys_newstat(name, &stat) != 0)
96091+ if (sys_newstat((const char __force_user *)name, (struct stat __force_user *)&stat) != 0)
96092 return 0;
96093 if (!S_ISBLK(stat.st_mode))
96094 return 0;
96095diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
96096index 3e0878e..8a9d7a0 100644
96097--- a/init/do_mounts_initrd.c
96098+++ b/init/do_mounts_initrd.c
96099@@ -37,13 +37,13 @@ static int init_linuxrc(struct subprocess_info *info, struct cred *new)
96100 {
96101 sys_unshare(CLONE_FS | CLONE_FILES);
96102 /* stdin/stdout/stderr for /linuxrc */
96103- sys_open("/dev/console", O_RDWR, 0);
96104+ sys_open((const char __force_user *)"/dev/console", O_RDWR, 0);
96105 sys_dup(0);
96106 sys_dup(0);
96107 /* move initrd over / and chdir/chroot in initrd root */
96108- sys_chdir("/root");
96109- sys_mount(".", "/", NULL, MS_MOVE, NULL);
96110- sys_chroot(".");
96111+ sys_chdir((const char __force_user *)"/root");
96112+ sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
96113+ sys_chroot((const char __force_user *)".");
96114 sys_setsid();
96115 return 0;
96116 }
96117@@ -59,8 +59,8 @@ static void __init handle_initrd(void)
96118 create_dev("/dev/root.old", Root_RAM0);
96119 /* mount initrd on rootfs' /root */
96120 mount_block_root("/dev/root.old", root_mountflags & ~MS_RDONLY);
96121- sys_mkdir("/old", 0700);
96122- sys_chdir("/old");
96123+ sys_mkdir((const char __force_user *)"/old", 0700);
96124+ sys_chdir((const char __force_user *)"/old");
96125
96126 /* try loading default modules from initrd */
96127 load_default_modules();
96128@@ -80,31 +80,31 @@ static void __init handle_initrd(void)
96129 current->flags &= ~PF_FREEZER_SKIP;
96130
96131 /* move initrd to rootfs' /old */
96132- sys_mount("..", ".", NULL, MS_MOVE, NULL);
96133+ sys_mount((char __force_user *)"..", (char __force_user *)".", NULL, MS_MOVE, NULL);
96134 /* switch root and cwd back to / of rootfs */
96135- sys_chroot("..");
96136+ sys_chroot((const char __force_user *)"..");
96137
96138 if (new_decode_dev(real_root_dev) == Root_RAM0) {
96139- sys_chdir("/old");
96140+ sys_chdir((const char __force_user *)"/old");
96141 return;
96142 }
96143
96144- sys_chdir("/");
96145+ sys_chdir((const char __force_user *)"/");
96146 ROOT_DEV = new_decode_dev(real_root_dev);
96147 mount_root();
96148
96149 printk(KERN_NOTICE "Trying to move old root to /initrd ... ");
96150- error = sys_mount("/old", "/root/initrd", NULL, MS_MOVE, NULL);
96151+ error = sys_mount((char __force_user *)"/old", (char __force_user *)"/root/initrd", NULL, MS_MOVE, NULL);
96152 if (!error)
96153 printk("okay\n");
96154 else {
96155- int fd = sys_open("/dev/root.old", O_RDWR, 0);
96156+ int fd = sys_open((const char __force_user *)"/dev/root.old", O_RDWR, 0);
96157 if (error == -ENOENT)
96158 printk("/initrd does not exist. Ignored.\n");
96159 else
96160 printk("failed\n");
96161 printk(KERN_NOTICE "Unmounting old root\n");
96162- sys_umount("/old", MNT_DETACH);
96163+ sys_umount((char __force_user *)"/old", MNT_DETACH);
96164 printk(KERN_NOTICE "Trying to free ramdisk memory ... ");
96165 if (fd < 0) {
96166 error = fd;
96167@@ -127,11 +127,11 @@ int __init initrd_load(void)
96168 * mounted in the normal path.
96169 */
96170 if (rd_load_image("/initrd.image") && ROOT_DEV != Root_RAM0) {
96171- sys_unlink("/initrd.image");
96172+ sys_unlink((const char __force_user *)"/initrd.image");
96173 handle_initrd();
96174 return 1;
96175 }
96176 }
96177- sys_unlink("/initrd.image");
96178+ sys_unlink((const char __force_user *)"/initrd.image");
96179 return 0;
96180 }
96181diff --git a/init/do_mounts_md.c b/init/do_mounts_md.c
96182index 8cb6db5..d729f50 100644
96183--- a/init/do_mounts_md.c
96184+++ b/init/do_mounts_md.c
96185@@ -180,7 +180,7 @@ static void __init md_setup_drive(void)
96186 partitioned ? "_d" : "", minor,
96187 md_setup_args[ent].device_names);
96188
96189- fd = sys_open(name, 0, 0);
96190+ fd = sys_open((char __force_user *)name, 0, 0);
96191 if (fd < 0) {
96192 printk(KERN_ERR "md: open failed - cannot start "
96193 "array %s\n", name);
96194@@ -243,7 +243,7 @@ static void __init md_setup_drive(void)
96195 * array without it
96196 */
96197 sys_close(fd);
96198- fd = sys_open(name, 0, 0);
96199+ fd = sys_open((char __force_user *)name, 0, 0);
96200 sys_ioctl(fd, BLKRRPART, 0);
96201 }
96202 sys_close(fd);
96203@@ -293,7 +293,7 @@ static void __init autodetect_raid(void)
96204
96205 wait_for_device_probe();
96206
96207- fd = sys_open("/dev/md0", 0, 0);
96208+ fd = sys_open((const char __force_user *) "/dev/md0", 0, 0);
96209 if (fd >= 0) {
96210 sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
96211 sys_close(fd);
96212diff --git a/init/init_task.c b/init/init_task.c
96213index ba0a7f36..2bcf1d5 100644
96214--- a/init/init_task.c
96215+++ b/init/init_task.c
96216@@ -22,5 +22,9 @@ EXPORT_SYMBOL(init_task);
96217 * Initial thread structure. Alignment of this is handled by a special
96218 * linker map entry.
96219 */
96220+#ifdef CONFIG_X86
96221+union thread_union init_thread_union __init_task_data;
96222+#else
96223 union thread_union init_thread_union __init_task_data =
96224 { INIT_THREAD_INFO(init_task) };
96225+#endif
96226diff --git a/init/initramfs.c b/init/initramfs.c
96227index ad1bd77..dca2c1b 100644
96228--- a/init/initramfs.c
96229+++ b/init/initramfs.c
96230@@ -25,7 +25,7 @@ static ssize_t __init xwrite(int fd, const char *p, size_t count)
96231
96232 /* sys_write only can write MAX_RW_COUNT aka 2G-4K bytes at most */
96233 while (count) {
96234- ssize_t rv = sys_write(fd, p, count);
96235+ ssize_t rv = sys_write(fd, (char __force_user *)p, count);
96236
96237 if (rv < 0) {
96238 if (rv == -EINTR || rv == -EAGAIN)
96239@@ -107,7 +107,7 @@ static void __init free_hash(void)
96240 }
96241 }
96242
96243-static long __init do_utime(char *filename, time_t mtime)
96244+static long __init do_utime(char __force_user *filename, time_t mtime)
96245 {
96246 struct timespec t[2];
96247
96248@@ -142,7 +142,7 @@ static void __init dir_utime(void)
96249 struct dir_entry *de, *tmp;
96250 list_for_each_entry_safe(de, tmp, &dir_list, list) {
96251 list_del(&de->list);
96252- do_utime(de->name, de->mtime);
96253+ do_utime((char __force_user *)de->name, de->mtime);
96254 kfree(de->name);
96255 kfree(de);
96256 }
96257@@ -304,7 +304,7 @@ static int __init maybe_link(void)
96258 if (nlink >= 2) {
96259 char *old = find_link(major, minor, ino, mode, collected);
96260 if (old)
96261- return (sys_link(old, collected) < 0) ? -1 : 1;
96262+ return (sys_link((char __force_user *)old, (char __force_user *)collected) < 0) ? -1 : 1;
96263 }
96264 return 0;
96265 }
96266@@ -313,11 +313,11 @@ static void __init clean_path(char *path, umode_t fmode)
96267 {
96268 struct stat st;
96269
96270- if (!sys_newlstat(path, &st) && (st.st_mode ^ fmode) & S_IFMT) {
96271+ if (!sys_newlstat((char __force_user *)path, (struct stat __force_user *)&st) && (st.st_mode ^ fmode) & S_IFMT) {
96272 if (S_ISDIR(st.st_mode))
96273- sys_rmdir(path);
96274+ sys_rmdir((char __force_user *)path);
96275 else
96276- sys_unlink(path);
96277+ sys_unlink((char __force_user *)path);
96278 }
96279 }
96280
96281@@ -338,7 +338,7 @@ static int __init do_name(void)
96282 int openflags = O_WRONLY|O_CREAT;
96283 if (ml != 1)
96284 openflags |= O_TRUNC;
96285- wfd = sys_open(collected, openflags, mode);
96286+ wfd = sys_open((char __force_user *)collected, openflags, mode);
96287
96288 if (wfd >= 0) {
96289 sys_fchown(wfd, uid, gid);
96290@@ -350,17 +350,17 @@ static int __init do_name(void)
96291 }
96292 }
96293 } else if (S_ISDIR(mode)) {
96294- sys_mkdir(collected, mode);
96295- sys_chown(collected, uid, gid);
96296- sys_chmod(collected, mode);
96297+ sys_mkdir((char __force_user *)collected, mode);
96298+ sys_chown((char __force_user *)collected, uid, gid);
96299+ sys_chmod((char __force_user *)collected, mode);
96300 dir_add(collected, mtime);
96301 } else if (S_ISBLK(mode) || S_ISCHR(mode) ||
96302 S_ISFIFO(mode) || S_ISSOCK(mode)) {
96303 if (maybe_link() == 0) {
96304- sys_mknod(collected, mode, rdev);
96305- sys_chown(collected, uid, gid);
96306- sys_chmod(collected, mode);
96307- do_utime(collected, mtime);
96308+ sys_mknod((char __force_user *)collected, mode, rdev);
96309+ sys_chown((char __force_user *)collected, uid, gid);
96310+ sys_chmod((char __force_user *)collected, mode);
96311+ do_utime((char __force_user *)collected, mtime);
96312 }
96313 }
96314 return 0;
96315@@ -372,7 +372,7 @@ static int __init do_copy(void)
96316 if (xwrite(wfd, victim, body_len) != body_len)
96317 error("write error");
96318 sys_close(wfd);
96319- do_utime(vcollected, mtime);
96320+ do_utime((char __force_user *)vcollected, mtime);
96321 kfree(vcollected);
96322 eat(body_len);
96323 state = SkipIt;
96324@@ -390,9 +390,9 @@ static int __init do_symlink(void)
96325 {
96326 collected[N_ALIGN(name_len) + body_len] = '\0';
96327 clean_path(collected, 0);
96328- sys_symlink(collected + N_ALIGN(name_len), collected);
96329- sys_lchown(collected, uid, gid);
96330- do_utime(collected, mtime);
96331+ sys_symlink((char __force_user *)collected + N_ALIGN(name_len), (char __force_user *)collected);
96332+ sys_lchown((char __force_user *)collected, uid, gid);
96333+ do_utime((char __force_user *)collected, mtime);
96334 state = SkipIt;
96335 next_state = Reset;
96336 return 0;
96337diff --git a/init/main.c b/init/main.c
96338index 6f0f1c5f..a542824 100644
96339--- a/init/main.c
96340+++ b/init/main.c
96341@@ -96,6 +96,8 @@ extern void radix_tree_init(void);
96342 static inline void mark_rodata_ro(void) { }
96343 #endif
96344
96345+extern void grsecurity_init(void);
96346+
96347 /*
96348 * Debug helper: via this flag we know that we are in 'early bootup code'
96349 * where only the boot processor is running with IRQ disabled. This means
96350@@ -157,6 +159,85 @@ static int __init set_reset_devices(char *str)
96351
96352 __setup("reset_devices", set_reset_devices);
96353
96354+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
96355+kgid_t grsec_proc_gid = KGIDT_INIT(CONFIG_GRKERNSEC_PROC_GID);
96356+static int __init setup_grsec_proc_gid(char *str)
96357+{
96358+ grsec_proc_gid = KGIDT_INIT(simple_strtol(str, NULL, 0));
96359+ return 1;
96360+}
96361+__setup("grsec_proc_gid=", setup_grsec_proc_gid);
96362+#endif
96363+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
96364+int grsec_enable_sysfs_restrict = 1;
96365+static int __init setup_grsec_sysfs_restrict(char *str)
96366+{
96367+ if (!simple_strtol(str, NULL, 0))
96368+ grsec_enable_sysfs_restrict = 0;
96369+ return 1;
96370+}
96371+__setup("grsec_sysfs_restrict", setup_grsec_sysfs_restrict);
96372+#endif
96373+
96374+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
96375+unsigned long pax_user_shadow_base __read_only;
96376+EXPORT_SYMBOL(pax_user_shadow_base);
96377+extern char pax_enter_kernel_user[];
96378+extern char pax_exit_kernel_user[];
96379+#endif
96380+
96381+#if defined(CONFIG_X86) && defined(CONFIG_PAX_MEMORY_UDEREF)
96382+static int __init setup_pax_nouderef(char *str)
96383+{
96384+#ifdef CONFIG_X86_32
96385+ unsigned int cpu;
96386+ struct desc_struct *gdt;
96387+
96388+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
96389+ gdt = get_cpu_gdt_table(cpu);
96390+ gdt[GDT_ENTRY_KERNEL_DS].type = 3;
96391+ gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
96392+ gdt[GDT_ENTRY_DEFAULT_USER_CS].limit = 0xf;
96393+ gdt[GDT_ENTRY_DEFAULT_USER_DS].limit = 0xf;
96394+ }
96395+ loadsegment(ds, __KERNEL_DS);
96396+ loadsegment(es, __KERNEL_DS);
96397+ loadsegment(ss, __KERNEL_DS);
96398+#else
96399+ memcpy(pax_enter_kernel_user, (unsigned char []){0xc3}, 1);
96400+ memcpy(pax_exit_kernel_user, (unsigned char []){0xc3}, 1);
96401+ clone_pgd_mask = ~(pgdval_t)0UL;
96402+ pax_user_shadow_base = 0UL;
96403+ setup_clear_cpu_cap(X86_FEATURE_PCID);
96404+ setup_clear_cpu_cap(X86_FEATURE_INVPCID);
96405+#endif
96406+
96407+ return 0;
96408+}
96409+early_param("pax_nouderef", setup_pax_nouderef);
96410+
96411+#ifdef CONFIG_X86_64
96412+static int __init setup_pax_weakuderef(char *str)
96413+{
96414+ if (clone_pgd_mask != ~(pgdval_t)0UL)
96415+ pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
96416+ return 1;
96417+}
96418+__setup("pax_weakuderef", setup_pax_weakuderef);
96419+#endif
96420+#endif
96421+
96422+#ifdef CONFIG_PAX_SOFTMODE
96423+int pax_softmode;
96424+
96425+static int __init setup_pax_softmode(char *str)
96426+{
96427+ get_option(&str, &pax_softmode);
96428+ return 1;
96429+}
96430+__setup("pax_softmode=", setup_pax_softmode);
96431+#endif
96432+
96433 static const char *argv_init[MAX_INIT_ARGS+2] = { "init", NULL, };
96434 const char *envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, };
96435 static const char *panic_later, *panic_param;
96436@@ -722,7 +803,7 @@ static bool __init_or_module initcall_blacklisted(initcall_t fn)
96437 struct blacklist_entry *entry;
96438 char *fn_name;
96439
96440- fn_name = kasprintf(GFP_KERNEL, "%pf", fn);
96441+ fn_name = kasprintf(GFP_KERNEL, "%pX", fn);
96442 if (!fn_name)
96443 return false;
96444
96445@@ -774,7 +855,7 @@ int __init_or_module do_one_initcall(initcall_t fn)
96446 {
96447 int count = preempt_count();
96448 int ret;
96449- char msgbuf[64];
96450+ const char *msg1 = "", *msg2 = "";
96451
96452 if (initcall_blacklisted(fn))
96453 return -EPERM;
96454@@ -784,18 +865,17 @@ int __init_or_module do_one_initcall(initcall_t fn)
96455 else
96456 ret = fn();
96457
96458- msgbuf[0] = 0;
96459-
96460 if (preempt_count() != count) {
96461- sprintf(msgbuf, "preemption imbalance ");
96462+ msg1 = " preemption imbalance";
96463 preempt_count_set(count);
96464 }
96465 if (irqs_disabled()) {
96466- strlcat(msgbuf, "disabled interrupts ", sizeof(msgbuf));
96467+ msg2 = " disabled interrupts";
96468 local_irq_enable();
96469 }
96470- WARN(msgbuf[0], "initcall %pF returned with %s\n", fn, msgbuf);
96471+ WARN(*msg1 || *msg2, "initcall %pF returned with%s%s\n", fn, msg1, msg2);
96472
96473+ add_latent_entropy();
96474 return ret;
96475 }
96476
96477@@ -901,8 +981,8 @@ static int run_init_process(const char *init_filename)
96478 {
96479 argv_init[0] = init_filename;
96480 return do_execve(getname_kernel(init_filename),
96481- (const char __user *const __user *)argv_init,
96482- (const char __user *const __user *)envp_init);
96483+ (const char __user *const __force_user *)argv_init,
96484+ (const char __user *const __force_user *)envp_init);
96485 }
96486
96487 static int try_to_run_init_process(const char *init_filename)
96488@@ -919,6 +999,10 @@ static int try_to_run_init_process(const char *init_filename)
96489 return ret;
96490 }
96491
96492+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
96493+extern int gr_init_ran;
96494+#endif
96495+
96496 static noinline void __init kernel_init_freeable(void);
96497
96498 static int __ref kernel_init(void *unused)
96499@@ -943,6 +1027,11 @@ static int __ref kernel_init(void *unused)
96500 ramdisk_execute_command, ret);
96501 }
96502
96503+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
96504+ /* if no initrd was used, be extra sure we enforce chroot restrictions */
96505+ gr_init_ran = 1;
96506+#endif
96507+
96508 /*
96509 * We try each of these until one succeeds.
96510 *
96511@@ -998,7 +1087,7 @@ static noinline void __init kernel_init_freeable(void)
96512 do_basic_setup();
96513
96514 /* Open the /dev/console on the rootfs, this should never fail */
96515- if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
96516+ if (sys_open((const char __force_user *) "/dev/console", O_RDWR, 0) < 0)
96517 pr_err("Warning: unable to open an initial console.\n");
96518
96519 (void) sys_dup(0);
96520@@ -1011,11 +1100,13 @@ static noinline void __init kernel_init_freeable(void)
96521 if (!ramdisk_execute_command)
96522 ramdisk_execute_command = "/init";
96523
96524- if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) {
96525+ if (sys_access((const char __force_user *) ramdisk_execute_command, 0) != 0) {
96526 ramdisk_execute_command = NULL;
96527 prepare_namespace();
96528 }
96529
96530+ grsecurity_init();
96531+
96532 /*
96533 * Ok, we have completed the initial bootup, and
96534 * we're essentially up and running. Get rid of the
96535diff --git a/ipc/compat.c b/ipc/compat.c
96536index 9b3c85f..5266b0f 100644
96537--- a/ipc/compat.c
96538+++ b/ipc/compat.c
96539@@ -396,7 +396,7 @@ COMPAT_SYSCALL_DEFINE6(ipc, u32, call, int, first, int, second,
96540 COMPAT_SHMLBA);
96541 if (err < 0)
96542 return err;
96543- return put_user(raddr, (compat_ulong_t *)compat_ptr(third));
96544+ return put_user(raddr, (compat_ulong_t __user *)compat_ptr(third));
96545 }
96546 case SHMDT:
96547 return sys_shmdt(compat_ptr(ptr));
96548@@ -747,7 +747,7 @@ COMPAT_SYSCALL_DEFINE3(shmctl, int, first, int, second, void __user *, uptr)
96549 }
96550
96551 COMPAT_SYSCALL_DEFINE4(semtimedop, int, semid, struct sembuf __user *, tsems,
96552- unsigned, nsops,
96553+ compat_long_t, nsops,
96554 const struct compat_timespec __user *, timeout)
96555 {
96556 struct timespec __user *ts64;
96557diff --git a/ipc/ipc_sysctl.c b/ipc/ipc_sysctl.c
96558index 8ad93c2..efd80f8 100644
96559--- a/ipc/ipc_sysctl.c
96560+++ b/ipc/ipc_sysctl.c
96561@@ -30,7 +30,7 @@ static void *get_ipc(struct ctl_table *table)
96562 static int proc_ipc_dointvec(struct ctl_table *table, int write,
96563 void __user *buffer, size_t *lenp, loff_t *ppos)
96564 {
96565- struct ctl_table ipc_table;
96566+ ctl_table_no_const ipc_table;
96567
96568 memcpy(&ipc_table, table, sizeof(ipc_table));
96569 ipc_table.data = get_ipc(table);
96570@@ -41,7 +41,7 @@ static int proc_ipc_dointvec(struct ctl_table *table, int write,
96571 static int proc_ipc_dointvec_minmax(struct ctl_table *table, int write,
96572 void __user *buffer, size_t *lenp, loff_t *ppos)
96573 {
96574- struct ctl_table ipc_table;
96575+ ctl_table_no_const ipc_table;
96576
96577 memcpy(&ipc_table, table, sizeof(ipc_table));
96578 ipc_table.data = get_ipc(table);
96579@@ -65,7 +65,7 @@ static int proc_ipc_dointvec_minmax_orphans(struct ctl_table *table, int write,
96580 static int proc_ipc_doulongvec_minmax(struct ctl_table *table, int write,
96581 void __user *buffer, size_t *lenp, loff_t *ppos)
96582 {
96583- struct ctl_table ipc_table;
96584+ ctl_table_no_const ipc_table;
96585 memcpy(&ipc_table, table, sizeof(ipc_table));
96586 ipc_table.data = get_ipc(table);
96587
96588@@ -76,7 +76,7 @@ static int proc_ipc_doulongvec_minmax(struct ctl_table *table, int write,
96589 static int proc_ipc_auto_msgmni(struct ctl_table *table, int write,
96590 void __user *buffer, size_t *lenp, loff_t *ppos)
96591 {
96592- struct ctl_table ipc_table;
96593+ ctl_table_no_const ipc_table;
96594 int dummy = 0;
96595
96596 memcpy(&ipc_table, table, sizeof(ipc_table));
96597diff --git a/ipc/mq_sysctl.c b/ipc/mq_sysctl.c
96598index 68d4e95..1477ded 100644
96599--- a/ipc/mq_sysctl.c
96600+++ b/ipc/mq_sysctl.c
96601@@ -25,7 +25,7 @@ static void *get_mq(struct ctl_table *table)
96602 static int proc_mq_dointvec(struct ctl_table *table, int write,
96603 void __user *buffer, size_t *lenp, loff_t *ppos)
96604 {
96605- struct ctl_table mq_table;
96606+ ctl_table_no_const mq_table;
96607 memcpy(&mq_table, table, sizeof(mq_table));
96608 mq_table.data = get_mq(table);
96609
96610@@ -35,7 +35,7 @@ static int proc_mq_dointvec(struct ctl_table *table, int write,
96611 static int proc_mq_dointvec_minmax(struct ctl_table *table, int write,
96612 void __user *buffer, size_t *lenp, loff_t *ppos)
96613 {
96614- struct ctl_table mq_table;
96615+ ctl_table_no_const mq_table;
96616 memcpy(&mq_table, table, sizeof(mq_table));
96617 mq_table.data = get_mq(table);
96618
96619diff --git a/ipc/mqueue.c b/ipc/mqueue.c
96620index 7635a1c..7432cb6 100644
96621--- a/ipc/mqueue.c
96622+++ b/ipc/mqueue.c
96623@@ -278,6 +278,7 @@ static struct inode *mqueue_get_inode(struct super_block *sb,
96624 mq_bytes = mq_treesize + (info->attr.mq_maxmsg *
96625 info->attr.mq_msgsize);
96626
96627+ gr_learn_resource(current, RLIMIT_MSGQUEUE, u->mq_bytes + mq_bytes, 1);
96628 spin_lock(&mq_lock);
96629 if (u->mq_bytes + mq_bytes < u->mq_bytes ||
96630 u->mq_bytes + mq_bytes > rlimit(RLIMIT_MSGQUEUE)) {
96631diff --git a/ipc/sem.c b/ipc/sem.c
96632index 9284211..bca5b1b 100644
96633--- a/ipc/sem.c
96634+++ b/ipc/sem.c
96635@@ -1780,7 +1780,7 @@ static int get_queue_result(struct sem_queue *q)
96636 }
96637
96638 SYSCALL_DEFINE4(semtimedop, int, semid, struct sembuf __user *, tsops,
96639- unsigned, nsops, const struct timespec __user *, timeout)
96640+ long, nsops, const struct timespec __user *, timeout)
96641 {
96642 int error = -EINVAL;
96643 struct sem_array *sma;
96644@@ -2015,7 +2015,7 @@ out_free:
96645 }
96646
96647 SYSCALL_DEFINE3(semop, int, semid, struct sembuf __user *, tsops,
96648- unsigned, nsops)
96649+ long, nsops)
96650 {
96651 return sys_semtimedop(semid, tsops, nsops, NULL);
96652 }
96653diff --git a/ipc/shm.c b/ipc/shm.c
96654index 19633b4..d454904 100644
96655--- a/ipc/shm.c
96656+++ b/ipc/shm.c
96657@@ -72,6 +72,14 @@ static void shm_destroy(struct ipc_namespace *ns, struct shmid_kernel *shp);
96658 static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
96659 #endif
96660
96661+#ifdef CONFIG_GRKERNSEC
96662+extern int gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
96663+ const u64 shm_createtime, const kuid_t cuid,
96664+ const int shmid);
96665+extern int gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
96666+ const u64 shm_createtime);
96667+#endif
96668+
96669 void shm_init_ns(struct ipc_namespace *ns)
96670 {
96671 ns->shm_ctlmax = SHMMAX;
96672@@ -560,6 +568,9 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
96673 shp->shm_lprid = 0;
96674 shp->shm_atim = shp->shm_dtim = 0;
96675 shp->shm_ctim = get_seconds();
96676+#ifdef CONFIG_GRKERNSEC
96677+ shp->shm_createtime = ktime_get_ns();
96678+#endif
96679 shp->shm_segsz = size;
96680 shp->shm_nattch = 0;
96681 shp->shm_file = file;
96682@@ -1096,6 +1107,12 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
96683 f_mode = FMODE_READ | FMODE_WRITE;
96684 }
96685 if (shmflg & SHM_EXEC) {
96686+
96687+#ifdef CONFIG_PAX_MPROTECT
96688+ if (current->mm->pax_flags & MF_PAX_MPROTECT)
96689+ goto out;
96690+#endif
96691+
96692 prot |= PROT_EXEC;
96693 acc_mode |= S_IXUGO;
96694 }
96695@@ -1120,6 +1137,15 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
96696 if (err)
96697 goto out_unlock;
96698
96699+#ifdef CONFIG_GRKERNSEC
96700+ if (!gr_handle_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime,
96701+ shp->shm_perm.cuid, shmid) ||
96702+ !gr_chroot_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime)) {
96703+ err = -EACCES;
96704+ goto out_unlock;
96705+ }
96706+#endif
96707+
96708 ipc_lock_object(&shp->shm_perm);
96709
96710 /* check if shm_destroy() is tearing down shp */
96711@@ -1132,6 +1158,9 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
96712 path = shp->shm_file->f_path;
96713 path_get(&path);
96714 shp->shm_nattch++;
96715+#ifdef CONFIG_GRKERNSEC
96716+ shp->shm_lapid = current->pid;
96717+#endif
96718 size = i_size_read(path.dentry->d_inode);
96719 ipc_unlock_object(&shp->shm_perm);
96720 rcu_read_unlock();
96721diff --git a/ipc/util.c b/ipc/util.c
96722index 106bed0..f851429 100644
96723--- a/ipc/util.c
96724+++ b/ipc/util.c
96725@@ -71,6 +71,8 @@ struct ipc_proc_iface {
96726 int (*show)(struct seq_file *, void *);
96727 };
96728
96729+extern int gr_ipc_permitted(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, int requested_mode, int granted_mode);
96730+
96731 /**
96732 * ipc_init - initialise ipc subsystem
96733 *
96734@@ -497,6 +499,10 @@ int ipcperms(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, short flag)
96735 granted_mode >>= 6;
96736 else if (in_group_p(ipcp->cgid) || in_group_p(ipcp->gid))
96737 granted_mode >>= 3;
96738+
96739+ if (!gr_ipc_permitted(ns, ipcp, requested_mode, granted_mode))
96740+ return -1;
96741+
96742 /* is there some bit set in requested_mode but not in granted_mode? */
96743 if ((requested_mode & ~granted_mode & 0007) &&
96744 !ns_capable(ns->user_ns, CAP_IPC_OWNER))
96745diff --git a/kernel/audit.c b/kernel/audit.c
96746index 72ab759..757deba 100644
96747--- a/kernel/audit.c
96748+++ b/kernel/audit.c
96749@@ -122,7 +122,7 @@ u32 audit_sig_sid = 0;
96750 3) suppressed due to audit_rate_limit
96751 4) suppressed due to audit_backlog_limit
96752 */
96753-static atomic_t audit_lost = ATOMIC_INIT(0);
96754+static atomic_unchecked_t audit_lost = ATOMIC_INIT(0);
96755
96756 /* The netlink socket. */
96757 static struct sock *audit_sock;
96758@@ -256,7 +256,7 @@ void audit_log_lost(const char *message)
96759 unsigned long now;
96760 int print;
96761
96762- atomic_inc(&audit_lost);
96763+ atomic_inc_unchecked(&audit_lost);
96764
96765 print = (audit_failure == AUDIT_FAIL_PANIC || !audit_rate_limit);
96766
96767@@ -273,7 +273,7 @@ void audit_log_lost(const char *message)
96768 if (print) {
96769 if (printk_ratelimit())
96770 pr_warn("audit_lost=%u audit_rate_limit=%u audit_backlog_limit=%u\n",
96771- atomic_read(&audit_lost),
96772+ atomic_read_unchecked(&audit_lost),
96773 audit_rate_limit,
96774 audit_backlog_limit);
96775 audit_panic(message);
96776@@ -831,7 +831,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
96777 s.pid = audit_pid;
96778 s.rate_limit = audit_rate_limit;
96779 s.backlog_limit = audit_backlog_limit;
96780- s.lost = atomic_read(&audit_lost);
96781+ s.lost = atomic_read_unchecked(&audit_lost);
96782 s.backlog = skb_queue_len(&audit_skb_queue);
96783 s.feature_bitmap = AUDIT_FEATURE_BITMAP_ALL;
96784 s.backlog_wait_time = audit_backlog_wait_time;
96785diff --git a/kernel/auditsc.c b/kernel/auditsc.c
96786index dc4ae70..2a2bddc 100644
96787--- a/kernel/auditsc.c
96788+++ b/kernel/auditsc.c
96789@@ -1955,7 +1955,7 @@ int auditsc_get_stamp(struct audit_context *ctx,
96790 }
96791
96792 /* global counter which is incremented every time something logs in */
96793-static atomic_t session_id = ATOMIC_INIT(0);
96794+static atomic_unchecked_t session_id = ATOMIC_INIT(0);
96795
96796 static int audit_set_loginuid_perm(kuid_t loginuid)
96797 {
96798@@ -2022,7 +2022,7 @@ int audit_set_loginuid(kuid_t loginuid)
96799
96800 /* are we setting or clearing? */
96801 if (uid_valid(loginuid))
96802- sessionid = (unsigned int)atomic_inc_return(&session_id);
96803+ sessionid = (unsigned int)atomic_inc_return_unchecked(&session_id);
96804
96805 task->sessionid = sessionid;
96806 task->loginuid = loginuid;
96807diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c
96808index 0c5796e..a9414e2 100644
96809--- a/kernel/bpf/core.c
96810+++ b/kernel/bpf/core.c
96811@@ -143,14 +143,17 @@ bpf_jit_binary_alloc(unsigned int proglen, u8 **image_ptr,
96812 * random section of illegal instructions.
96813 */
96814 size = round_up(proglen + sizeof(*hdr) + 128, PAGE_SIZE);
96815- hdr = module_alloc(size);
96816+ hdr = module_alloc_exec(size);
96817 if (hdr == NULL)
96818 return NULL;
96819
96820 /* Fill space with illegal/arch-dep instructions. */
96821 bpf_fill_ill_insns(hdr, size);
96822
96823+ pax_open_kernel();
96824 hdr->pages = size / PAGE_SIZE;
96825+ pax_close_kernel();
96826+
96827 hole = min_t(unsigned int, size - (proglen + sizeof(*hdr)),
96828 PAGE_SIZE - sizeof(*hdr));
96829 start = (prandom_u32() % hole) & ~(alignment - 1);
96830@@ -163,7 +166,7 @@ bpf_jit_binary_alloc(unsigned int proglen, u8 **image_ptr,
96831
96832 void bpf_jit_binary_free(struct bpf_binary_header *hdr)
96833 {
96834- module_memfree(hdr);
96835+ module_memfree_exec(hdr);
96836 }
96837 #endif /* CONFIG_BPF_JIT */
96838
96839diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
96840index 536edc2..d28c85d 100644
96841--- a/kernel/bpf/syscall.c
96842+++ b/kernel/bpf/syscall.c
96843@@ -548,11 +548,15 @@ SYSCALL_DEFINE3(bpf, int, cmd, union bpf_attr __user *, uattr, unsigned int, siz
96844 int err;
96845
96846 /* the syscall is limited to root temporarily. This restriction will be
96847- * lifted when security audit is clean. Note that eBPF+tracing must have
96848- * this restriction, since it may pass kernel data to user space
96849+ * lifted by upstream when a half-assed security audit is clean. Note
96850+ * that eBPF+tracing must have this restriction, since it may pass
96851+ * kernel data to user space
96852 */
96853 if (!capable(CAP_SYS_ADMIN))
96854 return -EPERM;
96855+#ifdef CONFIG_GRKERNSEC
96856+ return -EPERM;
96857+#endif
96858
96859 if (!access_ok(VERIFY_READ, uattr, 1))
96860 return -EFAULT;
96861diff --git a/kernel/capability.c b/kernel/capability.c
96862index 989f5bf..d317ca0 100644
96863--- a/kernel/capability.c
96864+++ b/kernel/capability.c
96865@@ -192,6 +192,9 @@ SYSCALL_DEFINE2(capget, cap_user_header_t, header, cap_user_data_t, dataptr)
96866 * before modification is attempted and the application
96867 * fails.
96868 */
96869+ if (tocopy > ARRAY_SIZE(kdata))
96870+ return -EFAULT;
96871+
96872 if (copy_to_user(dataptr, kdata, tocopy
96873 * sizeof(struct __user_cap_data_struct))) {
96874 return -EFAULT;
96875@@ -297,10 +300,11 @@ bool has_ns_capability(struct task_struct *t,
96876 int ret;
96877
96878 rcu_read_lock();
96879- ret = security_capable(__task_cred(t), ns, cap);
96880+ ret = security_capable(__task_cred(t), ns, cap) == 0 &&
96881+ gr_task_is_capable(t, __task_cred(t), cap);
96882 rcu_read_unlock();
96883
96884- return (ret == 0);
96885+ return ret;
96886 }
96887
96888 /**
96889@@ -337,10 +341,10 @@ bool has_ns_capability_noaudit(struct task_struct *t,
96890 int ret;
96891
96892 rcu_read_lock();
96893- ret = security_capable_noaudit(__task_cred(t), ns, cap);
96894+ ret = security_capable_noaudit(__task_cred(t), ns, cap) == 0 && gr_task_is_capable_nolog(t, cap);
96895 rcu_read_unlock();
96896
96897- return (ret == 0);
96898+ return ret;
96899 }
96900
96901 /**
96902@@ -378,7 +382,7 @@ bool ns_capable(struct user_namespace *ns, int cap)
96903 BUG();
96904 }
96905
96906- if (security_capable(current_cred(), ns, cap) == 0) {
96907+ if (security_capable(current_cred(), ns, cap) == 0 && gr_is_capable(cap)) {
96908 current->flags |= PF_SUPERPRIV;
96909 return true;
96910 }
96911@@ -386,6 +390,21 @@ bool ns_capable(struct user_namespace *ns, int cap)
96912 }
96913 EXPORT_SYMBOL(ns_capable);
96914
96915+bool ns_capable_nolog(struct user_namespace *ns, int cap)
96916+{
96917+ if (unlikely(!cap_valid(cap))) {
96918+ printk(KERN_CRIT "capable_nolog() called with invalid cap=%u\n", cap);
96919+ BUG();
96920+ }
96921+
96922+ if (security_capable_noaudit(current_cred(), ns, cap) == 0 && gr_is_capable_nolog(cap)) {
96923+ current->flags |= PF_SUPERPRIV;
96924+ return true;
96925+ }
96926+ return false;
96927+}
96928+EXPORT_SYMBOL(ns_capable_nolog);
96929+
96930 /**
96931 * file_ns_capable - Determine if the file's opener had a capability in effect
96932 * @file: The file we want to check
96933@@ -427,6 +446,12 @@ bool capable(int cap)
96934 }
96935 EXPORT_SYMBOL(capable);
96936
96937+bool capable_nolog(int cap)
96938+{
96939+ return ns_capable_nolog(&init_user_ns, cap);
96940+}
96941+EXPORT_SYMBOL(capable_nolog);
96942+
96943 /**
96944 * capable_wrt_inode_uidgid - Check nsown_capable and uid and gid mapped
96945 * @inode: The inode in question
96946@@ -444,3 +469,12 @@ bool capable_wrt_inode_uidgid(const struct inode *inode, int cap)
96947 kgid_has_mapping(ns, inode->i_gid);
96948 }
96949 EXPORT_SYMBOL(capable_wrt_inode_uidgid);
96950+
96951+bool capable_wrt_inode_uidgid_nolog(const struct inode *inode, int cap)
96952+{
96953+ struct user_namespace *ns = current_user_ns();
96954+
96955+ return ns_capable_nolog(ns, cap) && kuid_has_mapping(ns, inode->i_uid) &&
96956+ kgid_has_mapping(ns, inode->i_gid);
96957+}
96958+EXPORT_SYMBOL(capable_wrt_inode_uidgid_nolog);
96959diff --git a/kernel/cgroup.c b/kernel/cgroup.c
96960index 29a7b2c..a64e30a 100644
96961--- a/kernel/cgroup.c
96962+++ b/kernel/cgroup.c
96963@@ -5347,6 +5347,9 @@ static void cgroup_release_agent(struct work_struct *work)
96964 if (!pathbuf || !agentbuf)
96965 goto out;
96966
96967+ if (agentbuf[0] == '\0')
96968+ goto out;
96969+
96970 path = cgroup_path(cgrp, pathbuf, PATH_MAX);
96971 if (!path)
96972 goto out;
96973@@ -5532,7 +5535,7 @@ static int cgroup_css_links_read(struct seq_file *seq, void *v)
96974 struct task_struct *task;
96975 int count = 0;
96976
96977- seq_printf(seq, "css_set %p\n", cset);
96978+ seq_printf(seq, "css_set %pK\n", cset);
96979
96980 list_for_each_entry(task, &cset->tasks, cg_list) {
96981 if (count++ > MAX_TASKS_SHOWN_PER_CSS)
96982diff --git a/kernel/compat.c b/kernel/compat.c
96983index 24f0061..762ec00 100644
96984--- a/kernel/compat.c
96985+++ b/kernel/compat.c
96986@@ -13,6 +13,7 @@
96987
96988 #include <linux/linkage.h>
96989 #include <linux/compat.h>
96990+#include <linux/module.h>
96991 #include <linux/errno.h>
96992 #include <linux/time.h>
96993 #include <linux/signal.h>
96994@@ -220,7 +221,7 @@ static long compat_nanosleep_restart(struct restart_block *restart)
96995 mm_segment_t oldfs;
96996 long ret;
96997
96998- restart->nanosleep.rmtp = (struct timespec __user *) &rmt;
96999+ restart->nanosleep.rmtp = (struct timespec __force_user *) &rmt;
97000 oldfs = get_fs();
97001 set_fs(KERNEL_DS);
97002 ret = hrtimer_nanosleep_restart(restart);
97003@@ -252,7 +253,7 @@ COMPAT_SYSCALL_DEFINE2(nanosleep, struct compat_timespec __user *, rqtp,
97004 oldfs = get_fs();
97005 set_fs(KERNEL_DS);
97006 ret = hrtimer_nanosleep(&tu,
97007- rmtp ? (struct timespec __user *)&rmt : NULL,
97008+ rmtp ? (struct timespec __force_user *)&rmt : NULL,
97009 HRTIMER_MODE_REL, CLOCK_MONOTONIC);
97010 set_fs(oldfs);
97011
97012@@ -378,7 +379,7 @@ COMPAT_SYSCALL_DEFINE1(sigpending, compat_old_sigset_t __user *, set)
97013 mm_segment_t old_fs = get_fs();
97014
97015 set_fs(KERNEL_DS);
97016- ret = sys_sigpending((old_sigset_t __user *) &s);
97017+ ret = sys_sigpending((old_sigset_t __force_user *) &s);
97018 set_fs(old_fs);
97019 if (ret == 0)
97020 ret = put_user(s, set);
97021@@ -468,7 +469,7 @@ COMPAT_SYSCALL_DEFINE2(old_getrlimit, unsigned int, resource,
97022 mm_segment_t old_fs = get_fs();
97023
97024 set_fs(KERNEL_DS);
97025- ret = sys_old_getrlimit(resource, (struct rlimit __user *)&r);
97026+ ret = sys_old_getrlimit(resource, (struct rlimit __force_user *)&r);
97027 set_fs(old_fs);
97028
97029 if (!ret) {
97030@@ -550,8 +551,8 @@ COMPAT_SYSCALL_DEFINE4(wait4,
97031 set_fs (KERNEL_DS);
97032 ret = sys_wait4(pid,
97033 (stat_addr ?
97034- (unsigned int __user *) &status : NULL),
97035- options, (struct rusage __user *) &r);
97036+ (unsigned int __force_user *) &status : NULL),
97037+ options, (struct rusage __force_user *) &r);
97038 set_fs (old_fs);
97039
97040 if (ret > 0) {
97041@@ -577,8 +578,8 @@ COMPAT_SYSCALL_DEFINE5(waitid,
97042 memset(&info, 0, sizeof(info));
97043
97044 set_fs(KERNEL_DS);
97045- ret = sys_waitid(which, pid, (siginfo_t __user *)&info, options,
97046- uru ? (struct rusage __user *)&ru : NULL);
97047+ ret = sys_waitid(which, pid, (siginfo_t __force_user *)&info, options,
97048+ uru ? (struct rusage __force_user *)&ru : NULL);
97049 set_fs(old_fs);
97050
97051 if ((ret < 0) || (info.si_signo == 0))
97052@@ -712,8 +713,8 @@ COMPAT_SYSCALL_DEFINE4(timer_settime, timer_t, timer_id, int, flags,
97053 oldfs = get_fs();
97054 set_fs(KERNEL_DS);
97055 err = sys_timer_settime(timer_id, flags,
97056- (struct itimerspec __user *) &newts,
97057- (struct itimerspec __user *) &oldts);
97058+ (struct itimerspec __force_user *) &newts,
97059+ (struct itimerspec __force_user *) &oldts);
97060 set_fs(oldfs);
97061 if (!err && old && put_compat_itimerspec(old, &oldts))
97062 return -EFAULT;
97063@@ -730,7 +731,7 @@ COMPAT_SYSCALL_DEFINE2(timer_gettime, timer_t, timer_id,
97064 oldfs = get_fs();
97065 set_fs(KERNEL_DS);
97066 err = sys_timer_gettime(timer_id,
97067- (struct itimerspec __user *) &ts);
97068+ (struct itimerspec __force_user *) &ts);
97069 set_fs(oldfs);
97070 if (!err && put_compat_itimerspec(setting, &ts))
97071 return -EFAULT;
97072@@ -749,7 +750,7 @@ COMPAT_SYSCALL_DEFINE2(clock_settime, clockid_t, which_clock,
97073 oldfs = get_fs();
97074 set_fs(KERNEL_DS);
97075 err = sys_clock_settime(which_clock,
97076- (struct timespec __user *) &ts);
97077+ (struct timespec __force_user *) &ts);
97078 set_fs(oldfs);
97079 return err;
97080 }
97081@@ -764,7 +765,7 @@ COMPAT_SYSCALL_DEFINE2(clock_gettime, clockid_t, which_clock,
97082 oldfs = get_fs();
97083 set_fs(KERNEL_DS);
97084 err = sys_clock_gettime(which_clock,
97085- (struct timespec __user *) &ts);
97086+ (struct timespec __force_user *) &ts);
97087 set_fs(oldfs);
97088 if (!err && compat_put_timespec(&ts, tp))
97089 return -EFAULT;
97090@@ -784,7 +785,7 @@ COMPAT_SYSCALL_DEFINE2(clock_adjtime, clockid_t, which_clock,
97091
97092 oldfs = get_fs();
97093 set_fs(KERNEL_DS);
97094- ret = sys_clock_adjtime(which_clock, (struct timex __user *) &txc);
97095+ ret = sys_clock_adjtime(which_clock, (struct timex __force_user *) &txc);
97096 set_fs(oldfs);
97097
97098 err = compat_put_timex(utp, &txc);
97099@@ -804,7 +805,7 @@ COMPAT_SYSCALL_DEFINE2(clock_getres, clockid_t, which_clock,
97100 oldfs = get_fs();
97101 set_fs(KERNEL_DS);
97102 err = sys_clock_getres(which_clock,
97103- (struct timespec __user *) &ts);
97104+ (struct timespec __force_user *) &ts);
97105 set_fs(oldfs);
97106 if (!err && tp && compat_put_timespec(&ts, tp))
97107 return -EFAULT;
97108@@ -818,7 +819,7 @@ static long compat_clock_nanosleep_restart(struct restart_block *restart)
97109 struct timespec tu;
97110 struct compat_timespec __user *rmtp = restart->nanosleep.compat_rmtp;
97111
97112- restart->nanosleep.rmtp = (struct timespec __user *) &tu;
97113+ restart->nanosleep.rmtp = (struct timespec __force_user *) &tu;
97114 oldfs = get_fs();
97115 set_fs(KERNEL_DS);
97116 err = clock_nanosleep_restart(restart);
97117@@ -850,8 +851,8 @@ COMPAT_SYSCALL_DEFINE4(clock_nanosleep, clockid_t, which_clock, int, flags,
97118 oldfs = get_fs();
97119 set_fs(KERNEL_DS);
97120 err = sys_clock_nanosleep(which_clock, flags,
97121- (struct timespec __user *) &in,
97122- (struct timespec __user *) &out);
97123+ (struct timespec __force_user *) &in,
97124+ (struct timespec __force_user *) &out);
97125 set_fs(oldfs);
97126
97127 if ((err == -ERESTART_RESTARTBLOCK) && rmtp &&
97128@@ -912,7 +913,8 @@ long compat_get_bitmap(unsigned long *mask, const compat_ulong_t __user *umask,
97129 * bitmap. We must however ensure the end of the
97130 * kernel bitmap is zeroed.
97131 */
97132- if (nr_compat_longs-- > 0) {
97133+ if (nr_compat_longs) {
97134+ nr_compat_longs--;
97135 if (__get_user(um, umask))
97136 return -EFAULT;
97137 } else {
97138@@ -954,7 +956,8 @@ long compat_put_bitmap(compat_ulong_t __user *umask, unsigned long *mask,
97139 * We dont want to write past the end of the userspace
97140 * bitmap.
97141 */
97142- if (nr_compat_longs-- > 0) {
97143+ if (nr_compat_longs) {
97144+ nr_compat_longs--;
97145 if (__put_user(um, umask))
97146 return -EFAULT;
97147 }
97148@@ -1145,7 +1148,7 @@ COMPAT_SYSCALL_DEFINE2(sched_rr_get_interval,
97149 mm_segment_t old_fs = get_fs();
97150
97151 set_fs(KERNEL_DS);
97152- ret = sys_sched_rr_get_interval(pid, (struct timespec __user *)&t);
97153+ ret = sys_sched_rr_get_interval(pid, (struct timespec __force_user *)&t);
97154 set_fs(old_fs);
97155 if (compat_put_timespec(&t, interval))
97156 return -EFAULT;
97157diff --git a/kernel/configs.c b/kernel/configs.c
97158index c18b1f1..b9a0132 100644
97159--- a/kernel/configs.c
97160+++ b/kernel/configs.c
97161@@ -74,8 +74,19 @@ static int __init ikconfig_init(void)
97162 struct proc_dir_entry *entry;
97163
97164 /* create the current config file */
97165+#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
97166+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_HIDESYM)
97167+ entry = proc_create("config.gz", S_IFREG | S_IRUSR, NULL,
97168+ &ikconfig_file_ops);
97169+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
97170+ entry = proc_create("config.gz", S_IFREG | S_IRUSR | S_IRGRP, NULL,
97171+ &ikconfig_file_ops);
97172+#endif
97173+#else
97174 entry = proc_create("config.gz", S_IFREG | S_IRUGO, NULL,
97175 &ikconfig_file_ops);
97176+#endif
97177+
97178 if (!entry)
97179 return -ENOMEM;
97180
97181diff --git a/kernel/cred.c b/kernel/cred.c
97182index e0573a4..26c0fd3 100644
97183--- a/kernel/cred.c
97184+++ b/kernel/cred.c
97185@@ -164,6 +164,16 @@ void exit_creds(struct task_struct *tsk)
97186 validate_creds(cred);
97187 alter_cred_subscribers(cred, -1);
97188 put_cred(cred);
97189+
97190+#ifdef CONFIG_GRKERNSEC_SETXID
97191+ cred = (struct cred *) tsk->delayed_cred;
97192+ if (cred != NULL) {
97193+ tsk->delayed_cred = NULL;
97194+ validate_creds(cred);
97195+ alter_cred_subscribers(cred, -1);
97196+ put_cred(cred);
97197+ }
97198+#endif
97199 }
97200
97201 /**
97202@@ -411,7 +421,7 @@ static bool cred_cap_issubset(const struct cred *set, const struct cred *subset)
97203 * Always returns 0 thus allowing this function to be tail-called at the end
97204 * of, say, sys_setgid().
97205 */
97206-int commit_creds(struct cred *new)
97207+static int __commit_creds(struct cred *new)
97208 {
97209 struct task_struct *task = current;
97210 const struct cred *old = task->real_cred;
97211@@ -430,6 +440,8 @@ int commit_creds(struct cred *new)
97212
97213 get_cred(new); /* we will require a ref for the subj creds too */
97214
97215+ gr_set_role_label(task, new->uid, new->gid);
97216+
97217 /* dumpability changes */
97218 if (!uid_eq(old->euid, new->euid) ||
97219 !gid_eq(old->egid, new->egid) ||
97220@@ -479,6 +491,105 @@ int commit_creds(struct cred *new)
97221 put_cred(old);
97222 return 0;
97223 }
97224+#ifdef CONFIG_GRKERNSEC_SETXID
97225+extern int set_user(struct cred *new);
97226+
97227+void gr_delayed_cred_worker(void)
97228+{
97229+ const struct cred *new = current->delayed_cred;
97230+ struct cred *ncred;
97231+
97232+ current->delayed_cred = NULL;
97233+
97234+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID) && new != NULL) {
97235+ // from doing get_cred on it when queueing this
97236+ put_cred(new);
97237+ return;
97238+ } else if (new == NULL)
97239+ return;
97240+
97241+ ncred = prepare_creds();
97242+ if (!ncred)
97243+ goto die;
97244+ // uids
97245+ ncred->uid = new->uid;
97246+ ncred->euid = new->euid;
97247+ ncred->suid = new->suid;
97248+ ncred->fsuid = new->fsuid;
97249+ // gids
97250+ ncred->gid = new->gid;
97251+ ncred->egid = new->egid;
97252+ ncred->sgid = new->sgid;
97253+ ncred->fsgid = new->fsgid;
97254+ // groups
97255+ set_groups(ncred, new->group_info);
97256+ // caps
97257+ ncred->securebits = new->securebits;
97258+ ncred->cap_inheritable = new->cap_inheritable;
97259+ ncred->cap_permitted = new->cap_permitted;
97260+ ncred->cap_effective = new->cap_effective;
97261+ ncred->cap_bset = new->cap_bset;
97262+
97263+ if (set_user(ncred)) {
97264+ abort_creds(ncred);
97265+ goto die;
97266+ }
97267+
97268+ // from doing get_cred on it when queueing this
97269+ put_cred(new);
97270+
97271+ __commit_creds(ncred);
97272+ return;
97273+die:
97274+ // from doing get_cred on it when queueing this
97275+ put_cred(new);
97276+ do_group_exit(SIGKILL);
97277+}
97278+#endif
97279+
97280+int commit_creds(struct cred *new)
97281+{
97282+#ifdef CONFIG_GRKERNSEC_SETXID
97283+ int ret;
97284+ int schedule_it = 0;
97285+ struct task_struct *t;
97286+ unsigned oldsecurebits = current_cred()->securebits;
97287+
97288+ /* we won't get called with tasklist_lock held for writing
97289+ and interrupts disabled as the cred struct in that case is
97290+ init_cred
97291+ */
97292+ if (grsec_enable_setxid && !current_is_single_threaded() &&
97293+ uid_eq(current_uid(), GLOBAL_ROOT_UID) &&
97294+ !uid_eq(new->uid, GLOBAL_ROOT_UID)) {
97295+ schedule_it = 1;
97296+ }
97297+ ret = __commit_creds(new);
97298+ if (schedule_it) {
97299+ rcu_read_lock();
97300+ read_lock(&tasklist_lock);
97301+ for (t = next_thread(current); t != current;
97302+ t = next_thread(t)) {
97303+ /* we'll check if the thread has uid 0 in
97304+ * the delayed worker routine
97305+ */
97306+ if (task_securebits(t) == oldsecurebits &&
97307+ t->delayed_cred == NULL) {
97308+ t->delayed_cred = get_cred(new);
97309+ set_tsk_thread_flag(t, TIF_GRSEC_SETXID);
97310+ set_tsk_need_resched(t);
97311+ }
97312+ }
97313+ read_unlock(&tasklist_lock);
97314+ rcu_read_unlock();
97315+ }
97316+
97317+ return ret;
97318+#else
97319+ return __commit_creds(new);
97320+#endif
97321+}
97322+
97323 EXPORT_SYMBOL(commit_creds);
97324
97325 /**
97326diff --git a/kernel/debug/debug_core.c b/kernel/debug/debug_core.c
97327index 0874e2e..5b32cc9 100644
97328--- a/kernel/debug/debug_core.c
97329+++ b/kernel/debug/debug_core.c
97330@@ -127,7 +127,7 @@ static DEFINE_RAW_SPINLOCK(dbg_slave_lock);
97331 */
97332 static atomic_t masters_in_kgdb;
97333 static atomic_t slaves_in_kgdb;
97334-static atomic_t kgdb_break_tasklet_var;
97335+static atomic_unchecked_t kgdb_break_tasklet_var;
97336 atomic_t kgdb_setting_breakpoint;
97337
97338 struct task_struct *kgdb_usethread;
97339@@ -137,7 +137,7 @@ int kgdb_single_step;
97340 static pid_t kgdb_sstep_pid;
97341
97342 /* to keep track of the CPU which is doing the single stepping*/
97343-atomic_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
97344+atomic_unchecked_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
97345
97346 /*
97347 * If you are debugging a problem where roundup (the collection of
97348@@ -552,7 +552,7 @@ return_normal:
97349 * kernel will only try for the value of sstep_tries before
97350 * giving up and continuing on.
97351 */
97352- if (atomic_read(&kgdb_cpu_doing_single_step) != -1 &&
97353+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1 &&
97354 (kgdb_info[cpu].task &&
97355 kgdb_info[cpu].task->pid != kgdb_sstep_pid) && --sstep_tries) {
97356 atomic_set(&kgdb_active, -1);
97357@@ -654,8 +654,8 @@ cpu_master_loop:
97358 }
97359
97360 kgdb_restore:
97361- if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
97362- int sstep_cpu = atomic_read(&kgdb_cpu_doing_single_step);
97363+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1) {
97364+ int sstep_cpu = atomic_read_unchecked(&kgdb_cpu_doing_single_step);
97365 if (kgdb_info[sstep_cpu].task)
97366 kgdb_sstep_pid = kgdb_info[sstep_cpu].task->pid;
97367 else
97368@@ -949,18 +949,18 @@ static void kgdb_unregister_callbacks(void)
97369 static void kgdb_tasklet_bpt(unsigned long ing)
97370 {
97371 kgdb_breakpoint();
97372- atomic_set(&kgdb_break_tasklet_var, 0);
97373+ atomic_set_unchecked(&kgdb_break_tasklet_var, 0);
97374 }
97375
97376 static DECLARE_TASKLET(kgdb_tasklet_breakpoint, kgdb_tasklet_bpt, 0);
97377
97378 void kgdb_schedule_breakpoint(void)
97379 {
97380- if (atomic_read(&kgdb_break_tasklet_var) ||
97381+ if (atomic_read_unchecked(&kgdb_break_tasklet_var) ||
97382 atomic_read(&kgdb_active) != -1 ||
97383 atomic_read(&kgdb_setting_breakpoint))
97384 return;
97385- atomic_inc(&kgdb_break_tasklet_var);
97386+ atomic_inc_unchecked(&kgdb_break_tasklet_var);
97387 tasklet_schedule(&kgdb_tasklet_breakpoint);
97388 }
97389 EXPORT_SYMBOL_GPL(kgdb_schedule_breakpoint);
97390diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c
97391index 41213454..861e178 100644
97392--- a/kernel/debug/kdb/kdb_main.c
97393+++ b/kernel/debug/kdb/kdb_main.c
97394@@ -2021,7 +2021,7 @@ static int kdb_lsmod(int argc, const char **argv)
97395 continue;
97396
97397 kdb_printf("%-20s%8u 0x%p ", mod->name,
97398- mod->core_size, (void *)mod);
97399+ mod->core_size_rx + mod->core_size_rw, (void *)mod);
97400 #ifdef CONFIG_MODULE_UNLOAD
97401 kdb_printf("%4d ", module_refcount(mod));
97402 #endif
97403@@ -2031,7 +2031,7 @@ static int kdb_lsmod(int argc, const char **argv)
97404 kdb_printf(" (Loading)");
97405 else
97406 kdb_printf(" (Live)");
97407- kdb_printf(" 0x%p", mod->module_core);
97408+ kdb_printf(" 0x%p 0x%p", mod->module_core_rx, mod->module_core_rw);
97409
97410 #ifdef CONFIG_MODULE_UNLOAD
97411 {
97412diff --git a/kernel/events/core.c b/kernel/events/core.c
97413index 2fabc06..79cceec 100644
97414--- a/kernel/events/core.c
97415+++ b/kernel/events/core.c
97416@@ -170,8 +170,15 @@ static struct srcu_struct pmus_srcu;
97417 * 0 - disallow raw tracepoint access for unpriv
97418 * 1 - disallow cpu events for unpriv
97419 * 2 - disallow kernel profiling for unpriv
97420+ * 3 - disallow all unpriv perf event use
97421 */
97422-int sysctl_perf_event_paranoid __read_mostly = 1;
97423+#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
97424+int sysctl_perf_event_legitimately_concerned __read_mostly = 3;
97425+#elif defined(CONFIG_GRKERNSEC_HIDESYM)
97426+int sysctl_perf_event_legitimately_concerned __read_mostly = 2;
97427+#else
97428+int sysctl_perf_event_legitimately_concerned __read_mostly = 1;
97429+#endif
97430
97431 /* Minimum for 512 kiB + 1 user control page */
97432 int sysctl_perf_event_mlock __read_mostly = 512 + (PAGE_SIZE / 1024); /* 'free' kiB per user */
97433@@ -197,7 +204,7 @@ void update_perf_cpu_limits(void)
97434
97435 tmp *= sysctl_perf_cpu_time_max_percent;
97436 do_div(tmp, 100);
97437- ACCESS_ONCE(perf_sample_allowed_ns) = tmp;
97438+ ACCESS_ONCE_RW(perf_sample_allowed_ns) = tmp;
97439 }
97440
97441 static int perf_rotate_context(struct perf_cpu_context *cpuctx);
97442@@ -303,7 +310,7 @@ void perf_sample_event_took(u64 sample_len_ns)
97443 }
97444 }
97445
97446-static atomic64_t perf_event_id;
97447+static atomic64_unchecked_t perf_event_id;
97448
97449 static void cpu_ctx_sched_out(struct perf_cpu_context *cpuctx,
97450 enum event_type_t event_type);
97451@@ -3220,7 +3227,7 @@ static void __perf_event_read(void *info)
97452
97453 static inline u64 perf_event_count(struct perf_event *event)
97454 {
97455- return local64_read(&event->count) + atomic64_read(&event->child_count);
97456+ return local64_read(&event->count) + atomic64_read_unchecked(&event->child_count);
97457 }
97458
97459 static u64 perf_event_read(struct perf_event *event)
97460@@ -3656,9 +3663,9 @@ u64 perf_event_read_value(struct perf_event *event, u64 *enabled, u64 *running)
97461 mutex_lock(&event->child_mutex);
97462 total += perf_event_read(event);
97463 *enabled += event->total_time_enabled +
97464- atomic64_read(&event->child_total_time_enabled);
97465+ atomic64_read_unchecked(&event->child_total_time_enabled);
97466 *running += event->total_time_running +
97467- atomic64_read(&event->child_total_time_running);
97468+ atomic64_read_unchecked(&event->child_total_time_running);
97469
97470 list_for_each_entry(child, &event->child_list, child_list) {
97471 total += perf_event_read(child);
97472@@ -4147,10 +4154,10 @@ void perf_event_update_userpage(struct perf_event *event)
97473 userpg->offset -= local64_read(&event->hw.prev_count);
97474
97475 userpg->time_enabled = enabled +
97476- atomic64_read(&event->child_total_time_enabled);
97477+ atomic64_read_unchecked(&event->child_total_time_enabled);
97478
97479 userpg->time_running = running +
97480- atomic64_read(&event->child_total_time_running);
97481+ atomic64_read_unchecked(&event->child_total_time_running);
97482
97483 arch_perf_update_userpage(event, userpg, now);
97484
97485@@ -4740,7 +4747,7 @@ perf_output_sample_ustack(struct perf_output_handle *handle, u64 dump_size,
97486
97487 /* Data. */
97488 sp = perf_user_stack_pointer(regs);
97489- rem = __output_copy_user(handle, (void *) sp, dump_size);
97490+ rem = __output_copy_user(handle, (void __user *) sp, dump_size);
97491 dyn_size = dump_size - rem;
97492
97493 perf_output_skip(handle, rem);
97494@@ -4831,11 +4838,11 @@ static void perf_output_read_one(struct perf_output_handle *handle,
97495 values[n++] = perf_event_count(event);
97496 if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) {
97497 values[n++] = enabled +
97498- atomic64_read(&event->child_total_time_enabled);
97499+ atomic64_read_unchecked(&event->child_total_time_enabled);
97500 }
97501 if (read_format & PERF_FORMAT_TOTAL_TIME_RUNNING) {
97502 values[n++] = running +
97503- atomic64_read(&event->child_total_time_running);
97504+ atomic64_read_unchecked(&event->child_total_time_running);
97505 }
97506 if (read_format & PERF_FORMAT_ID)
97507 values[n++] = primary_event_id(event);
97508@@ -7180,7 +7187,7 @@ perf_event_alloc(struct perf_event_attr *attr, int cpu,
97509 event->parent = parent_event;
97510
97511 event->ns = get_pid_ns(task_active_pid_ns(current));
97512- event->id = atomic64_inc_return(&perf_event_id);
97513+ event->id = atomic64_inc_return_unchecked(&perf_event_id);
97514
97515 event->state = PERF_EVENT_STATE_INACTIVE;
97516
97517@@ -7470,6 +7477,11 @@ SYSCALL_DEFINE5(perf_event_open,
97518 if (flags & ~PERF_FLAG_ALL)
97519 return -EINVAL;
97520
97521+#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
97522+ if (perf_paranoid_any() && !capable(CAP_SYS_ADMIN))
97523+ return -EACCES;
97524+#endif
97525+
97526 err = perf_copy_attr(attr_uptr, &attr);
97527 if (err)
97528 return err;
97529@@ -7892,10 +7904,10 @@ static void sync_child_event(struct perf_event *child_event,
97530 /*
97531 * Add back the child's count to the parent's count:
97532 */
97533- atomic64_add(child_val, &parent_event->child_count);
97534- atomic64_add(child_event->total_time_enabled,
97535+ atomic64_add_unchecked(child_val, &parent_event->child_count);
97536+ atomic64_add_unchecked(child_event->total_time_enabled,
97537 &parent_event->child_total_time_enabled);
97538- atomic64_add(child_event->total_time_running,
97539+ atomic64_add_unchecked(child_event->total_time_running,
97540 &parent_event->child_total_time_running);
97541
97542 /*
97543diff --git a/kernel/events/internal.h b/kernel/events/internal.h
97544index 569b2187..19940d9 100644
97545--- a/kernel/events/internal.h
97546+++ b/kernel/events/internal.h
97547@@ -81,10 +81,10 @@ static inline unsigned long perf_data_size(struct ring_buffer *rb)
97548 return rb->nr_pages << (PAGE_SHIFT + page_order(rb));
97549 }
97550
97551-#define DEFINE_OUTPUT_COPY(func_name, memcpy_func) \
97552+#define DEFINE_OUTPUT_COPY(func_name, memcpy_func, user) \
97553 static inline unsigned long \
97554 func_name(struct perf_output_handle *handle, \
97555- const void *buf, unsigned long len) \
97556+ const void user *buf, unsigned long len) \
97557 { \
97558 unsigned long size, written; \
97559 \
97560@@ -117,7 +117,7 @@ memcpy_common(void *dst, const void *src, unsigned long n)
97561 return 0;
97562 }
97563
97564-DEFINE_OUTPUT_COPY(__output_copy, memcpy_common)
97565+DEFINE_OUTPUT_COPY(__output_copy, memcpy_common, )
97566
97567 static inline unsigned long
97568 memcpy_skip(void *dst, const void *src, unsigned long n)
97569@@ -125,7 +125,7 @@ memcpy_skip(void *dst, const void *src, unsigned long n)
97570 return 0;
97571 }
97572
97573-DEFINE_OUTPUT_COPY(__output_skip, memcpy_skip)
97574+DEFINE_OUTPUT_COPY(__output_skip, memcpy_skip, )
97575
97576 #ifndef arch_perf_out_copy_user
97577 #define arch_perf_out_copy_user arch_perf_out_copy_user
97578@@ -143,7 +143,7 @@ arch_perf_out_copy_user(void *dst, const void *src, unsigned long n)
97579 }
97580 #endif
97581
97582-DEFINE_OUTPUT_COPY(__output_copy_user, arch_perf_out_copy_user)
97583+DEFINE_OUTPUT_COPY(__output_copy_user, arch_perf_out_copy_user, __user)
97584
97585 /* Callchain handling */
97586 extern struct perf_callchain_entry *
97587diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
97588index cb346f2..e4dc317 100644
97589--- a/kernel/events/uprobes.c
97590+++ b/kernel/events/uprobes.c
97591@@ -1670,7 +1670,7 @@ static int is_trap_at_addr(struct mm_struct *mm, unsigned long vaddr)
97592 {
97593 struct page *page;
97594 uprobe_opcode_t opcode;
97595- int result;
97596+ long result;
97597
97598 pagefault_disable();
97599 result = __copy_from_user_inatomic(&opcode, (void __user*)vaddr,
97600diff --git a/kernel/exit.c b/kernel/exit.c
97601index feff10b..f623dd5 100644
97602--- a/kernel/exit.c
97603+++ b/kernel/exit.c
97604@@ -171,6 +171,10 @@ void release_task(struct task_struct *p)
97605 struct task_struct *leader;
97606 int zap_leader;
97607 repeat:
97608+#ifdef CONFIG_NET
97609+ gr_del_task_from_ip_table(p);
97610+#endif
97611+
97612 /* don't need to get the RCU readlock here - the process is dead and
97613 * can't be modifying its own credentials. But shut RCU-lockdep up */
97614 rcu_read_lock();
97615@@ -656,6 +660,8 @@ void do_exit(long code)
97616 int group_dead;
97617 TASKS_RCU(int tasks_rcu_i);
97618
97619+ set_fs(USER_DS);
97620+
97621 profile_task_exit(tsk);
97622
97623 WARN_ON(blk_needs_flush_plug(tsk));
97624@@ -672,7 +678,6 @@ void do_exit(long code)
97625 * mm_release()->clear_child_tid() from writing to a user-controlled
97626 * kernel address.
97627 */
97628- set_fs(USER_DS);
97629
97630 ptrace_event(PTRACE_EVENT_EXIT, code);
97631
97632@@ -730,6 +735,9 @@ void do_exit(long code)
97633 tsk->exit_code = code;
97634 taskstats_exit(tsk, group_dead);
97635
97636+ gr_acl_handle_psacct(tsk, code);
97637+ gr_acl_handle_exit();
97638+
97639 exit_mm(tsk);
97640
97641 if (group_dead)
97642@@ -849,7 +857,7 @@ SYSCALL_DEFINE1(exit, int, error_code)
97643 * Take down every thread in the group. This is called by fatal signals
97644 * as well as by sys_exit_group (below).
97645 */
97646-void
97647+__noreturn void
97648 do_group_exit(int exit_code)
97649 {
97650 struct signal_struct *sig = current->signal;
97651diff --git a/kernel/fork.c b/kernel/fork.c
97652index cf65139..704476e 100644
97653--- a/kernel/fork.c
97654+++ b/kernel/fork.c
97655@@ -177,12 +177,54 @@ static void free_thread_info(struct thread_info *ti)
97656 void thread_info_cache_init(void)
97657 {
97658 thread_info_cache = kmem_cache_create("thread_info", THREAD_SIZE,
97659- THREAD_SIZE, 0, NULL);
97660+ THREAD_SIZE, SLAB_USERCOPY, NULL);
97661 BUG_ON(thread_info_cache == NULL);
97662 }
97663 # endif
97664 #endif
97665
97666+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
97667+static inline struct thread_info *gr_alloc_thread_info_node(struct task_struct *tsk,
97668+ int node, void **lowmem_stack)
97669+{
97670+ struct page *pages[THREAD_SIZE / PAGE_SIZE];
97671+ void *ret = NULL;
97672+ unsigned int i;
97673+
97674+ *lowmem_stack = alloc_thread_info_node(tsk, node);
97675+ if (*lowmem_stack == NULL)
97676+ goto out;
97677+
97678+ for (i = 0; i < THREAD_SIZE / PAGE_SIZE; i++)
97679+ pages[i] = virt_to_page(*lowmem_stack + (i * PAGE_SIZE));
97680+
97681+ /* use VM_IOREMAP to gain THREAD_SIZE alignment */
97682+ ret = vmap(pages, THREAD_SIZE / PAGE_SIZE, VM_IOREMAP, PAGE_KERNEL);
97683+ if (ret == NULL) {
97684+ free_thread_info(*lowmem_stack);
97685+ *lowmem_stack = NULL;
97686+ }
97687+
97688+out:
97689+ return ret;
97690+}
97691+
97692+static inline void gr_free_thread_info(struct task_struct *tsk, struct thread_info *ti)
97693+{
97694+ unmap_process_stacks(tsk);
97695+}
97696+#else
97697+static inline struct thread_info *gr_alloc_thread_info_node(struct task_struct *tsk,
97698+ int node, void **lowmem_stack)
97699+{
97700+ return alloc_thread_info_node(tsk, node);
97701+}
97702+static inline void gr_free_thread_info(struct task_struct *tsk, struct thread_info *ti)
97703+{
97704+ free_thread_info(ti);
97705+}
97706+#endif
97707+
97708 /* SLAB cache for signal_struct structures (tsk->signal) */
97709 static struct kmem_cache *signal_cachep;
97710
97711@@ -201,18 +243,22 @@ struct kmem_cache *vm_area_cachep;
97712 /* SLAB cache for mm_struct structures (tsk->mm) */
97713 static struct kmem_cache *mm_cachep;
97714
97715-static void account_kernel_stack(struct thread_info *ti, int account)
97716+static void account_kernel_stack(struct task_struct *tsk, struct thread_info *ti, int account)
97717 {
97718+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
97719+ struct zone *zone = page_zone(virt_to_page(tsk->lowmem_stack));
97720+#else
97721 struct zone *zone = page_zone(virt_to_page(ti));
97722+#endif
97723
97724 mod_zone_page_state(zone, NR_KERNEL_STACK, account);
97725 }
97726
97727 void free_task(struct task_struct *tsk)
97728 {
97729- account_kernel_stack(tsk->stack, -1);
97730+ account_kernel_stack(tsk, tsk->stack, -1);
97731 arch_release_thread_info(tsk->stack);
97732- free_thread_info(tsk->stack);
97733+ gr_free_thread_info(tsk, tsk->stack);
97734 rt_mutex_debug_task_free(tsk);
97735 ftrace_graph_exit_task(tsk);
97736 put_seccomp_filter(tsk);
97737@@ -306,6 +352,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
97738 {
97739 struct task_struct *tsk;
97740 struct thread_info *ti;
97741+ void *lowmem_stack;
97742 int node = tsk_fork_get_node(orig);
97743 int err;
97744
97745@@ -313,7 +360,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
97746 if (!tsk)
97747 return NULL;
97748
97749- ti = alloc_thread_info_node(tsk, node);
97750+ ti = gr_alloc_thread_info_node(tsk, node, &lowmem_stack);
97751 if (!ti)
97752 goto free_tsk;
97753
97754@@ -322,6 +369,9 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
97755 goto free_ti;
97756
97757 tsk->stack = ti;
97758+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
97759+ tsk->lowmem_stack = lowmem_stack;
97760+#endif
97761 #ifdef CONFIG_SECCOMP
97762 /*
97763 * We must handle setting up seccomp filters once we're under
97764@@ -338,7 +388,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
97765 set_task_stack_end_magic(tsk);
97766
97767 #ifdef CONFIG_CC_STACKPROTECTOR
97768- tsk->stack_canary = get_random_int();
97769+ tsk->stack_canary = pax_get_random_long();
97770 #endif
97771
97772 /*
97773@@ -352,24 +402,89 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
97774 tsk->splice_pipe = NULL;
97775 tsk->task_frag.page = NULL;
97776
97777- account_kernel_stack(ti, 1);
97778+ account_kernel_stack(tsk, ti, 1);
97779
97780 return tsk;
97781
97782 free_ti:
97783- free_thread_info(ti);
97784+ gr_free_thread_info(tsk, ti);
97785 free_tsk:
97786 free_task_struct(tsk);
97787 return NULL;
97788 }
97789
97790 #ifdef CONFIG_MMU
97791-static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
97792+static struct vm_area_struct *dup_vma(struct mm_struct *mm, struct mm_struct *oldmm, struct vm_area_struct *mpnt)
97793+{
97794+ struct vm_area_struct *tmp;
97795+ unsigned long charge;
97796+ struct file *file;
97797+ int retval;
97798+
97799+ charge = 0;
97800+ if (mpnt->vm_flags & VM_ACCOUNT) {
97801+ unsigned long len = vma_pages(mpnt);
97802+
97803+ if (security_vm_enough_memory_mm(oldmm, len)) /* sic */
97804+ goto fail_nomem;
97805+ charge = len;
97806+ }
97807+ tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
97808+ if (!tmp)
97809+ goto fail_nomem;
97810+ *tmp = *mpnt;
97811+ tmp->vm_mm = mm;
97812+ INIT_LIST_HEAD(&tmp->anon_vma_chain);
97813+ retval = vma_dup_policy(mpnt, tmp);
97814+ if (retval)
97815+ goto fail_nomem_policy;
97816+ if (anon_vma_fork(tmp, mpnt))
97817+ goto fail_nomem_anon_vma_fork;
97818+ tmp->vm_flags &= ~VM_LOCKED;
97819+ tmp->vm_next = tmp->vm_prev = NULL;
97820+ tmp->vm_mirror = NULL;
97821+ file = tmp->vm_file;
97822+ if (file) {
97823+ struct inode *inode = file_inode(file);
97824+ struct address_space *mapping = file->f_mapping;
97825+
97826+ get_file(file);
97827+ if (tmp->vm_flags & VM_DENYWRITE)
97828+ atomic_dec(&inode->i_writecount);
97829+ i_mmap_lock_write(mapping);
97830+ if (tmp->vm_flags & VM_SHARED)
97831+ atomic_inc(&mapping->i_mmap_writable);
97832+ flush_dcache_mmap_lock(mapping);
97833+ /* insert tmp into the share list, just after mpnt */
97834+ vma_interval_tree_insert_after(tmp, mpnt, &mapping->i_mmap);
97835+ flush_dcache_mmap_unlock(mapping);
97836+ i_mmap_unlock_write(mapping);
97837+ }
97838+
97839+ /*
97840+ * Clear hugetlb-related page reserves for children. This only
97841+ * affects MAP_PRIVATE mappings. Faults generated by the child
97842+ * are not guaranteed to succeed, even if read-only
97843+ */
97844+ if (is_vm_hugetlb_page(tmp))
97845+ reset_vma_resv_huge_pages(tmp);
97846+
97847+ return tmp;
97848+
97849+fail_nomem_anon_vma_fork:
97850+ mpol_put(vma_policy(tmp));
97851+fail_nomem_policy:
97852+ kmem_cache_free(vm_area_cachep, tmp);
97853+fail_nomem:
97854+ vm_unacct_memory(charge);
97855+ return NULL;
97856+}
97857+
97858+static __latent_entropy int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
97859 {
97860 struct vm_area_struct *mpnt, *tmp, *prev, **pprev;
97861 struct rb_node **rb_link, *rb_parent;
97862 int retval;
97863- unsigned long charge;
97864
97865 uprobe_start_dup_mmap();
97866 down_write(&oldmm->mmap_sem);
97867@@ -397,51 +512,15 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
97868
97869 prev = NULL;
97870 for (mpnt = oldmm->mmap; mpnt; mpnt = mpnt->vm_next) {
97871- struct file *file;
97872-
97873 if (mpnt->vm_flags & VM_DONTCOPY) {
97874 vm_stat_account(mm, mpnt->vm_flags, mpnt->vm_file,
97875 -vma_pages(mpnt));
97876 continue;
97877 }
97878- charge = 0;
97879- if (mpnt->vm_flags & VM_ACCOUNT) {
97880- unsigned long len = vma_pages(mpnt);
97881-
97882- if (security_vm_enough_memory_mm(oldmm, len)) /* sic */
97883- goto fail_nomem;
97884- charge = len;
97885- }
97886- tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
97887- if (!tmp)
97888- goto fail_nomem;
97889- *tmp = *mpnt;
97890- INIT_LIST_HEAD(&tmp->anon_vma_chain);
97891- retval = vma_dup_policy(mpnt, tmp);
97892- if (retval)
97893- goto fail_nomem_policy;
97894- tmp->vm_mm = mm;
97895- if (anon_vma_fork(tmp, mpnt))
97896- goto fail_nomem_anon_vma_fork;
97897- tmp->vm_flags &= ~VM_LOCKED;
97898- tmp->vm_next = tmp->vm_prev = NULL;
97899- file = tmp->vm_file;
97900- if (file) {
97901- struct inode *inode = file_inode(file);
97902- struct address_space *mapping = file->f_mapping;
97903-
97904- get_file(file);
97905- if (tmp->vm_flags & VM_DENYWRITE)
97906- atomic_dec(&inode->i_writecount);
97907- i_mmap_lock_write(mapping);
97908- if (tmp->vm_flags & VM_SHARED)
97909- atomic_inc(&mapping->i_mmap_writable);
97910- flush_dcache_mmap_lock(mapping);
97911- /* insert tmp into the share list, just after mpnt */
97912- vma_interval_tree_insert_after(tmp, mpnt,
97913- &mapping->i_mmap);
97914- flush_dcache_mmap_unlock(mapping);
97915- i_mmap_unlock_write(mapping);
97916+ tmp = dup_vma(mm, oldmm, mpnt);
97917+ if (!tmp) {
97918+ retval = -ENOMEM;
97919+ goto out;
97920 }
97921
97922 /*
97923@@ -473,6 +552,31 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
97924 if (retval)
97925 goto out;
97926 }
97927+
97928+#ifdef CONFIG_PAX_SEGMEXEC
97929+ if (oldmm->pax_flags & MF_PAX_SEGMEXEC) {
97930+ struct vm_area_struct *mpnt_m;
97931+
97932+ for (mpnt = oldmm->mmap, mpnt_m = mm->mmap; mpnt; mpnt = mpnt->vm_next, mpnt_m = mpnt_m->vm_next) {
97933+ BUG_ON(!mpnt_m || mpnt_m->vm_mirror || mpnt->vm_mm != oldmm || mpnt_m->vm_mm != mm);
97934+
97935+ if (!mpnt->vm_mirror)
97936+ continue;
97937+
97938+ if (mpnt->vm_end <= SEGMEXEC_TASK_SIZE) {
97939+ BUG_ON(mpnt->vm_mirror->vm_mirror != mpnt);
97940+ mpnt->vm_mirror = mpnt_m;
97941+ } else {
97942+ BUG_ON(mpnt->vm_mirror->vm_mirror == mpnt || mpnt->vm_mirror->vm_mirror->vm_mm != mm);
97943+ mpnt_m->vm_mirror = mpnt->vm_mirror->vm_mirror;
97944+ mpnt_m->vm_mirror->vm_mirror = mpnt_m;
97945+ mpnt->vm_mirror->vm_mirror = mpnt;
97946+ }
97947+ }
97948+ BUG_ON(mpnt_m);
97949+ }
97950+#endif
97951+
97952 /* a new mm has just been created */
97953 arch_dup_mmap(oldmm, mm);
97954 retval = 0;
97955@@ -482,14 +586,6 @@ out:
97956 up_write(&oldmm->mmap_sem);
97957 uprobe_end_dup_mmap();
97958 return retval;
97959-fail_nomem_anon_vma_fork:
97960- mpol_put(vma_policy(tmp));
97961-fail_nomem_policy:
97962- kmem_cache_free(vm_area_cachep, tmp);
97963-fail_nomem:
97964- retval = -ENOMEM;
97965- vm_unacct_memory(charge);
97966- goto out;
97967 }
97968
97969 static inline int mm_alloc_pgd(struct mm_struct *mm)
97970@@ -739,8 +835,8 @@ struct mm_struct *mm_access(struct task_struct *task, unsigned int mode)
97971 return ERR_PTR(err);
97972
97973 mm = get_task_mm(task);
97974- if (mm && mm != current->mm &&
97975- !ptrace_may_access(task, mode)) {
97976+ if (mm && ((mm != current->mm && !ptrace_may_access(task, mode)) ||
97977+ (mode == PTRACE_MODE_ATTACH && (gr_handle_proc_ptrace(task) || gr_acl_handle_procpidmem(task))))) {
97978 mmput(mm);
97979 mm = ERR_PTR(-EACCES);
97980 }
97981@@ -943,13 +1039,20 @@ static int copy_fs(unsigned long clone_flags, struct task_struct *tsk)
97982 spin_unlock(&fs->lock);
97983 return -EAGAIN;
97984 }
97985- fs->users++;
97986+ atomic_inc(&fs->users);
97987 spin_unlock(&fs->lock);
97988 return 0;
97989 }
97990 tsk->fs = copy_fs_struct(fs);
97991 if (!tsk->fs)
97992 return -ENOMEM;
97993+ /* Carry through gr_chroot_dentry and is_chrooted instead
97994+ of recomputing it here. Already copied when the task struct
97995+ is duplicated. This allows pivot_root to not be treated as
97996+ a chroot
97997+ */
97998+ //gr_set_chroot_entries(tsk, &tsk->fs->root);
97999+
98000 return 0;
98001 }
98002
98003@@ -1187,7 +1290,7 @@ init_task_pid(struct task_struct *task, enum pid_type type, struct pid *pid)
98004 * parts of the process environment (as per the clone
98005 * flags). The actual kick-off is left to the caller.
98006 */
98007-static struct task_struct *copy_process(unsigned long clone_flags,
98008+static __latent_entropy struct task_struct *copy_process(unsigned long clone_flags,
98009 unsigned long stack_start,
98010 unsigned long stack_size,
98011 int __user *child_tidptr,
98012@@ -1258,6 +1361,9 @@ static struct task_struct *copy_process(unsigned long clone_flags,
98013 DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
98014 #endif
98015 retval = -EAGAIN;
98016+
98017+ gr_learn_resource(p, RLIMIT_NPROC, atomic_read(&p->real_cred->user->processes), 0);
98018+
98019 if (atomic_read(&p->real_cred->user->processes) >=
98020 task_rlimit(p, RLIMIT_NPROC)) {
98021 if (p->real_cred->user != INIT_USER &&
98022@@ -1507,6 +1613,11 @@ static struct task_struct *copy_process(unsigned long clone_flags,
98023 goto bad_fork_free_pid;
98024 }
98025
98026+ /* synchronizes with gr_set_acls()
98027+ we need to call this past the point of no return for fork()
98028+ */
98029+ gr_copy_label(p);
98030+
98031 if (likely(p->pid)) {
98032 ptrace_init_task(p, (clone_flags & CLONE_PTRACE) || trace);
98033
98034@@ -1597,6 +1708,8 @@ bad_fork_cleanup_count:
98035 bad_fork_free:
98036 free_task(p);
98037 fork_out:
98038+ gr_log_forkfail(retval);
98039+
98040 return ERR_PTR(retval);
98041 }
98042
98043@@ -1658,6 +1771,7 @@ long do_fork(unsigned long clone_flags,
98044
98045 p = copy_process(clone_flags, stack_start, stack_size,
98046 child_tidptr, NULL, trace);
98047+ add_latent_entropy();
98048 /*
98049 * Do this prior waking up the new thread - the thread pointer
98050 * might get invalid after that point, if the thread exits quickly.
98051@@ -1674,6 +1788,8 @@ long do_fork(unsigned long clone_flags,
98052 if (clone_flags & CLONE_PARENT_SETTID)
98053 put_user(nr, parent_tidptr);
98054
98055+ gr_handle_brute_check();
98056+
98057 if (clone_flags & CLONE_VFORK) {
98058 p->vfork_done = &vfork;
98059 init_completion(&vfork);
98060@@ -1792,7 +1908,7 @@ void __init proc_caches_init(void)
98061 mm_cachep = kmem_cache_create("mm_struct",
98062 sizeof(struct mm_struct), ARCH_MIN_MMSTRUCT_ALIGN,
98063 SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_NOTRACK, NULL);
98064- vm_area_cachep = KMEM_CACHE(vm_area_struct, SLAB_PANIC);
98065+ vm_area_cachep = KMEM_CACHE(vm_area_struct, SLAB_PANIC | SLAB_NO_SANITIZE);
98066 mmap_init();
98067 nsproxy_cache_init();
98068 }
98069@@ -1832,7 +1948,7 @@ static int unshare_fs(unsigned long unshare_flags, struct fs_struct **new_fsp)
98070 return 0;
98071
98072 /* don't need lock here; in the worst case we'll do useless copy */
98073- if (fs->users == 1)
98074+ if (atomic_read(&fs->users) == 1)
98075 return 0;
98076
98077 *new_fsp = copy_fs_struct(fs);
98078@@ -1944,7 +2060,8 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags)
98079 fs = current->fs;
98080 spin_lock(&fs->lock);
98081 current->fs = new_fs;
98082- if (--fs->users)
98083+ gr_set_chroot_entries(current, &current->fs->root);
98084+ if (atomic_dec_return(&fs->users))
98085 new_fs = NULL;
98086 else
98087 new_fs = fs;
98088diff --git a/kernel/futex.c b/kernel/futex.c
98089index 2a5e383..878bac6 100644
98090--- a/kernel/futex.c
98091+++ b/kernel/futex.c
98092@@ -201,7 +201,7 @@ struct futex_pi_state {
98093 atomic_t refcount;
98094
98095 union futex_key key;
98096-};
98097+} __randomize_layout;
98098
98099 /**
98100 * struct futex_q - The hashed futex queue entry, one per waiting task
98101@@ -235,7 +235,7 @@ struct futex_q {
98102 struct rt_mutex_waiter *rt_waiter;
98103 union futex_key *requeue_pi_key;
98104 u32 bitset;
98105-};
98106+} __randomize_layout;
98107
98108 static const struct futex_q futex_q_init = {
98109 /* list gets initialized in queue_me()*/
98110@@ -402,6 +402,11 @@ get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key, int rw)
98111 struct page *page, *page_head;
98112 int err, ro = 0;
98113
98114+#ifdef CONFIG_PAX_SEGMEXEC
98115+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && address >= SEGMEXEC_TASK_SIZE)
98116+ return -EFAULT;
98117+#endif
98118+
98119 /*
98120 * The futex address must be "naturally" aligned.
98121 */
98122@@ -601,7 +606,7 @@ static int cmpxchg_futex_value_locked(u32 *curval, u32 __user *uaddr,
98123
98124 static int get_futex_value_locked(u32 *dest, u32 __user *from)
98125 {
98126- int ret;
98127+ unsigned long ret;
98128
98129 pagefault_disable();
98130 ret = __copy_from_user_inatomic(dest, from, sizeof(u32));
98131@@ -3006,6 +3011,7 @@ static void __init futex_detect_cmpxchg(void)
98132 {
98133 #ifndef CONFIG_HAVE_FUTEX_CMPXCHG
98134 u32 curval;
98135+ mm_segment_t oldfs;
98136
98137 /*
98138 * This will fail and we want it. Some arch implementations do
98139@@ -3017,8 +3023,11 @@ static void __init futex_detect_cmpxchg(void)
98140 * implementation, the non-functional ones will return
98141 * -ENOSYS.
98142 */
98143+ oldfs = get_fs();
98144+ set_fs(USER_DS);
98145 if (cmpxchg_futex_value_locked(&curval, NULL, 0, 0) == -EFAULT)
98146 futex_cmpxchg_enabled = 1;
98147+ set_fs(oldfs);
98148 #endif
98149 }
98150
98151diff --git a/kernel/futex_compat.c b/kernel/futex_compat.c
98152index 55c8c93..9ba7ad6 100644
98153--- a/kernel/futex_compat.c
98154+++ b/kernel/futex_compat.c
98155@@ -32,7 +32,7 @@ fetch_robust_entry(compat_uptr_t *uentry, struct robust_list __user **entry,
98156 return 0;
98157 }
98158
98159-static void __user *futex_uaddr(struct robust_list __user *entry,
98160+static void __user __intentional_overflow(-1) *futex_uaddr(struct robust_list __user *entry,
98161 compat_long_t futex_offset)
98162 {
98163 compat_uptr_t base = ptr_to_compat(entry);
98164diff --git a/kernel/gcov/base.c b/kernel/gcov/base.c
98165index b358a80..fc25240 100644
98166--- a/kernel/gcov/base.c
98167+++ b/kernel/gcov/base.c
98168@@ -114,11 +114,6 @@ void gcov_enable_events(void)
98169 }
98170
98171 #ifdef CONFIG_MODULES
98172-static inline int within(void *addr, void *start, unsigned long size)
98173-{
98174- return ((addr >= start) && (addr < start + size));
98175-}
98176-
98177 /* Update list and generate events when modules are unloaded. */
98178 static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
98179 void *data)
98180@@ -133,7 +128,7 @@ static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
98181
98182 /* Remove entries located in module from linked list. */
98183 while ((info = gcov_info_next(info))) {
98184- if (within(info, mod->module_core, mod->core_size)) {
98185+ if (within_module_core_rw((unsigned long)info, mod)) {
98186 gcov_info_unlink(prev, info);
98187 if (gcov_events_enabled)
98188 gcov_event(GCOV_REMOVE, info);
98189diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
98190index 886d09e..c7ff4e5 100644
98191--- a/kernel/irq/manage.c
98192+++ b/kernel/irq/manage.c
98193@@ -874,7 +874,7 @@ static int irq_thread(void *data)
98194
98195 action_ret = handler_fn(desc, action);
98196 if (action_ret == IRQ_HANDLED)
98197- atomic_inc(&desc->threads_handled);
98198+ atomic_inc_unchecked(&desc->threads_handled);
98199
98200 wake_threads_waitq(desc);
98201 }
98202diff --git a/kernel/irq/spurious.c b/kernel/irq/spurious.c
98203index e2514b0..de3dfe0 100644
98204--- a/kernel/irq/spurious.c
98205+++ b/kernel/irq/spurious.c
98206@@ -337,7 +337,7 @@ void note_interrupt(unsigned int irq, struct irq_desc *desc,
98207 * count. We just care about the count being
98208 * different than the one we saw before.
98209 */
98210- handled = atomic_read(&desc->threads_handled);
98211+ handled = atomic_read_unchecked(&desc->threads_handled);
98212 handled |= SPURIOUS_DEFERRED;
98213 if (handled != desc->threads_handled_last) {
98214 action_ret = IRQ_HANDLED;
98215diff --git a/kernel/jump_label.c b/kernel/jump_label.c
98216index 9019f15..9a3c42e 100644
98217--- a/kernel/jump_label.c
98218+++ b/kernel/jump_label.c
98219@@ -14,6 +14,7 @@
98220 #include <linux/err.h>
98221 #include <linux/static_key.h>
98222 #include <linux/jump_label_ratelimit.h>
98223+#include <linux/mm.h>
98224
98225 #ifdef HAVE_JUMP_LABEL
98226
98227@@ -51,7 +52,9 @@ jump_label_sort_entries(struct jump_entry *start, struct jump_entry *stop)
98228
98229 size = (((unsigned long)stop - (unsigned long)start)
98230 / sizeof(struct jump_entry));
98231+ pax_open_kernel();
98232 sort(start, size, sizeof(struct jump_entry), jump_label_cmp, NULL);
98233+ pax_close_kernel();
98234 }
98235
98236 static void jump_label_update(struct static_key *key, int enable);
98237@@ -363,10 +366,12 @@ static void jump_label_invalidate_module_init(struct module *mod)
98238 struct jump_entry *iter_stop = iter_start + mod->num_jump_entries;
98239 struct jump_entry *iter;
98240
98241+ pax_open_kernel();
98242 for (iter = iter_start; iter < iter_stop; iter++) {
98243 if (within_module_init(iter->code, mod))
98244 iter->code = 0;
98245 }
98246+ pax_close_kernel();
98247 }
98248
98249 static int
98250diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c
98251index 5c5987f..bc502b0 100644
98252--- a/kernel/kallsyms.c
98253+++ b/kernel/kallsyms.c
98254@@ -11,6 +11,9 @@
98255 * Changed the compression method from stem compression to "table lookup"
98256 * compression (see scripts/kallsyms.c for a more complete description)
98257 */
98258+#ifdef CONFIG_GRKERNSEC_HIDESYM
98259+#define __INCLUDED_BY_HIDESYM 1
98260+#endif
98261 #include <linux/kallsyms.h>
98262 #include <linux/module.h>
98263 #include <linux/init.h>
98264@@ -54,12 +57,33 @@ extern const unsigned long kallsyms_markers[] __weak;
98265
98266 static inline int is_kernel_inittext(unsigned long addr)
98267 {
98268+ if (system_state != SYSTEM_BOOTING)
98269+ return 0;
98270+
98271 if (addr >= (unsigned long)_sinittext
98272 && addr <= (unsigned long)_einittext)
98273 return 1;
98274 return 0;
98275 }
98276
98277+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
98278+#ifdef CONFIG_MODULES
98279+static inline int is_module_text(unsigned long addr)
98280+{
98281+ if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END)
98282+ return 1;
98283+
98284+ addr = ktla_ktva(addr);
98285+ return (unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END;
98286+}
98287+#else
98288+static inline int is_module_text(unsigned long addr)
98289+{
98290+ return 0;
98291+}
98292+#endif
98293+#endif
98294+
98295 static inline int is_kernel_text(unsigned long addr)
98296 {
98297 if ((addr >= (unsigned long)_stext && addr <= (unsigned long)_etext) ||
98298@@ -70,13 +94,28 @@ static inline int is_kernel_text(unsigned long addr)
98299
98300 static inline int is_kernel(unsigned long addr)
98301 {
98302+
98303+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
98304+ if (is_kernel_text(addr) || is_kernel_inittext(addr))
98305+ return 1;
98306+
98307+ if (ktla_ktva((unsigned long)_text) <= addr && addr < (unsigned long)_end)
98308+#else
98309 if (addr >= (unsigned long)_stext && addr <= (unsigned long)_end)
98310+#endif
98311+
98312 return 1;
98313 return in_gate_area_no_mm(addr);
98314 }
98315
98316 static int is_ksym_addr(unsigned long addr)
98317 {
98318+
98319+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
98320+ if (is_module_text(addr))
98321+ return 0;
98322+#endif
98323+
98324 if (all_var)
98325 return is_kernel(addr);
98326
98327@@ -481,7 +520,6 @@ static unsigned long get_ksymbol_core(struct kallsym_iter *iter)
98328
98329 static void reset_iter(struct kallsym_iter *iter, loff_t new_pos)
98330 {
98331- iter->name[0] = '\0';
98332 iter->nameoff = get_symbol_offset(new_pos);
98333 iter->pos = new_pos;
98334 }
98335@@ -529,6 +567,11 @@ static int s_show(struct seq_file *m, void *p)
98336 {
98337 struct kallsym_iter *iter = m->private;
98338
98339+#ifdef CONFIG_GRKERNSEC_HIDESYM
98340+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID))
98341+ return 0;
98342+#endif
98343+
98344 /* Some debugging symbols have no name. Ignore them. */
98345 if (!iter->name[0])
98346 return 0;
98347@@ -542,6 +585,7 @@ static int s_show(struct seq_file *m, void *p)
98348 */
98349 type = iter->exported ? toupper(iter->type) :
98350 tolower(iter->type);
98351+
98352 seq_printf(m, "%pK %c %s\t[%s]\n", (void *)iter->value,
98353 type, iter->name, iter->module_name);
98354 } else
98355diff --git a/kernel/kcmp.c b/kernel/kcmp.c
98356index 0aa69ea..a7fcafb 100644
98357--- a/kernel/kcmp.c
98358+++ b/kernel/kcmp.c
98359@@ -100,6 +100,10 @@ SYSCALL_DEFINE5(kcmp, pid_t, pid1, pid_t, pid2, int, type,
98360 struct task_struct *task1, *task2;
98361 int ret;
98362
98363+#ifdef CONFIG_GRKERNSEC
98364+ return -ENOSYS;
98365+#endif
98366+
98367 rcu_read_lock();
98368
98369 /*
98370diff --git a/kernel/kexec.c b/kernel/kexec.c
98371index 38c25b1..12b3f69 100644
98372--- a/kernel/kexec.c
98373+++ b/kernel/kexec.c
98374@@ -1348,7 +1348,8 @@ COMPAT_SYSCALL_DEFINE4(kexec_load, compat_ulong_t, entry,
98375 compat_ulong_t, flags)
98376 {
98377 struct compat_kexec_segment in;
98378- struct kexec_segment out, __user *ksegments;
98379+ struct kexec_segment out;
98380+ struct kexec_segment __user *ksegments;
98381 unsigned long i, result;
98382
98383 /* Don't allow clients that don't understand the native
98384diff --git a/kernel/kmod.c b/kernel/kmod.c
98385index 2777f40..a689506 100644
98386--- a/kernel/kmod.c
98387+++ b/kernel/kmod.c
98388@@ -68,7 +68,7 @@ static void free_modprobe_argv(struct subprocess_info *info)
98389 kfree(info->argv);
98390 }
98391
98392-static int call_modprobe(char *module_name, int wait)
98393+static int call_modprobe(char *module_name, char *module_param, int wait)
98394 {
98395 struct subprocess_info *info;
98396 static char *envp[] = {
98397@@ -78,7 +78,7 @@ static int call_modprobe(char *module_name, int wait)
98398 NULL
98399 };
98400
98401- char **argv = kmalloc(sizeof(char *[5]), GFP_KERNEL);
98402+ char **argv = kmalloc(sizeof(char *[6]), GFP_KERNEL);
98403 if (!argv)
98404 goto out;
98405
98406@@ -90,7 +90,8 @@ static int call_modprobe(char *module_name, int wait)
98407 argv[1] = "-q";
98408 argv[2] = "--";
98409 argv[3] = module_name; /* check free_modprobe_argv() */
98410- argv[4] = NULL;
98411+ argv[4] = module_param;
98412+ argv[5] = NULL;
98413
98414 info = call_usermodehelper_setup(modprobe_path, argv, envp, GFP_KERNEL,
98415 NULL, free_modprobe_argv, NULL);
98416@@ -122,9 +123,8 @@ out:
98417 * If module auto-loading support is disabled then this function
98418 * becomes a no-operation.
98419 */
98420-int __request_module(bool wait, const char *fmt, ...)
98421+static int ____request_module(bool wait, char *module_param, const char *fmt, va_list ap)
98422 {
98423- va_list args;
98424 char module_name[MODULE_NAME_LEN];
98425 unsigned int max_modprobes;
98426 int ret;
98427@@ -143,9 +143,7 @@ int __request_module(bool wait, const char *fmt, ...)
98428 if (!modprobe_path[0])
98429 return 0;
98430
98431- va_start(args, fmt);
98432- ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, args);
98433- va_end(args);
98434+ ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, ap);
98435 if (ret >= MODULE_NAME_LEN)
98436 return -ENAMETOOLONG;
98437
98438@@ -153,6 +151,20 @@ int __request_module(bool wait, const char *fmt, ...)
98439 if (ret)
98440 return ret;
98441
98442+#ifdef CONFIG_GRKERNSEC_MODHARDEN
98443+ if (uid_eq(current_uid(), GLOBAL_ROOT_UID)) {
98444+ /* hack to workaround consolekit/udisks stupidity */
98445+ read_lock(&tasklist_lock);
98446+ if (!strcmp(current->comm, "mount") &&
98447+ current->real_parent && !strncmp(current->real_parent->comm, "udisk", 5)) {
98448+ read_unlock(&tasklist_lock);
98449+ printk(KERN_ALERT "grsec: denied attempt to auto-load fs module %.64s by udisks\n", module_name);
98450+ return -EPERM;
98451+ }
98452+ read_unlock(&tasklist_lock);
98453+ }
98454+#endif
98455+
98456 /* If modprobe needs a service that is in a module, we get a recursive
98457 * loop. Limit the number of running kmod threads to max_threads/2 or
98458 * MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method
98459@@ -181,16 +193,61 @@ int __request_module(bool wait, const char *fmt, ...)
98460
98461 trace_module_request(module_name, wait, _RET_IP_);
98462
98463- ret = call_modprobe(module_name, wait ? UMH_WAIT_PROC : UMH_WAIT_EXEC);
98464+ ret = call_modprobe(module_name, module_param, wait ? UMH_WAIT_PROC : UMH_WAIT_EXEC);
98465
98466 atomic_dec(&kmod_concurrent);
98467 return ret;
98468 }
98469+
98470+int ___request_module(bool wait, char *module_param, const char *fmt, ...)
98471+{
98472+ va_list args;
98473+ int ret;
98474+
98475+ va_start(args, fmt);
98476+ ret = ____request_module(wait, module_param, fmt, args);
98477+ va_end(args);
98478+
98479+ return ret;
98480+}
98481+
98482+int __request_module(bool wait, const char *fmt, ...)
98483+{
98484+ va_list args;
98485+ int ret;
98486+
98487+#ifdef CONFIG_GRKERNSEC_MODHARDEN
98488+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)) {
98489+ char module_param[MODULE_NAME_LEN];
98490+
98491+ memset(module_param, 0, sizeof(module_param));
98492+
98493+ snprintf(module_param, sizeof(module_param) - 1, "grsec_modharden_normal%u_", GR_GLOBAL_UID(current_uid()));
98494+
98495+ va_start(args, fmt);
98496+ ret = ____request_module(wait, module_param, fmt, args);
98497+ va_end(args);
98498+
98499+ return ret;
98500+ }
98501+#endif
98502+
98503+ va_start(args, fmt);
98504+ ret = ____request_module(wait, NULL, fmt, args);
98505+ va_end(args);
98506+
98507+ return ret;
98508+}
98509+
98510 EXPORT_SYMBOL(__request_module);
98511 #endif /* CONFIG_MODULES */
98512
98513 static void call_usermodehelper_freeinfo(struct subprocess_info *info)
98514 {
98515+#ifdef CONFIG_GRKERNSEC
98516+ kfree(info->path);
98517+ info->path = info->origpath;
98518+#endif
98519 if (info->cleanup)
98520 (*info->cleanup)(info);
98521 kfree(info);
98522@@ -232,6 +289,21 @@ static int ____call_usermodehelper(void *data)
98523 */
98524 set_user_nice(current, 0);
98525
98526+#ifdef CONFIG_GRKERNSEC
98527+ /* this is race-free as far as userland is concerned as we copied
98528+ out the path to be used prior to this point and are now operating
98529+ on that copy
98530+ */
98531+ if ((strncmp(sub_info->path, "/sbin/", 6) && strncmp(sub_info->path, "/usr/lib/", 9) &&
98532+ strncmp(sub_info->path, "/lib/", 5) && strncmp(sub_info->path, "/lib64/", 7) &&
98533+ strncmp(sub_info->path, "/usr/libexec/", 13) && strncmp(sub_info->path, "/usr/bin/", 9) &&
98534+ strcmp(sub_info->path, "/usr/share/apport/apport")) || strstr(sub_info->path, "..")) {
98535+ printk(KERN_ALERT "grsec: denied exec of usermode helper binary %.950s located outside of permitted system paths\n", sub_info->path);
98536+ retval = -EPERM;
98537+ goto out;
98538+ }
98539+#endif
98540+
98541 retval = -ENOMEM;
98542 new = prepare_kernel_cred(current);
98543 if (!new)
98544@@ -254,8 +326,8 @@ static int ____call_usermodehelper(void *data)
98545 commit_creds(new);
98546
98547 retval = do_execve(getname_kernel(sub_info->path),
98548- (const char __user *const __user *)sub_info->argv,
98549- (const char __user *const __user *)sub_info->envp);
98550+ (const char __user *const __force_user *)sub_info->argv,
98551+ (const char __user *const __force_user *)sub_info->envp);
98552 out:
98553 sub_info->retval = retval;
98554 /* wait_for_helper() will call umh_complete if UHM_WAIT_PROC. */
98555@@ -288,7 +360,7 @@ static int wait_for_helper(void *data)
98556 *
98557 * Thus the __user pointer cast is valid here.
98558 */
98559- sys_wait4(pid, (int __user *)&ret, 0, NULL);
98560+ sys_wait4(pid, (int __force_user *)&ret, 0, NULL);
98561
98562 /*
98563 * If ret is 0, either ____call_usermodehelper failed and the
98564@@ -510,7 +582,12 @@ struct subprocess_info *call_usermodehelper_setup(char *path, char **argv,
98565 goto out;
98566
98567 INIT_WORK(&sub_info->work, __call_usermodehelper);
98568+#ifdef CONFIG_GRKERNSEC
98569+ sub_info->origpath = path;
98570+ sub_info->path = kstrdup(path, gfp_mask);
98571+#else
98572 sub_info->path = path;
98573+#endif
98574 sub_info->argv = argv;
98575 sub_info->envp = envp;
98576
98577@@ -612,7 +689,7 @@ EXPORT_SYMBOL(call_usermodehelper);
98578 static int proc_cap_handler(struct ctl_table *table, int write,
98579 void __user *buffer, size_t *lenp, loff_t *ppos)
98580 {
98581- struct ctl_table t;
98582+ ctl_table_no_const t;
98583 unsigned long cap_array[_KERNEL_CAPABILITY_U32S];
98584 kernel_cap_t new_cap;
98585 int err, i;
98586diff --git a/kernel/kprobes.c b/kernel/kprobes.c
98587index c90e417..e6c515d 100644
98588--- a/kernel/kprobes.c
98589+++ b/kernel/kprobes.c
98590@@ -31,6 +31,9 @@
98591 * <jkenisto@us.ibm.com> and Prasanna S Panchamukhi
98592 * <prasanna@in.ibm.com> added function-return probes.
98593 */
98594+#ifdef CONFIG_GRKERNSEC_HIDESYM
98595+#define __INCLUDED_BY_HIDESYM 1
98596+#endif
98597 #include <linux/kprobes.h>
98598 #include <linux/hash.h>
98599 #include <linux/init.h>
98600@@ -122,12 +125,12 @@ enum kprobe_slot_state {
98601
98602 static void *alloc_insn_page(void)
98603 {
98604- return module_alloc(PAGE_SIZE);
98605+ return module_alloc_exec(PAGE_SIZE);
98606 }
98607
98608 static void free_insn_page(void *page)
98609 {
98610- module_memfree(page);
98611+ module_memfree_exec(page);
98612 }
98613
98614 struct kprobe_insn_cache kprobe_insn_slots = {
98615@@ -2198,11 +2201,11 @@ static void report_probe(struct seq_file *pi, struct kprobe *p,
98616 kprobe_type = "k";
98617
98618 if (sym)
98619- seq_printf(pi, "%p %s %s+0x%x %s ",
98620+ seq_printf(pi, "%pK %s %s+0x%x %s ",
98621 p->addr, kprobe_type, sym, offset,
98622 (modname ? modname : " "));
98623 else
98624- seq_printf(pi, "%p %s %p ",
98625+ seq_printf(pi, "%pK %s %pK ",
98626 p->addr, kprobe_type, p->addr);
98627
98628 if (!pp)
98629diff --git a/kernel/ksysfs.c b/kernel/ksysfs.c
98630index 6683cce..daf8999 100644
98631--- a/kernel/ksysfs.c
98632+++ b/kernel/ksysfs.c
98633@@ -50,6 +50,8 @@ static ssize_t uevent_helper_store(struct kobject *kobj,
98634 {
98635 if (count+1 > UEVENT_HELPER_PATH_LEN)
98636 return -ENOENT;
98637+ if (!capable(CAP_SYS_ADMIN))
98638+ return -EPERM;
98639 memcpy(uevent_helper, buf, count);
98640 uevent_helper[count] = '\0';
98641 if (count && uevent_helper[count-1] == '\n')
98642@@ -176,7 +178,7 @@ static ssize_t notes_read(struct file *filp, struct kobject *kobj,
98643 return count;
98644 }
98645
98646-static struct bin_attribute notes_attr = {
98647+static bin_attribute_no_const notes_attr __read_only = {
98648 .attr = {
98649 .name = "notes",
98650 .mode = S_IRUGO,
98651diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
98652index ba77ab5..d6a3e20 100644
98653--- a/kernel/locking/lockdep.c
98654+++ b/kernel/locking/lockdep.c
98655@@ -599,6 +599,10 @@ static int static_obj(void *obj)
98656 end = (unsigned long) &_end,
98657 addr = (unsigned long) obj;
98658
98659+#ifdef CONFIG_PAX_KERNEXEC
98660+ start = ktla_ktva(start);
98661+#endif
98662+
98663 /*
98664 * static variable?
98665 */
98666@@ -743,6 +747,7 @@ register_lock_class(struct lockdep_map *lock, unsigned int subclass, int force)
98667 if (!static_obj(lock->key)) {
98668 debug_locks_off();
98669 printk("INFO: trying to register non-static key.\n");
98670+ printk("lock:%pS key:%pS.\n", lock, lock->key);
98671 printk("the code is fine but needs lockdep annotation.\n");
98672 printk("turning off the locking correctness validator.\n");
98673 dump_stack();
98674@@ -3088,7 +3093,7 @@ static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass,
98675 if (!class)
98676 return 0;
98677 }
98678- atomic_inc((atomic_t *)&class->ops);
98679+ atomic_long_inc_unchecked((atomic_long_unchecked_t *)&class->ops);
98680 if (very_verbose(class)) {
98681 printk("\nacquire class [%p] %s", class->key, class->name);
98682 if (class->name_version > 1)
98683diff --git a/kernel/locking/lockdep_proc.c b/kernel/locking/lockdep_proc.c
98684index ef43ac4..2720dfa 100644
98685--- a/kernel/locking/lockdep_proc.c
98686+++ b/kernel/locking/lockdep_proc.c
98687@@ -65,7 +65,7 @@ static int l_show(struct seq_file *m, void *v)
98688 return 0;
98689 }
98690
98691- seq_printf(m, "%p", class->key);
98692+ seq_printf(m, "%pK", class->key);
98693 #ifdef CONFIG_DEBUG_LOCKDEP
98694 seq_printf(m, " OPS:%8ld", class->ops);
98695 #endif
98696@@ -83,7 +83,7 @@ static int l_show(struct seq_file *m, void *v)
98697
98698 list_for_each_entry(entry, &class->locks_after, entry) {
98699 if (entry->distance == 1) {
98700- seq_printf(m, " -> [%p] ", entry->class->key);
98701+ seq_printf(m, " -> [%pK] ", entry->class->key);
98702 print_name(m, entry->class);
98703 seq_puts(m, "\n");
98704 }
98705@@ -152,7 +152,7 @@ static int lc_show(struct seq_file *m, void *v)
98706 if (!class->key)
98707 continue;
98708
98709- seq_printf(m, "[%p] ", class->key);
98710+ seq_printf(m, "[%pK] ", class->key);
98711 print_name(m, class);
98712 seq_puts(m, "\n");
98713 }
98714@@ -496,7 +496,7 @@ static void seq_stats(struct seq_file *m, struct lock_stat_data *data)
98715 if (!i)
98716 seq_line(m, '-', 40-namelen, namelen);
98717
98718- snprintf(ip, sizeof(ip), "[<%p>]",
98719+ snprintf(ip, sizeof(ip), "[<%pK>]",
98720 (void *)class->contention_point[i]);
98721 seq_printf(m, "%40s %14lu %29s %pS\n",
98722 name, stats->contention_point[i],
98723@@ -511,7 +511,7 @@ static void seq_stats(struct seq_file *m, struct lock_stat_data *data)
98724 if (!i)
98725 seq_line(m, '-', 40-namelen, namelen);
98726
98727- snprintf(ip, sizeof(ip), "[<%p>]",
98728+ snprintf(ip, sizeof(ip), "[<%pK>]",
98729 (void *)class->contending_point[i]);
98730 seq_printf(m, "%40s %14lu %29s %pS\n",
98731 name, stats->contending_point[i],
98732diff --git a/kernel/locking/mcs_spinlock.h b/kernel/locking/mcs_spinlock.h
98733index d1fe2ba..180cd65e 100644
98734--- a/kernel/locking/mcs_spinlock.h
98735+++ b/kernel/locking/mcs_spinlock.h
98736@@ -78,7 +78,7 @@ void mcs_spin_lock(struct mcs_spinlock **lock, struct mcs_spinlock *node)
98737 */
98738 return;
98739 }
98740- ACCESS_ONCE(prev->next) = node;
98741+ ACCESS_ONCE_RW(prev->next) = node;
98742
98743 /* Wait until the lock holder passes the lock down. */
98744 arch_mcs_spin_lock_contended(&node->locked);
98745diff --git a/kernel/locking/mutex-debug.c b/kernel/locking/mutex-debug.c
98746index 3ef3736..9c951fa 100644
98747--- a/kernel/locking/mutex-debug.c
98748+++ b/kernel/locking/mutex-debug.c
98749@@ -49,21 +49,21 @@ void debug_mutex_free_waiter(struct mutex_waiter *waiter)
98750 }
98751
98752 void debug_mutex_add_waiter(struct mutex *lock, struct mutex_waiter *waiter,
98753- struct thread_info *ti)
98754+ struct task_struct *task)
98755 {
98756 SMP_DEBUG_LOCKS_WARN_ON(!spin_is_locked(&lock->wait_lock));
98757
98758 /* Mark the current thread as blocked on the lock: */
98759- ti->task->blocked_on = waiter;
98760+ task->blocked_on = waiter;
98761 }
98762
98763 void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
98764- struct thread_info *ti)
98765+ struct task_struct *task)
98766 {
98767 DEBUG_LOCKS_WARN_ON(list_empty(&waiter->list));
98768- DEBUG_LOCKS_WARN_ON(waiter->task != ti->task);
98769- DEBUG_LOCKS_WARN_ON(ti->task->blocked_on != waiter);
98770- ti->task->blocked_on = NULL;
98771+ DEBUG_LOCKS_WARN_ON(waiter->task != task);
98772+ DEBUG_LOCKS_WARN_ON(task->blocked_on != waiter);
98773+ task->blocked_on = NULL;
98774
98775 list_del_init(&waiter->list);
98776 waiter->task = NULL;
98777diff --git a/kernel/locking/mutex-debug.h b/kernel/locking/mutex-debug.h
98778index 0799fd3..d06ae3b 100644
98779--- a/kernel/locking/mutex-debug.h
98780+++ b/kernel/locking/mutex-debug.h
98781@@ -20,9 +20,9 @@ extern void debug_mutex_wake_waiter(struct mutex *lock,
98782 extern void debug_mutex_free_waiter(struct mutex_waiter *waiter);
98783 extern void debug_mutex_add_waiter(struct mutex *lock,
98784 struct mutex_waiter *waiter,
98785- struct thread_info *ti);
98786+ struct task_struct *task);
98787 extern void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
98788- struct thread_info *ti);
98789+ struct task_struct *task);
98790 extern void debug_mutex_unlock(struct mutex *lock);
98791 extern void debug_mutex_init(struct mutex *lock, const char *name,
98792 struct lock_class_key *key);
98793diff --git a/kernel/locking/mutex.c b/kernel/locking/mutex.c
98794index 94674e5..de4966f 100644
98795--- a/kernel/locking/mutex.c
98796+++ b/kernel/locking/mutex.c
98797@@ -542,7 +542,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
98798 goto skip_wait;
98799
98800 debug_mutex_lock_common(lock, &waiter);
98801- debug_mutex_add_waiter(lock, &waiter, task_thread_info(task));
98802+ debug_mutex_add_waiter(lock, &waiter, task);
98803
98804 /* add waiting tasks to the end of the waitqueue (FIFO): */
98805 list_add_tail(&waiter.list, &lock->wait_list);
98806@@ -589,7 +589,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
98807 }
98808 __set_task_state(task, TASK_RUNNING);
98809
98810- mutex_remove_waiter(lock, &waiter, current_thread_info());
98811+ mutex_remove_waiter(lock, &waiter, task);
98812 /* set it to 0 if there are no waiters left: */
98813 if (likely(list_empty(&lock->wait_list)))
98814 atomic_set(&lock->count, 0);
98815@@ -610,7 +610,7 @@ skip_wait:
98816 return 0;
98817
98818 err:
98819- mutex_remove_waiter(lock, &waiter, task_thread_info(task));
98820+ mutex_remove_waiter(lock, &waiter, task);
98821 spin_unlock_mutex(&lock->wait_lock, flags);
98822 debug_mutex_free_waiter(&waiter);
98823 mutex_release(&lock->dep_map, 1, ip);
98824diff --git a/kernel/locking/osq_lock.c b/kernel/locking/osq_lock.c
98825index c112d00..1946ad9 100644
98826--- a/kernel/locking/osq_lock.c
98827+++ b/kernel/locking/osq_lock.c
98828@@ -98,7 +98,7 @@ bool osq_lock(struct optimistic_spin_queue *lock)
98829
98830 prev = decode_cpu(old);
98831 node->prev = prev;
98832- ACCESS_ONCE(prev->next) = node;
98833+ ACCESS_ONCE_RW(prev->next) = node;
98834
98835 /*
98836 * Normally @prev is untouchable after the above store; because at that
98837@@ -170,8 +170,8 @@ unqueue:
98838 * it will wait in Step-A.
98839 */
98840
98841- ACCESS_ONCE(next->prev) = prev;
98842- ACCESS_ONCE(prev->next) = next;
98843+ ACCESS_ONCE_RW(next->prev) = prev;
98844+ ACCESS_ONCE_RW(prev->next) = next;
98845
98846 return false;
98847 }
98848@@ -193,11 +193,11 @@ void osq_unlock(struct optimistic_spin_queue *lock)
98849 node = this_cpu_ptr(&osq_node);
98850 next = xchg(&node->next, NULL);
98851 if (next) {
98852- ACCESS_ONCE(next->locked) = 1;
98853+ ACCESS_ONCE_RW(next->locked) = 1;
98854 return;
98855 }
98856
98857 next = osq_wait_next(lock, node, NULL);
98858 if (next)
98859- ACCESS_ONCE(next->locked) = 1;
98860+ ACCESS_ONCE_RW(next->locked) = 1;
98861 }
98862diff --git a/kernel/locking/rtmutex-tester.c b/kernel/locking/rtmutex-tester.c
98863index 1d96dd0..994ff19 100644
98864--- a/kernel/locking/rtmutex-tester.c
98865+++ b/kernel/locking/rtmutex-tester.c
98866@@ -22,7 +22,7 @@
98867 #define MAX_RT_TEST_MUTEXES 8
98868
98869 static spinlock_t rttest_lock;
98870-static atomic_t rttest_event;
98871+static atomic_unchecked_t rttest_event;
98872
98873 struct test_thread_data {
98874 int opcode;
98875@@ -63,7 +63,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
98876
98877 case RTTEST_LOCKCONT:
98878 td->mutexes[td->opdata] = 1;
98879- td->event = atomic_add_return(1, &rttest_event);
98880+ td->event = atomic_add_return_unchecked(1, &rttest_event);
98881 return 0;
98882
98883 case RTTEST_RESET:
98884@@ -76,7 +76,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
98885 return 0;
98886
98887 case RTTEST_RESETEVENT:
98888- atomic_set(&rttest_event, 0);
98889+ atomic_set_unchecked(&rttest_event, 0);
98890 return 0;
98891
98892 default:
98893@@ -93,9 +93,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
98894 return ret;
98895
98896 td->mutexes[id] = 1;
98897- td->event = atomic_add_return(1, &rttest_event);
98898+ td->event = atomic_add_return_unchecked(1, &rttest_event);
98899 rt_mutex_lock(&mutexes[id]);
98900- td->event = atomic_add_return(1, &rttest_event);
98901+ td->event = atomic_add_return_unchecked(1, &rttest_event);
98902 td->mutexes[id] = 4;
98903 return 0;
98904
98905@@ -106,9 +106,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
98906 return ret;
98907
98908 td->mutexes[id] = 1;
98909- td->event = atomic_add_return(1, &rttest_event);
98910+ td->event = atomic_add_return_unchecked(1, &rttest_event);
98911 ret = rt_mutex_lock_interruptible(&mutexes[id], 0);
98912- td->event = atomic_add_return(1, &rttest_event);
98913+ td->event = atomic_add_return_unchecked(1, &rttest_event);
98914 td->mutexes[id] = ret ? 0 : 4;
98915 return ret ? -EINTR : 0;
98916
98917@@ -117,9 +117,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
98918 if (id < 0 || id >= MAX_RT_TEST_MUTEXES || td->mutexes[id] != 4)
98919 return ret;
98920
98921- td->event = atomic_add_return(1, &rttest_event);
98922+ td->event = atomic_add_return_unchecked(1, &rttest_event);
98923 rt_mutex_unlock(&mutexes[id]);
98924- td->event = atomic_add_return(1, &rttest_event);
98925+ td->event = atomic_add_return_unchecked(1, &rttest_event);
98926 td->mutexes[id] = 0;
98927 return 0;
98928
98929@@ -166,7 +166,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
98930 break;
98931
98932 td->mutexes[dat] = 2;
98933- td->event = atomic_add_return(1, &rttest_event);
98934+ td->event = atomic_add_return_unchecked(1, &rttest_event);
98935 break;
98936
98937 default:
98938@@ -186,7 +186,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
98939 return;
98940
98941 td->mutexes[dat] = 3;
98942- td->event = atomic_add_return(1, &rttest_event);
98943+ td->event = atomic_add_return_unchecked(1, &rttest_event);
98944 break;
98945
98946 case RTTEST_LOCKNOWAIT:
98947@@ -198,7 +198,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
98948 return;
98949
98950 td->mutexes[dat] = 1;
98951- td->event = atomic_add_return(1, &rttest_event);
98952+ td->event = atomic_add_return_unchecked(1, &rttest_event);
98953 return;
98954
98955 default:
98956diff --git a/kernel/module.c b/kernel/module.c
98957index 538794c..76d7957 100644
98958--- a/kernel/module.c
98959+++ b/kernel/module.c
98960@@ -59,6 +59,7 @@
98961 #include <linux/jump_label.h>
98962 #include <linux/pfn.h>
98963 #include <linux/bsearch.h>
98964+#include <linux/grsecurity.h>
98965 #include <uapi/linux/module.h>
98966 #include "module-internal.h"
98967
98968@@ -155,7 +156,8 @@ static BLOCKING_NOTIFIER_HEAD(module_notify_list);
98969
98970 /* Bounds of module allocation, for speeding __module_address.
98971 * Protected by module_mutex. */
98972-static unsigned long module_addr_min = -1UL, module_addr_max = 0;
98973+static unsigned long module_addr_min_rw = -1UL, module_addr_max_rw = 0;
98974+static unsigned long module_addr_min_rx = -1UL, module_addr_max_rx = 0;
98975
98976 int register_module_notifier(struct notifier_block *nb)
98977 {
98978@@ -322,7 +324,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
98979 return true;
98980
98981 list_for_each_entry_rcu(mod, &modules, list) {
98982- struct symsearch arr[] = {
98983+ struct symsearch modarr[] = {
98984 { mod->syms, mod->syms + mod->num_syms, mod->crcs,
98985 NOT_GPL_ONLY, false },
98986 { mod->gpl_syms, mod->gpl_syms + mod->num_gpl_syms,
98987@@ -347,7 +349,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
98988 if (mod->state == MODULE_STATE_UNFORMED)
98989 continue;
98990
98991- if (each_symbol_in_section(arr, ARRAY_SIZE(arr), mod, fn, data))
98992+ if (each_symbol_in_section(modarr, ARRAY_SIZE(modarr), mod, fn, data))
98993 return true;
98994 }
98995 return false;
98996@@ -487,7 +489,7 @@ static int percpu_modalloc(struct module *mod, struct load_info *info)
98997 if (!pcpusec->sh_size)
98998 return 0;
98999
99000- if (align > PAGE_SIZE) {
99001+ if (align-1 >= PAGE_SIZE) {
99002 pr_warn("%s: per-cpu alignment %li > %li\n",
99003 mod->name, align, PAGE_SIZE);
99004 align = PAGE_SIZE;
99005@@ -1053,7 +1055,7 @@ struct module_attribute module_uevent =
99006 static ssize_t show_coresize(struct module_attribute *mattr,
99007 struct module_kobject *mk, char *buffer)
99008 {
99009- return sprintf(buffer, "%u\n", mk->mod->core_size);
99010+ return sprintf(buffer, "%u\n", mk->mod->core_size_rx + mk->mod->core_size_rw);
99011 }
99012
99013 static struct module_attribute modinfo_coresize =
99014@@ -1062,7 +1064,7 @@ static struct module_attribute modinfo_coresize =
99015 static ssize_t show_initsize(struct module_attribute *mattr,
99016 struct module_kobject *mk, char *buffer)
99017 {
99018- return sprintf(buffer, "%u\n", mk->mod->init_size);
99019+ return sprintf(buffer, "%u\n", mk->mod->init_size_rx + mk->mod->init_size_rw);
99020 }
99021
99022 static struct module_attribute modinfo_initsize =
99023@@ -1154,12 +1156,29 @@ static int check_version(Elf_Shdr *sechdrs,
99024 goto bad_version;
99025 }
99026
99027+#ifdef CONFIG_GRKERNSEC_RANDSTRUCT
99028+ /*
99029+ * avoid potentially printing jibberish on attempted load
99030+ * of a module randomized with a different seed
99031+ */
99032+ pr_warn("no symbol version for %s\n", symname);
99033+#else
99034 pr_warn("%s: no symbol version for %s\n", mod->name, symname);
99035+#endif
99036 return 0;
99037
99038 bad_version:
99039+#ifdef CONFIG_GRKERNSEC_RANDSTRUCT
99040+ /*
99041+ * avoid potentially printing jibberish on attempted load
99042+ * of a module randomized with a different seed
99043+ */
99044+ pr_warn("attempted module disagrees about version of symbol %s\n",
99045+ symname);
99046+#else
99047 pr_warn("%s: disagrees about version of symbol %s\n",
99048 mod->name, symname);
99049+#endif
99050 return 0;
99051 }
99052
99053@@ -1281,7 +1300,7 @@ resolve_symbol_wait(struct module *mod,
99054 */
99055 #ifdef CONFIG_SYSFS
99056
99057-#ifdef CONFIG_KALLSYMS
99058+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
99059 static inline bool sect_empty(const Elf_Shdr *sect)
99060 {
99061 return !(sect->sh_flags & SHF_ALLOC) || sect->sh_size == 0;
99062@@ -1419,7 +1438,7 @@ static void add_notes_attrs(struct module *mod, const struct load_info *info)
99063 {
99064 unsigned int notes, loaded, i;
99065 struct module_notes_attrs *notes_attrs;
99066- struct bin_attribute *nattr;
99067+ bin_attribute_no_const *nattr;
99068
99069 /* failed to create section attributes, so can't create notes */
99070 if (!mod->sect_attrs)
99071@@ -1531,7 +1550,7 @@ static void del_usage_links(struct module *mod)
99072 static int module_add_modinfo_attrs(struct module *mod)
99073 {
99074 struct module_attribute *attr;
99075- struct module_attribute *temp_attr;
99076+ module_attribute_no_const *temp_attr;
99077 int error = 0;
99078 int i;
99079
99080@@ -1741,21 +1760,21 @@ static void set_section_ro_nx(void *base,
99081
99082 static void unset_module_core_ro_nx(struct module *mod)
99083 {
99084- set_page_attributes(mod->module_core + mod->core_text_size,
99085- mod->module_core + mod->core_size,
99086+ set_page_attributes(mod->module_core_rw,
99087+ mod->module_core_rw + mod->core_size_rw,
99088 set_memory_x);
99089- set_page_attributes(mod->module_core,
99090- mod->module_core + mod->core_ro_size,
99091+ set_page_attributes(mod->module_core_rx,
99092+ mod->module_core_rx + mod->core_size_rx,
99093 set_memory_rw);
99094 }
99095
99096 static void unset_module_init_ro_nx(struct module *mod)
99097 {
99098- set_page_attributes(mod->module_init + mod->init_text_size,
99099- mod->module_init + mod->init_size,
99100+ set_page_attributes(mod->module_init_rw,
99101+ mod->module_init_rw + mod->init_size_rw,
99102 set_memory_x);
99103- set_page_attributes(mod->module_init,
99104- mod->module_init + mod->init_ro_size,
99105+ set_page_attributes(mod->module_init_rx,
99106+ mod->module_init_rx + mod->init_size_rx,
99107 set_memory_rw);
99108 }
99109
99110@@ -1768,14 +1787,14 @@ void set_all_modules_text_rw(void)
99111 list_for_each_entry_rcu(mod, &modules, list) {
99112 if (mod->state == MODULE_STATE_UNFORMED)
99113 continue;
99114- if ((mod->module_core) && (mod->core_text_size)) {
99115- set_page_attributes(mod->module_core,
99116- mod->module_core + mod->core_text_size,
99117+ if ((mod->module_core_rx) && (mod->core_size_rx)) {
99118+ set_page_attributes(mod->module_core_rx,
99119+ mod->module_core_rx + mod->core_size_rx,
99120 set_memory_rw);
99121 }
99122- if ((mod->module_init) && (mod->init_text_size)) {
99123- set_page_attributes(mod->module_init,
99124- mod->module_init + mod->init_text_size,
99125+ if ((mod->module_init_rx) && (mod->init_size_rx)) {
99126+ set_page_attributes(mod->module_init_rx,
99127+ mod->module_init_rx + mod->init_size_rx,
99128 set_memory_rw);
99129 }
99130 }
99131@@ -1791,14 +1810,14 @@ void set_all_modules_text_ro(void)
99132 list_for_each_entry_rcu(mod, &modules, list) {
99133 if (mod->state == MODULE_STATE_UNFORMED)
99134 continue;
99135- if ((mod->module_core) && (mod->core_text_size)) {
99136- set_page_attributes(mod->module_core,
99137- mod->module_core + mod->core_text_size,
99138+ if ((mod->module_core_rx) && (mod->core_size_rx)) {
99139+ set_page_attributes(mod->module_core_rx,
99140+ mod->module_core_rx + mod->core_size_rx,
99141 set_memory_ro);
99142 }
99143- if ((mod->module_init) && (mod->init_text_size)) {
99144- set_page_attributes(mod->module_init,
99145- mod->module_init + mod->init_text_size,
99146+ if ((mod->module_init_rx) && (mod->init_size_rx)) {
99147+ set_page_attributes(mod->module_init_rx,
99148+ mod->module_init_rx + mod->init_size_rx,
99149 set_memory_ro);
99150 }
99151 }
99152@@ -1807,7 +1826,15 @@ void set_all_modules_text_ro(void)
99153 #else
99154 static inline void set_section_ro_nx(void *base, unsigned long text_size, unsigned long ro_size, unsigned long total_size) { }
99155 static void unset_module_core_ro_nx(struct module *mod) { }
99156-static void unset_module_init_ro_nx(struct module *mod) { }
99157+static void unset_module_init_ro_nx(struct module *mod)
99158+{
99159+
99160+#ifdef CONFIG_PAX_KERNEXEC
99161+ set_memory_nx((unsigned long)mod->module_init_rx, PFN_UP(mod->init_size_rx));
99162+ set_memory_rw((unsigned long)mod->module_init_rx, PFN_UP(mod->init_size_rx));
99163+#endif
99164+
99165+}
99166 #endif
99167
99168 void __weak module_memfree(void *module_region)
99169@@ -1861,16 +1888,19 @@ static void free_module(struct module *mod)
99170 /* This may be NULL, but that's OK */
99171 unset_module_init_ro_nx(mod);
99172 module_arch_freeing_init(mod);
99173- module_memfree(mod->module_init);
99174+ module_memfree(mod->module_init_rw);
99175+ module_memfree_exec(mod->module_init_rx);
99176 kfree(mod->args);
99177 percpu_modfree(mod);
99178
99179 /* Free lock-classes; relies on the preceding sync_rcu(). */
99180- lockdep_free_key_range(mod->module_core, mod->core_size);
99181+ lockdep_free_key_range(mod->module_core_rx, mod->core_size_rx);
99182+ lockdep_free_key_range(mod->module_core_rw, mod->core_size_rw);
99183
99184 /* Finally, free the core (containing the module structure) */
99185 unset_module_core_ro_nx(mod);
99186- module_memfree(mod->module_core);
99187+ module_memfree_exec(mod->module_core_rx);
99188+ module_memfree(mod->module_core_rw);
99189
99190 #ifdef CONFIG_MPU
99191 update_protections(current->mm);
99192@@ -1939,9 +1969,31 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
99193 int ret = 0;
99194 const struct kernel_symbol *ksym;
99195
99196+#ifdef CONFIG_GRKERNSEC_MODHARDEN
99197+ int is_fs_load = 0;
99198+ int register_filesystem_found = 0;
99199+ char *p;
99200+
99201+ p = strstr(mod->args, "grsec_modharden_fs");
99202+ if (p) {
99203+ char *endptr = p + sizeof("grsec_modharden_fs") - 1;
99204+ /* copy \0 as well */
99205+ memmove(p, endptr, strlen(mod->args) - (unsigned int)(endptr - mod->args) + 1);
99206+ is_fs_load = 1;
99207+ }
99208+#endif
99209+
99210 for (i = 1; i < symsec->sh_size / sizeof(Elf_Sym); i++) {
99211 const char *name = info->strtab + sym[i].st_name;
99212
99213+#ifdef CONFIG_GRKERNSEC_MODHARDEN
99214+ /* it's a real shame this will never get ripped and copied
99215+ upstream! ;(
99216+ */
99217+ if (is_fs_load && !strcmp(name, "register_filesystem"))
99218+ register_filesystem_found = 1;
99219+#endif
99220+
99221 switch (sym[i].st_shndx) {
99222 case SHN_COMMON:
99223 /* Ignore common symbols */
99224@@ -1966,7 +2018,9 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
99225 ksym = resolve_symbol_wait(mod, info, name);
99226 /* Ok if resolved. */
99227 if (ksym && !IS_ERR(ksym)) {
99228+ pax_open_kernel();
99229 sym[i].st_value = ksym->value;
99230+ pax_close_kernel();
99231 break;
99232 }
99233
99234@@ -1985,11 +2039,20 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
99235 secbase = (unsigned long)mod_percpu(mod);
99236 else
99237 secbase = info->sechdrs[sym[i].st_shndx].sh_addr;
99238+ pax_open_kernel();
99239 sym[i].st_value += secbase;
99240+ pax_close_kernel();
99241 break;
99242 }
99243 }
99244
99245+#ifdef CONFIG_GRKERNSEC_MODHARDEN
99246+ if (is_fs_load && !register_filesystem_found) {
99247+ printk(KERN_ALERT "grsec: Denied attempt to load non-fs module %.64s through mount\n", mod->name);
99248+ ret = -EPERM;
99249+ }
99250+#endif
99251+
99252 return ret;
99253 }
99254
99255@@ -2073,22 +2136,12 @@ static void layout_sections(struct module *mod, struct load_info *info)
99256 || s->sh_entsize != ~0UL
99257 || strstarts(sname, ".init"))
99258 continue;
99259- s->sh_entsize = get_offset(mod, &mod->core_size, s, i);
99260+ if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
99261+ s->sh_entsize = get_offset(mod, &mod->core_size_rw, s, i);
99262+ else
99263+ s->sh_entsize = get_offset(mod, &mod->core_size_rx, s, i);
99264 pr_debug("\t%s\n", sname);
99265 }
99266- switch (m) {
99267- case 0: /* executable */
99268- mod->core_size = debug_align(mod->core_size);
99269- mod->core_text_size = mod->core_size;
99270- break;
99271- case 1: /* RO: text and ro-data */
99272- mod->core_size = debug_align(mod->core_size);
99273- mod->core_ro_size = mod->core_size;
99274- break;
99275- case 3: /* whole core */
99276- mod->core_size = debug_align(mod->core_size);
99277- break;
99278- }
99279 }
99280
99281 pr_debug("Init section allocation order:\n");
99282@@ -2102,23 +2155,13 @@ static void layout_sections(struct module *mod, struct load_info *info)
99283 || s->sh_entsize != ~0UL
99284 || !strstarts(sname, ".init"))
99285 continue;
99286- s->sh_entsize = (get_offset(mod, &mod->init_size, s, i)
99287- | INIT_OFFSET_MASK);
99288+ if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
99289+ s->sh_entsize = get_offset(mod, &mod->init_size_rw, s, i);
99290+ else
99291+ s->sh_entsize = get_offset(mod, &mod->init_size_rx, s, i);
99292+ s->sh_entsize |= INIT_OFFSET_MASK;
99293 pr_debug("\t%s\n", sname);
99294 }
99295- switch (m) {
99296- case 0: /* executable */
99297- mod->init_size = debug_align(mod->init_size);
99298- mod->init_text_size = mod->init_size;
99299- break;
99300- case 1: /* RO: text and ro-data */
99301- mod->init_size = debug_align(mod->init_size);
99302- mod->init_ro_size = mod->init_size;
99303- break;
99304- case 3: /* whole init */
99305- mod->init_size = debug_align(mod->init_size);
99306- break;
99307- }
99308 }
99309 }
99310
99311@@ -2291,7 +2334,7 @@ static void layout_symtab(struct module *mod, struct load_info *info)
99312
99313 /* Put symbol section at end of init part of module. */
99314 symsect->sh_flags |= SHF_ALLOC;
99315- symsect->sh_entsize = get_offset(mod, &mod->init_size, symsect,
99316+ symsect->sh_entsize = get_offset(mod, &mod->init_size_rx, symsect,
99317 info->index.sym) | INIT_OFFSET_MASK;
99318 pr_debug("\t%s\n", info->secstrings + symsect->sh_name);
99319
99320@@ -2308,16 +2351,16 @@ static void layout_symtab(struct module *mod, struct load_info *info)
99321 }
99322
99323 /* Append room for core symbols at end of core part. */
99324- info->symoffs = ALIGN(mod->core_size, symsect->sh_addralign ?: 1);
99325- info->stroffs = mod->core_size = info->symoffs + ndst * sizeof(Elf_Sym);
99326- mod->core_size += strtab_size;
99327- mod->core_size = debug_align(mod->core_size);
99328+ info->symoffs = ALIGN(mod->core_size_rx, symsect->sh_addralign ?: 1);
99329+ info->stroffs = mod->core_size_rx = info->symoffs + ndst * sizeof(Elf_Sym);
99330+ mod->core_size_rx += strtab_size;
99331+ mod->core_size_rx = debug_align(mod->core_size_rx);
99332
99333 /* Put string table section at end of init part of module. */
99334 strsect->sh_flags |= SHF_ALLOC;
99335- strsect->sh_entsize = get_offset(mod, &mod->init_size, strsect,
99336+ strsect->sh_entsize = get_offset(mod, &mod->init_size_rx, strsect,
99337 info->index.str) | INIT_OFFSET_MASK;
99338- mod->init_size = debug_align(mod->init_size);
99339+ mod->init_size_rx = debug_align(mod->init_size_rx);
99340 pr_debug("\t%s\n", info->secstrings + strsect->sh_name);
99341 }
99342
99343@@ -2334,12 +2377,14 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
99344 /* Make sure we get permanent strtab: don't use info->strtab. */
99345 mod->strtab = (void *)info->sechdrs[info->index.str].sh_addr;
99346
99347+ pax_open_kernel();
99348+
99349 /* Set types up while we still have access to sections. */
99350 for (i = 0; i < mod->num_symtab; i++)
99351 mod->symtab[i].st_info = elf_type(&mod->symtab[i], info);
99352
99353- mod->core_symtab = dst = mod->module_core + info->symoffs;
99354- mod->core_strtab = s = mod->module_core + info->stroffs;
99355+ mod->core_symtab = dst = mod->module_core_rx + info->symoffs;
99356+ mod->core_strtab = s = mod->module_core_rx + info->stroffs;
99357 src = mod->symtab;
99358 for (ndst = i = 0; i < mod->num_symtab; i++) {
99359 if (i == 0 ||
99360@@ -2351,6 +2396,8 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
99361 }
99362 }
99363 mod->core_num_syms = ndst;
99364+
99365+ pax_close_kernel();
99366 }
99367 #else
99368 static inline void layout_symtab(struct module *mod, struct load_info *info)
99369@@ -2384,17 +2431,33 @@ void * __weak module_alloc(unsigned long size)
99370 return vmalloc_exec(size);
99371 }
99372
99373-static void *module_alloc_update_bounds(unsigned long size)
99374+static void *module_alloc_update_bounds_rw(unsigned long size)
99375 {
99376 void *ret = module_alloc(size);
99377
99378 if (ret) {
99379 mutex_lock(&module_mutex);
99380 /* Update module bounds. */
99381- if ((unsigned long)ret < module_addr_min)
99382- module_addr_min = (unsigned long)ret;
99383- if ((unsigned long)ret + size > module_addr_max)
99384- module_addr_max = (unsigned long)ret + size;
99385+ if ((unsigned long)ret < module_addr_min_rw)
99386+ module_addr_min_rw = (unsigned long)ret;
99387+ if ((unsigned long)ret + size > module_addr_max_rw)
99388+ module_addr_max_rw = (unsigned long)ret + size;
99389+ mutex_unlock(&module_mutex);
99390+ }
99391+ return ret;
99392+}
99393+
99394+static void *module_alloc_update_bounds_rx(unsigned long size)
99395+{
99396+ void *ret = module_alloc_exec(size);
99397+
99398+ if (ret) {
99399+ mutex_lock(&module_mutex);
99400+ /* Update module bounds. */
99401+ if ((unsigned long)ret < module_addr_min_rx)
99402+ module_addr_min_rx = (unsigned long)ret;
99403+ if ((unsigned long)ret + size > module_addr_max_rx)
99404+ module_addr_max_rx = (unsigned long)ret + size;
99405 mutex_unlock(&module_mutex);
99406 }
99407 return ret;
99408@@ -2665,7 +2728,15 @@ static struct module *setup_load_info(struct load_info *info, int flags)
99409 mod = (void *)info->sechdrs[info->index.mod].sh_addr;
99410
99411 if (info->index.sym == 0) {
99412+#ifdef CONFIG_GRKERNSEC_RANDSTRUCT
99413+ /*
99414+ * avoid potentially printing jibberish on attempted load
99415+ * of a module randomized with a different seed
99416+ */
99417+ pr_warn("module has no symbols (stripped?)\n");
99418+#else
99419 pr_warn("%s: module has no symbols (stripped?)\n", mod->name);
99420+#endif
99421 return ERR_PTR(-ENOEXEC);
99422 }
99423
99424@@ -2681,8 +2752,14 @@ static struct module *setup_load_info(struct load_info *info, int flags)
99425 static int check_modinfo(struct module *mod, struct load_info *info, int flags)
99426 {
99427 const char *modmagic = get_modinfo(info, "vermagic");
99428+ const char *license = get_modinfo(info, "license");
99429 int err;
99430
99431+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
99432+ if (!license || !license_is_gpl_compatible(license))
99433+ return -ENOEXEC;
99434+#endif
99435+
99436 if (flags & MODULE_INIT_IGNORE_VERMAGIC)
99437 modmagic = NULL;
99438
99439@@ -2707,7 +2784,7 @@ static int check_modinfo(struct module *mod, struct load_info *info, int flags)
99440 }
99441
99442 /* Set up license info based on the info section */
99443- set_license(mod, get_modinfo(info, "license"));
99444+ set_license(mod, license);
99445
99446 return 0;
99447 }
99448@@ -2801,7 +2878,7 @@ static int move_module(struct module *mod, struct load_info *info)
99449 void *ptr;
99450
99451 /* Do the allocs. */
99452- ptr = module_alloc_update_bounds(mod->core_size);
99453+ ptr = module_alloc_update_bounds_rw(mod->core_size_rw);
99454 /*
99455 * The pointer to this block is stored in the module structure
99456 * which is inside the block. Just mark it as not being a
99457@@ -2811,11 +2888,11 @@ static int move_module(struct module *mod, struct load_info *info)
99458 if (!ptr)
99459 return -ENOMEM;
99460
99461- memset(ptr, 0, mod->core_size);
99462- mod->module_core = ptr;
99463+ memset(ptr, 0, mod->core_size_rw);
99464+ mod->module_core_rw = ptr;
99465
99466- if (mod->init_size) {
99467- ptr = module_alloc_update_bounds(mod->init_size);
99468+ if (mod->init_size_rw) {
99469+ ptr = module_alloc_update_bounds_rw(mod->init_size_rw);
99470 /*
99471 * The pointer to this block is stored in the module structure
99472 * which is inside the block. This block doesn't need to be
99473@@ -2824,13 +2901,45 @@ static int move_module(struct module *mod, struct load_info *info)
99474 */
99475 kmemleak_ignore(ptr);
99476 if (!ptr) {
99477- module_memfree(mod->module_core);
99478+ module_memfree(mod->module_core_rw);
99479 return -ENOMEM;
99480 }
99481- memset(ptr, 0, mod->init_size);
99482- mod->module_init = ptr;
99483+ memset(ptr, 0, mod->init_size_rw);
99484+ mod->module_init_rw = ptr;
99485 } else
99486- mod->module_init = NULL;
99487+ mod->module_init_rw = NULL;
99488+
99489+ ptr = module_alloc_update_bounds_rx(mod->core_size_rx);
99490+ kmemleak_not_leak(ptr);
99491+ if (!ptr) {
99492+ if (mod->module_init_rw)
99493+ module_memfree(mod->module_init_rw);
99494+ module_memfree(mod->module_core_rw);
99495+ return -ENOMEM;
99496+ }
99497+
99498+ pax_open_kernel();
99499+ memset(ptr, 0, mod->core_size_rx);
99500+ pax_close_kernel();
99501+ mod->module_core_rx = ptr;
99502+
99503+ if (mod->init_size_rx) {
99504+ ptr = module_alloc_update_bounds_rx(mod->init_size_rx);
99505+ kmemleak_ignore(ptr);
99506+ if (!ptr && mod->init_size_rx) {
99507+ module_memfree_exec(mod->module_core_rx);
99508+ if (mod->module_init_rw)
99509+ module_memfree(mod->module_init_rw);
99510+ module_memfree(mod->module_core_rw);
99511+ return -ENOMEM;
99512+ }
99513+
99514+ pax_open_kernel();
99515+ memset(ptr, 0, mod->init_size_rx);
99516+ pax_close_kernel();
99517+ mod->module_init_rx = ptr;
99518+ } else
99519+ mod->module_init_rx = NULL;
99520
99521 /* Transfer each section which specifies SHF_ALLOC */
99522 pr_debug("final section addresses:\n");
99523@@ -2841,16 +2950,45 @@ static int move_module(struct module *mod, struct load_info *info)
99524 if (!(shdr->sh_flags & SHF_ALLOC))
99525 continue;
99526
99527- if (shdr->sh_entsize & INIT_OFFSET_MASK)
99528- dest = mod->module_init
99529- + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
99530- else
99531- dest = mod->module_core + shdr->sh_entsize;
99532+ if (shdr->sh_entsize & INIT_OFFSET_MASK) {
99533+ if ((shdr->sh_flags & SHF_WRITE) || !(shdr->sh_flags & SHF_ALLOC))
99534+ dest = mod->module_init_rw
99535+ + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
99536+ else
99537+ dest = mod->module_init_rx
99538+ + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
99539+ } else {
99540+ if ((shdr->sh_flags & SHF_WRITE) || !(shdr->sh_flags & SHF_ALLOC))
99541+ dest = mod->module_core_rw + shdr->sh_entsize;
99542+ else
99543+ dest = mod->module_core_rx + shdr->sh_entsize;
99544+ }
99545+
99546+ if (shdr->sh_type != SHT_NOBITS) {
99547+
99548+#ifdef CONFIG_PAX_KERNEXEC
99549+#ifdef CONFIG_X86_64
99550+ if ((shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_EXECINSTR))
99551+ set_memory_x((unsigned long)dest, (shdr->sh_size + PAGE_SIZE) >> PAGE_SHIFT);
99552+#endif
99553+ if (!(shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_ALLOC)) {
99554+ pax_open_kernel();
99555+ memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
99556+ pax_close_kernel();
99557+ } else
99558+#endif
99559
99560- if (shdr->sh_type != SHT_NOBITS)
99561 memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
99562+ }
99563 /* Update sh_addr to point to copy in image. */
99564- shdr->sh_addr = (unsigned long)dest;
99565+
99566+#ifdef CONFIG_PAX_KERNEXEC
99567+ if (shdr->sh_flags & SHF_EXECINSTR)
99568+ shdr->sh_addr = ktva_ktla((unsigned long)dest);
99569+ else
99570+#endif
99571+
99572+ shdr->sh_addr = (unsigned long)dest;
99573 pr_debug("\t0x%lx %s\n",
99574 (long)shdr->sh_addr, info->secstrings + shdr->sh_name);
99575 }
99576@@ -2907,12 +3045,12 @@ static void flush_module_icache(const struct module *mod)
99577 * Do it before processing of module parameters, so the module
99578 * can provide parameter accessor functions of its own.
99579 */
99580- if (mod->module_init)
99581- flush_icache_range((unsigned long)mod->module_init,
99582- (unsigned long)mod->module_init
99583- + mod->init_size);
99584- flush_icache_range((unsigned long)mod->module_core,
99585- (unsigned long)mod->module_core + mod->core_size);
99586+ if (mod->module_init_rx)
99587+ flush_icache_range((unsigned long)mod->module_init_rx,
99588+ (unsigned long)mod->module_init_rx
99589+ + mod->init_size_rx);
99590+ flush_icache_range((unsigned long)mod->module_core_rx,
99591+ (unsigned long)mod->module_core_rx + mod->core_size_rx);
99592
99593 set_fs(old_fs);
99594 }
99595@@ -2970,8 +3108,10 @@ static void module_deallocate(struct module *mod, struct load_info *info)
99596 {
99597 percpu_modfree(mod);
99598 module_arch_freeing_init(mod);
99599- module_memfree(mod->module_init);
99600- module_memfree(mod->module_core);
99601+ module_memfree_exec(mod->module_init_rx);
99602+ module_memfree_exec(mod->module_core_rx);
99603+ module_memfree(mod->module_init_rw);
99604+ module_memfree(mod->module_core_rw);
99605 }
99606
99607 int __weak module_finalize(const Elf_Ehdr *hdr,
99608@@ -2984,7 +3124,9 @@ int __weak module_finalize(const Elf_Ehdr *hdr,
99609 static int post_relocation(struct module *mod, const struct load_info *info)
99610 {
99611 /* Sort exception table now relocations are done. */
99612+ pax_open_kernel();
99613 sort_extable(mod->extable, mod->extable + mod->num_exentries);
99614+ pax_close_kernel();
99615
99616 /* Copy relocated percpu area over. */
99617 percpu_modcopy(mod, (void *)info->sechdrs[info->index.pcpu].sh_addr,
99618@@ -3032,13 +3174,15 @@ static void do_mod_ctors(struct module *mod)
99619 /* For freeing module_init on success, in case kallsyms traversing */
99620 struct mod_initfree {
99621 struct rcu_head rcu;
99622- void *module_init;
99623+ void *module_init_rw;
99624+ void *module_init_rx;
99625 };
99626
99627 static void do_free_init(struct rcu_head *head)
99628 {
99629 struct mod_initfree *m = container_of(head, struct mod_initfree, rcu);
99630- module_memfree(m->module_init);
99631+ module_memfree(m->module_init_rw);
99632+ module_memfree_exec(m->module_init_rx);
99633 kfree(m);
99634 }
99635
99636@@ -3058,7 +3202,8 @@ static noinline int do_init_module(struct module *mod)
99637 ret = -ENOMEM;
99638 goto fail;
99639 }
99640- freeinit->module_init = mod->module_init;
99641+ freeinit->module_init_rw = mod->module_init_rw;
99642+ freeinit->module_init_rx = mod->module_init_rx;
99643
99644 /*
99645 * We want to find out whether @mod uses async during init. Clear
99646@@ -3117,10 +3262,10 @@ static noinline int do_init_module(struct module *mod)
99647 #endif
99648 unset_module_init_ro_nx(mod);
99649 module_arch_freeing_init(mod);
99650- mod->module_init = NULL;
99651- mod->init_size = 0;
99652- mod->init_ro_size = 0;
99653- mod->init_text_size = 0;
99654+ mod->module_init_rw = NULL;
99655+ mod->module_init_rx = NULL;
99656+ mod->init_size_rw = 0;
99657+ mod->init_size_rx = 0;
99658 /*
99659 * We want to free module_init, but be aware that kallsyms may be
99660 * walking this with preempt disabled. In all the failure paths,
99661@@ -3208,16 +3353,16 @@ static int complete_formation(struct module *mod, struct load_info *info)
99662 module_bug_finalize(info->hdr, info->sechdrs, mod);
99663
99664 /* Set RO and NX regions for core */
99665- set_section_ro_nx(mod->module_core,
99666- mod->core_text_size,
99667- mod->core_ro_size,
99668- mod->core_size);
99669+ set_section_ro_nx(mod->module_core_rx,
99670+ mod->core_size_rx,
99671+ mod->core_size_rx,
99672+ mod->core_size_rx);
99673
99674 /* Set RO and NX regions for init */
99675- set_section_ro_nx(mod->module_init,
99676- mod->init_text_size,
99677- mod->init_ro_size,
99678- mod->init_size);
99679+ set_section_ro_nx(mod->module_init_rx,
99680+ mod->init_size_rx,
99681+ mod->init_size_rx,
99682+ mod->init_size_rx);
99683
99684 /* Mark state as coming so strong_try_module_get() ignores us,
99685 * but kallsyms etc. can see us. */
99686@@ -3301,9 +3446,38 @@ static int load_module(struct load_info *info, const char __user *uargs,
99687 if (err)
99688 goto free_unload;
99689
99690+ /* Now copy in args */
99691+ mod->args = strndup_user(uargs, ~0UL >> 1);
99692+ if (IS_ERR(mod->args)) {
99693+ err = PTR_ERR(mod->args);
99694+ goto free_unload;
99695+ }
99696+
99697 /* Set up MODINFO_ATTR fields */
99698 setup_modinfo(mod, info);
99699
99700+#ifdef CONFIG_GRKERNSEC_MODHARDEN
99701+ {
99702+ char *p, *p2;
99703+
99704+ if (strstr(mod->args, "grsec_modharden_netdev")) {
99705+ 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);
99706+ err = -EPERM;
99707+ goto free_modinfo;
99708+ } else if ((p = strstr(mod->args, "grsec_modharden_normal"))) {
99709+ p += sizeof("grsec_modharden_normal") - 1;
99710+ p2 = strstr(p, "_");
99711+ if (p2) {
99712+ *p2 = '\0';
99713+ printk(KERN_ALERT "grsec: denied kernel module auto-load of %.64s by uid %.9s\n", mod->name, p);
99714+ *p2 = '_';
99715+ }
99716+ err = -EPERM;
99717+ goto free_modinfo;
99718+ }
99719+ }
99720+#endif
99721+
99722 /* Fix up syms, so that st_value is a pointer to location. */
99723 err = simplify_symbols(mod, info);
99724 if (err < 0)
99725@@ -3319,13 +3493,6 @@ static int load_module(struct load_info *info, const char __user *uargs,
99726
99727 flush_module_icache(mod);
99728
99729- /* Now copy in args */
99730- mod->args = strndup_user(uargs, ~0UL >> 1);
99731- if (IS_ERR(mod->args)) {
99732- err = PTR_ERR(mod->args);
99733- goto free_arch_cleanup;
99734- }
99735-
99736 dynamic_debug_setup(info->debug, info->num_debug);
99737
99738 /* Ftrace init must be called in the MODULE_STATE_UNFORMED state */
99739@@ -3376,11 +3543,10 @@ static int load_module(struct load_info *info, const char __user *uargs,
99740 ddebug_cleanup:
99741 dynamic_debug_remove(info->debug);
99742 synchronize_sched();
99743- kfree(mod->args);
99744- free_arch_cleanup:
99745 module_arch_cleanup(mod);
99746 free_modinfo:
99747 free_modinfo(mod);
99748+ kfree(mod->args);
99749 free_unload:
99750 module_unload_free(mod);
99751 unlink_mod:
99752@@ -3393,7 +3559,8 @@ static int load_module(struct load_info *info, const char __user *uargs,
99753 mutex_unlock(&module_mutex);
99754 free_module:
99755 /* Free lock-classes; relies on the preceding sync_rcu() */
99756- lockdep_free_key_range(mod->module_core, mod->core_size);
99757+ lockdep_free_key_range(mod->module_core_rx, mod->core_size_rx);
99758+ lockdep_free_key_range(mod->module_core_rw, mod->core_size_rw);
99759
99760 module_deallocate(mod, info);
99761 free_copy:
99762@@ -3470,10 +3637,16 @@ static const char *get_ksymbol(struct module *mod,
99763 unsigned long nextval;
99764
99765 /* At worse, next value is at end of module */
99766- if (within_module_init(addr, mod))
99767- nextval = (unsigned long)mod->module_init+mod->init_text_size;
99768+ if (within_module_init_rx(addr, mod))
99769+ nextval = (unsigned long)mod->module_init_rx+mod->init_size_rx;
99770+ else if (within_module_init_rw(addr, mod))
99771+ nextval = (unsigned long)mod->module_init_rw+mod->init_size_rw;
99772+ else if (within_module_core_rx(addr, mod))
99773+ nextval = (unsigned long)mod->module_core_rx+mod->core_size_rx;
99774+ else if (within_module_core_rw(addr, mod))
99775+ nextval = (unsigned long)mod->module_core_rw+mod->core_size_rw;
99776 else
99777- nextval = (unsigned long)mod->module_core+mod->core_text_size;
99778+ return NULL;
99779
99780 /* Scan for closest preceding symbol, and next symbol. (ELF
99781 starts real symbols at 1). */
99782@@ -3721,7 +3894,7 @@ static int m_show(struct seq_file *m, void *p)
99783 return 0;
99784
99785 seq_printf(m, "%s %u",
99786- mod->name, mod->init_size + mod->core_size);
99787+ mod->name, mod->init_size_rx + mod->init_size_rw + mod->core_size_rx + mod->core_size_rw);
99788 print_unload_info(m, mod);
99789
99790 /* Informative for users. */
99791@@ -3730,7 +3903,7 @@ static int m_show(struct seq_file *m, void *p)
99792 mod->state == MODULE_STATE_COMING ? "Loading" :
99793 "Live");
99794 /* Used by oprofile and other similar tools. */
99795- seq_printf(m, " 0x%pK", mod->module_core);
99796+ seq_printf(m, " 0x%pK 0x%pK", mod->module_core_rx, mod->module_core_rw);
99797
99798 /* Taints info */
99799 if (mod->taints)
99800@@ -3766,7 +3939,17 @@ static const struct file_operations proc_modules_operations = {
99801
99802 static int __init proc_modules_init(void)
99803 {
99804+#ifndef CONFIG_GRKERNSEC_HIDESYM
99805+#ifdef CONFIG_GRKERNSEC_PROC_USER
99806+ proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
99807+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
99808+ proc_create("modules", S_IRUSR | S_IRGRP, NULL, &proc_modules_operations);
99809+#else
99810 proc_create("modules", 0, NULL, &proc_modules_operations);
99811+#endif
99812+#else
99813+ proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
99814+#endif
99815 return 0;
99816 }
99817 module_init(proc_modules_init);
99818@@ -3827,7 +4010,8 @@ struct module *__module_address(unsigned long addr)
99819 {
99820 struct module *mod;
99821
99822- if (addr < module_addr_min || addr > module_addr_max)
99823+ if ((addr < module_addr_min_rx || addr > module_addr_max_rx) &&
99824+ (addr < module_addr_min_rw || addr > module_addr_max_rw))
99825 return NULL;
99826
99827 list_for_each_entry_rcu(mod, &modules, list) {
99828@@ -3868,11 +4052,20 @@ bool is_module_text_address(unsigned long addr)
99829 */
99830 struct module *__module_text_address(unsigned long addr)
99831 {
99832- struct module *mod = __module_address(addr);
99833+ struct module *mod;
99834+
99835+#ifdef CONFIG_X86_32
99836+ addr = ktla_ktva(addr);
99837+#endif
99838+
99839+ if (addr < module_addr_min_rx || addr > module_addr_max_rx)
99840+ return NULL;
99841+
99842+ mod = __module_address(addr);
99843+
99844 if (mod) {
99845 /* Make sure it's within the text section. */
99846- if (!within(addr, mod->module_init, mod->init_text_size)
99847- && !within(addr, mod->module_core, mod->core_text_size))
99848+ if (!within_module_init_rx(addr, mod) && !within_module_core_rx(addr, mod))
99849 mod = NULL;
99850 }
99851 return mod;
99852diff --git a/kernel/notifier.c b/kernel/notifier.c
99853index ae9fc7c..5085fbf 100644
99854--- a/kernel/notifier.c
99855+++ b/kernel/notifier.c
99856@@ -5,6 +5,7 @@
99857 #include <linux/rcupdate.h>
99858 #include <linux/vmalloc.h>
99859 #include <linux/reboot.h>
99860+#include <linux/mm.h>
99861
99862 /*
99863 * Notifier list for kernel code which wants to be called
99864@@ -24,10 +25,12 @@ static int notifier_chain_register(struct notifier_block **nl,
99865 while ((*nl) != NULL) {
99866 if (n->priority > (*nl)->priority)
99867 break;
99868- nl = &((*nl)->next);
99869+ nl = (struct notifier_block **)&((*nl)->next);
99870 }
99871- n->next = *nl;
99872+ pax_open_kernel();
99873+ *(const void **)&n->next = *nl;
99874 rcu_assign_pointer(*nl, n);
99875+ pax_close_kernel();
99876 return 0;
99877 }
99878
99879@@ -39,10 +42,12 @@ static int notifier_chain_cond_register(struct notifier_block **nl,
99880 return 0;
99881 if (n->priority > (*nl)->priority)
99882 break;
99883- nl = &((*nl)->next);
99884+ nl = (struct notifier_block **)&((*nl)->next);
99885 }
99886- n->next = *nl;
99887+ pax_open_kernel();
99888+ *(const void **)&n->next = *nl;
99889 rcu_assign_pointer(*nl, n);
99890+ pax_close_kernel();
99891 return 0;
99892 }
99893
99894@@ -51,10 +56,12 @@ static int notifier_chain_unregister(struct notifier_block **nl,
99895 {
99896 while ((*nl) != NULL) {
99897 if ((*nl) == n) {
99898+ pax_open_kernel();
99899 rcu_assign_pointer(*nl, n->next);
99900+ pax_close_kernel();
99901 return 0;
99902 }
99903- nl = &((*nl)->next);
99904+ nl = (struct notifier_block **)&((*nl)->next);
99905 }
99906 return -ENOENT;
99907 }
99908diff --git a/kernel/padata.c b/kernel/padata.c
99909index b38bea9..91acfbe 100644
99910--- a/kernel/padata.c
99911+++ b/kernel/padata.c
99912@@ -54,7 +54,7 @@ static int padata_cpu_hash(struct parallel_data *pd)
99913 * seq_nr mod. number of cpus in use.
99914 */
99915
99916- seq_nr = atomic_inc_return(&pd->seq_nr);
99917+ seq_nr = atomic_inc_return_unchecked(&pd->seq_nr);
99918 cpu_index = seq_nr % cpumask_weight(pd->cpumask.pcpu);
99919
99920 return padata_index_to_cpu(pd, cpu_index);
99921@@ -428,7 +428,7 @@ static struct parallel_data *padata_alloc_pd(struct padata_instance *pinst,
99922 padata_init_pqueues(pd);
99923 padata_init_squeues(pd);
99924 setup_timer(&pd->timer, padata_reorder_timer, (unsigned long)pd);
99925- atomic_set(&pd->seq_nr, -1);
99926+ atomic_set_unchecked(&pd->seq_nr, -1);
99927 atomic_set(&pd->reorder_objects, 0);
99928 atomic_set(&pd->refcnt, 0);
99929 pd->pinst = pinst;
99930diff --git a/kernel/panic.c b/kernel/panic.c
99931index 8136ad7..15c857b 100644
99932--- a/kernel/panic.c
99933+++ b/kernel/panic.c
99934@@ -54,7 +54,7 @@ EXPORT_SYMBOL(panic_blink);
99935 /*
99936 * Stop ourself in panic -- architecture code may override this
99937 */
99938-void __weak panic_smp_self_stop(void)
99939+void __weak __noreturn panic_smp_self_stop(void)
99940 {
99941 while (1)
99942 cpu_relax();
99943@@ -425,7 +425,7 @@ static void warn_slowpath_common(const char *file, int line, void *caller,
99944 disable_trace_on_warning();
99945
99946 pr_warn("------------[ cut here ]------------\n");
99947- pr_warn("WARNING: CPU: %d PID: %d at %s:%d %pS()\n",
99948+ pr_warn("WARNING: CPU: %d PID: %d at %s:%d %pA()\n",
99949 raw_smp_processor_id(), current->pid, file, line, caller);
99950
99951 if (args)
99952@@ -490,7 +490,8 @@ EXPORT_SYMBOL(warn_slowpath_null);
99953 */
99954 __visible void __stack_chk_fail(void)
99955 {
99956- panic("stack-protector: Kernel stack is corrupted in: %p\n",
99957+ dump_stack();
99958+ panic("stack-protector: Kernel stack is corrupted in: %pA\n",
99959 __builtin_return_address(0));
99960 }
99961 EXPORT_SYMBOL(__stack_chk_fail);
99962diff --git a/kernel/pid.c b/kernel/pid.c
99963index cd36a5e..11f185d 100644
99964--- a/kernel/pid.c
99965+++ b/kernel/pid.c
99966@@ -33,6 +33,7 @@
99967 #include <linux/rculist.h>
99968 #include <linux/bootmem.h>
99969 #include <linux/hash.h>
99970+#include <linux/security.h>
99971 #include <linux/pid_namespace.h>
99972 #include <linux/init_task.h>
99973 #include <linux/syscalls.h>
99974@@ -47,7 +48,7 @@ struct pid init_struct_pid = INIT_STRUCT_PID;
99975
99976 int pid_max = PID_MAX_DEFAULT;
99977
99978-#define RESERVED_PIDS 300
99979+#define RESERVED_PIDS 500
99980
99981 int pid_max_min = RESERVED_PIDS + 1;
99982 int pid_max_max = PID_MAX_LIMIT;
99983@@ -450,10 +451,18 @@ EXPORT_SYMBOL(pid_task);
99984 */
99985 struct task_struct *find_task_by_pid_ns(pid_t nr, struct pid_namespace *ns)
99986 {
99987+ struct task_struct *task;
99988+
99989 rcu_lockdep_assert(rcu_read_lock_held(),
99990 "find_task_by_pid_ns() needs rcu_read_lock()"
99991 " protection");
99992- return pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
99993+
99994+ task = pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
99995+
99996+ if (gr_pid_is_chrooted(task))
99997+ return NULL;
99998+
99999+ return task;
100000 }
100001
100002 struct task_struct *find_task_by_vpid(pid_t vnr)
100003@@ -461,6 +470,14 @@ struct task_struct *find_task_by_vpid(pid_t vnr)
100004 return find_task_by_pid_ns(vnr, task_active_pid_ns(current));
100005 }
100006
100007+struct task_struct *find_task_by_vpid_unrestricted(pid_t vnr)
100008+{
100009+ rcu_lockdep_assert(rcu_read_lock_held(),
100010+ "find_task_by_pid_ns() needs rcu_read_lock()"
100011+ " protection");
100012+ return pid_task(find_pid_ns(vnr, task_active_pid_ns(current)), PIDTYPE_PID);
100013+}
100014+
100015 struct pid *get_task_pid(struct task_struct *task, enum pid_type type)
100016 {
100017 struct pid *pid;
100018diff --git a/kernel/pid_namespace.c b/kernel/pid_namespace.c
100019index a65ba13..f600dbb 100644
100020--- a/kernel/pid_namespace.c
100021+++ b/kernel/pid_namespace.c
100022@@ -274,7 +274,7 @@ static int pid_ns_ctl_handler(struct ctl_table *table, int write,
100023 void __user *buffer, size_t *lenp, loff_t *ppos)
100024 {
100025 struct pid_namespace *pid_ns = task_active_pid_ns(current);
100026- struct ctl_table tmp = *table;
100027+ ctl_table_no_const tmp = *table;
100028
100029 if (write && !ns_capable(pid_ns->user_ns, CAP_SYS_ADMIN))
100030 return -EPERM;
100031diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
100032index 7e01f78..f5da19d 100644
100033--- a/kernel/power/Kconfig
100034+++ b/kernel/power/Kconfig
100035@@ -24,6 +24,8 @@ config HIBERNATE_CALLBACKS
100036 config HIBERNATION
100037 bool "Hibernation (aka 'suspend to disk')"
100038 depends on SWAP && ARCH_HIBERNATION_POSSIBLE
100039+ depends on !GRKERNSEC_KMEM
100040+ depends on !PAX_MEMORY_SANITIZE
100041 select HIBERNATE_CALLBACKS
100042 select LZO_COMPRESS
100043 select LZO_DECOMPRESS
100044diff --git a/kernel/power/process.c b/kernel/power/process.c
100045index 564f786..361a18e 100644
100046--- a/kernel/power/process.c
100047+++ b/kernel/power/process.c
100048@@ -35,6 +35,7 @@ static int try_to_freeze_tasks(bool user_only)
100049 unsigned int elapsed_msecs;
100050 bool wakeup = false;
100051 int sleep_usecs = USEC_PER_MSEC;
100052+ bool timedout = false;
100053
100054 do_gettimeofday(&start);
100055
100056@@ -45,13 +46,20 @@ static int try_to_freeze_tasks(bool user_only)
100057
100058 while (true) {
100059 todo = 0;
100060+ if (time_after(jiffies, end_time))
100061+ timedout = true;
100062 read_lock(&tasklist_lock);
100063 for_each_process_thread(g, p) {
100064 if (p == current || !freeze_task(p))
100065 continue;
100066
100067- if (!freezer_should_skip(p))
100068+ if (!freezer_should_skip(p)) {
100069 todo++;
100070+ if (timedout) {
100071+ printk(KERN_ERR "Task refusing to freeze:\n");
100072+ sched_show_task(p);
100073+ }
100074+ }
100075 }
100076 read_unlock(&tasklist_lock);
100077
100078@@ -60,7 +68,7 @@ static int try_to_freeze_tasks(bool user_only)
100079 todo += wq_busy;
100080 }
100081
100082- if (!todo || time_after(jiffies, end_time))
100083+ if (!todo || timedout)
100084 break;
100085
100086 if (pm_wakeup_pending()) {
100087diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
100088index bb0635b..9aff9f3 100644
100089--- a/kernel/printk/printk.c
100090+++ b/kernel/printk/printk.c
100091@@ -486,6 +486,11 @@ int check_syslog_permissions(int type, bool from_file)
100092 if (from_file && type != SYSLOG_ACTION_OPEN)
100093 return 0;
100094
100095+#ifdef CONFIG_GRKERNSEC_DMESG
100096+ if (grsec_enable_dmesg && !capable(CAP_SYSLOG) && !capable_nolog(CAP_SYS_ADMIN))
100097+ return -EPERM;
100098+#endif
100099+
100100 if (syslog_action_restricted(type)) {
100101 if (capable(CAP_SYSLOG))
100102 return 0;
100103diff --git a/kernel/profile.c b/kernel/profile.c
100104index a7bcd28..5b368fa 100644
100105--- a/kernel/profile.c
100106+++ b/kernel/profile.c
100107@@ -37,7 +37,7 @@ struct profile_hit {
100108 #define NR_PROFILE_HIT (PAGE_SIZE/sizeof(struct profile_hit))
100109 #define NR_PROFILE_GRP (NR_PROFILE_HIT/PROFILE_GRPSZ)
100110
100111-static atomic_t *prof_buffer;
100112+static atomic_unchecked_t *prof_buffer;
100113 static unsigned long prof_len, prof_shift;
100114
100115 int prof_on __read_mostly;
100116@@ -256,7 +256,7 @@ static void profile_flip_buffers(void)
100117 hits[i].pc = 0;
100118 continue;
100119 }
100120- atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
100121+ atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
100122 hits[i].hits = hits[i].pc = 0;
100123 }
100124 }
100125@@ -317,9 +317,9 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
100126 * Add the current hit(s) and flush the write-queue out
100127 * to the global buffer:
100128 */
100129- atomic_add(nr_hits, &prof_buffer[pc]);
100130+ atomic_add_unchecked(nr_hits, &prof_buffer[pc]);
100131 for (i = 0; i < NR_PROFILE_HIT; ++i) {
100132- atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
100133+ atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
100134 hits[i].pc = hits[i].hits = 0;
100135 }
100136 out:
100137@@ -394,7 +394,7 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
100138 {
100139 unsigned long pc;
100140 pc = ((unsigned long)__pc - (unsigned long)_stext) >> prof_shift;
100141- atomic_add(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
100142+ atomic_add_unchecked(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
100143 }
100144 #endif /* !CONFIG_SMP */
100145
100146@@ -489,7 +489,7 @@ read_profile(struct file *file, char __user *buf, size_t count, loff_t *ppos)
100147 return -EFAULT;
100148 buf++; p++; count--; read++;
100149 }
100150- pnt = (char *)prof_buffer + p - sizeof(atomic_t);
100151+ pnt = (char *)prof_buffer + p - sizeof(atomic_unchecked_t);
100152 if (copy_to_user(buf, (void *)pnt, count))
100153 return -EFAULT;
100154 read += count;
100155@@ -520,7 +520,7 @@ static ssize_t write_profile(struct file *file, const char __user *buf,
100156 }
100157 #endif
100158 profile_discard_flip_buffers();
100159- memset(prof_buffer, 0, prof_len * sizeof(atomic_t));
100160+ memset(prof_buffer, 0, prof_len * sizeof(atomic_unchecked_t));
100161 return count;
100162 }
100163
100164diff --git a/kernel/ptrace.c b/kernel/ptrace.c
100165index 9a34bd8..38d90e5 100644
100166--- a/kernel/ptrace.c
100167+++ b/kernel/ptrace.c
100168@@ -321,7 +321,7 @@ static int ptrace_attach(struct task_struct *task, long request,
100169 if (seize)
100170 flags |= PT_SEIZED;
100171 rcu_read_lock();
100172- if (ns_capable(__task_cred(task)->user_ns, CAP_SYS_PTRACE))
100173+ if (ns_capable_nolog(__task_cred(task)->user_ns, CAP_SYS_PTRACE))
100174 flags |= PT_PTRACE_CAP;
100175 rcu_read_unlock();
100176 task->ptrace = flags;
100177@@ -515,7 +515,7 @@ int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst
100178 break;
100179 return -EIO;
100180 }
100181- if (copy_to_user(dst, buf, retval))
100182+ if (retval > sizeof(buf) || copy_to_user(dst, buf, retval))
100183 return -EFAULT;
100184 copied += retval;
100185 src += retval;
100186@@ -803,7 +803,7 @@ int ptrace_request(struct task_struct *child, long request,
100187 bool seized = child->ptrace & PT_SEIZED;
100188 int ret = -EIO;
100189 siginfo_t siginfo, *si;
100190- void __user *datavp = (void __user *) data;
100191+ void __user *datavp = (__force void __user *) data;
100192 unsigned long __user *datalp = datavp;
100193 unsigned long flags;
100194
100195@@ -1049,14 +1049,21 @@ SYSCALL_DEFINE4(ptrace, long, request, long, pid, unsigned long, addr,
100196 goto out;
100197 }
100198
100199+ if (gr_handle_ptrace(child, request)) {
100200+ ret = -EPERM;
100201+ goto out_put_task_struct;
100202+ }
100203+
100204 if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
100205 ret = ptrace_attach(child, request, addr, data);
100206 /*
100207 * Some architectures need to do book-keeping after
100208 * a ptrace attach.
100209 */
100210- if (!ret)
100211+ if (!ret) {
100212 arch_ptrace_attach(child);
100213+ gr_audit_ptrace(child);
100214+ }
100215 goto out_put_task_struct;
100216 }
100217
100218@@ -1084,7 +1091,7 @@ int generic_ptrace_peekdata(struct task_struct *tsk, unsigned long addr,
100219 copied = access_process_vm(tsk, addr, &tmp, sizeof(tmp), 0);
100220 if (copied != sizeof(tmp))
100221 return -EIO;
100222- return put_user(tmp, (unsigned long __user *)data);
100223+ return put_user(tmp, (__force unsigned long __user *)data);
100224 }
100225
100226 int generic_ptrace_pokedata(struct task_struct *tsk, unsigned long addr,
100227@@ -1177,7 +1184,7 @@ int compat_ptrace_request(struct task_struct *child, compat_long_t request,
100228 }
100229
100230 COMPAT_SYSCALL_DEFINE4(ptrace, compat_long_t, request, compat_long_t, pid,
100231- compat_long_t, addr, compat_long_t, data)
100232+ compat_ulong_t, addr, compat_ulong_t, data)
100233 {
100234 struct task_struct *child;
100235 long ret;
100236@@ -1193,14 +1200,21 @@ COMPAT_SYSCALL_DEFINE4(ptrace, compat_long_t, request, compat_long_t, pid,
100237 goto out;
100238 }
100239
100240+ if (gr_handle_ptrace(child, request)) {
100241+ ret = -EPERM;
100242+ goto out_put_task_struct;
100243+ }
100244+
100245 if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
100246 ret = ptrace_attach(child, request, addr, data);
100247 /*
100248 * Some architectures need to do book-keeping after
100249 * a ptrace attach.
100250 */
100251- if (!ret)
100252+ if (!ret) {
100253 arch_ptrace_attach(child);
100254+ gr_audit_ptrace(child);
100255+ }
100256 goto out_put_task_struct;
100257 }
100258
100259diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c
100260index 30d42aa..cac5d66 100644
100261--- a/kernel/rcu/rcutorture.c
100262+++ b/kernel/rcu/rcutorture.c
100263@@ -134,12 +134,12 @@ static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1],
100264 rcu_torture_count) = { 0 };
100265 static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1],
100266 rcu_torture_batch) = { 0 };
100267-static atomic_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
100268-static atomic_t n_rcu_torture_alloc;
100269-static atomic_t n_rcu_torture_alloc_fail;
100270-static atomic_t n_rcu_torture_free;
100271-static atomic_t n_rcu_torture_mberror;
100272-static atomic_t n_rcu_torture_error;
100273+static atomic_unchecked_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
100274+static atomic_unchecked_t n_rcu_torture_alloc;
100275+static atomic_unchecked_t n_rcu_torture_alloc_fail;
100276+static atomic_unchecked_t n_rcu_torture_free;
100277+static atomic_unchecked_t n_rcu_torture_mberror;
100278+static atomic_unchecked_t n_rcu_torture_error;
100279 static long n_rcu_torture_barrier_error;
100280 static long n_rcu_torture_boost_ktrerror;
100281 static long n_rcu_torture_boost_rterror;
100282@@ -148,7 +148,7 @@ static long n_rcu_torture_boosts;
100283 static long n_rcu_torture_timers;
100284 static long n_barrier_attempts;
100285 static long n_barrier_successes;
100286-static atomic_long_t n_cbfloods;
100287+static atomic_long_unchecked_t n_cbfloods;
100288 static struct list_head rcu_torture_removed;
100289
100290 static int rcu_torture_writer_state;
100291@@ -211,11 +211,11 @@ rcu_torture_alloc(void)
100292
100293 spin_lock_bh(&rcu_torture_lock);
100294 if (list_empty(&rcu_torture_freelist)) {
100295- atomic_inc(&n_rcu_torture_alloc_fail);
100296+ atomic_inc_unchecked(&n_rcu_torture_alloc_fail);
100297 spin_unlock_bh(&rcu_torture_lock);
100298 return NULL;
100299 }
100300- atomic_inc(&n_rcu_torture_alloc);
100301+ atomic_inc_unchecked(&n_rcu_torture_alloc);
100302 p = rcu_torture_freelist.next;
100303 list_del_init(p);
100304 spin_unlock_bh(&rcu_torture_lock);
100305@@ -228,7 +228,7 @@ rcu_torture_alloc(void)
100306 static void
100307 rcu_torture_free(struct rcu_torture *p)
100308 {
100309- atomic_inc(&n_rcu_torture_free);
100310+ atomic_inc_unchecked(&n_rcu_torture_free);
100311 spin_lock_bh(&rcu_torture_lock);
100312 list_add_tail(&p->rtort_free, &rcu_torture_freelist);
100313 spin_unlock_bh(&rcu_torture_lock);
100314@@ -308,7 +308,7 @@ rcu_torture_pipe_update_one(struct rcu_torture *rp)
100315 i = rp->rtort_pipe_count;
100316 if (i > RCU_TORTURE_PIPE_LEN)
100317 i = RCU_TORTURE_PIPE_LEN;
100318- atomic_inc(&rcu_torture_wcount[i]);
100319+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
100320 if (++rp->rtort_pipe_count >= RCU_TORTURE_PIPE_LEN) {
100321 rp->rtort_mbtest = 0;
100322 return true;
100323@@ -796,7 +796,7 @@ rcu_torture_cbflood(void *arg)
100324 VERBOSE_TOROUT_STRING("rcu_torture_cbflood task started");
100325 do {
100326 schedule_timeout_interruptible(cbflood_inter_holdoff);
100327- atomic_long_inc(&n_cbfloods);
100328+ atomic_long_inc_unchecked(&n_cbfloods);
100329 WARN_ON(signal_pending(current));
100330 for (i = 0; i < cbflood_n_burst; i++) {
100331 for (j = 0; j < cbflood_n_per_burst; j++) {
100332@@ -915,7 +915,7 @@ rcu_torture_writer(void *arg)
100333 i = old_rp->rtort_pipe_count;
100334 if (i > RCU_TORTURE_PIPE_LEN)
100335 i = RCU_TORTURE_PIPE_LEN;
100336- atomic_inc(&rcu_torture_wcount[i]);
100337+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
100338 old_rp->rtort_pipe_count++;
100339 switch (synctype[torture_random(&rand) % nsynctypes]) {
100340 case RTWS_DEF_FREE:
100341@@ -1036,7 +1036,7 @@ static void rcu_torture_timer(unsigned long unused)
100342 return;
100343 }
100344 if (p->rtort_mbtest == 0)
100345- atomic_inc(&n_rcu_torture_mberror);
100346+ atomic_inc_unchecked(&n_rcu_torture_mberror);
100347 spin_lock(&rand_lock);
100348 cur_ops->read_delay(&rand);
100349 n_rcu_torture_timers++;
100350@@ -1111,7 +1111,7 @@ rcu_torture_reader(void *arg)
100351 continue;
100352 }
100353 if (p->rtort_mbtest == 0)
100354- atomic_inc(&n_rcu_torture_mberror);
100355+ atomic_inc_unchecked(&n_rcu_torture_mberror);
100356 cur_ops->read_delay(&rand);
100357 preempt_disable();
100358 pipe_count = p->rtort_pipe_count;
100359@@ -1180,11 +1180,11 @@ rcu_torture_stats_print(void)
100360 rcu_torture_current,
100361 rcu_torture_current_version,
100362 list_empty(&rcu_torture_freelist),
100363- atomic_read(&n_rcu_torture_alloc),
100364- atomic_read(&n_rcu_torture_alloc_fail),
100365- atomic_read(&n_rcu_torture_free));
100366+ atomic_read_unchecked(&n_rcu_torture_alloc),
100367+ atomic_read_unchecked(&n_rcu_torture_alloc_fail),
100368+ atomic_read_unchecked(&n_rcu_torture_free));
100369 pr_cont("rtmbe: %d rtbke: %ld rtbre: %ld ",
100370- atomic_read(&n_rcu_torture_mberror),
100371+ atomic_read_unchecked(&n_rcu_torture_mberror),
100372 n_rcu_torture_boost_ktrerror,
100373 n_rcu_torture_boost_rterror);
100374 pr_cont("rtbf: %ld rtb: %ld nt: %ld ",
100375@@ -1196,17 +1196,17 @@ rcu_torture_stats_print(void)
100376 n_barrier_successes,
100377 n_barrier_attempts,
100378 n_rcu_torture_barrier_error);
100379- pr_cont("cbflood: %ld\n", atomic_long_read(&n_cbfloods));
100380+ pr_cont("cbflood: %ld\n", atomic_long_read_unchecked(&n_cbfloods));
100381
100382 pr_alert("%s%s ", torture_type, TORTURE_FLAG);
100383- if (atomic_read(&n_rcu_torture_mberror) != 0 ||
100384+ if (atomic_read_unchecked(&n_rcu_torture_mberror) != 0 ||
100385 n_rcu_torture_barrier_error != 0 ||
100386 n_rcu_torture_boost_ktrerror != 0 ||
100387 n_rcu_torture_boost_rterror != 0 ||
100388 n_rcu_torture_boost_failure != 0 ||
100389 i > 1) {
100390 pr_cont("%s", "!!! ");
100391- atomic_inc(&n_rcu_torture_error);
100392+ atomic_inc_unchecked(&n_rcu_torture_error);
100393 WARN_ON_ONCE(1);
100394 }
100395 pr_cont("Reader Pipe: ");
100396@@ -1223,7 +1223,7 @@ rcu_torture_stats_print(void)
100397 pr_alert("%s%s ", torture_type, TORTURE_FLAG);
100398 pr_cont("Free-Block Circulation: ");
100399 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
100400- pr_cont(" %d", atomic_read(&rcu_torture_wcount[i]));
100401+ pr_cont(" %d", atomic_read_unchecked(&rcu_torture_wcount[i]));
100402 }
100403 pr_cont("\n");
100404
100405@@ -1570,7 +1570,7 @@ rcu_torture_cleanup(void)
100406
100407 rcu_torture_stats_print(); /* -After- the stats thread is stopped! */
100408
100409- if (atomic_read(&n_rcu_torture_error) || n_rcu_torture_barrier_error)
100410+ if (atomic_read_unchecked(&n_rcu_torture_error) || n_rcu_torture_barrier_error)
100411 rcu_torture_print_module_parms(cur_ops, "End of test: FAILURE");
100412 else if (torture_onoff_failures())
100413 rcu_torture_print_module_parms(cur_ops,
100414@@ -1695,18 +1695,18 @@ rcu_torture_init(void)
100415
100416 rcu_torture_current = NULL;
100417 rcu_torture_current_version = 0;
100418- atomic_set(&n_rcu_torture_alloc, 0);
100419- atomic_set(&n_rcu_torture_alloc_fail, 0);
100420- atomic_set(&n_rcu_torture_free, 0);
100421- atomic_set(&n_rcu_torture_mberror, 0);
100422- atomic_set(&n_rcu_torture_error, 0);
100423+ atomic_set_unchecked(&n_rcu_torture_alloc, 0);
100424+ atomic_set_unchecked(&n_rcu_torture_alloc_fail, 0);
100425+ atomic_set_unchecked(&n_rcu_torture_free, 0);
100426+ atomic_set_unchecked(&n_rcu_torture_mberror, 0);
100427+ atomic_set_unchecked(&n_rcu_torture_error, 0);
100428 n_rcu_torture_barrier_error = 0;
100429 n_rcu_torture_boost_ktrerror = 0;
100430 n_rcu_torture_boost_rterror = 0;
100431 n_rcu_torture_boost_failure = 0;
100432 n_rcu_torture_boosts = 0;
100433 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++)
100434- atomic_set(&rcu_torture_wcount[i], 0);
100435+ atomic_set_unchecked(&rcu_torture_wcount[i], 0);
100436 for_each_possible_cpu(cpu) {
100437 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
100438 per_cpu(rcu_torture_count, cpu)[i] = 0;
100439diff --git a/kernel/rcu/tiny.c b/kernel/rcu/tiny.c
100440index cc9ceca..ce075a6 100644
100441--- a/kernel/rcu/tiny.c
100442+++ b/kernel/rcu/tiny.c
100443@@ -42,7 +42,7 @@
100444 /* Forward declarations for tiny_plugin.h. */
100445 struct rcu_ctrlblk;
100446 static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp);
100447-static void rcu_process_callbacks(struct softirq_action *unused);
100448+static void rcu_process_callbacks(void);
100449 static void __call_rcu(struct rcu_head *head,
100450 void (*func)(struct rcu_head *rcu),
100451 struct rcu_ctrlblk *rcp);
100452@@ -210,7 +210,7 @@ static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp)
100453 false));
100454 }
100455
100456-static void rcu_process_callbacks(struct softirq_action *unused)
100457+static __latent_entropy void rcu_process_callbacks(void)
100458 {
100459 __rcu_process_callbacks(&rcu_sched_ctrlblk);
100460 __rcu_process_callbacks(&rcu_bh_ctrlblk);
100461diff --git a/kernel/rcu/tiny_plugin.h b/kernel/rcu/tiny_plugin.h
100462index f94e209..d2985bd 100644
100463--- a/kernel/rcu/tiny_plugin.h
100464+++ b/kernel/rcu/tiny_plugin.h
100465@@ -150,10 +150,10 @@ static void check_cpu_stall(struct rcu_ctrlblk *rcp)
100466 rcp->name, rcp->ticks_this_gp, DYNTICK_TASK_EXIT_IDLE,
100467 jiffies - rcp->gp_start, rcp->qlen);
100468 dump_stack();
100469- ACCESS_ONCE(rcp->jiffies_stall) = jiffies +
100470+ ACCESS_ONCE_RW(rcp->jiffies_stall) = jiffies +
100471 3 * rcu_jiffies_till_stall_check() + 3;
100472 } else if (ULONG_CMP_GE(j, js)) {
100473- ACCESS_ONCE(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
100474+ ACCESS_ONCE_RW(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
100475 }
100476 }
100477
100478@@ -161,7 +161,7 @@ static void reset_cpu_stall_ticks(struct rcu_ctrlblk *rcp)
100479 {
100480 rcp->ticks_this_gp = 0;
100481 rcp->gp_start = jiffies;
100482- ACCESS_ONCE(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
100483+ ACCESS_ONCE_RW(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
100484 }
100485
100486 static void check_cpu_stalls(void)
100487diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
100488index 48d640c..9401d30 100644
100489--- a/kernel/rcu/tree.c
100490+++ b/kernel/rcu/tree.c
100491@@ -268,7 +268,7 @@ static void rcu_momentary_dyntick_idle(void)
100492 */
100493 rdtp = this_cpu_ptr(&rcu_dynticks);
100494 smp_mb__before_atomic(); /* Earlier stuff before QS. */
100495- atomic_add(2, &rdtp->dynticks); /* QS. */
100496+ atomic_add_unchecked(2, &rdtp->dynticks); /* QS. */
100497 smp_mb__after_atomic(); /* Later stuff after QS. */
100498 break;
100499 }
100500@@ -580,9 +580,9 @@ static void rcu_eqs_enter_common(long long oldval, bool user)
100501 rcu_prepare_for_idle();
100502 /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
100503 smp_mb__before_atomic(); /* See above. */
100504- atomic_inc(&rdtp->dynticks);
100505+ atomic_inc_unchecked(&rdtp->dynticks);
100506 smp_mb__after_atomic(); /* Force ordering with next sojourn. */
100507- WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
100508+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
100509 rcu_dynticks_task_enter();
100510
100511 /*
100512@@ -703,10 +703,10 @@ static void rcu_eqs_exit_common(long long oldval, int user)
100513
100514 rcu_dynticks_task_exit();
100515 smp_mb__before_atomic(); /* Force ordering w/previous sojourn. */
100516- atomic_inc(&rdtp->dynticks);
100517+ atomic_inc_unchecked(&rdtp->dynticks);
100518 /* CPUs seeing atomic_inc() must see later RCU read-side crit sects */
100519 smp_mb__after_atomic(); /* See above. */
100520- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
100521+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
100522 rcu_cleanup_after_idle();
100523 trace_rcu_dyntick(TPS("End"), oldval, rdtp->dynticks_nesting);
100524 if (!user && !is_idle_task(current)) {
100525@@ -840,12 +840,12 @@ void rcu_nmi_enter(void)
100526 * to be in the outermost NMI handler that interrupted an RCU-idle
100527 * period (observation due to Andy Lutomirski).
100528 */
100529- if (!(atomic_read(&rdtp->dynticks) & 0x1)) {
100530+ if (!(atomic_read_unchecked(&rdtp->dynticks) & 0x1)) {
100531 smp_mb__before_atomic(); /* Force delay from prior write. */
100532- atomic_inc(&rdtp->dynticks);
100533+ atomic_inc_unchecked(&rdtp->dynticks);
100534 /* atomic_inc() before later RCU read-side crit sects */
100535 smp_mb__after_atomic(); /* See above. */
100536- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
100537+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
100538 incby = 1;
100539 }
100540 rdtp->dynticks_nmi_nesting += incby;
100541@@ -870,7 +870,7 @@ void rcu_nmi_exit(void)
100542 * to us!)
100543 */
100544 WARN_ON_ONCE(rdtp->dynticks_nmi_nesting <= 0);
100545- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
100546+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
100547
100548 /*
100549 * If the nesting level is not 1, the CPU wasn't RCU-idle, so
100550@@ -885,9 +885,9 @@ void rcu_nmi_exit(void)
100551 rdtp->dynticks_nmi_nesting = 0;
100552 /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
100553 smp_mb__before_atomic(); /* See above. */
100554- atomic_inc(&rdtp->dynticks);
100555+ atomic_inc_unchecked(&rdtp->dynticks);
100556 smp_mb__after_atomic(); /* Force delay to next write. */
100557- WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
100558+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
100559 }
100560
100561 /**
100562@@ -900,7 +900,7 @@ void rcu_nmi_exit(void)
100563 */
100564 bool notrace __rcu_is_watching(void)
100565 {
100566- return atomic_read(this_cpu_ptr(&rcu_dynticks.dynticks)) & 0x1;
100567+ return atomic_read_unchecked(this_cpu_ptr(&rcu_dynticks.dynticks)) & 0x1;
100568 }
100569
100570 /**
100571@@ -983,7 +983,7 @@ static int rcu_is_cpu_rrupt_from_idle(void)
100572 static int dyntick_save_progress_counter(struct rcu_data *rdp,
100573 bool *isidle, unsigned long *maxj)
100574 {
100575- rdp->dynticks_snap = atomic_add_return(0, &rdp->dynticks->dynticks);
100576+ rdp->dynticks_snap = atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
100577 rcu_sysidle_check_cpu(rdp, isidle, maxj);
100578 if ((rdp->dynticks_snap & 0x1) == 0) {
100579 trace_rcu_fqs(rdp->rsp->name, rdp->gpnum, rdp->cpu, TPS("dti"));
100580@@ -991,7 +991,7 @@ static int dyntick_save_progress_counter(struct rcu_data *rdp,
100581 } else {
100582 if (ULONG_CMP_LT(ACCESS_ONCE(rdp->gpnum) + ULONG_MAX / 4,
100583 rdp->mynode->gpnum))
100584- ACCESS_ONCE(rdp->gpwrap) = true;
100585+ ACCESS_ONCE_RW(rdp->gpwrap) = true;
100586 return 0;
100587 }
100588 }
100589@@ -1009,7 +1009,7 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp,
100590 int *rcrmp;
100591 unsigned int snap;
100592
100593- curr = (unsigned int)atomic_add_return(0, &rdp->dynticks->dynticks);
100594+ curr = (unsigned int)atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
100595 snap = (unsigned int)rdp->dynticks_snap;
100596
100597 /*
100598@@ -1072,10 +1072,10 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp,
100599 rdp->rsp->gp_start + jiffies_till_sched_qs) ||
100600 ULONG_CMP_GE(jiffies, rdp->rsp->jiffies_resched)) {
100601 if (!(ACCESS_ONCE(*rcrmp) & rdp->rsp->flavor_mask)) {
100602- ACCESS_ONCE(rdp->cond_resched_completed) =
100603+ ACCESS_ONCE_RW(rdp->cond_resched_completed) =
100604 ACCESS_ONCE(rdp->mynode->completed);
100605 smp_mb(); /* ->cond_resched_completed before *rcrmp. */
100606- ACCESS_ONCE(*rcrmp) =
100607+ ACCESS_ONCE_RW(*rcrmp) =
100608 ACCESS_ONCE(*rcrmp) + rdp->rsp->flavor_mask;
100609 resched_cpu(rdp->cpu); /* Force CPU into scheduler. */
100610 rdp->rsp->jiffies_resched += 5; /* Enable beating. */
100611@@ -1097,7 +1097,7 @@ static void record_gp_stall_check_time(struct rcu_state *rsp)
100612 rsp->gp_start = j;
100613 smp_wmb(); /* Record start time before stall time. */
100614 j1 = rcu_jiffies_till_stall_check();
100615- ACCESS_ONCE(rsp->jiffies_stall) = j + j1;
100616+ ACCESS_ONCE_RW(rsp->jiffies_stall) = j + j1;
100617 rsp->jiffies_resched = j + j1 / 2;
100618 rsp->n_force_qs_gpstart = ACCESS_ONCE(rsp->n_force_qs);
100619 }
100620@@ -1156,7 +1156,7 @@ static void print_other_cpu_stall(struct rcu_state *rsp, unsigned long gpnum)
100621 raw_spin_unlock_irqrestore(&rnp->lock, flags);
100622 return;
100623 }
100624- ACCESS_ONCE(rsp->jiffies_stall) = jiffies + 3 * rcu_jiffies_till_stall_check() + 3;
100625+ ACCESS_ONCE_RW(rsp->jiffies_stall) = jiffies + 3 * rcu_jiffies_till_stall_check() + 3;
100626 raw_spin_unlock_irqrestore(&rnp->lock, flags);
100627
100628 /*
100629@@ -1240,7 +1240,7 @@ static void print_cpu_stall(struct rcu_state *rsp)
100630
100631 raw_spin_lock_irqsave(&rnp->lock, flags);
100632 if (ULONG_CMP_GE(jiffies, ACCESS_ONCE(rsp->jiffies_stall)))
100633- ACCESS_ONCE(rsp->jiffies_stall) = jiffies +
100634+ ACCESS_ONCE_RW(rsp->jiffies_stall) = jiffies +
100635 3 * rcu_jiffies_till_stall_check() + 3;
100636 raw_spin_unlock_irqrestore(&rnp->lock, flags);
100637
100638@@ -1324,7 +1324,7 @@ void rcu_cpu_stall_reset(void)
100639 struct rcu_state *rsp;
100640
100641 for_each_rcu_flavor(rsp)
100642- ACCESS_ONCE(rsp->jiffies_stall) = jiffies + ULONG_MAX / 2;
100643+ ACCESS_ONCE_RW(rsp->jiffies_stall) = jiffies + ULONG_MAX / 2;
100644 }
100645
100646 /*
100647@@ -1671,7 +1671,7 @@ static bool __note_gp_changes(struct rcu_state *rsp, struct rcu_node *rnp,
100648 rdp->rcu_qs_ctr_snap = __this_cpu_read(rcu_qs_ctr);
100649 rdp->qs_pending = !!(rnp->qsmask & rdp->grpmask);
100650 zero_cpu_stall_ticks(rdp);
100651- ACCESS_ONCE(rdp->gpwrap) = false;
100652+ ACCESS_ONCE_RW(rdp->gpwrap) = false;
100653 }
100654 return ret;
100655 }
100656@@ -1706,7 +1706,7 @@ static int rcu_gp_init(struct rcu_state *rsp)
100657 struct rcu_data *rdp;
100658 struct rcu_node *rnp = rcu_get_root(rsp);
100659
100660- ACCESS_ONCE(rsp->gp_activity) = jiffies;
100661+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
100662 rcu_bind_gp_kthread();
100663 raw_spin_lock_irq(&rnp->lock);
100664 smp_mb__after_unlock_lock();
100665@@ -1715,7 +1715,7 @@ static int rcu_gp_init(struct rcu_state *rsp)
100666 raw_spin_unlock_irq(&rnp->lock);
100667 return 0;
100668 }
100669- ACCESS_ONCE(rsp->gp_flags) = 0; /* Clear all flags: New grace period. */
100670+ ACCESS_ONCE_RW(rsp->gp_flags) = 0; /* Clear all flags: New grace period. */
100671
100672 if (WARN_ON_ONCE(rcu_gp_in_progress(rsp))) {
100673 /*
100674@@ -1756,9 +1756,9 @@ static int rcu_gp_init(struct rcu_state *rsp)
100675 rdp = this_cpu_ptr(rsp->rda);
100676 rcu_preempt_check_blocked_tasks(rnp);
100677 rnp->qsmask = rnp->qsmaskinit;
100678- ACCESS_ONCE(rnp->gpnum) = rsp->gpnum;
100679+ ACCESS_ONCE_RW(rnp->gpnum) = rsp->gpnum;
100680 WARN_ON_ONCE(rnp->completed != rsp->completed);
100681- ACCESS_ONCE(rnp->completed) = rsp->completed;
100682+ ACCESS_ONCE_RW(rnp->completed) = rsp->completed;
100683 if (rnp == rdp->mynode)
100684 (void)__note_gp_changes(rsp, rnp, rdp);
100685 rcu_preempt_boost_start_gp(rnp);
100686@@ -1767,7 +1767,7 @@ static int rcu_gp_init(struct rcu_state *rsp)
100687 rnp->grphi, rnp->qsmask);
100688 raw_spin_unlock_irq(&rnp->lock);
100689 cond_resched_rcu_qs();
100690- ACCESS_ONCE(rsp->gp_activity) = jiffies;
100691+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
100692 }
100693
100694 mutex_unlock(&rsp->onoff_mutex);
100695@@ -1784,7 +1784,7 @@ static int rcu_gp_fqs(struct rcu_state *rsp, int fqs_state_in)
100696 unsigned long maxj;
100697 struct rcu_node *rnp = rcu_get_root(rsp);
100698
100699- ACCESS_ONCE(rsp->gp_activity) = jiffies;
100700+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
100701 rsp->n_force_qs++;
100702 if (fqs_state == RCU_SAVE_DYNTICK) {
100703 /* Collect dyntick-idle snapshots. */
100704@@ -1805,7 +1805,7 @@ static int rcu_gp_fqs(struct rcu_state *rsp, int fqs_state_in)
100705 if (ACCESS_ONCE(rsp->gp_flags) & RCU_GP_FLAG_FQS) {
100706 raw_spin_lock_irq(&rnp->lock);
100707 smp_mb__after_unlock_lock();
100708- ACCESS_ONCE(rsp->gp_flags) =
100709+ ACCESS_ONCE_RW(rsp->gp_flags) =
100710 ACCESS_ONCE(rsp->gp_flags) & ~RCU_GP_FLAG_FQS;
100711 raw_spin_unlock_irq(&rnp->lock);
100712 }
100713@@ -1823,7 +1823,7 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
100714 struct rcu_data *rdp;
100715 struct rcu_node *rnp = rcu_get_root(rsp);
100716
100717- ACCESS_ONCE(rsp->gp_activity) = jiffies;
100718+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
100719 raw_spin_lock_irq(&rnp->lock);
100720 smp_mb__after_unlock_lock();
100721 gp_duration = jiffies - rsp->gp_start;
100722@@ -1852,7 +1852,7 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
100723 rcu_for_each_node_breadth_first(rsp, rnp) {
100724 raw_spin_lock_irq(&rnp->lock);
100725 smp_mb__after_unlock_lock();
100726- ACCESS_ONCE(rnp->completed) = rsp->gpnum;
100727+ ACCESS_ONCE_RW(rnp->completed) = rsp->gpnum;
100728 rdp = this_cpu_ptr(rsp->rda);
100729 if (rnp == rdp->mynode)
100730 needgp = __note_gp_changes(rsp, rnp, rdp) || needgp;
100731@@ -1860,7 +1860,7 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
100732 nocb += rcu_future_gp_cleanup(rsp, rnp);
100733 raw_spin_unlock_irq(&rnp->lock);
100734 cond_resched_rcu_qs();
100735- ACCESS_ONCE(rsp->gp_activity) = jiffies;
100736+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
100737 }
100738 rnp = rcu_get_root(rsp);
100739 raw_spin_lock_irq(&rnp->lock);
100740@@ -1868,14 +1868,14 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
100741 rcu_nocb_gp_set(rnp, nocb);
100742
100743 /* Declare grace period done. */
100744- ACCESS_ONCE(rsp->completed) = rsp->gpnum;
100745+ ACCESS_ONCE_RW(rsp->completed) = rsp->gpnum;
100746 trace_rcu_grace_period(rsp->name, rsp->completed, TPS("end"));
100747 rsp->fqs_state = RCU_GP_IDLE;
100748 rdp = this_cpu_ptr(rsp->rda);
100749 /* Advance CBs to reduce false positives below. */
100750 needgp = rcu_advance_cbs(rsp, rnp, rdp) || needgp;
100751 if (needgp || cpu_needs_another_gp(rsp, rdp)) {
100752- ACCESS_ONCE(rsp->gp_flags) = RCU_GP_FLAG_INIT;
100753+ ACCESS_ONCE_RW(rsp->gp_flags) = RCU_GP_FLAG_INIT;
100754 trace_rcu_grace_period(rsp->name,
100755 ACCESS_ONCE(rsp->gpnum),
100756 TPS("newreq"));
100757@@ -1910,7 +1910,7 @@ static int __noreturn rcu_gp_kthread(void *arg)
100758 if (rcu_gp_init(rsp))
100759 break;
100760 cond_resched_rcu_qs();
100761- ACCESS_ONCE(rsp->gp_activity) = jiffies;
100762+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
100763 WARN_ON(signal_pending(current));
100764 trace_rcu_grace_period(rsp->name,
100765 ACCESS_ONCE(rsp->gpnum),
100766@@ -1954,11 +1954,11 @@ static int __noreturn rcu_gp_kthread(void *arg)
100767 ACCESS_ONCE(rsp->gpnum),
100768 TPS("fqsend"));
100769 cond_resched_rcu_qs();
100770- ACCESS_ONCE(rsp->gp_activity) = jiffies;
100771+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
100772 } else {
100773 /* Deal with stray signal. */
100774 cond_resched_rcu_qs();
100775- ACCESS_ONCE(rsp->gp_activity) = jiffies;
100776+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
100777 WARN_ON(signal_pending(current));
100778 trace_rcu_grace_period(rsp->name,
100779 ACCESS_ONCE(rsp->gpnum),
100780@@ -2003,7 +2003,7 @@ rcu_start_gp_advanced(struct rcu_state *rsp, struct rcu_node *rnp,
100781 */
100782 return false;
100783 }
100784- ACCESS_ONCE(rsp->gp_flags) = RCU_GP_FLAG_INIT;
100785+ ACCESS_ONCE_RW(rsp->gp_flags) = RCU_GP_FLAG_INIT;
100786 trace_rcu_grace_period(rsp->name, ACCESS_ONCE(rsp->gpnum),
100787 TPS("newreq"));
100788
100789@@ -2228,7 +2228,7 @@ rcu_send_cbs_to_orphanage(int cpu, struct rcu_state *rsp,
100790 rsp->qlen += rdp->qlen;
100791 rdp->n_cbs_orphaned += rdp->qlen;
100792 rdp->qlen_lazy = 0;
100793- ACCESS_ONCE(rdp->qlen) = 0;
100794+ ACCESS_ONCE_RW(rdp->qlen) = 0;
100795 }
100796
100797 /*
100798@@ -2490,7 +2490,7 @@ static void rcu_do_batch(struct rcu_state *rsp, struct rcu_data *rdp)
100799 }
100800 smp_mb(); /* List handling before counting for rcu_barrier(). */
100801 rdp->qlen_lazy -= count_lazy;
100802- ACCESS_ONCE(rdp->qlen) = rdp->qlen - count;
100803+ ACCESS_ONCE_RW(rdp->qlen) = rdp->qlen - count;
100804 rdp->n_cbs_invoked += count;
100805
100806 /* Reinstate batch limit if we have worked down the excess. */
100807@@ -2647,7 +2647,7 @@ static void force_quiescent_state(struct rcu_state *rsp)
100808 raw_spin_unlock_irqrestore(&rnp_old->lock, flags);
100809 return; /* Someone beat us to it. */
100810 }
100811- ACCESS_ONCE(rsp->gp_flags) =
100812+ ACCESS_ONCE_RW(rsp->gp_flags) =
100813 ACCESS_ONCE(rsp->gp_flags) | RCU_GP_FLAG_FQS;
100814 raw_spin_unlock_irqrestore(&rnp_old->lock, flags);
100815 rcu_gp_kthread_wake(rsp);
100816@@ -2693,7 +2693,7 @@ __rcu_process_callbacks(struct rcu_state *rsp)
100817 /*
100818 * Do RCU core processing for the current CPU.
100819 */
100820-static void rcu_process_callbacks(struct softirq_action *unused)
100821+static void rcu_process_callbacks(void)
100822 {
100823 struct rcu_state *rsp;
100824
100825@@ -2805,7 +2805,7 @@ __call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu),
100826 WARN_ON_ONCE((unsigned long)head & 0x1); /* Misaligned rcu_head! */
100827 if (debug_rcu_head_queue(head)) {
100828 /* Probable double call_rcu(), so leak the callback. */
100829- ACCESS_ONCE(head->func) = rcu_leak_callback;
100830+ ACCESS_ONCE_RW(head->func) = rcu_leak_callback;
100831 WARN_ONCE(1, "__call_rcu(): Leaked duplicate callback\n");
100832 return;
100833 }
100834@@ -2833,7 +2833,7 @@ __call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu),
100835 local_irq_restore(flags);
100836 return;
100837 }
100838- ACCESS_ONCE(rdp->qlen) = rdp->qlen + 1;
100839+ ACCESS_ONCE_RW(rdp->qlen) = rdp->qlen + 1;
100840 if (lazy)
100841 rdp->qlen_lazy++;
100842 else
100843@@ -3106,11 +3106,11 @@ void synchronize_sched_expedited(void)
100844 * counter wrap on a 32-bit system. Quite a few more CPUs would of
100845 * course be required on a 64-bit system.
100846 */
100847- if (ULONG_CMP_GE((ulong)atomic_long_read(&rsp->expedited_start),
100848+ if (ULONG_CMP_GE((ulong)atomic_long_read_unchecked(&rsp->expedited_start),
100849 (ulong)atomic_long_read(&rsp->expedited_done) +
100850 ULONG_MAX / 8)) {
100851 synchronize_sched();
100852- atomic_long_inc(&rsp->expedited_wrap);
100853+ atomic_long_inc_unchecked(&rsp->expedited_wrap);
100854 return;
100855 }
100856
100857@@ -3118,12 +3118,12 @@ void synchronize_sched_expedited(void)
100858 * Take a ticket. Note that atomic_inc_return() implies a
100859 * full memory barrier.
100860 */
100861- snap = atomic_long_inc_return(&rsp->expedited_start);
100862+ snap = atomic_long_inc_return_unchecked(&rsp->expedited_start);
100863 firstsnap = snap;
100864 if (!try_get_online_cpus()) {
100865 /* CPU hotplug operation in flight, fall back to normal GP. */
100866 wait_rcu_gp(call_rcu_sched);
100867- atomic_long_inc(&rsp->expedited_normal);
100868+ atomic_long_inc_unchecked(&rsp->expedited_normal);
100869 return;
100870 }
100871 WARN_ON_ONCE(cpu_is_offline(raw_smp_processor_id()));
100872@@ -3136,7 +3136,7 @@ void synchronize_sched_expedited(void)
100873 for_each_cpu(cpu, cm) {
100874 struct rcu_dynticks *rdtp = &per_cpu(rcu_dynticks, cpu);
100875
100876- if (!(atomic_add_return(0, &rdtp->dynticks) & 0x1))
100877+ if (!(atomic_add_return_unchecked(0, &rdtp->dynticks) & 0x1))
100878 cpumask_clear_cpu(cpu, cm);
100879 }
100880 if (cpumask_weight(cm) == 0)
100881@@ -3151,14 +3151,14 @@ void synchronize_sched_expedited(void)
100882 synchronize_sched_expedited_cpu_stop,
100883 NULL) == -EAGAIN) {
100884 put_online_cpus();
100885- atomic_long_inc(&rsp->expedited_tryfail);
100886+ atomic_long_inc_unchecked(&rsp->expedited_tryfail);
100887
100888 /* Check to see if someone else did our work for us. */
100889 s = atomic_long_read(&rsp->expedited_done);
100890 if (ULONG_CMP_GE((ulong)s, (ulong)firstsnap)) {
100891 /* ensure test happens before caller kfree */
100892 smp_mb__before_atomic(); /* ^^^ */
100893- atomic_long_inc(&rsp->expedited_workdone1);
100894+ atomic_long_inc_unchecked(&rsp->expedited_workdone1);
100895 free_cpumask_var(cm);
100896 return;
100897 }
100898@@ -3168,7 +3168,7 @@ void synchronize_sched_expedited(void)
100899 udelay(trycount * num_online_cpus());
100900 } else {
100901 wait_rcu_gp(call_rcu_sched);
100902- atomic_long_inc(&rsp->expedited_normal);
100903+ atomic_long_inc_unchecked(&rsp->expedited_normal);
100904 free_cpumask_var(cm);
100905 return;
100906 }
100907@@ -3178,7 +3178,7 @@ void synchronize_sched_expedited(void)
100908 if (ULONG_CMP_GE((ulong)s, (ulong)firstsnap)) {
100909 /* ensure test happens before caller kfree */
100910 smp_mb__before_atomic(); /* ^^^ */
100911- atomic_long_inc(&rsp->expedited_workdone2);
100912+ atomic_long_inc_unchecked(&rsp->expedited_workdone2);
100913 free_cpumask_var(cm);
100914 return;
100915 }
100916@@ -3193,14 +3193,14 @@ void synchronize_sched_expedited(void)
100917 if (!try_get_online_cpus()) {
100918 /* CPU hotplug operation in flight, use normal GP. */
100919 wait_rcu_gp(call_rcu_sched);
100920- atomic_long_inc(&rsp->expedited_normal);
100921+ atomic_long_inc_unchecked(&rsp->expedited_normal);
100922 free_cpumask_var(cm);
100923 return;
100924 }
100925- snap = atomic_long_read(&rsp->expedited_start);
100926+ snap = atomic_long_read_unchecked(&rsp->expedited_start);
100927 smp_mb(); /* ensure read is before try_stop_cpus(). */
100928 }
100929- atomic_long_inc(&rsp->expedited_stoppedcpus);
100930+ atomic_long_inc_unchecked(&rsp->expedited_stoppedcpus);
100931
100932 all_cpus_idle:
100933 free_cpumask_var(cm);
100934@@ -3212,16 +3212,16 @@ all_cpus_idle:
100935 * than we did already did their update.
100936 */
100937 do {
100938- atomic_long_inc(&rsp->expedited_done_tries);
100939+ atomic_long_inc_unchecked(&rsp->expedited_done_tries);
100940 s = atomic_long_read(&rsp->expedited_done);
100941 if (ULONG_CMP_GE((ulong)s, (ulong)snap)) {
100942 /* ensure test happens before caller kfree */
100943 smp_mb__before_atomic(); /* ^^^ */
100944- atomic_long_inc(&rsp->expedited_done_lost);
100945+ atomic_long_inc_unchecked(&rsp->expedited_done_lost);
100946 break;
100947 }
100948 } while (atomic_long_cmpxchg(&rsp->expedited_done, s, snap) != s);
100949- atomic_long_inc(&rsp->expedited_done_exit);
100950+ atomic_long_inc_unchecked(&rsp->expedited_done_exit);
100951
100952 put_online_cpus();
100953 }
100954@@ -3431,7 +3431,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
100955 * ACCESS_ONCE() to prevent the compiler from speculating
100956 * the increment to precede the early-exit check.
100957 */
100958- ACCESS_ONCE(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
100959+ ACCESS_ONCE_RW(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
100960 WARN_ON_ONCE((rsp->n_barrier_done & 0x1) != 1);
100961 _rcu_barrier_trace(rsp, "Inc1", -1, rsp->n_barrier_done);
100962 smp_mb(); /* Order ->n_barrier_done increment with below mechanism. */
100963@@ -3487,7 +3487,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
100964
100965 /* Increment ->n_barrier_done to prevent duplicate work. */
100966 smp_mb(); /* Keep increment after above mechanism. */
100967- ACCESS_ONCE(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
100968+ ACCESS_ONCE_RW(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
100969 WARN_ON_ONCE((rsp->n_barrier_done & 0x1) != 0);
100970 _rcu_barrier_trace(rsp, "Inc2", -1, rsp->n_barrier_done);
100971 smp_mb(); /* Keep increment before caller's subsequent code. */
100972@@ -3532,7 +3532,7 @@ rcu_boot_init_percpu_data(int cpu, struct rcu_state *rsp)
100973 rdp->grpmask = 1UL << (cpu - rdp->mynode->grplo);
100974 rdp->dynticks = &per_cpu(rcu_dynticks, cpu);
100975 WARN_ON_ONCE(rdp->dynticks->dynticks_nesting != DYNTICK_TASK_EXIT_IDLE);
100976- WARN_ON_ONCE(atomic_read(&rdp->dynticks->dynticks) != 1);
100977+ WARN_ON_ONCE(atomic_read_unchecked(&rdp->dynticks->dynticks) != 1);
100978 rdp->cpu = cpu;
100979 rdp->rsp = rsp;
100980 rcu_boot_init_nocb_percpu_data(rdp);
100981@@ -3565,8 +3565,8 @@ rcu_init_percpu_data(int cpu, struct rcu_state *rsp)
100982 init_callback_list(rdp); /* Re-enable callbacks on this CPU. */
100983 rdp->dynticks->dynticks_nesting = DYNTICK_TASK_EXIT_IDLE;
100984 rcu_sysidle_init_percpu_data(rdp->dynticks);
100985- atomic_set(&rdp->dynticks->dynticks,
100986- (atomic_read(&rdp->dynticks->dynticks) & ~0x1) + 1);
100987+ atomic_set_unchecked(&rdp->dynticks->dynticks,
100988+ (atomic_read_unchecked(&rdp->dynticks->dynticks) & ~0x1) + 1);
100989 raw_spin_unlock(&rnp->lock); /* irqs remain disabled. */
100990
100991 /* Add CPU to rcu_node bitmasks. */
100992diff --git a/kernel/rcu/tree.h b/kernel/rcu/tree.h
100993index 119de39..f07d31a 100644
100994--- a/kernel/rcu/tree.h
100995+++ b/kernel/rcu/tree.h
100996@@ -86,11 +86,11 @@ struct rcu_dynticks {
100997 long long dynticks_nesting; /* Track irq/process nesting level. */
100998 /* Process level is worth LLONG_MAX/2. */
100999 int dynticks_nmi_nesting; /* Track NMI nesting level. */
101000- atomic_t dynticks; /* Even value for idle, else odd. */
101001+ atomic_unchecked_t dynticks;/* Even value for idle, else odd. */
101002 #ifdef CONFIG_NO_HZ_FULL_SYSIDLE
101003 long long dynticks_idle_nesting;
101004 /* irq/process nesting level from idle. */
101005- atomic_t dynticks_idle; /* Even value for idle, else odd. */
101006+ atomic_unchecked_t dynticks_idle;/* Even value for idle, else odd. */
101007 /* "Idle" excludes userspace execution. */
101008 unsigned long dynticks_idle_jiffies;
101009 /* End of last non-NMI non-idle period. */
101010@@ -457,17 +457,17 @@ struct rcu_state {
101011 /* _rcu_barrier(). */
101012 /* End of fields guarded by barrier_mutex. */
101013
101014- atomic_long_t expedited_start; /* Starting ticket. */
101015- atomic_long_t expedited_done; /* Done ticket. */
101016- atomic_long_t expedited_wrap; /* # near-wrap incidents. */
101017- atomic_long_t expedited_tryfail; /* # acquisition failures. */
101018- atomic_long_t expedited_workdone1; /* # done by others #1. */
101019- atomic_long_t expedited_workdone2; /* # done by others #2. */
101020- atomic_long_t expedited_normal; /* # fallbacks to normal. */
101021- atomic_long_t expedited_stoppedcpus; /* # successful stop_cpus. */
101022- atomic_long_t expedited_done_tries; /* # tries to update _done. */
101023- atomic_long_t expedited_done_lost; /* # times beaten to _done. */
101024- atomic_long_t expedited_done_exit; /* # times exited _done loop. */
101025+ atomic_long_unchecked_t expedited_start; /* Starting ticket. */
101026+ atomic_long_t expedited_done; /* Done ticket. */
101027+ atomic_long_unchecked_t expedited_wrap; /* # near-wrap incidents. */
101028+ atomic_long_unchecked_t expedited_tryfail; /* # acquisition failures. */
101029+ atomic_long_unchecked_t expedited_workdone1; /* # done by others #1. */
101030+ atomic_long_unchecked_t expedited_workdone2; /* # done by others #2. */
101031+ atomic_long_unchecked_t expedited_normal; /* # fallbacks to normal. */
101032+ atomic_long_unchecked_t expedited_stoppedcpus; /* # successful stop_cpus. */
101033+ atomic_long_unchecked_t expedited_done_tries; /* # tries to update _done. */
101034+ atomic_long_unchecked_t expedited_done_lost; /* # times beaten to _done. */
101035+ atomic_long_unchecked_t expedited_done_exit; /* # times exited _done loop. */
101036
101037 unsigned long jiffies_force_qs; /* Time at which to invoke */
101038 /* force_quiescent_state(). */
101039diff --git a/kernel/rcu/tree_plugin.h b/kernel/rcu/tree_plugin.h
101040index 0a571e9..fbfd611 100644
101041--- a/kernel/rcu/tree_plugin.h
101042+++ b/kernel/rcu/tree_plugin.h
101043@@ -619,7 +619,7 @@ static int rcu_preempted_readers_exp(struct rcu_node *rnp)
101044 static int sync_rcu_preempt_exp_done(struct rcu_node *rnp)
101045 {
101046 return !rcu_preempted_readers_exp(rnp) &&
101047- ACCESS_ONCE(rnp->expmask) == 0;
101048+ ACCESS_ONCE_RW(rnp->expmask) == 0;
101049 }
101050
101051 /*
101052@@ -780,7 +780,7 @@ void synchronize_rcu_expedited(void)
101053
101054 /* Clean up and exit. */
101055 smp_mb(); /* ensure expedited GP seen before counter increment. */
101056- ACCESS_ONCE(sync_rcu_preempt_exp_count) =
101057+ ACCESS_ONCE_RW(sync_rcu_preempt_exp_count) =
101058 sync_rcu_preempt_exp_count + 1;
101059 unlock_mb_ret:
101060 mutex_unlock(&sync_rcu_preempt_exp_mutex);
101061@@ -1290,7 +1290,7 @@ static void rcu_boost_kthread_setaffinity(struct rcu_node *rnp, int outgoingcpu)
101062 free_cpumask_var(cm);
101063 }
101064
101065-static struct smp_hotplug_thread rcu_cpu_thread_spec = {
101066+static struct smp_hotplug_thread rcu_cpu_thread_spec __read_only = {
101067 .store = &rcu_cpu_kthread_task,
101068 .thread_should_run = rcu_cpu_kthread_should_run,
101069 .thread_fn = rcu_cpu_kthread,
101070@@ -1761,7 +1761,7 @@ static void print_cpu_stall_info(struct rcu_state *rsp, int cpu)
101071 print_cpu_stall_fast_no_hz(fast_no_hz, cpu);
101072 pr_err("\t%d: (%lu %s) idle=%03x/%llx/%d softirq=%u/%u fqs=%ld %s\n",
101073 cpu, ticks_value, ticks_title,
101074- atomic_read(&rdtp->dynticks) & 0xfff,
101075+ atomic_read_unchecked(&rdtp->dynticks) & 0xfff,
101076 rdtp->dynticks_nesting, rdtp->dynticks_nmi_nesting,
101077 rdp->softirq_snap, kstat_softirqs_cpu(RCU_SOFTIRQ, cpu),
101078 ACCESS_ONCE(rsp->n_force_qs) - rsp->n_force_qs_gpstart,
101079@@ -1906,7 +1906,7 @@ static void wake_nocb_leader(struct rcu_data *rdp, bool force)
101080 return;
101081 if (ACCESS_ONCE(rdp_leader->nocb_leader_sleep) || force) {
101082 /* Prior smp_mb__after_atomic() orders against prior enqueue. */
101083- ACCESS_ONCE(rdp_leader->nocb_leader_sleep) = false;
101084+ ACCESS_ONCE_RW(rdp_leader->nocb_leader_sleep) = false;
101085 wake_up(&rdp_leader->nocb_wq);
101086 }
101087 }
101088@@ -1978,7 +1978,7 @@ static void __call_rcu_nocb_enqueue(struct rcu_data *rdp,
101089 atomic_long_add(rhcount, &rdp->nocb_q_count);
101090 /* rcu_barrier() relies on ->nocb_q_count add before xchg. */
101091 old_rhpp = xchg(&rdp->nocb_tail, rhtp);
101092- ACCESS_ONCE(*old_rhpp) = rhp;
101093+ ACCESS_ONCE_RW(*old_rhpp) = rhp;
101094 atomic_long_add(rhcount_lazy, &rdp->nocb_q_count_lazy);
101095 smp_mb__after_atomic(); /* Store *old_rhpp before _wake test. */
101096
101097@@ -2167,7 +2167,7 @@ wait_again:
101098 continue; /* No CBs here, try next follower. */
101099
101100 /* Move callbacks to wait-for-GP list, which is empty. */
101101- ACCESS_ONCE(rdp->nocb_head) = NULL;
101102+ ACCESS_ONCE_RW(rdp->nocb_head) = NULL;
101103 rdp->nocb_gp_tail = xchg(&rdp->nocb_tail, &rdp->nocb_head);
101104 gotcbs = true;
101105 }
101106@@ -2288,7 +2288,7 @@ static int rcu_nocb_kthread(void *arg)
101107 list = ACCESS_ONCE(rdp->nocb_follower_head);
101108 BUG_ON(!list);
101109 trace_rcu_nocb_wake(rdp->rsp->name, rdp->cpu, "WokeNonEmpty");
101110- ACCESS_ONCE(rdp->nocb_follower_head) = NULL;
101111+ ACCESS_ONCE_RW(rdp->nocb_follower_head) = NULL;
101112 tail = xchg(&rdp->nocb_follower_tail, &rdp->nocb_follower_head);
101113
101114 /* Each pass through the following loop invokes a callback. */
101115@@ -2338,7 +2338,7 @@ static void do_nocb_deferred_wakeup(struct rcu_data *rdp)
101116 if (!rcu_nocb_need_deferred_wakeup(rdp))
101117 return;
101118 ndw = ACCESS_ONCE(rdp->nocb_defer_wakeup);
101119- ACCESS_ONCE(rdp->nocb_defer_wakeup) = RCU_NOGP_WAKE_NOT;
101120+ ACCESS_ONCE_RW(rdp->nocb_defer_wakeup) = RCU_NOGP_WAKE_NOT;
101121 wake_nocb_leader(rdp, ndw == RCU_NOGP_WAKE_FORCE);
101122 trace_rcu_nocb_wake(rdp->rsp->name, rdp->cpu, TPS("DeferredWake"));
101123 }
101124@@ -2461,7 +2461,7 @@ static void rcu_spawn_one_nocb_kthread(struct rcu_state *rsp, int cpu)
101125 t = kthread_run(rcu_nocb_kthread, rdp_spawn,
101126 "rcuo%c/%d", rsp->abbr, cpu);
101127 BUG_ON(IS_ERR(t));
101128- ACCESS_ONCE(rdp_spawn->nocb_kthread) = t;
101129+ ACCESS_ONCE_RW(rdp_spawn->nocb_kthread) = t;
101130 }
101131
101132 /*
101133@@ -2666,11 +2666,11 @@ static void rcu_sysidle_enter(int irq)
101134
101135 /* Record start of fully idle period. */
101136 j = jiffies;
101137- ACCESS_ONCE(rdtp->dynticks_idle_jiffies) = j;
101138+ ACCESS_ONCE_RW(rdtp->dynticks_idle_jiffies) = j;
101139 smp_mb__before_atomic();
101140- atomic_inc(&rdtp->dynticks_idle);
101141+ atomic_inc_unchecked(&rdtp->dynticks_idle);
101142 smp_mb__after_atomic();
101143- WARN_ON_ONCE(atomic_read(&rdtp->dynticks_idle) & 0x1);
101144+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks_idle) & 0x1);
101145 }
101146
101147 /*
101148@@ -2741,9 +2741,9 @@ static void rcu_sysidle_exit(int irq)
101149
101150 /* Record end of idle period. */
101151 smp_mb__before_atomic();
101152- atomic_inc(&rdtp->dynticks_idle);
101153+ atomic_inc_unchecked(&rdtp->dynticks_idle);
101154 smp_mb__after_atomic();
101155- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks_idle) & 0x1));
101156+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks_idle) & 0x1));
101157
101158 /*
101159 * If we are the timekeeping CPU, we are permitted to be non-idle
101160@@ -2788,7 +2788,7 @@ static void rcu_sysidle_check_cpu(struct rcu_data *rdp, bool *isidle,
101161 WARN_ON_ONCE(smp_processor_id() != tick_do_timer_cpu);
101162
101163 /* Pick up current idle and NMI-nesting counter and check. */
101164- cur = atomic_read(&rdtp->dynticks_idle);
101165+ cur = atomic_read_unchecked(&rdtp->dynticks_idle);
101166 if (cur & 0x1) {
101167 *isidle = false; /* We are not idle! */
101168 return;
101169@@ -2837,7 +2837,7 @@ static void rcu_sysidle(unsigned long j)
101170 case RCU_SYSIDLE_NOT:
101171
101172 /* First time all are idle, so note a short idle period. */
101173- ACCESS_ONCE(full_sysidle_state) = RCU_SYSIDLE_SHORT;
101174+ ACCESS_ONCE_RW(full_sysidle_state) = RCU_SYSIDLE_SHORT;
101175 break;
101176
101177 case RCU_SYSIDLE_SHORT:
101178@@ -2875,7 +2875,7 @@ static void rcu_sysidle_cancel(void)
101179 {
101180 smp_mb();
101181 if (full_sysidle_state > RCU_SYSIDLE_SHORT)
101182- ACCESS_ONCE(full_sysidle_state) = RCU_SYSIDLE_NOT;
101183+ ACCESS_ONCE_RW(full_sysidle_state) = RCU_SYSIDLE_NOT;
101184 }
101185
101186 /*
101187@@ -2927,7 +2927,7 @@ static void rcu_sysidle_cb(struct rcu_head *rhp)
101188 smp_mb(); /* grace period precedes setting inuse. */
101189
101190 rshp = container_of(rhp, struct rcu_sysidle_head, rh);
101191- ACCESS_ONCE(rshp->inuse) = 0;
101192+ ACCESS_ONCE_RW(rshp->inuse) = 0;
101193 }
101194
101195 /*
101196@@ -3080,7 +3080,7 @@ static void rcu_bind_gp_kthread(void)
101197 static void rcu_dynticks_task_enter(void)
101198 {
101199 #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL)
101200- ACCESS_ONCE(current->rcu_tasks_idle_cpu) = smp_processor_id();
101201+ ACCESS_ONCE_RW(current->rcu_tasks_idle_cpu) = smp_processor_id();
101202 #endif /* #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL) */
101203 }
101204
101205@@ -3088,6 +3088,6 @@ static void rcu_dynticks_task_enter(void)
101206 static void rcu_dynticks_task_exit(void)
101207 {
101208 #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL)
101209- ACCESS_ONCE(current->rcu_tasks_idle_cpu) = -1;
101210+ ACCESS_ONCE_RW(current->rcu_tasks_idle_cpu) = -1;
101211 #endif /* #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL) */
101212 }
101213diff --git a/kernel/rcu/tree_trace.c b/kernel/rcu/tree_trace.c
101214index fbb6240..f6c5097 100644
101215--- a/kernel/rcu/tree_trace.c
101216+++ b/kernel/rcu/tree_trace.c
101217@@ -125,7 +125,7 @@ static void print_one_rcu_data(struct seq_file *m, struct rcu_data *rdp)
101218 rdp->rcu_qs_ctr_snap == per_cpu(rcu_qs_ctr, rdp->cpu),
101219 rdp->qs_pending);
101220 seq_printf(m, " dt=%d/%llx/%d df=%lu",
101221- atomic_read(&rdp->dynticks->dynticks),
101222+ atomic_read_unchecked(&rdp->dynticks->dynticks),
101223 rdp->dynticks->dynticks_nesting,
101224 rdp->dynticks->dynticks_nmi_nesting,
101225 rdp->dynticks_fqs);
101226@@ -186,17 +186,17 @@ static int show_rcuexp(struct seq_file *m, void *v)
101227 struct rcu_state *rsp = (struct rcu_state *)m->private;
101228
101229 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",
101230- atomic_long_read(&rsp->expedited_start),
101231+ atomic_long_read_unchecked(&rsp->expedited_start),
101232 atomic_long_read(&rsp->expedited_done),
101233- atomic_long_read(&rsp->expedited_wrap),
101234- atomic_long_read(&rsp->expedited_tryfail),
101235- atomic_long_read(&rsp->expedited_workdone1),
101236- atomic_long_read(&rsp->expedited_workdone2),
101237- atomic_long_read(&rsp->expedited_normal),
101238- atomic_long_read(&rsp->expedited_stoppedcpus),
101239- atomic_long_read(&rsp->expedited_done_tries),
101240- atomic_long_read(&rsp->expedited_done_lost),
101241- atomic_long_read(&rsp->expedited_done_exit));
101242+ atomic_long_read_unchecked(&rsp->expedited_wrap),
101243+ atomic_long_read_unchecked(&rsp->expedited_tryfail),
101244+ atomic_long_read_unchecked(&rsp->expedited_workdone1),
101245+ atomic_long_read_unchecked(&rsp->expedited_workdone2),
101246+ atomic_long_read_unchecked(&rsp->expedited_normal),
101247+ atomic_long_read_unchecked(&rsp->expedited_stoppedcpus),
101248+ atomic_long_read_unchecked(&rsp->expedited_done_tries),
101249+ atomic_long_read_unchecked(&rsp->expedited_done_lost),
101250+ atomic_long_read_unchecked(&rsp->expedited_done_exit));
101251 return 0;
101252 }
101253
101254diff --git a/kernel/rcu/update.c b/kernel/rcu/update.c
101255index e0d31a3..f4dafe3 100644
101256--- a/kernel/rcu/update.c
101257+++ b/kernel/rcu/update.c
101258@@ -342,10 +342,10 @@ int rcu_jiffies_till_stall_check(void)
101259 * for CONFIG_RCU_CPU_STALL_TIMEOUT.
101260 */
101261 if (till_stall_check < 3) {
101262- ACCESS_ONCE(rcu_cpu_stall_timeout) = 3;
101263+ ACCESS_ONCE_RW(rcu_cpu_stall_timeout) = 3;
101264 till_stall_check = 3;
101265 } else if (till_stall_check > 300) {
101266- ACCESS_ONCE(rcu_cpu_stall_timeout) = 300;
101267+ ACCESS_ONCE_RW(rcu_cpu_stall_timeout) = 300;
101268 till_stall_check = 300;
101269 }
101270 return till_stall_check * HZ + RCU_STALL_DELAY_DELTA;
101271@@ -501,7 +501,7 @@ static void check_holdout_task(struct task_struct *t,
101272 !ACCESS_ONCE(t->on_rq) ||
101273 (IS_ENABLED(CONFIG_NO_HZ_FULL) &&
101274 !is_idle_task(t) && t->rcu_tasks_idle_cpu >= 0)) {
101275- ACCESS_ONCE(t->rcu_tasks_holdout) = false;
101276+ ACCESS_ONCE_RW(t->rcu_tasks_holdout) = false;
101277 list_del_init(&t->rcu_tasks_holdout_list);
101278 put_task_struct(t);
101279 return;
101280@@ -589,7 +589,7 @@ static int __noreturn rcu_tasks_kthread(void *arg)
101281 !is_idle_task(t)) {
101282 get_task_struct(t);
101283 t->rcu_tasks_nvcsw = ACCESS_ONCE(t->nvcsw);
101284- ACCESS_ONCE(t->rcu_tasks_holdout) = true;
101285+ ACCESS_ONCE_RW(t->rcu_tasks_holdout) = true;
101286 list_add(&t->rcu_tasks_holdout_list,
101287 &rcu_tasks_holdouts);
101288 }
101289@@ -686,7 +686,7 @@ static void rcu_spawn_tasks_kthread(void)
101290 t = kthread_run(rcu_tasks_kthread, NULL, "rcu_tasks_kthread");
101291 BUG_ON(IS_ERR(t));
101292 smp_mb(); /* Ensure others see full kthread. */
101293- ACCESS_ONCE(rcu_tasks_kthread_ptr) = t;
101294+ ACCESS_ONCE_RW(rcu_tasks_kthread_ptr) = t;
101295 mutex_unlock(&rcu_tasks_kthread_mutex);
101296 }
101297
101298diff --git a/kernel/resource.c b/kernel/resource.c
101299index 19f2357..ebe7f35 100644
101300--- a/kernel/resource.c
101301+++ b/kernel/resource.c
101302@@ -162,8 +162,18 @@ static const struct file_operations proc_iomem_operations = {
101303
101304 static int __init ioresources_init(void)
101305 {
101306+#ifdef CONFIG_GRKERNSEC_PROC_ADD
101307+#ifdef CONFIG_GRKERNSEC_PROC_USER
101308+ proc_create("ioports", S_IRUSR, NULL, &proc_ioports_operations);
101309+ proc_create("iomem", S_IRUSR, NULL, &proc_iomem_operations);
101310+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
101311+ proc_create("ioports", S_IRUSR | S_IRGRP, NULL, &proc_ioports_operations);
101312+ proc_create("iomem", S_IRUSR | S_IRGRP, NULL, &proc_iomem_operations);
101313+#endif
101314+#else
101315 proc_create("ioports", 0, NULL, &proc_ioports_operations);
101316 proc_create("iomem", 0, NULL, &proc_iomem_operations);
101317+#endif
101318 return 0;
101319 }
101320 __initcall(ioresources_init);
101321diff --git a/kernel/sched/auto_group.c b/kernel/sched/auto_group.c
101322index eae160d..c9aa22e 100644
101323--- a/kernel/sched/auto_group.c
101324+++ b/kernel/sched/auto_group.c
101325@@ -11,7 +11,7 @@
101326
101327 unsigned int __read_mostly sysctl_sched_autogroup_enabled = 1;
101328 static struct autogroup autogroup_default;
101329-static atomic_t autogroup_seq_nr;
101330+static atomic_unchecked_t autogroup_seq_nr;
101331
101332 void __init autogroup_init(struct task_struct *init_task)
101333 {
101334@@ -79,7 +79,7 @@ static inline struct autogroup *autogroup_create(void)
101335
101336 kref_init(&ag->kref);
101337 init_rwsem(&ag->lock);
101338- ag->id = atomic_inc_return(&autogroup_seq_nr);
101339+ ag->id = atomic_inc_return_unchecked(&autogroup_seq_nr);
101340 ag->tg = tg;
101341 #ifdef CONFIG_RT_GROUP_SCHED
101342 /*
101343diff --git a/kernel/sched/completion.c b/kernel/sched/completion.c
101344index 8d0f35d..c16360d 100644
101345--- a/kernel/sched/completion.c
101346+++ b/kernel/sched/completion.c
101347@@ -205,7 +205,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible);
101348 * Return: -ERESTARTSYS if interrupted, 0 if timed out, positive (at least 1,
101349 * or number of jiffies left till timeout) if completed.
101350 */
101351-long __sched
101352+long __sched __intentional_overflow(-1)
101353 wait_for_completion_interruptible_timeout(struct completion *x,
101354 unsigned long timeout)
101355 {
101356@@ -222,7 +222,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible_timeout);
101357 *
101358 * Return: -ERESTARTSYS if interrupted, 0 if completed.
101359 */
101360-int __sched wait_for_completion_killable(struct completion *x)
101361+int __sched __intentional_overflow(-1) wait_for_completion_killable(struct completion *x)
101362 {
101363 long t = wait_for_common(x, MAX_SCHEDULE_TIMEOUT, TASK_KILLABLE);
101364 if (t == -ERESTARTSYS)
101365@@ -243,7 +243,7 @@ EXPORT_SYMBOL(wait_for_completion_killable);
101366 * Return: -ERESTARTSYS if interrupted, 0 if timed out, positive (at least 1,
101367 * or number of jiffies left till timeout) if completed.
101368 */
101369-long __sched
101370+long __sched __intentional_overflow(-1)
101371 wait_for_completion_killable_timeout(struct completion *x,
101372 unsigned long timeout)
101373 {
101374diff --git a/kernel/sched/core.c b/kernel/sched/core.c
101375index f4da2cb..e44587b 100644
101376--- a/kernel/sched/core.c
101377+++ b/kernel/sched/core.c
101378@@ -1862,7 +1862,7 @@ void set_numabalancing_state(bool enabled)
101379 int sysctl_numa_balancing(struct ctl_table *table, int write,
101380 void __user *buffer, size_t *lenp, loff_t *ppos)
101381 {
101382- struct ctl_table t;
101383+ ctl_table_no_const t;
101384 int err;
101385 int state = numabalancing_enabled;
101386
101387@@ -2312,8 +2312,10 @@ context_switch(struct rq *rq, struct task_struct *prev,
101388 next->active_mm = oldmm;
101389 atomic_inc(&oldmm->mm_count);
101390 enter_lazy_tlb(oldmm, next);
101391- } else
101392+ } else {
101393 switch_mm(oldmm, mm, next);
101394+ populate_stack();
101395+ }
101396
101397 if (!prev->mm) {
101398 prev->active_mm = NULL;
101399@@ -3124,6 +3126,8 @@ int can_nice(const struct task_struct *p, const int nice)
101400 /* convert nice value [19,-20] to rlimit style value [1,40] */
101401 int nice_rlim = nice_to_rlimit(nice);
101402
101403+ gr_learn_resource(p, RLIMIT_NICE, nice_rlim, 1);
101404+
101405 return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
101406 capable(CAP_SYS_NICE));
101407 }
101408@@ -3150,7 +3154,8 @@ SYSCALL_DEFINE1(nice, int, increment)
101409 nice = task_nice(current) + increment;
101410
101411 nice = clamp_val(nice, MIN_NICE, MAX_NICE);
101412- if (increment < 0 && !can_nice(current, nice))
101413+ if (increment < 0 && (!can_nice(current, nice) ||
101414+ gr_handle_chroot_nice()))
101415 return -EPERM;
101416
101417 retval = security_task_setnice(current, nice);
101418@@ -3462,6 +3467,7 @@ recheck:
101419 if (policy != p->policy && !rlim_rtprio)
101420 return -EPERM;
101421
101422+ gr_learn_resource(p, RLIMIT_RTPRIO, attr->sched_priority, 1);
101423 /* can't increase priority */
101424 if (attr->sched_priority > p->rt_priority &&
101425 attr->sched_priority > rlim_rtprio)
101426@@ -4945,6 +4951,7 @@ void idle_task_exit(void)
101427
101428 if (mm != &init_mm) {
101429 switch_mm(mm, &init_mm, current);
101430+ populate_stack();
101431 finish_arch_post_lock_switch();
101432 }
101433 mmdrop(mm);
101434@@ -5040,7 +5047,7 @@ static void migrate_tasks(unsigned int dead_cpu)
101435
101436 #if defined(CONFIG_SCHED_DEBUG) && defined(CONFIG_SYSCTL)
101437
101438-static struct ctl_table sd_ctl_dir[] = {
101439+static ctl_table_no_const sd_ctl_dir[] __read_only = {
101440 {
101441 .procname = "sched_domain",
101442 .mode = 0555,
101443@@ -5057,17 +5064,17 @@ static struct ctl_table sd_ctl_root[] = {
101444 {}
101445 };
101446
101447-static struct ctl_table *sd_alloc_ctl_entry(int n)
101448+static ctl_table_no_const *sd_alloc_ctl_entry(int n)
101449 {
101450- struct ctl_table *entry =
101451+ ctl_table_no_const *entry =
101452 kcalloc(n, sizeof(struct ctl_table), GFP_KERNEL);
101453
101454 return entry;
101455 }
101456
101457-static void sd_free_ctl_entry(struct ctl_table **tablep)
101458+static void sd_free_ctl_entry(ctl_table_no_const *tablep)
101459 {
101460- struct ctl_table *entry;
101461+ ctl_table_no_const *entry;
101462
101463 /*
101464 * In the intermediate directories, both the child directory and
101465@@ -5075,22 +5082,25 @@ static void sd_free_ctl_entry(struct ctl_table **tablep)
101466 * will always be set. In the lowest directory the names are
101467 * static strings and all have proc handlers.
101468 */
101469- for (entry = *tablep; entry->mode; entry++) {
101470- if (entry->child)
101471- sd_free_ctl_entry(&entry->child);
101472+ for (entry = tablep; entry->mode; entry++) {
101473+ if (entry->child) {
101474+ sd_free_ctl_entry(entry->child);
101475+ pax_open_kernel();
101476+ entry->child = NULL;
101477+ pax_close_kernel();
101478+ }
101479 if (entry->proc_handler == NULL)
101480 kfree(entry->procname);
101481 }
101482
101483- kfree(*tablep);
101484- *tablep = NULL;
101485+ kfree(tablep);
101486 }
101487
101488 static int min_load_idx = 0;
101489 static int max_load_idx = CPU_LOAD_IDX_MAX-1;
101490
101491 static void
101492-set_table_entry(struct ctl_table *entry,
101493+set_table_entry(ctl_table_no_const *entry,
101494 const char *procname, void *data, int maxlen,
101495 umode_t mode, proc_handler *proc_handler,
101496 bool load_idx)
101497@@ -5110,7 +5120,7 @@ set_table_entry(struct ctl_table *entry,
101498 static struct ctl_table *
101499 sd_alloc_ctl_domain_table(struct sched_domain *sd)
101500 {
101501- struct ctl_table *table = sd_alloc_ctl_entry(14);
101502+ ctl_table_no_const *table = sd_alloc_ctl_entry(14);
101503
101504 if (table == NULL)
101505 return NULL;
101506@@ -5148,9 +5158,9 @@ sd_alloc_ctl_domain_table(struct sched_domain *sd)
101507 return table;
101508 }
101509
101510-static struct ctl_table *sd_alloc_ctl_cpu_table(int cpu)
101511+static ctl_table_no_const *sd_alloc_ctl_cpu_table(int cpu)
101512 {
101513- struct ctl_table *entry, *table;
101514+ ctl_table_no_const *entry, *table;
101515 struct sched_domain *sd;
101516 int domain_num = 0, i;
101517 char buf[32];
101518@@ -5177,11 +5187,13 @@ static struct ctl_table_header *sd_sysctl_header;
101519 static void register_sched_domain_sysctl(void)
101520 {
101521 int i, cpu_num = num_possible_cpus();
101522- struct ctl_table *entry = sd_alloc_ctl_entry(cpu_num + 1);
101523+ ctl_table_no_const *entry = sd_alloc_ctl_entry(cpu_num + 1);
101524 char buf[32];
101525
101526 WARN_ON(sd_ctl_dir[0].child);
101527+ pax_open_kernel();
101528 sd_ctl_dir[0].child = entry;
101529+ pax_close_kernel();
101530
101531 if (entry == NULL)
101532 return;
101533@@ -5204,8 +5216,12 @@ static void unregister_sched_domain_sysctl(void)
101534 if (sd_sysctl_header)
101535 unregister_sysctl_table(sd_sysctl_header);
101536 sd_sysctl_header = NULL;
101537- if (sd_ctl_dir[0].child)
101538- sd_free_ctl_entry(&sd_ctl_dir[0].child);
101539+ if (sd_ctl_dir[0].child) {
101540+ sd_free_ctl_entry(sd_ctl_dir[0].child);
101541+ pax_open_kernel();
101542+ sd_ctl_dir[0].child = NULL;
101543+ pax_close_kernel();
101544+ }
101545 }
101546 #else
101547 static void register_sched_domain_sysctl(void)
101548diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
101549index 486d00c..62f3f6e 100644
101550--- a/kernel/sched/fair.c
101551+++ b/kernel/sched/fair.c
101552@@ -2092,7 +2092,7 @@ void task_numa_fault(int last_cpupid, int mem_node, int pages, int flags)
101553
101554 static void reset_ptenuma_scan(struct task_struct *p)
101555 {
101556- ACCESS_ONCE(p->mm->numa_scan_seq)++;
101557+ ACCESS_ONCE_RW(p->mm->numa_scan_seq)++;
101558 p->mm->numa_scan_offset = 0;
101559 }
101560
101561@@ -7656,7 +7656,7 @@ static void nohz_idle_balance(struct rq *this_rq, enum cpu_idle_type idle) { }
101562 * run_rebalance_domains is triggered when needed from the scheduler tick.
101563 * Also triggered for nohz idle balancing (with nohz_balancing_kick set).
101564 */
101565-static void run_rebalance_domains(struct softirq_action *h)
101566+static __latent_entropy void run_rebalance_domains(void)
101567 {
101568 struct rq *this_rq = this_rq();
101569 enum cpu_idle_type idle = this_rq->idle_balance ?
101570diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
101571index dc0f435..ae2e085 100644
101572--- a/kernel/sched/sched.h
101573+++ b/kernel/sched/sched.h
101574@@ -1200,7 +1200,7 @@ struct sched_class {
101575 #ifdef CONFIG_FAIR_GROUP_SCHED
101576 void (*task_move_group) (struct task_struct *p, int on_rq);
101577 #endif
101578-};
101579+} __do_const;
101580
101581 static inline void put_prev_task(struct rq *rq, struct task_struct *prev)
101582 {
101583diff --git a/kernel/signal.c b/kernel/signal.c
101584index a390499..ebe9a21 100644
101585--- a/kernel/signal.c
101586+++ b/kernel/signal.c
101587@@ -53,12 +53,12 @@ static struct kmem_cache *sigqueue_cachep;
101588
101589 int print_fatal_signals __read_mostly;
101590
101591-static void __user *sig_handler(struct task_struct *t, int sig)
101592+static __sighandler_t sig_handler(struct task_struct *t, int sig)
101593 {
101594 return t->sighand->action[sig - 1].sa.sa_handler;
101595 }
101596
101597-static int sig_handler_ignored(void __user *handler, int sig)
101598+static int sig_handler_ignored(__sighandler_t handler, int sig)
101599 {
101600 /* Is it explicitly or implicitly ignored? */
101601 return handler == SIG_IGN ||
101602@@ -67,7 +67,7 @@ static int sig_handler_ignored(void __user *handler, int sig)
101603
101604 static int sig_task_ignored(struct task_struct *t, int sig, bool force)
101605 {
101606- void __user *handler;
101607+ __sighandler_t handler;
101608
101609 handler = sig_handler(t, sig);
101610
101611@@ -372,6 +372,9 @@ __sigqueue_alloc(int sig, struct task_struct *t, gfp_t flags, int override_rlimi
101612 atomic_inc(&user->sigpending);
101613 rcu_read_unlock();
101614
101615+ if (!override_rlimit)
101616+ gr_learn_resource(t, RLIMIT_SIGPENDING, atomic_read(&user->sigpending), 1);
101617+
101618 if (override_rlimit ||
101619 atomic_read(&user->sigpending) <=
101620 task_rlimit(t, RLIMIT_SIGPENDING)) {
101621@@ -499,7 +502,7 @@ flush_signal_handlers(struct task_struct *t, int force_default)
101622
101623 int unhandled_signal(struct task_struct *tsk, int sig)
101624 {
101625- void __user *handler = tsk->sighand->action[sig-1].sa.sa_handler;
101626+ __sighandler_t handler = tsk->sighand->action[sig-1].sa.sa_handler;
101627 if (is_global_init(tsk))
101628 return 1;
101629 if (handler != SIG_IGN && handler != SIG_DFL)
101630@@ -793,6 +796,13 @@ static int check_kill_permission(int sig, struct siginfo *info,
101631 }
101632 }
101633
101634+ /* allow glibc communication via tgkill to other threads in our
101635+ thread group */
101636+ if ((info == SEND_SIG_NOINFO || info->si_code != SI_TKILL ||
101637+ sig != (SIGRTMIN+1) || task_tgid_vnr(t) != info->si_pid)
101638+ && gr_handle_signal(t, sig))
101639+ return -EPERM;
101640+
101641 return security_task_kill(t, info, sig, 0);
101642 }
101643
101644@@ -1176,7 +1186,7 @@ __group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
101645 return send_signal(sig, info, p, 1);
101646 }
101647
101648-static int
101649+int
101650 specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t)
101651 {
101652 return send_signal(sig, info, t, 0);
101653@@ -1213,6 +1223,7 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
101654 unsigned long int flags;
101655 int ret, blocked, ignored;
101656 struct k_sigaction *action;
101657+ int is_unhandled = 0;
101658
101659 spin_lock_irqsave(&t->sighand->siglock, flags);
101660 action = &t->sighand->action[sig-1];
101661@@ -1227,9 +1238,18 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
101662 }
101663 if (action->sa.sa_handler == SIG_DFL)
101664 t->signal->flags &= ~SIGNAL_UNKILLABLE;
101665+ if (action->sa.sa_handler == SIG_IGN || action->sa.sa_handler == SIG_DFL)
101666+ is_unhandled = 1;
101667 ret = specific_send_sig_info(sig, info, t);
101668 spin_unlock_irqrestore(&t->sighand->siglock, flags);
101669
101670+ /* only deal with unhandled signals, java etc trigger SIGSEGV during
101671+ normal operation */
101672+ if (is_unhandled) {
101673+ gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, t);
101674+ gr_handle_crash(t, sig);
101675+ }
101676+
101677 return ret;
101678 }
101679
101680@@ -1310,8 +1330,11 @@ int group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
101681 ret = check_kill_permission(sig, info, p);
101682 rcu_read_unlock();
101683
101684- if (!ret && sig)
101685+ if (!ret && sig) {
101686 ret = do_send_sig_info(sig, info, p, true);
101687+ if (!ret)
101688+ gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, p);
101689+ }
101690
101691 return ret;
101692 }
101693@@ -2915,7 +2938,15 @@ do_send_specific(pid_t tgid, pid_t pid, int sig, struct siginfo *info)
101694 int error = -ESRCH;
101695
101696 rcu_read_lock();
101697- p = find_task_by_vpid(pid);
101698+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
101699+ /* allow glibc communication via tgkill to other threads in our
101700+ thread group */
101701+ if (grsec_enable_chroot_findtask && info->si_code == SI_TKILL &&
101702+ sig == (SIGRTMIN+1) && tgid == info->si_pid)
101703+ p = find_task_by_vpid_unrestricted(pid);
101704+ else
101705+#endif
101706+ p = find_task_by_vpid(pid);
101707 if (p && (tgid <= 0 || task_tgid_vnr(p) == tgid)) {
101708 error = check_kill_permission(sig, info, p);
101709 /*
101710@@ -3248,8 +3279,8 @@ COMPAT_SYSCALL_DEFINE2(sigaltstack,
101711 }
101712 seg = get_fs();
101713 set_fs(KERNEL_DS);
101714- ret = do_sigaltstack((stack_t __force __user *) (uss_ptr ? &uss : NULL),
101715- (stack_t __force __user *) &uoss,
101716+ ret = do_sigaltstack((stack_t __force_user *) (uss_ptr ? &uss : NULL),
101717+ (stack_t __force_user *) &uoss,
101718 compat_user_stack_pointer());
101719 set_fs(seg);
101720 if (ret >= 0 && uoss_ptr) {
101721diff --git a/kernel/smpboot.c b/kernel/smpboot.c
101722index 40190f2..8861d40 100644
101723--- a/kernel/smpboot.c
101724+++ b/kernel/smpboot.c
101725@@ -290,7 +290,7 @@ int smpboot_register_percpu_thread(struct smp_hotplug_thread *plug_thread)
101726 }
101727 smpboot_unpark_thread(plug_thread, cpu);
101728 }
101729- list_add(&plug_thread->list, &hotplug_threads);
101730+ pax_list_add(&plug_thread->list, &hotplug_threads);
101731 out:
101732 mutex_unlock(&smpboot_threads_lock);
101733 put_online_cpus();
101734@@ -308,7 +308,7 @@ void smpboot_unregister_percpu_thread(struct smp_hotplug_thread *plug_thread)
101735 {
101736 get_online_cpus();
101737 mutex_lock(&smpboot_threads_lock);
101738- list_del(&plug_thread->list);
101739+ pax_list_del(&plug_thread->list);
101740 smpboot_destroy_threads(plug_thread);
101741 mutex_unlock(&smpboot_threads_lock);
101742 put_online_cpus();
101743diff --git a/kernel/softirq.c b/kernel/softirq.c
101744index 479e443..66d845e1 100644
101745--- a/kernel/softirq.c
101746+++ b/kernel/softirq.c
101747@@ -53,7 +53,7 @@ irq_cpustat_t irq_stat[NR_CPUS] ____cacheline_aligned;
101748 EXPORT_SYMBOL(irq_stat);
101749 #endif
101750
101751-static struct softirq_action softirq_vec[NR_SOFTIRQS] __cacheline_aligned_in_smp;
101752+static struct softirq_action softirq_vec[NR_SOFTIRQS] __read_only __aligned(PAGE_SIZE);
101753
101754 DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
101755
101756@@ -270,7 +270,7 @@ restart:
101757 kstat_incr_softirqs_this_cpu(vec_nr);
101758
101759 trace_softirq_entry(vec_nr);
101760- h->action(h);
101761+ h->action();
101762 trace_softirq_exit(vec_nr);
101763 if (unlikely(prev_count != preempt_count())) {
101764 pr_err("huh, entered softirq %u %s %p with preempt_count %08x, exited with %08x?\n",
101765@@ -430,7 +430,7 @@ void __raise_softirq_irqoff(unsigned int nr)
101766 or_softirq_pending(1UL << nr);
101767 }
101768
101769-void open_softirq(int nr, void (*action)(struct softirq_action *))
101770+void __init open_softirq(int nr, void (*action)(void))
101771 {
101772 softirq_vec[nr].action = action;
101773 }
101774@@ -482,7 +482,7 @@ void __tasklet_hi_schedule_first(struct tasklet_struct *t)
101775 }
101776 EXPORT_SYMBOL(__tasklet_hi_schedule_first);
101777
101778-static void tasklet_action(struct softirq_action *a)
101779+static void tasklet_action(void)
101780 {
101781 struct tasklet_struct *list;
101782
101783@@ -518,7 +518,7 @@ static void tasklet_action(struct softirq_action *a)
101784 }
101785 }
101786
101787-static void tasklet_hi_action(struct softirq_action *a)
101788+static __latent_entropy void tasklet_hi_action(void)
101789 {
101790 struct tasklet_struct *list;
101791
101792@@ -744,7 +744,7 @@ static struct notifier_block cpu_nfb = {
101793 .notifier_call = cpu_callback
101794 };
101795
101796-static struct smp_hotplug_thread softirq_threads = {
101797+static struct smp_hotplug_thread softirq_threads __read_only = {
101798 .store = &ksoftirqd,
101799 .thread_should_run = ksoftirqd_should_run,
101800 .thread_fn = run_ksoftirqd,
101801diff --git a/kernel/sys.c b/kernel/sys.c
101802index a03d9cd..55dbe9c 100644
101803--- a/kernel/sys.c
101804+++ b/kernel/sys.c
101805@@ -160,6 +160,12 @@ static int set_one_prio(struct task_struct *p, int niceval, int error)
101806 error = -EACCES;
101807 goto out;
101808 }
101809+
101810+ if (gr_handle_chroot_setpriority(p, niceval)) {
101811+ error = -EACCES;
101812+ goto out;
101813+ }
101814+
101815 no_nice = security_task_setnice(p, niceval);
101816 if (no_nice) {
101817 error = no_nice;
101818@@ -365,6 +371,20 @@ SYSCALL_DEFINE2(setregid, gid_t, rgid, gid_t, egid)
101819 goto error;
101820 }
101821
101822+ if (gr_check_group_change(new->gid, new->egid, INVALID_GID))
101823+ goto error;
101824+
101825+ if (!gid_eq(new->gid, old->gid)) {
101826+ /* make sure we generate a learn log for what will
101827+ end up being a role transition after a full-learning
101828+ policy is generated
101829+ CAP_SETGID is required to perform a transition
101830+ we may not log a CAP_SETGID check above, e.g.
101831+ in the case where new rgid = old egid
101832+ */
101833+ gr_learn_cap(current, new, CAP_SETGID);
101834+ }
101835+
101836 if (rgid != (gid_t) -1 ||
101837 (egid != (gid_t) -1 && !gid_eq(kegid, old->gid)))
101838 new->sgid = new->egid;
101839@@ -400,6 +420,10 @@ SYSCALL_DEFINE1(setgid, gid_t, gid)
101840 old = current_cred();
101841
101842 retval = -EPERM;
101843+
101844+ if (gr_check_group_change(kgid, kgid, kgid))
101845+ goto error;
101846+
101847 if (ns_capable(old->user_ns, CAP_SETGID))
101848 new->gid = new->egid = new->sgid = new->fsgid = kgid;
101849 else if (gid_eq(kgid, old->gid) || gid_eq(kgid, old->sgid))
101850@@ -417,7 +441,7 @@ error:
101851 /*
101852 * change the user struct in a credentials set to match the new UID
101853 */
101854-static int set_user(struct cred *new)
101855+int set_user(struct cred *new)
101856 {
101857 struct user_struct *new_user;
101858
101859@@ -497,7 +521,18 @@ SYSCALL_DEFINE2(setreuid, uid_t, ruid, uid_t, euid)
101860 goto error;
101861 }
101862
101863+ if (gr_check_user_change(new->uid, new->euid, INVALID_UID))
101864+ goto error;
101865+
101866 if (!uid_eq(new->uid, old->uid)) {
101867+ /* make sure we generate a learn log for what will
101868+ end up being a role transition after a full-learning
101869+ policy is generated
101870+ CAP_SETUID is required to perform a transition
101871+ we may not log a CAP_SETUID check above, e.g.
101872+ in the case where new ruid = old euid
101873+ */
101874+ gr_learn_cap(current, new, CAP_SETUID);
101875 retval = set_user(new);
101876 if (retval < 0)
101877 goto error;
101878@@ -547,6 +582,12 @@ SYSCALL_DEFINE1(setuid, uid_t, uid)
101879 old = current_cred();
101880
101881 retval = -EPERM;
101882+
101883+ if (gr_check_crash_uid(kuid))
101884+ goto error;
101885+ if (gr_check_user_change(kuid, kuid, kuid))
101886+ goto error;
101887+
101888 if (ns_capable(old->user_ns, CAP_SETUID)) {
101889 new->suid = new->uid = kuid;
101890 if (!uid_eq(kuid, old->uid)) {
101891@@ -616,6 +657,9 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid, uid_t, euid, uid_t, suid)
101892 goto error;
101893 }
101894
101895+ if (gr_check_user_change(kruid, keuid, INVALID_UID))
101896+ goto error;
101897+
101898 if (ruid != (uid_t) -1) {
101899 new->uid = kruid;
101900 if (!uid_eq(kruid, old->uid)) {
101901@@ -700,6 +744,9 @@ SYSCALL_DEFINE3(setresgid, gid_t, rgid, gid_t, egid, gid_t, sgid)
101902 goto error;
101903 }
101904
101905+ if (gr_check_group_change(krgid, kegid, INVALID_GID))
101906+ goto error;
101907+
101908 if (rgid != (gid_t) -1)
101909 new->gid = krgid;
101910 if (egid != (gid_t) -1)
101911@@ -764,12 +811,16 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
101912 uid_eq(kuid, old->suid) || uid_eq(kuid, old->fsuid) ||
101913 ns_capable(old->user_ns, CAP_SETUID)) {
101914 if (!uid_eq(kuid, old->fsuid)) {
101915+ if (gr_check_user_change(INVALID_UID, INVALID_UID, kuid))
101916+ goto error;
101917+
101918 new->fsuid = kuid;
101919 if (security_task_fix_setuid(new, old, LSM_SETID_FS) == 0)
101920 goto change_okay;
101921 }
101922 }
101923
101924+error:
101925 abort_creds(new);
101926 return old_fsuid;
101927
101928@@ -802,12 +853,16 @@ SYSCALL_DEFINE1(setfsgid, gid_t, gid)
101929 if (gid_eq(kgid, old->gid) || gid_eq(kgid, old->egid) ||
101930 gid_eq(kgid, old->sgid) || gid_eq(kgid, old->fsgid) ||
101931 ns_capable(old->user_ns, CAP_SETGID)) {
101932+ if (gr_check_group_change(INVALID_GID, INVALID_GID, kgid))
101933+ goto error;
101934+
101935 if (!gid_eq(kgid, old->fsgid)) {
101936 new->fsgid = kgid;
101937 goto change_okay;
101938 }
101939 }
101940
101941+error:
101942 abort_creds(new);
101943 return old_fsgid;
101944
101945@@ -1185,19 +1240,19 @@ SYSCALL_DEFINE1(olduname, struct oldold_utsname __user *, name)
101946 return -EFAULT;
101947
101948 down_read(&uts_sem);
101949- error = __copy_to_user(&name->sysname, &utsname()->sysname,
101950+ error = __copy_to_user(name->sysname, &utsname()->sysname,
101951 __OLD_UTS_LEN);
101952 error |= __put_user(0, name->sysname + __OLD_UTS_LEN);
101953- error |= __copy_to_user(&name->nodename, &utsname()->nodename,
101954+ error |= __copy_to_user(name->nodename, &utsname()->nodename,
101955 __OLD_UTS_LEN);
101956 error |= __put_user(0, name->nodename + __OLD_UTS_LEN);
101957- error |= __copy_to_user(&name->release, &utsname()->release,
101958+ error |= __copy_to_user(name->release, &utsname()->release,
101959 __OLD_UTS_LEN);
101960 error |= __put_user(0, name->release + __OLD_UTS_LEN);
101961- error |= __copy_to_user(&name->version, &utsname()->version,
101962+ error |= __copy_to_user(name->version, &utsname()->version,
101963 __OLD_UTS_LEN);
101964 error |= __put_user(0, name->version + __OLD_UTS_LEN);
101965- error |= __copy_to_user(&name->machine, &utsname()->machine,
101966+ error |= __copy_to_user(name->machine, &utsname()->machine,
101967 __OLD_UTS_LEN);
101968 error |= __put_user(0, name->machine + __OLD_UTS_LEN);
101969 up_read(&uts_sem);
101970@@ -1398,6 +1453,13 @@ int do_prlimit(struct task_struct *tsk, unsigned int resource,
101971 */
101972 new_rlim->rlim_cur = 1;
101973 }
101974+ /* Handle the case where a fork and setuid occur and then RLIMIT_NPROC
101975+ is changed to a lower value. Since tasks can be created by the same
101976+ user in between this limit change and an execve by this task, force
101977+ a recheck only for this task by setting PF_NPROC_EXCEEDED
101978+ */
101979+ if (resource == RLIMIT_NPROC && tsk->real_cred->user != INIT_USER)
101980+ tsk->flags |= PF_NPROC_EXCEEDED;
101981 }
101982 if (!retval) {
101983 if (old_rlim)
101984diff --git a/kernel/sysctl.c b/kernel/sysctl.c
101985index ce410bb..cd276f0 100644
101986--- a/kernel/sysctl.c
101987+++ b/kernel/sysctl.c
101988@@ -94,7 +94,6 @@
101989
101990
101991 #if defined(CONFIG_SYSCTL)
101992-
101993 /* External variables not in a header file. */
101994 extern int max_threads;
101995 extern int suid_dumpable;
101996@@ -115,19 +114,20 @@ extern int sysctl_nr_trim_pages;
101997
101998 /* Constants used for minimum and maximum */
101999 #ifdef CONFIG_LOCKUP_DETECTOR
102000-static int sixty = 60;
102001+static int sixty __read_only = 60;
102002 #endif
102003
102004-static int __maybe_unused neg_one = -1;
102005+static int __maybe_unused neg_one __read_only = -1;
102006
102007-static int zero;
102008-static int __maybe_unused one = 1;
102009-static int __maybe_unused two = 2;
102010-static int __maybe_unused four = 4;
102011-static unsigned long one_ul = 1;
102012-static int one_hundred = 100;
102013+static int zero __read_only = 0;
102014+static int __maybe_unused one __read_only = 1;
102015+static int __maybe_unused two __read_only = 2;
102016+static int __maybe_unused three __read_only = 3;
102017+static int __maybe_unused four __read_only = 4;
102018+static unsigned long one_ul __read_only = 1;
102019+static int one_hundred __read_only = 100;
102020 #ifdef CONFIG_PRINTK
102021-static int ten_thousand = 10000;
102022+static int ten_thousand __read_only = 10000;
102023 #endif
102024
102025 /* this is needed for the proc_doulongvec_minmax of vm_dirty_bytes */
102026@@ -181,10 +181,8 @@ static int proc_taint(struct ctl_table *table, int write,
102027 void __user *buffer, size_t *lenp, loff_t *ppos);
102028 #endif
102029
102030-#ifdef CONFIG_PRINTK
102031 static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
102032 void __user *buffer, size_t *lenp, loff_t *ppos);
102033-#endif
102034
102035 static int proc_dointvec_minmax_coredump(struct ctl_table *table, int write,
102036 void __user *buffer, size_t *lenp, loff_t *ppos);
102037@@ -215,6 +213,8 @@ static int sysrq_sysctl_handler(struct ctl_table *table, int write,
102038
102039 #endif
102040
102041+extern struct ctl_table grsecurity_table[];
102042+
102043 static struct ctl_table kern_table[];
102044 static struct ctl_table vm_table[];
102045 static struct ctl_table fs_table[];
102046@@ -229,6 +229,20 @@ extern struct ctl_table epoll_table[];
102047 int sysctl_legacy_va_layout;
102048 #endif
102049
102050+#ifdef CONFIG_PAX_SOFTMODE
102051+static struct ctl_table pax_table[] = {
102052+ {
102053+ .procname = "softmode",
102054+ .data = &pax_softmode,
102055+ .maxlen = sizeof(unsigned int),
102056+ .mode = 0600,
102057+ .proc_handler = &proc_dointvec,
102058+ },
102059+
102060+ { }
102061+};
102062+#endif
102063+
102064 /* The default sysctl tables: */
102065
102066 static struct ctl_table sysctl_base_table[] = {
102067@@ -277,6 +291,22 @@ static int max_extfrag_threshold = 1000;
102068 #endif
102069
102070 static struct ctl_table kern_table[] = {
102071+#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS)
102072+ {
102073+ .procname = "grsecurity",
102074+ .mode = 0500,
102075+ .child = grsecurity_table,
102076+ },
102077+#endif
102078+
102079+#ifdef CONFIG_PAX_SOFTMODE
102080+ {
102081+ .procname = "pax",
102082+ .mode = 0500,
102083+ .child = pax_table,
102084+ },
102085+#endif
102086+
102087 {
102088 .procname = "sched_child_runs_first",
102089 .data = &sysctl_sched_child_runs_first,
102090@@ -649,7 +679,7 @@ static struct ctl_table kern_table[] = {
102091 .data = &modprobe_path,
102092 .maxlen = KMOD_PATH_LEN,
102093 .mode = 0644,
102094- .proc_handler = proc_dostring,
102095+ .proc_handler = proc_dostring_modpriv,
102096 },
102097 {
102098 .procname = "modules_disabled",
102099@@ -816,16 +846,20 @@ static struct ctl_table kern_table[] = {
102100 .extra1 = &zero,
102101 .extra2 = &one,
102102 },
102103+#endif
102104 {
102105 .procname = "kptr_restrict",
102106 .data = &kptr_restrict,
102107 .maxlen = sizeof(int),
102108 .mode = 0644,
102109 .proc_handler = proc_dointvec_minmax_sysadmin,
102110+#ifdef CONFIG_GRKERNSEC_HIDESYM
102111+ .extra1 = &two,
102112+#else
102113 .extra1 = &zero,
102114+#endif
102115 .extra2 = &two,
102116 },
102117-#endif
102118 {
102119 .procname = "ngroups_max",
102120 .data = &ngroups_max,
102121@@ -1072,10 +1106,17 @@ static struct ctl_table kern_table[] = {
102122 */
102123 {
102124 .procname = "perf_event_paranoid",
102125- .data = &sysctl_perf_event_paranoid,
102126- .maxlen = sizeof(sysctl_perf_event_paranoid),
102127+ .data = &sysctl_perf_event_legitimately_concerned,
102128+ .maxlen = sizeof(sysctl_perf_event_legitimately_concerned),
102129 .mode = 0644,
102130- .proc_handler = proc_dointvec,
102131+ /* go ahead, be a hero */
102132+ .proc_handler = proc_dointvec_minmax_sysadmin,
102133+ .extra1 = &neg_one,
102134+#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
102135+ .extra2 = &three,
102136+#else
102137+ .extra2 = &two,
102138+#endif
102139 },
102140 {
102141 .procname = "perf_event_mlock_kb",
102142@@ -1348,6 +1389,13 @@ static struct ctl_table vm_table[] = {
102143 .proc_handler = proc_dointvec_minmax,
102144 .extra1 = &zero,
102145 },
102146+ {
102147+ .procname = "heap_stack_gap",
102148+ .data = &sysctl_heap_stack_gap,
102149+ .maxlen = sizeof(sysctl_heap_stack_gap),
102150+ .mode = 0644,
102151+ .proc_handler = proc_doulongvec_minmax,
102152+ },
102153 #else
102154 {
102155 .procname = "nr_trim_pages",
102156@@ -1830,6 +1878,16 @@ int proc_dostring(struct ctl_table *table, int write,
102157 (char __user *)buffer, lenp, ppos);
102158 }
102159
102160+int proc_dostring_modpriv(struct ctl_table *table, int write,
102161+ void __user *buffer, size_t *lenp, loff_t *ppos)
102162+{
102163+ if (write && !capable(CAP_SYS_MODULE))
102164+ return -EPERM;
102165+
102166+ return _proc_do_string(table->data, table->maxlen, write,
102167+ buffer, lenp, ppos);
102168+}
102169+
102170 static size_t proc_skip_spaces(char **buf)
102171 {
102172 size_t ret;
102173@@ -1935,6 +1993,8 @@ static int proc_put_long(void __user **buf, size_t *size, unsigned long val,
102174 len = strlen(tmp);
102175 if (len > *size)
102176 len = *size;
102177+ if (len > sizeof(tmp))
102178+ len = sizeof(tmp);
102179 if (copy_to_user(*buf, tmp, len))
102180 return -EFAULT;
102181 *size -= len;
102182@@ -2112,7 +2172,7 @@ int proc_dointvec(struct ctl_table *table, int write,
102183 static int proc_taint(struct ctl_table *table, int write,
102184 void __user *buffer, size_t *lenp, loff_t *ppos)
102185 {
102186- struct ctl_table t;
102187+ ctl_table_no_const t;
102188 unsigned long tmptaint = get_taint();
102189 int err;
102190
102191@@ -2140,7 +2200,6 @@ static int proc_taint(struct ctl_table *table, int write,
102192 return err;
102193 }
102194
102195-#ifdef CONFIG_PRINTK
102196 static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
102197 void __user *buffer, size_t *lenp, loff_t *ppos)
102198 {
102199@@ -2149,7 +2208,6 @@ static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
102200
102201 return proc_dointvec_minmax(table, write, buffer, lenp, ppos);
102202 }
102203-#endif
102204
102205 struct do_proc_dointvec_minmax_conv_param {
102206 int *min;
102207@@ -2709,6 +2767,12 @@ int proc_dostring(struct ctl_table *table, int write,
102208 return -ENOSYS;
102209 }
102210
102211+int proc_dostring_modpriv(struct ctl_table *table, int write,
102212+ void __user *buffer, size_t *lenp, loff_t *ppos)
102213+{
102214+ return -ENOSYS;
102215+}
102216+
102217 int proc_dointvec(struct ctl_table *table, int write,
102218 void __user *buffer, size_t *lenp, loff_t *ppos)
102219 {
102220@@ -2765,5 +2829,6 @@ EXPORT_SYMBOL(proc_dointvec_minmax);
102221 EXPORT_SYMBOL(proc_dointvec_userhz_jiffies);
102222 EXPORT_SYMBOL(proc_dointvec_ms_jiffies);
102223 EXPORT_SYMBOL(proc_dostring);
102224+EXPORT_SYMBOL(proc_dostring_modpriv);
102225 EXPORT_SYMBOL(proc_doulongvec_minmax);
102226 EXPORT_SYMBOL(proc_doulongvec_ms_jiffies_minmax);
102227diff --git a/kernel/taskstats.c b/kernel/taskstats.c
102228index 21f82c2..c1984e5 100644
102229--- a/kernel/taskstats.c
102230+++ b/kernel/taskstats.c
102231@@ -28,9 +28,12 @@
102232 #include <linux/fs.h>
102233 #include <linux/file.h>
102234 #include <linux/pid_namespace.h>
102235+#include <linux/grsecurity.h>
102236 #include <net/genetlink.h>
102237 #include <linux/atomic.h>
102238
102239+extern int gr_is_taskstats_denied(int pid);
102240+
102241 /*
102242 * Maximum length of a cpumask that can be specified in
102243 * the TASKSTATS_CMD_ATTR_REGISTER/DEREGISTER_CPUMASK attribute
102244@@ -567,6 +570,9 @@ err:
102245
102246 static int taskstats_user_cmd(struct sk_buff *skb, struct genl_info *info)
102247 {
102248+ if (gr_is_taskstats_denied(current->pid))
102249+ return -EACCES;
102250+
102251 if (info->attrs[TASKSTATS_CMD_ATTR_REGISTER_CPUMASK])
102252 return cmd_attr_register_cpumask(info);
102253 else if (info->attrs[TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK])
102254diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
102255index 1b001ed..55ef9e4 100644
102256--- a/kernel/time/alarmtimer.c
102257+++ b/kernel/time/alarmtimer.c
102258@@ -823,7 +823,7 @@ static int __init alarmtimer_init(void)
102259 struct platform_device *pdev;
102260 int error = 0;
102261 int i;
102262- struct k_clock alarm_clock = {
102263+ static struct k_clock alarm_clock = {
102264 .clock_getres = alarm_clock_getres,
102265 .clock_get = alarm_clock_get,
102266 .timer_create = alarm_timer_create,
102267diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
102268index 38f586c..14386a7 100644
102269--- a/kernel/time/hrtimer.c
102270+++ b/kernel/time/hrtimer.c
102271@@ -1393,7 +1393,7 @@ void hrtimer_peek_ahead_timers(void)
102272 local_irq_restore(flags);
102273 }
102274
102275-static void run_hrtimer_softirq(struct softirq_action *h)
102276+static __latent_entropy void run_hrtimer_softirq(void)
102277 {
102278 hrtimer_peek_ahead_timers();
102279 }
102280diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c
102281index 0075da7..63cc872 100644
102282--- a/kernel/time/posix-cpu-timers.c
102283+++ b/kernel/time/posix-cpu-timers.c
102284@@ -1449,14 +1449,14 @@ struct k_clock clock_posix_cpu = {
102285
102286 static __init int init_posix_cpu_timers(void)
102287 {
102288- struct k_clock process = {
102289+ static struct k_clock process = {
102290 .clock_getres = process_cpu_clock_getres,
102291 .clock_get = process_cpu_clock_get,
102292 .timer_create = process_cpu_timer_create,
102293 .nsleep = process_cpu_nsleep,
102294 .nsleep_restart = process_cpu_nsleep_restart,
102295 };
102296- struct k_clock thread = {
102297+ static struct k_clock thread = {
102298 .clock_getres = thread_cpu_clock_getres,
102299 .clock_get = thread_cpu_clock_get,
102300 .timer_create = thread_cpu_timer_create,
102301diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c
102302index 31ea01f..7fc61ef 100644
102303--- a/kernel/time/posix-timers.c
102304+++ b/kernel/time/posix-timers.c
102305@@ -43,6 +43,7 @@
102306 #include <linux/hash.h>
102307 #include <linux/posix-clock.h>
102308 #include <linux/posix-timers.h>
102309+#include <linux/grsecurity.h>
102310 #include <linux/syscalls.h>
102311 #include <linux/wait.h>
102312 #include <linux/workqueue.h>
102313@@ -124,7 +125,7 @@ static DEFINE_SPINLOCK(hash_lock);
102314 * which we beg off on and pass to do_sys_settimeofday().
102315 */
102316
102317-static struct k_clock posix_clocks[MAX_CLOCKS];
102318+static struct k_clock *posix_clocks[MAX_CLOCKS];
102319
102320 /*
102321 * These ones are defined below.
102322@@ -277,7 +278,7 @@ static int posix_get_tai(clockid_t which_clock, struct timespec *tp)
102323 */
102324 static __init int init_posix_timers(void)
102325 {
102326- struct k_clock clock_realtime = {
102327+ static struct k_clock clock_realtime = {
102328 .clock_getres = hrtimer_get_res,
102329 .clock_get = posix_clock_realtime_get,
102330 .clock_set = posix_clock_realtime_set,
102331@@ -289,7 +290,7 @@ static __init int init_posix_timers(void)
102332 .timer_get = common_timer_get,
102333 .timer_del = common_timer_del,
102334 };
102335- struct k_clock clock_monotonic = {
102336+ static struct k_clock clock_monotonic = {
102337 .clock_getres = hrtimer_get_res,
102338 .clock_get = posix_ktime_get_ts,
102339 .nsleep = common_nsleep,
102340@@ -299,19 +300,19 @@ static __init int init_posix_timers(void)
102341 .timer_get = common_timer_get,
102342 .timer_del = common_timer_del,
102343 };
102344- struct k_clock clock_monotonic_raw = {
102345+ static struct k_clock clock_monotonic_raw = {
102346 .clock_getres = hrtimer_get_res,
102347 .clock_get = posix_get_monotonic_raw,
102348 };
102349- struct k_clock clock_realtime_coarse = {
102350+ static struct k_clock clock_realtime_coarse = {
102351 .clock_getres = posix_get_coarse_res,
102352 .clock_get = posix_get_realtime_coarse,
102353 };
102354- struct k_clock clock_monotonic_coarse = {
102355+ static struct k_clock clock_monotonic_coarse = {
102356 .clock_getres = posix_get_coarse_res,
102357 .clock_get = posix_get_monotonic_coarse,
102358 };
102359- struct k_clock clock_tai = {
102360+ static struct k_clock clock_tai = {
102361 .clock_getres = hrtimer_get_res,
102362 .clock_get = posix_get_tai,
102363 .nsleep = common_nsleep,
102364@@ -321,7 +322,7 @@ static __init int init_posix_timers(void)
102365 .timer_get = common_timer_get,
102366 .timer_del = common_timer_del,
102367 };
102368- struct k_clock clock_boottime = {
102369+ static struct k_clock clock_boottime = {
102370 .clock_getres = hrtimer_get_res,
102371 .clock_get = posix_get_boottime,
102372 .nsleep = common_nsleep,
102373@@ -533,7 +534,7 @@ void posix_timers_register_clock(const clockid_t clock_id,
102374 return;
102375 }
102376
102377- posix_clocks[clock_id] = *new_clock;
102378+ posix_clocks[clock_id] = new_clock;
102379 }
102380 EXPORT_SYMBOL_GPL(posix_timers_register_clock);
102381
102382@@ -579,9 +580,9 @@ static struct k_clock *clockid_to_kclock(const clockid_t id)
102383 return (id & CLOCKFD_MASK) == CLOCKFD ?
102384 &clock_posix_dynamic : &clock_posix_cpu;
102385
102386- if (id >= MAX_CLOCKS || !posix_clocks[id].clock_getres)
102387+ if (id >= MAX_CLOCKS || !posix_clocks[id] || !posix_clocks[id]->clock_getres)
102388 return NULL;
102389- return &posix_clocks[id];
102390+ return posix_clocks[id];
102391 }
102392
102393 static int common_timer_create(struct k_itimer *new_timer)
102394@@ -599,7 +600,7 @@ SYSCALL_DEFINE3(timer_create, const clockid_t, which_clock,
102395 struct k_clock *kc = clockid_to_kclock(which_clock);
102396 struct k_itimer *new_timer;
102397 int error, new_timer_id;
102398- sigevent_t event;
102399+ sigevent_t event = { };
102400 int it_id_set = IT_ID_NOT_SET;
102401
102402 if (!kc)
102403@@ -1014,6 +1015,13 @@ SYSCALL_DEFINE2(clock_settime, const clockid_t, which_clock,
102404 if (copy_from_user(&new_tp, tp, sizeof (*tp)))
102405 return -EFAULT;
102406
102407+ /* only the CLOCK_REALTIME clock can be set, all other clocks
102408+ have their clock_set fptr set to a nosettime dummy function
102409+ CLOCK_REALTIME has a NULL clock_set fptr which causes it to
102410+ call common_clock_set, which calls do_sys_settimeofday, which
102411+ we hook
102412+ */
102413+
102414 return kc->clock_set(which_clock, &new_tp);
102415 }
102416
102417diff --git a/kernel/time/time.c b/kernel/time/time.c
102418index 2c85b77..6530536 100644
102419--- a/kernel/time/time.c
102420+++ b/kernel/time/time.c
102421@@ -173,6 +173,11 @@ int do_sys_settimeofday(const struct timespec *tv, const struct timezone *tz)
102422 return error;
102423
102424 if (tz) {
102425+ /* we log in do_settimeofday called below, so don't log twice
102426+ */
102427+ if (!tv)
102428+ gr_log_timechange();
102429+
102430 sys_tz = *tz;
102431 update_vsyscall_tz();
102432 if (firsttime) {
102433diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
102434index 91db941..a371671 100644
102435--- a/kernel/time/timekeeping.c
102436+++ b/kernel/time/timekeeping.c
102437@@ -15,6 +15,7 @@
102438 #include <linux/init.h>
102439 #include <linux/mm.h>
102440 #include <linux/sched.h>
102441+#include <linux/grsecurity.h>
102442 #include <linux/syscore_ops.h>
102443 #include <linux/clocksource.h>
102444 #include <linux/jiffies.h>
102445@@ -802,6 +803,8 @@ int do_settimeofday64(const struct timespec64 *ts)
102446 if (!timespec64_valid_strict(ts))
102447 return -EINVAL;
102448
102449+ gr_log_timechange();
102450+
102451 raw_spin_lock_irqsave(&timekeeper_lock, flags);
102452 write_seqcount_begin(&tk_core.seq);
102453
102454diff --git a/kernel/time/timer.c b/kernel/time/timer.c
102455index 2d3f5c5..7ed7dc5 100644
102456--- a/kernel/time/timer.c
102457+++ b/kernel/time/timer.c
102458@@ -1393,7 +1393,7 @@ void update_process_times(int user_tick)
102459 /*
102460 * This function runs timers and the timer-tq in bottom half context.
102461 */
102462-static void run_timer_softirq(struct softirq_action *h)
102463+static __latent_entropy void run_timer_softirq(void)
102464 {
102465 struct tvec_base *base = __this_cpu_read(tvec_bases);
102466
102467@@ -1456,7 +1456,7 @@ static void process_timeout(unsigned long __data)
102468 *
102469 * In all cases the return value is guaranteed to be non-negative.
102470 */
102471-signed long __sched schedule_timeout(signed long timeout)
102472+signed long __sched __intentional_overflow(-1) schedule_timeout(signed long timeout)
102473 {
102474 struct timer_list timer;
102475 unsigned long expire;
102476diff --git a/kernel/time/timer_list.c b/kernel/time/timer_list.c
102477index 61ed862..3b52c65 100644
102478--- a/kernel/time/timer_list.c
102479+++ b/kernel/time/timer_list.c
102480@@ -45,12 +45,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base, hrtimer_bases);
102481
102482 static void print_name_offset(struct seq_file *m, void *sym)
102483 {
102484+#ifdef CONFIG_GRKERNSEC_HIDESYM
102485+ SEQ_printf(m, "<%p>", NULL);
102486+#else
102487 char symname[KSYM_NAME_LEN];
102488
102489 if (lookup_symbol_name((unsigned long)sym, symname) < 0)
102490 SEQ_printf(m, "<%pK>", sym);
102491 else
102492 SEQ_printf(m, "%s", symname);
102493+#endif
102494 }
102495
102496 static void
102497@@ -119,7 +123,11 @@ next_one:
102498 static void
102499 print_base(struct seq_file *m, struct hrtimer_clock_base *base, u64 now)
102500 {
102501+#ifdef CONFIG_GRKERNSEC_HIDESYM
102502+ SEQ_printf(m, " .base: %p\n", NULL);
102503+#else
102504 SEQ_printf(m, " .base: %pK\n", base);
102505+#endif
102506 SEQ_printf(m, " .index: %d\n",
102507 base->index);
102508 SEQ_printf(m, " .resolution: %Lu nsecs\n",
102509@@ -362,7 +370,11 @@ static int __init init_timer_list_procfs(void)
102510 {
102511 struct proc_dir_entry *pe;
102512
102513+#ifdef CONFIG_GRKERNSEC_PROC_ADD
102514+ pe = proc_create("timer_list", 0400, NULL, &timer_list_fops);
102515+#else
102516 pe = proc_create("timer_list", 0444, NULL, &timer_list_fops);
102517+#endif
102518 if (!pe)
102519 return -ENOMEM;
102520 return 0;
102521diff --git a/kernel/time/timer_stats.c b/kernel/time/timer_stats.c
102522index 1fb08f2..ca4bb1e 100644
102523--- a/kernel/time/timer_stats.c
102524+++ b/kernel/time/timer_stats.c
102525@@ -116,7 +116,7 @@ static ktime_t time_start, time_stop;
102526 static unsigned long nr_entries;
102527 static struct entry entries[MAX_ENTRIES];
102528
102529-static atomic_t overflow_count;
102530+static atomic_unchecked_t overflow_count;
102531
102532 /*
102533 * The entries are in a hash-table, for fast lookup:
102534@@ -140,7 +140,7 @@ static void reset_entries(void)
102535 nr_entries = 0;
102536 memset(entries, 0, sizeof(entries));
102537 memset(tstat_hash_table, 0, sizeof(tstat_hash_table));
102538- atomic_set(&overflow_count, 0);
102539+ atomic_set_unchecked(&overflow_count, 0);
102540 }
102541
102542 static struct entry *alloc_entry(void)
102543@@ -261,7 +261,7 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
102544 if (likely(entry))
102545 entry->count++;
102546 else
102547- atomic_inc(&overflow_count);
102548+ atomic_inc_unchecked(&overflow_count);
102549
102550 out_unlock:
102551 raw_spin_unlock_irqrestore(lock, flags);
102552@@ -269,12 +269,16 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
102553
102554 static void print_name_offset(struct seq_file *m, unsigned long addr)
102555 {
102556+#ifdef CONFIG_GRKERNSEC_HIDESYM
102557+ seq_printf(m, "<%p>", NULL);
102558+#else
102559 char symname[KSYM_NAME_LEN];
102560
102561 if (lookup_symbol_name(addr, symname) < 0)
102562- seq_printf(m, "<%p>", (void *)addr);
102563+ seq_printf(m, "<%pK>", (void *)addr);
102564 else
102565 seq_printf(m, "%s", symname);
102566+#endif
102567 }
102568
102569 static int tstats_show(struct seq_file *m, void *v)
102570@@ -300,8 +304,8 @@ static int tstats_show(struct seq_file *m, void *v)
102571
102572 seq_puts(m, "Timer Stats Version: v0.3\n");
102573 seq_printf(m, "Sample period: %ld.%03ld s\n", period.tv_sec, ms);
102574- if (atomic_read(&overflow_count))
102575- seq_printf(m, "Overflow: %d entries\n", atomic_read(&overflow_count));
102576+ if (atomic_read_unchecked(&overflow_count))
102577+ seq_printf(m, "Overflow: %d entries\n", atomic_read_unchecked(&overflow_count));
102578 seq_printf(m, "Collection: %s\n", timer_stats_active ? "active" : "inactive");
102579
102580 for (i = 0; i < nr_entries; i++) {
102581@@ -417,7 +421,11 @@ static int __init init_tstats_procfs(void)
102582 {
102583 struct proc_dir_entry *pe;
102584
102585+#ifdef CONFIG_GRKERNSEC_PROC_ADD
102586+ pe = proc_create("timer_stats", 0600, NULL, &tstats_fops);
102587+#else
102588 pe = proc_create("timer_stats", 0644, NULL, &tstats_fops);
102589+#endif
102590 if (!pe)
102591 return -ENOMEM;
102592 return 0;
102593diff --git a/kernel/torture.c b/kernel/torture.c
102594index dd70993..0bf694b 100644
102595--- a/kernel/torture.c
102596+++ b/kernel/torture.c
102597@@ -482,7 +482,7 @@ static int torture_shutdown_notify(struct notifier_block *unused1,
102598 mutex_lock(&fullstop_mutex);
102599 if (ACCESS_ONCE(fullstop) == FULLSTOP_DONTSTOP) {
102600 VERBOSE_TOROUT_STRING("Unscheduled system shutdown detected");
102601- ACCESS_ONCE(fullstop) = FULLSTOP_SHUTDOWN;
102602+ ACCESS_ONCE_RW(fullstop) = FULLSTOP_SHUTDOWN;
102603 } else {
102604 pr_warn("Concurrent rmmod and shutdown illegal!\n");
102605 }
102606@@ -549,14 +549,14 @@ static int torture_stutter(void *arg)
102607 if (!torture_must_stop()) {
102608 if (stutter > 1) {
102609 schedule_timeout_interruptible(stutter - 1);
102610- ACCESS_ONCE(stutter_pause_test) = 2;
102611+ ACCESS_ONCE_RW(stutter_pause_test) = 2;
102612 }
102613 schedule_timeout_interruptible(1);
102614- ACCESS_ONCE(stutter_pause_test) = 1;
102615+ ACCESS_ONCE_RW(stutter_pause_test) = 1;
102616 }
102617 if (!torture_must_stop())
102618 schedule_timeout_interruptible(stutter);
102619- ACCESS_ONCE(stutter_pause_test) = 0;
102620+ ACCESS_ONCE_RW(stutter_pause_test) = 0;
102621 torture_shutdown_absorb("torture_stutter");
102622 } while (!torture_must_stop());
102623 torture_kthread_stopping("torture_stutter");
102624@@ -648,7 +648,7 @@ bool torture_cleanup_begin(void)
102625 schedule_timeout_uninterruptible(10);
102626 return true;
102627 }
102628- ACCESS_ONCE(fullstop) = FULLSTOP_RMMOD;
102629+ ACCESS_ONCE_RW(fullstop) = FULLSTOP_RMMOD;
102630 mutex_unlock(&fullstop_mutex);
102631 torture_shutdown_cleanup();
102632 torture_shuffle_cleanup();
102633diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
102634index 483cecf..ac46091 100644
102635--- a/kernel/trace/blktrace.c
102636+++ b/kernel/trace/blktrace.c
102637@@ -328,7 +328,7 @@ static ssize_t blk_dropped_read(struct file *filp, char __user *buffer,
102638 struct blk_trace *bt = filp->private_data;
102639 char buf[16];
102640
102641- snprintf(buf, sizeof(buf), "%u\n", atomic_read(&bt->dropped));
102642+ snprintf(buf, sizeof(buf), "%u\n", atomic_read_unchecked(&bt->dropped));
102643
102644 return simple_read_from_buffer(buffer, count, ppos, buf, strlen(buf));
102645 }
102646@@ -386,7 +386,7 @@ static int blk_subbuf_start_callback(struct rchan_buf *buf, void *subbuf,
102647 return 1;
102648
102649 bt = buf->chan->private_data;
102650- atomic_inc(&bt->dropped);
102651+ atomic_inc_unchecked(&bt->dropped);
102652 return 0;
102653 }
102654
102655@@ -487,7 +487,7 @@ int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev,
102656
102657 bt->dir = dir;
102658 bt->dev = dev;
102659- atomic_set(&bt->dropped, 0);
102660+ atomic_set_unchecked(&bt->dropped, 0);
102661 INIT_LIST_HEAD(&bt->running_list);
102662
102663 ret = -EIO;
102664diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
102665index 4f22802..bd268b1 100644
102666--- a/kernel/trace/ftrace.c
102667+++ b/kernel/trace/ftrace.c
102668@@ -2382,12 +2382,17 @@ ftrace_code_disable(struct module *mod, struct dyn_ftrace *rec)
102669 if (unlikely(ftrace_disabled))
102670 return 0;
102671
102672+ ret = ftrace_arch_code_modify_prepare();
102673+ FTRACE_WARN_ON(ret);
102674+ if (ret)
102675+ return 0;
102676+
102677 ret = ftrace_make_nop(mod, rec, MCOUNT_ADDR);
102678+ FTRACE_WARN_ON(ftrace_arch_code_modify_post_process());
102679 if (ret) {
102680 ftrace_bug(ret, rec);
102681- return 0;
102682 }
102683- return 1;
102684+ return ret ? 0 : 1;
102685 }
102686
102687 /*
102688@@ -4776,8 +4781,10 @@ static int ftrace_process_locs(struct module *mod,
102689 if (!count)
102690 return 0;
102691
102692+ pax_open_kernel();
102693 sort(start, count, sizeof(*start),
102694 ftrace_cmp_ips, ftrace_swap_ips);
102695+ pax_close_kernel();
102696
102697 start_pg = ftrace_allocate_pages(count);
102698 if (!start_pg)
102699@@ -5653,7 +5660,7 @@ static int alloc_retstack_tasklist(struct ftrace_ret_stack **ret_stack_list)
102700
102701 if (t->ret_stack == NULL) {
102702 atomic_set(&t->tracing_graph_pause, 0);
102703- atomic_set(&t->trace_overrun, 0);
102704+ atomic_set_unchecked(&t->trace_overrun, 0);
102705 t->curr_ret_stack = -1;
102706 /* Make sure the tasks see the -1 first: */
102707 smp_wmb();
102708@@ -5876,7 +5883,7 @@ static void
102709 graph_init_task(struct task_struct *t, struct ftrace_ret_stack *ret_stack)
102710 {
102711 atomic_set(&t->tracing_graph_pause, 0);
102712- atomic_set(&t->trace_overrun, 0);
102713+ atomic_set_unchecked(&t->trace_overrun, 0);
102714 t->ftrace_timestamp = 0;
102715 /* make curr_ret_stack visible before we add the ret_stack */
102716 smp_wmb();
102717diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
102718index 922048a..bb71a55 100644
102719--- a/kernel/trace/ring_buffer.c
102720+++ b/kernel/trace/ring_buffer.c
102721@@ -348,9 +348,9 @@ struct buffer_data_page {
102722 */
102723 struct buffer_page {
102724 struct list_head list; /* list of buffer pages */
102725- local_t write; /* index for next write */
102726+ local_unchecked_t write; /* index for next write */
102727 unsigned read; /* index for next read */
102728- local_t entries; /* entries on this page */
102729+ local_unchecked_t entries; /* entries on this page */
102730 unsigned long real_end; /* real end of data */
102731 struct buffer_data_page *page; /* Actual data page */
102732 };
102733@@ -471,11 +471,11 @@ struct ring_buffer_per_cpu {
102734 unsigned long last_overrun;
102735 local_t entries_bytes;
102736 local_t entries;
102737- local_t overrun;
102738- local_t commit_overrun;
102739- local_t dropped_events;
102740+ local_unchecked_t overrun;
102741+ local_unchecked_t commit_overrun;
102742+ local_unchecked_t dropped_events;
102743 local_t committing;
102744- local_t commits;
102745+ local_unchecked_t commits;
102746 unsigned long read;
102747 unsigned long read_bytes;
102748 u64 write_stamp;
102749@@ -1045,8 +1045,8 @@ static int rb_tail_page_update(struct ring_buffer_per_cpu *cpu_buffer,
102750 *
102751 * We add a counter to the write field to denote this.
102752 */
102753- old_write = local_add_return(RB_WRITE_INTCNT, &next_page->write);
102754- old_entries = local_add_return(RB_WRITE_INTCNT, &next_page->entries);
102755+ old_write = local_add_return_unchecked(RB_WRITE_INTCNT, &next_page->write);
102756+ old_entries = local_add_return_unchecked(RB_WRITE_INTCNT, &next_page->entries);
102757
102758 /*
102759 * Just make sure we have seen our old_write and synchronize
102760@@ -1074,8 +1074,8 @@ static int rb_tail_page_update(struct ring_buffer_per_cpu *cpu_buffer,
102761 * cmpxchg to only update if an interrupt did not already
102762 * do it for us. If the cmpxchg fails, we don't care.
102763 */
102764- (void)local_cmpxchg(&next_page->write, old_write, val);
102765- (void)local_cmpxchg(&next_page->entries, old_entries, eval);
102766+ (void)local_cmpxchg_unchecked(&next_page->write, old_write, val);
102767+ (void)local_cmpxchg_unchecked(&next_page->entries, old_entries, eval);
102768
102769 /*
102770 * No need to worry about races with clearing out the commit.
102771@@ -1443,12 +1443,12 @@ static void rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer);
102772
102773 static inline unsigned long rb_page_entries(struct buffer_page *bpage)
102774 {
102775- return local_read(&bpage->entries) & RB_WRITE_MASK;
102776+ return local_read_unchecked(&bpage->entries) & RB_WRITE_MASK;
102777 }
102778
102779 static inline unsigned long rb_page_write(struct buffer_page *bpage)
102780 {
102781- return local_read(&bpage->write) & RB_WRITE_MASK;
102782+ return local_read_unchecked(&bpage->write) & RB_WRITE_MASK;
102783 }
102784
102785 static int
102786@@ -1543,7 +1543,7 @@ rb_remove_pages(struct ring_buffer_per_cpu *cpu_buffer, unsigned int nr_pages)
102787 * bytes consumed in ring buffer from here.
102788 * Increment overrun to account for the lost events.
102789 */
102790- local_add(page_entries, &cpu_buffer->overrun);
102791+ local_add_unchecked(page_entries, &cpu_buffer->overrun);
102792 local_sub(BUF_PAGE_SIZE, &cpu_buffer->entries_bytes);
102793 }
102794
102795@@ -2105,7 +2105,7 @@ rb_handle_head_page(struct ring_buffer_per_cpu *cpu_buffer,
102796 * it is our responsibility to update
102797 * the counters.
102798 */
102799- local_add(entries, &cpu_buffer->overrun);
102800+ local_add_unchecked(entries, &cpu_buffer->overrun);
102801 local_sub(BUF_PAGE_SIZE, &cpu_buffer->entries_bytes);
102802
102803 /*
102804@@ -2255,7 +2255,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
102805 if (tail == BUF_PAGE_SIZE)
102806 tail_page->real_end = 0;
102807
102808- local_sub(length, &tail_page->write);
102809+ local_sub_unchecked(length, &tail_page->write);
102810 return;
102811 }
102812
102813@@ -2290,7 +2290,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
102814 rb_event_set_padding(event);
102815
102816 /* Set the write back to the previous setting */
102817- local_sub(length, &tail_page->write);
102818+ local_sub_unchecked(length, &tail_page->write);
102819 return;
102820 }
102821
102822@@ -2302,7 +2302,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
102823
102824 /* Set write to end of buffer */
102825 length = (tail + length) - BUF_PAGE_SIZE;
102826- local_sub(length, &tail_page->write);
102827+ local_sub_unchecked(length, &tail_page->write);
102828 }
102829
102830 /*
102831@@ -2328,7 +2328,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
102832 * about it.
102833 */
102834 if (unlikely(next_page == commit_page)) {
102835- local_inc(&cpu_buffer->commit_overrun);
102836+ local_inc_unchecked(&cpu_buffer->commit_overrun);
102837 goto out_reset;
102838 }
102839
102840@@ -2358,7 +2358,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
102841 * this is easy, just stop here.
102842 */
102843 if (!(buffer->flags & RB_FL_OVERWRITE)) {
102844- local_inc(&cpu_buffer->dropped_events);
102845+ local_inc_unchecked(&cpu_buffer->dropped_events);
102846 goto out_reset;
102847 }
102848
102849@@ -2384,7 +2384,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
102850 cpu_buffer->tail_page) &&
102851 (cpu_buffer->commit_page ==
102852 cpu_buffer->reader_page))) {
102853- local_inc(&cpu_buffer->commit_overrun);
102854+ local_inc_unchecked(&cpu_buffer->commit_overrun);
102855 goto out_reset;
102856 }
102857 }
102858@@ -2432,7 +2432,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
102859 length += RB_LEN_TIME_EXTEND;
102860
102861 tail_page = cpu_buffer->tail_page;
102862- write = local_add_return(length, &tail_page->write);
102863+ write = local_add_return_unchecked(length, &tail_page->write);
102864
102865 /* set write to only the index of the write */
102866 write &= RB_WRITE_MASK;
102867@@ -2456,7 +2456,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
102868 kmemcheck_annotate_bitfield(event, bitfield);
102869 rb_update_event(cpu_buffer, event, length, add_timestamp, delta);
102870
102871- local_inc(&tail_page->entries);
102872+ local_inc_unchecked(&tail_page->entries);
102873
102874 /*
102875 * If this is the first commit on the page, then update
102876@@ -2489,7 +2489,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
102877
102878 if (bpage->page == (void *)addr && rb_page_write(bpage) == old_index) {
102879 unsigned long write_mask =
102880- local_read(&bpage->write) & ~RB_WRITE_MASK;
102881+ local_read_unchecked(&bpage->write) & ~RB_WRITE_MASK;
102882 unsigned long event_length = rb_event_length(event);
102883 /*
102884 * This is on the tail page. It is possible that
102885@@ -2499,7 +2499,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
102886 */
102887 old_index += write_mask;
102888 new_index += write_mask;
102889- index = local_cmpxchg(&bpage->write, old_index, new_index);
102890+ index = local_cmpxchg_unchecked(&bpage->write, old_index, new_index);
102891 if (index == old_index) {
102892 /* update counters */
102893 local_sub(event_length, &cpu_buffer->entries_bytes);
102894@@ -2514,7 +2514,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
102895 static void rb_start_commit(struct ring_buffer_per_cpu *cpu_buffer)
102896 {
102897 local_inc(&cpu_buffer->committing);
102898- local_inc(&cpu_buffer->commits);
102899+ local_inc_unchecked(&cpu_buffer->commits);
102900 }
102901
102902 static inline void rb_end_commit(struct ring_buffer_per_cpu *cpu_buffer)
102903@@ -2526,7 +2526,7 @@ static inline void rb_end_commit(struct ring_buffer_per_cpu *cpu_buffer)
102904 return;
102905
102906 again:
102907- commits = local_read(&cpu_buffer->commits);
102908+ commits = local_read_unchecked(&cpu_buffer->commits);
102909 /* synchronize with interrupts */
102910 barrier();
102911 if (local_read(&cpu_buffer->committing) == 1)
102912@@ -2542,7 +2542,7 @@ static inline void rb_end_commit(struct ring_buffer_per_cpu *cpu_buffer)
102913 * updating of the commit page and the clearing of the
102914 * committing counter.
102915 */
102916- if (unlikely(local_read(&cpu_buffer->commits) != commits) &&
102917+ if (unlikely(local_read_unchecked(&cpu_buffer->commits) != commits) &&
102918 !local_read(&cpu_buffer->committing)) {
102919 local_inc(&cpu_buffer->committing);
102920 goto again;
102921@@ -2572,7 +2572,7 @@ rb_reserve_next_event(struct ring_buffer *buffer,
102922 barrier();
102923 if (unlikely(ACCESS_ONCE(cpu_buffer->buffer) != buffer)) {
102924 local_dec(&cpu_buffer->committing);
102925- local_dec(&cpu_buffer->commits);
102926+ local_dec_unchecked(&cpu_buffer->commits);
102927 return NULL;
102928 }
102929 #endif
102930@@ -2901,7 +2901,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer,
102931
102932 /* Do the likely case first */
102933 if (likely(bpage->page == (void *)addr)) {
102934- local_dec(&bpage->entries);
102935+ local_dec_unchecked(&bpage->entries);
102936 return;
102937 }
102938
102939@@ -2913,7 +2913,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer,
102940 start = bpage;
102941 do {
102942 if (bpage->page == (void *)addr) {
102943- local_dec(&bpage->entries);
102944+ local_dec_unchecked(&bpage->entries);
102945 return;
102946 }
102947 rb_inc_page(cpu_buffer, &bpage);
102948@@ -3197,7 +3197,7 @@ static inline unsigned long
102949 rb_num_of_entries(struct ring_buffer_per_cpu *cpu_buffer)
102950 {
102951 return local_read(&cpu_buffer->entries) -
102952- (local_read(&cpu_buffer->overrun) + cpu_buffer->read);
102953+ (local_read_unchecked(&cpu_buffer->overrun) + cpu_buffer->read);
102954 }
102955
102956 /**
102957@@ -3286,7 +3286,7 @@ unsigned long ring_buffer_overrun_cpu(struct ring_buffer *buffer, int cpu)
102958 return 0;
102959
102960 cpu_buffer = buffer->buffers[cpu];
102961- ret = local_read(&cpu_buffer->overrun);
102962+ ret = local_read_unchecked(&cpu_buffer->overrun);
102963
102964 return ret;
102965 }
102966@@ -3309,7 +3309,7 @@ ring_buffer_commit_overrun_cpu(struct ring_buffer *buffer, int cpu)
102967 return 0;
102968
102969 cpu_buffer = buffer->buffers[cpu];
102970- ret = local_read(&cpu_buffer->commit_overrun);
102971+ ret = local_read_unchecked(&cpu_buffer->commit_overrun);
102972
102973 return ret;
102974 }
102975@@ -3331,7 +3331,7 @@ ring_buffer_dropped_events_cpu(struct ring_buffer *buffer, int cpu)
102976 return 0;
102977
102978 cpu_buffer = buffer->buffers[cpu];
102979- ret = local_read(&cpu_buffer->dropped_events);
102980+ ret = local_read_unchecked(&cpu_buffer->dropped_events);
102981
102982 return ret;
102983 }
102984@@ -3394,7 +3394,7 @@ unsigned long ring_buffer_overruns(struct ring_buffer *buffer)
102985 /* if you care about this being correct, lock the buffer */
102986 for_each_buffer_cpu(buffer, cpu) {
102987 cpu_buffer = buffer->buffers[cpu];
102988- overruns += local_read(&cpu_buffer->overrun);
102989+ overruns += local_read_unchecked(&cpu_buffer->overrun);
102990 }
102991
102992 return overruns;
102993@@ -3565,8 +3565,8 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
102994 /*
102995 * Reset the reader page to size zero.
102996 */
102997- local_set(&cpu_buffer->reader_page->write, 0);
102998- local_set(&cpu_buffer->reader_page->entries, 0);
102999+ local_set_unchecked(&cpu_buffer->reader_page->write, 0);
103000+ local_set_unchecked(&cpu_buffer->reader_page->entries, 0);
103001 local_set(&cpu_buffer->reader_page->page->commit, 0);
103002 cpu_buffer->reader_page->real_end = 0;
103003
103004@@ -3600,7 +3600,7 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
103005 * want to compare with the last_overrun.
103006 */
103007 smp_mb();
103008- overwrite = local_read(&(cpu_buffer->overrun));
103009+ overwrite = local_read_unchecked(&(cpu_buffer->overrun));
103010
103011 /*
103012 * Here's the tricky part.
103013@@ -4172,8 +4172,8 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer)
103014
103015 cpu_buffer->head_page
103016 = list_entry(cpu_buffer->pages, struct buffer_page, list);
103017- local_set(&cpu_buffer->head_page->write, 0);
103018- local_set(&cpu_buffer->head_page->entries, 0);
103019+ local_set_unchecked(&cpu_buffer->head_page->write, 0);
103020+ local_set_unchecked(&cpu_buffer->head_page->entries, 0);
103021 local_set(&cpu_buffer->head_page->page->commit, 0);
103022
103023 cpu_buffer->head_page->read = 0;
103024@@ -4183,18 +4183,18 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer)
103025
103026 INIT_LIST_HEAD(&cpu_buffer->reader_page->list);
103027 INIT_LIST_HEAD(&cpu_buffer->new_pages);
103028- local_set(&cpu_buffer->reader_page->write, 0);
103029- local_set(&cpu_buffer->reader_page->entries, 0);
103030+ local_set_unchecked(&cpu_buffer->reader_page->write, 0);
103031+ local_set_unchecked(&cpu_buffer->reader_page->entries, 0);
103032 local_set(&cpu_buffer->reader_page->page->commit, 0);
103033 cpu_buffer->reader_page->read = 0;
103034
103035 local_set(&cpu_buffer->entries_bytes, 0);
103036- local_set(&cpu_buffer->overrun, 0);
103037- local_set(&cpu_buffer->commit_overrun, 0);
103038- local_set(&cpu_buffer->dropped_events, 0);
103039+ local_set_unchecked(&cpu_buffer->overrun, 0);
103040+ local_set_unchecked(&cpu_buffer->commit_overrun, 0);
103041+ local_set_unchecked(&cpu_buffer->dropped_events, 0);
103042 local_set(&cpu_buffer->entries, 0);
103043 local_set(&cpu_buffer->committing, 0);
103044- local_set(&cpu_buffer->commits, 0);
103045+ local_set_unchecked(&cpu_buffer->commits, 0);
103046 cpu_buffer->read = 0;
103047 cpu_buffer->read_bytes = 0;
103048
103049@@ -4595,8 +4595,8 @@ int ring_buffer_read_page(struct ring_buffer *buffer,
103050 rb_init_page(bpage);
103051 bpage = reader->page;
103052 reader->page = *data_page;
103053- local_set(&reader->write, 0);
103054- local_set(&reader->entries, 0);
103055+ local_set_unchecked(&reader->write, 0);
103056+ local_set_unchecked(&reader->entries, 0);
103057 reader->read = 0;
103058 *data_page = bpage;
103059
103060diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
103061index 62c6506..5c25989 100644
103062--- a/kernel/trace/trace.c
103063+++ b/kernel/trace/trace.c
103064@@ -3500,7 +3500,7 @@ int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set)
103065 return 0;
103066 }
103067
103068-int set_tracer_flag(struct trace_array *tr, unsigned int mask, int enabled)
103069+int set_tracer_flag(struct trace_array *tr, unsigned long mask, int enabled)
103070 {
103071 /* do nothing if flag is already set */
103072 if (!!(trace_flags & mask) == !!enabled)
103073diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
103074index dd8205a..1aae87a 100644
103075--- a/kernel/trace/trace.h
103076+++ b/kernel/trace/trace.h
103077@@ -1271,7 +1271,7 @@ extern const char *__stop___tracepoint_str[];
103078 void trace_printk_init_buffers(void);
103079 void trace_printk_start_comm(void);
103080 int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set);
103081-int set_tracer_flag(struct trace_array *tr, unsigned int mask, int enabled);
103082+int set_tracer_flag(struct trace_array *tr, unsigned long mask, int enabled);
103083
103084 /*
103085 * Normal trace_printk() and friends allocates special buffers
103086diff --git a/kernel/trace/trace_clock.c b/kernel/trace/trace_clock.c
103087index 57b67b1..66082a9 100644
103088--- a/kernel/trace/trace_clock.c
103089+++ b/kernel/trace/trace_clock.c
103090@@ -124,7 +124,7 @@ u64 notrace trace_clock_global(void)
103091 return now;
103092 }
103093
103094-static atomic64_t trace_counter;
103095+static atomic64_unchecked_t trace_counter;
103096
103097 /*
103098 * trace_clock_counter(): simply an atomic counter.
103099@@ -133,5 +133,5 @@ static atomic64_t trace_counter;
103100 */
103101 u64 notrace trace_clock_counter(void)
103102 {
103103- return atomic64_add_return(1, &trace_counter);
103104+ return atomic64_inc_return_unchecked(&trace_counter);
103105 }
103106diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
103107index a9c10a3..1864f6b 100644
103108--- a/kernel/trace/trace_events.c
103109+++ b/kernel/trace/trace_events.c
103110@@ -1762,7 +1762,6 @@ __trace_early_add_new_event(struct ftrace_event_call *call,
103111 return 0;
103112 }
103113
103114-struct ftrace_module_file_ops;
103115 static void __add_event_to_tracers(struct ftrace_event_call *call);
103116
103117 /* Add an additional event_call dynamically */
103118diff --git a/kernel/trace/trace_events_filter.c b/kernel/trace/trace_events_filter.c
103119index ced69da..7f2e97c 100644
103120--- a/kernel/trace/trace_events_filter.c
103121+++ b/kernel/trace/trace_events_filter.c
103122@@ -1369,19 +1369,26 @@ static int check_preds(struct filter_parse_state *ps)
103123 {
103124 int n_normal_preds = 0, n_logical_preds = 0;
103125 struct postfix_elt *elt;
103126+ int cnt = 0;
103127
103128 list_for_each_entry(elt, &ps->postfix, list) {
103129- if (elt->op == OP_NONE)
103130+ if (elt->op == OP_NONE) {
103131+ cnt++;
103132 continue;
103133+ }
103134
103135 if (elt->op == OP_AND || elt->op == OP_OR) {
103136 n_logical_preds++;
103137+ cnt--;
103138 continue;
103139 }
103140+ if (elt->op != OP_NOT)
103141+ cnt--;
103142 n_normal_preds++;
103143+ WARN_ON_ONCE(cnt < 0);
103144 }
103145
103146- if (!n_normal_preds || n_logical_preds >= n_normal_preds) {
103147+ if (cnt != 1 || !n_normal_preds || n_logical_preds >= n_normal_preds) {
103148 parse_error(ps, FILT_ERR_INVALID_FILTER, 0);
103149 return -EINVAL;
103150 }
103151diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_functions_graph.c
103152index b6fce36..d9f11a3 100644
103153--- a/kernel/trace/trace_functions_graph.c
103154+++ b/kernel/trace/trace_functions_graph.c
103155@@ -133,7 +133,7 @@ ftrace_push_return_trace(unsigned long ret, unsigned long func, int *depth,
103156
103157 /* The return trace stack is full */
103158 if (current->curr_ret_stack == FTRACE_RETFUNC_DEPTH - 1) {
103159- atomic_inc(&current->trace_overrun);
103160+ atomic_inc_unchecked(&current->trace_overrun);
103161 return -EBUSY;
103162 }
103163
103164@@ -230,7 +230,7 @@ ftrace_pop_return_trace(struct ftrace_graph_ret *trace, unsigned long *ret,
103165 *ret = current->ret_stack[index].ret;
103166 trace->func = current->ret_stack[index].func;
103167 trace->calltime = current->ret_stack[index].calltime;
103168- trace->overrun = atomic_read(&current->trace_overrun);
103169+ trace->overrun = atomic_read_unchecked(&current->trace_overrun);
103170 trace->depth = index;
103171 }
103172
103173diff --git a/kernel/trace/trace_mmiotrace.c b/kernel/trace/trace_mmiotrace.c
103174index 7a9ba62..2e0e4a1 100644
103175--- a/kernel/trace/trace_mmiotrace.c
103176+++ b/kernel/trace/trace_mmiotrace.c
103177@@ -24,7 +24,7 @@ struct header_iter {
103178 static struct trace_array *mmio_trace_array;
103179 static bool overrun_detected;
103180 static unsigned long prev_overruns;
103181-static atomic_t dropped_count;
103182+static atomic_unchecked_t dropped_count;
103183
103184 static void mmio_reset_data(struct trace_array *tr)
103185 {
103186@@ -124,7 +124,7 @@ static void mmio_close(struct trace_iterator *iter)
103187
103188 static unsigned long count_overruns(struct trace_iterator *iter)
103189 {
103190- unsigned long cnt = atomic_xchg(&dropped_count, 0);
103191+ unsigned long cnt = atomic_xchg_unchecked(&dropped_count, 0);
103192 unsigned long over = ring_buffer_overruns(iter->trace_buffer->buffer);
103193
103194 if (over > prev_overruns)
103195@@ -307,7 +307,7 @@ static void __trace_mmiotrace_rw(struct trace_array *tr,
103196 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_RW,
103197 sizeof(*entry), 0, pc);
103198 if (!event) {
103199- atomic_inc(&dropped_count);
103200+ atomic_inc_unchecked(&dropped_count);
103201 return;
103202 }
103203 entry = ring_buffer_event_data(event);
103204@@ -337,7 +337,7 @@ static void __trace_mmiotrace_map(struct trace_array *tr,
103205 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_MAP,
103206 sizeof(*entry), 0, pc);
103207 if (!event) {
103208- atomic_inc(&dropped_count);
103209+ atomic_inc_unchecked(&dropped_count);
103210 return;
103211 }
103212 entry = ring_buffer_event_data(event);
103213diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
103214index 692bf71..6d9a9cd 100644
103215--- a/kernel/trace/trace_output.c
103216+++ b/kernel/trace/trace_output.c
103217@@ -751,14 +751,16 @@ int register_ftrace_event(struct trace_event *event)
103218 goto out;
103219 }
103220
103221+ pax_open_kernel();
103222 if (event->funcs->trace == NULL)
103223- event->funcs->trace = trace_nop_print;
103224+ *(void **)&event->funcs->trace = trace_nop_print;
103225 if (event->funcs->raw == NULL)
103226- event->funcs->raw = trace_nop_print;
103227+ *(void **)&event->funcs->raw = trace_nop_print;
103228 if (event->funcs->hex == NULL)
103229- event->funcs->hex = trace_nop_print;
103230+ *(void **)&event->funcs->hex = trace_nop_print;
103231 if (event->funcs->binary == NULL)
103232- event->funcs->binary = trace_nop_print;
103233+ *(void **)&event->funcs->binary = trace_nop_print;
103234+ pax_close_kernel();
103235
103236 key = event->type & (EVENT_HASHSIZE - 1);
103237
103238diff --git a/kernel/trace/trace_seq.c b/kernel/trace/trace_seq.c
103239index e694c9f..6775a38 100644
103240--- a/kernel/trace/trace_seq.c
103241+++ b/kernel/trace/trace_seq.c
103242@@ -337,7 +337,7 @@ int trace_seq_path(struct trace_seq *s, const struct path *path)
103243 return 0;
103244 }
103245
103246- seq_buf_path(&s->seq, path, "\n");
103247+ seq_buf_path(&s->seq, path, "\n\\");
103248
103249 if (unlikely(seq_buf_has_overflowed(&s->seq))) {
103250 s->seq.len = save_len;
103251diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c
103252index c3e4fcf..ef6cc43 100644
103253--- a/kernel/trace/trace_stack.c
103254+++ b/kernel/trace/trace_stack.c
103255@@ -88,7 +88,7 @@ check_stack(unsigned long ip, unsigned long *stack)
103256 return;
103257
103258 /* we do not handle interrupt stacks yet */
103259- if (!object_is_on_stack(stack))
103260+ if (!object_starts_on_stack(stack))
103261 return;
103262
103263 local_irq_save(flags);
103264diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c
103265index f97f6e3..d367b48 100644
103266--- a/kernel/trace/trace_syscalls.c
103267+++ b/kernel/trace/trace_syscalls.c
103268@@ -590,6 +590,8 @@ static int perf_sysenter_enable(struct ftrace_event_call *call)
103269 int num;
103270
103271 num = ((struct syscall_metadata *)call->data)->syscall_nr;
103272+ if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
103273+ return -EINVAL;
103274
103275 mutex_lock(&syscall_trace_lock);
103276 if (!sys_perf_refcount_enter)
103277@@ -610,6 +612,8 @@ static void perf_sysenter_disable(struct ftrace_event_call *call)
103278 int num;
103279
103280 num = ((struct syscall_metadata *)call->data)->syscall_nr;
103281+ if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
103282+ return;
103283
103284 mutex_lock(&syscall_trace_lock);
103285 sys_perf_refcount_enter--;
103286@@ -662,6 +666,8 @@ static int perf_sysexit_enable(struct ftrace_event_call *call)
103287 int num;
103288
103289 num = ((struct syscall_metadata *)call->data)->syscall_nr;
103290+ if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
103291+ return -EINVAL;
103292
103293 mutex_lock(&syscall_trace_lock);
103294 if (!sys_perf_refcount_exit)
103295@@ -682,6 +688,8 @@ static void perf_sysexit_disable(struct ftrace_event_call *call)
103296 int num;
103297
103298 num = ((struct syscall_metadata *)call->data)->syscall_nr;
103299+ if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
103300+ return;
103301
103302 mutex_lock(&syscall_trace_lock);
103303 sys_perf_refcount_exit--;
103304diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
103305index 4109f83..fe1f830 100644
103306--- a/kernel/user_namespace.c
103307+++ b/kernel/user_namespace.c
103308@@ -83,6 +83,21 @@ int create_user_ns(struct cred *new)
103309 !kgid_has_mapping(parent_ns, group))
103310 return -EPERM;
103311
103312+#ifdef CONFIG_GRKERNSEC
103313+ /*
103314+ * This doesn't really inspire confidence:
103315+ * http://marc.info/?l=linux-kernel&m=135543612731939&w=2
103316+ * http://marc.info/?l=linux-kernel&m=135545831607095&w=2
103317+ * Increases kernel attack surface in areas developers
103318+ * previously cared little about ("low importance due
103319+ * to requiring "root" capability")
103320+ * To be removed when this code receives *proper* review
103321+ */
103322+ if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SETUID) ||
103323+ !capable(CAP_SETGID))
103324+ return -EPERM;
103325+#endif
103326+
103327 ns = kmem_cache_zalloc(user_ns_cachep, GFP_KERNEL);
103328 if (!ns)
103329 return -ENOMEM;
103330@@ -980,7 +995,7 @@ static int userns_install(struct nsproxy *nsproxy, struct ns_common *ns)
103331 if (atomic_read(&current->mm->mm_users) > 1)
103332 return -EINVAL;
103333
103334- if (current->fs->users != 1)
103335+ if (atomic_read(&current->fs->users) != 1)
103336 return -EINVAL;
103337
103338 if (!ns_capable(user_ns, CAP_SYS_ADMIN))
103339diff --git a/kernel/utsname_sysctl.c b/kernel/utsname_sysctl.c
103340index c8eac43..4b5f08f 100644
103341--- a/kernel/utsname_sysctl.c
103342+++ b/kernel/utsname_sysctl.c
103343@@ -47,7 +47,7 @@ static void put_uts(struct ctl_table *table, int write, void *which)
103344 static int proc_do_uts_string(struct ctl_table *table, int write,
103345 void __user *buffer, size_t *lenp, loff_t *ppos)
103346 {
103347- struct ctl_table uts_table;
103348+ ctl_table_no_const uts_table;
103349 int r;
103350 memcpy(&uts_table, table, sizeof(uts_table));
103351 uts_table.data = get_uts(table, write);
103352diff --git a/kernel/watchdog.c b/kernel/watchdog.c
103353index 3174bf8..3553520 100644
103354--- a/kernel/watchdog.c
103355+++ b/kernel/watchdog.c
103356@@ -572,7 +572,7 @@ static int watchdog_nmi_enable(unsigned int cpu) { return 0; }
103357 static void watchdog_nmi_disable(unsigned int cpu) { return; }
103358 #endif /* CONFIG_HARDLOCKUP_DETECTOR */
103359
103360-static struct smp_hotplug_thread watchdog_threads = {
103361+static struct smp_hotplug_thread watchdog_threads __read_only = {
103362 .store = &softlockup_watchdog,
103363 .thread_should_run = watchdog_should_run,
103364 .thread_fn = watchdog,
103365diff --git a/kernel/workqueue.c b/kernel/workqueue.c
103366index 41ff75b..5ad683a 100644
103367--- a/kernel/workqueue.c
103368+++ b/kernel/workqueue.c
103369@@ -4564,7 +4564,7 @@ static void rebind_workers(struct worker_pool *pool)
103370 WARN_ON_ONCE(!(worker_flags & WORKER_UNBOUND));
103371 worker_flags |= WORKER_REBOUND;
103372 worker_flags &= ~WORKER_UNBOUND;
103373- ACCESS_ONCE(worker->flags) = worker_flags;
103374+ ACCESS_ONCE_RW(worker->flags) = worker_flags;
103375 }
103376
103377 spin_unlock_irq(&pool->lock);
103378diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
103379index c5cefb3..a4241e3 100644
103380--- a/lib/Kconfig.debug
103381+++ b/lib/Kconfig.debug
103382@@ -923,7 +923,7 @@ config DEBUG_MUTEXES
103383
103384 config DEBUG_WW_MUTEX_SLOWPATH
103385 bool "Wait/wound mutex debugging: Slowpath testing"
103386- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
103387+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
103388 select DEBUG_LOCK_ALLOC
103389 select DEBUG_SPINLOCK
103390 select DEBUG_MUTEXES
103391@@ -940,7 +940,7 @@ config DEBUG_WW_MUTEX_SLOWPATH
103392
103393 config DEBUG_LOCK_ALLOC
103394 bool "Lock debugging: detect incorrect freeing of live locks"
103395- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
103396+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
103397 select DEBUG_SPINLOCK
103398 select DEBUG_MUTEXES
103399 select LOCKDEP
103400@@ -954,7 +954,7 @@ config DEBUG_LOCK_ALLOC
103401
103402 config PROVE_LOCKING
103403 bool "Lock debugging: prove locking correctness"
103404- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
103405+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
103406 select LOCKDEP
103407 select DEBUG_SPINLOCK
103408 select DEBUG_MUTEXES
103409@@ -1005,7 +1005,7 @@ config LOCKDEP
103410
103411 config LOCK_STAT
103412 bool "Lock usage statistics"
103413- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
103414+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
103415 select LOCKDEP
103416 select DEBUG_SPINLOCK
103417 select DEBUG_MUTEXES
103418@@ -1467,6 +1467,7 @@ config LATENCYTOP
103419 depends on DEBUG_KERNEL
103420 depends on STACKTRACE_SUPPORT
103421 depends on PROC_FS
103422+ depends on !GRKERNSEC_HIDESYM
103423 select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE && !ARM_UNWIND && !ARC
103424 select KALLSYMS
103425 select KALLSYMS_ALL
103426@@ -1483,7 +1484,7 @@ config ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
103427 config DEBUG_STRICT_USER_COPY_CHECKS
103428 bool "Strict user copy size checks"
103429 depends on ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
103430- depends on DEBUG_KERNEL && !TRACE_BRANCH_PROFILING
103431+ depends on DEBUG_KERNEL && !TRACE_BRANCH_PROFILING && !PAX_SIZE_OVERFLOW
103432 help
103433 Enabling this option turns a certain set of sanity checks for user
103434 copy operations into compile time failures.
103435@@ -1614,7 +1615,7 @@ endmenu # runtime tests
103436
103437 config PROVIDE_OHCI1394_DMA_INIT
103438 bool "Remote debugging over FireWire early on boot"
103439- depends on PCI && X86
103440+ depends on PCI && X86 && !GRKERNSEC
103441 help
103442 If you want to debug problems which hang or crash the kernel early
103443 on boot and the crashing machine has a FireWire port, you can use
103444diff --git a/lib/Makefile b/lib/Makefile
103445index 58f74d2..08e011f 100644
103446--- a/lib/Makefile
103447+++ b/lib/Makefile
103448@@ -59,7 +59,7 @@ obj-$(CONFIG_BTREE) += btree.o
103449 obj-$(CONFIG_INTERVAL_TREE) += interval_tree.o
103450 obj-$(CONFIG_ASSOCIATIVE_ARRAY) += assoc_array.o
103451 obj-$(CONFIG_DEBUG_PREEMPT) += smp_processor_id.o
103452-obj-$(CONFIG_DEBUG_LIST) += list_debug.o
103453+obj-y += list_debug.o
103454 obj-$(CONFIG_DEBUG_OBJECTS) += debugobjects.o
103455
103456 ifneq ($(CONFIG_HAVE_DEC_LOCK),y)
103457diff --git a/lib/average.c b/lib/average.c
103458index 114d1be..ab0350c 100644
103459--- a/lib/average.c
103460+++ b/lib/average.c
103461@@ -55,7 +55,7 @@ struct ewma *ewma_add(struct ewma *avg, unsigned long val)
103462 {
103463 unsigned long internal = ACCESS_ONCE(avg->internal);
103464
103465- ACCESS_ONCE(avg->internal) = internal ?
103466+ ACCESS_ONCE_RW(avg->internal) = internal ?
103467 (((internal << avg->weight) - internal) +
103468 (val << avg->factor)) >> avg->weight :
103469 (val << avg->factor);
103470diff --git a/lib/bitmap.c b/lib/bitmap.c
103471index d456f4c1..29a0308 100644
103472--- a/lib/bitmap.c
103473+++ b/lib/bitmap.c
103474@@ -264,7 +264,7 @@ int __bitmap_subset(const unsigned long *bitmap1,
103475 }
103476 EXPORT_SYMBOL(__bitmap_subset);
103477
103478-int __bitmap_weight(const unsigned long *bitmap, unsigned int bits)
103479+int __intentional_overflow(-1) __bitmap_weight(const unsigned long *bitmap, unsigned int bits)
103480 {
103481 unsigned int k, lim = bits/BITS_PER_LONG;
103482 int w = 0;
103483@@ -391,7 +391,7 @@ int __bitmap_parse(const char *buf, unsigned int buflen,
103484 {
103485 int c, old_c, totaldigits, ndigits, nchunks, nbits;
103486 u32 chunk;
103487- const char __user __force *ubuf = (const char __user __force *)buf;
103488+ const char __user *ubuf = (const char __force_user *)buf;
103489
103490 bitmap_zero(maskp, nmaskbits);
103491
103492@@ -476,7 +476,7 @@ int bitmap_parse_user(const char __user *ubuf,
103493 {
103494 if (!access_ok(VERIFY_READ, ubuf, ulen))
103495 return -EFAULT;
103496- return __bitmap_parse((const char __force *)ubuf,
103497+ return __bitmap_parse((const char __force_kernel *)ubuf,
103498 ulen, 1, maskp, nmaskbits);
103499
103500 }
103501@@ -535,7 +535,7 @@ static int __bitmap_parselist(const char *buf, unsigned int buflen,
103502 {
103503 unsigned a, b;
103504 int c, old_c, totaldigits;
103505- const char __user __force *ubuf = (const char __user __force *)buf;
103506+ const char __user *ubuf = (const char __force_user *)buf;
103507 int exp_digit, in_range;
103508
103509 totaldigits = c = 0;
103510@@ -630,7 +630,7 @@ int bitmap_parselist_user(const char __user *ubuf,
103511 {
103512 if (!access_ok(VERIFY_READ, ubuf, ulen))
103513 return -EFAULT;
103514- return __bitmap_parselist((const char __force *)ubuf,
103515+ return __bitmap_parselist((const char __force_kernel *)ubuf,
103516 ulen, 1, maskp, nmaskbits);
103517 }
103518 EXPORT_SYMBOL(bitmap_parselist_user);
103519diff --git a/lib/bug.c b/lib/bug.c
103520index 0c3bd95..5a615a1 100644
103521--- a/lib/bug.c
103522+++ b/lib/bug.c
103523@@ -145,6 +145,8 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
103524 return BUG_TRAP_TYPE_NONE;
103525
103526 bug = find_bug(bugaddr);
103527+ if (!bug)
103528+ return BUG_TRAP_TYPE_NONE;
103529
103530 file = NULL;
103531 line = 0;
103532diff --git a/lib/debugobjects.c b/lib/debugobjects.c
103533index 547f7f9..a6d4ba0 100644
103534--- a/lib/debugobjects.c
103535+++ b/lib/debugobjects.c
103536@@ -289,7 +289,7 @@ static void debug_object_is_on_stack(void *addr, int onstack)
103537 if (limit > 4)
103538 return;
103539
103540- is_on_stack = object_is_on_stack(addr);
103541+ is_on_stack = object_starts_on_stack(addr);
103542 if (is_on_stack == onstack)
103543 return;
103544
103545diff --git a/lib/decompress_bunzip2.c b/lib/decompress_bunzip2.c
103546index 6dd0335..1e9c239 100644
103547--- a/lib/decompress_bunzip2.c
103548+++ b/lib/decompress_bunzip2.c
103549@@ -665,7 +665,8 @@ static int INIT start_bunzip(struct bunzip_data **bdp, void *inbuf, long len,
103550
103551 /* Fourth byte (ascii '1'-'9'), indicates block size in units of 100k of
103552 uncompressed data. Allocate intermediate buffer for block. */
103553- bd->dbufSize = 100000*(i-BZh0);
103554+ i -= BZh0;
103555+ bd->dbufSize = 100000 * i;
103556
103557 bd->dbuf = large_malloc(bd->dbufSize * sizeof(int));
103558 if (!bd->dbuf)
103559diff --git a/lib/decompress_unlzma.c b/lib/decompress_unlzma.c
103560index 0be83af..4605e93 100644
103561--- a/lib/decompress_unlzma.c
103562+++ b/lib/decompress_unlzma.c
103563@@ -39,10 +39,10 @@
103564
103565 #define MIN(a, b) (((a) < (b)) ? (a) : (b))
103566
103567-static long long INIT read_int(unsigned char *ptr, int size)
103568+static unsigned long long INIT read_int(unsigned char *ptr, int size)
103569 {
103570 int i;
103571- long long ret = 0;
103572+ unsigned long long ret = 0;
103573
103574 for (i = 0; i < size; i++)
103575 ret = (ret << 8) | ptr[size-i-1];
103576diff --git a/lib/div64.c b/lib/div64.c
103577index 4382ad7..08aa558 100644
103578--- a/lib/div64.c
103579+++ b/lib/div64.c
103580@@ -59,7 +59,7 @@ uint32_t __attribute__((weak)) __div64_32(uint64_t *n, uint32_t base)
103581 EXPORT_SYMBOL(__div64_32);
103582
103583 #ifndef div_s64_rem
103584-s64 div_s64_rem(s64 dividend, s32 divisor, s32 *remainder)
103585+s64 __intentional_overflow(-1) div_s64_rem(s64 dividend, s32 divisor, s32 *remainder)
103586 {
103587 u64 quotient;
103588
103589@@ -130,7 +130,7 @@ EXPORT_SYMBOL(div64_u64_rem);
103590 * 'http://www.hackersdelight.org/HDcode/newCode/divDouble.c.txt'
103591 */
103592 #ifndef div64_u64
103593-u64 div64_u64(u64 dividend, u64 divisor)
103594+u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor)
103595 {
103596 u32 high = divisor >> 32;
103597 u64 quot;
103598diff --git a/lib/dma-debug.c b/lib/dma-debug.c
103599index 9722bd2..0d826f4 100644
103600--- a/lib/dma-debug.c
103601+++ b/lib/dma-debug.c
103602@@ -979,7 +979,7 @@ static int dma_debug_device_change(struct notifier_block *nb, unsigned long acti
103603
103604 void dma_debug_add_bus(struct bus_type *bus)
103605 {
103606- struct notifier_block *nb;
103607+ notifier_block_no_const *nb;
103608
103609 if (dma_debug_disabled())
103610 return;
103611@@ -1161,7 +1161,7 @@ static void check_unmap(struct dma_debug_entry *ref)
103612
103613 static void check_for_stack(struct device *dev, void *addr)
103614 {
103615- if (object_is_on_stack(addr))
103616+ if (object_starts_on_stack(addr))
103617 err_printk(dev, NULL, "DMA-API: device driver maps memory from "
103618 "stack [addr=%p]\n", addr);
103619 }
103620diff --git a/lib/inflate.c b/lib/inflate.c
103621index 013a761..c28f3fc 100644
103622--- a/lib/inflate.c
103623+++ b/lib/inflate.c
103624@@ -269,7 +269,7 @@ static void free(void *where)
103625 malloc_ptr = free_mem_ptr;
103626 }
103627 #else
103628-#define malloc(a) kmalloc(a, GFP_KERNEL)
103629+#define malloc(a) kmalloc((a), GFP_KERNEL)
103630 #define free(a) kfree(a)
103631 #endif
103632
103633diff --git a/lib/ioremap.c b/lib/ioremap.c
103634index 0c9216c..863bd89 100644
103635--- a/lib/ioremap.c
103636+++ b/lib/ioremap.c
103637@@ -38,7 +38,7 @@ static inline int ioremap_pmd_range(pud_t *pud, unsigned long addr,
103638 unsigned long next;
103639
103640 phys_addr -= addr;
103641- pmd = pmd_alloc(&init_mm, pud, addr);
103642+ pmd = pmd_alloc_kernel(&init_mm, pud, addr);
103643 if (!pmd)
103644 return -ENOMEM;
103645 do {
103646@@ -56,7 +56,7 @@ static inline int ioremap_pud_range(pgd_t *pgd, unsigned long addr,
103647 unsigned long next;
103648
103649 phys_addr -= addr;
103650- pud = pud_alloc(&init_mm, pgd, addr);
103651+ pud = pud_alloc_kernel(&init_mm, pgd, addr);
103652 if (!pud)
103653 return -ENOMEM;
103654 do {
103655diff --git a/lib/is_single_threaded.c b/lib/is_single_threaded.c
103656index bd2bea9..6b3c95e 100644
103657--- a/lib/is_single_threaded.c
103658+++ b/lib/is_single_threaded.c
103659@@ -22,6 +22,9 @@ bool current_is_single_threaded(void)
103660 struct task_struct *p, *t;
103661 bool ret;
103662
103663+ if (!mm)
103664+ return true;
103665+
103666 if (atomic_read(&task->signal->live) != 1)
103667 return false;
103668
103669diff --git a/lib/kobject.c b/lib/kobject.c
103670index 03d4ab3..46f6374 100644
103671--- a/lib/kobject.c
103672+++ b/lib/kobject.c
103673@@ -931,9 +931,9 @@ EXPORT_SYMBOL_GPL(kset_create_and_add);
103674
103675
103676 static DEFINE_SPINLOCK(kobj_ns_type_lock);
103677-static const struct kobj_ns_type_operations *kobj_ns_ops_tbl[KOBJ_NS_TYPES];
103678+static const struct kobj_ns_type_operations *kobj_ns_ops_tbl[KOBJ_NS_TYPES] __read_only;
103679
103680-int kobj_ns_type_register(const struct kobj_ns_type_operations *ops)
103681+int __init kobj_ns_type_register(const struct kobj_ns_type_operations *ops)
103682 {
103683 enum kobj_ns_type type = ops->type;
103684 int error;
103685diff --git a/lib/list_debug.c b/lib/list_debug.c
103686index c24c2f7..f0296f4 100644
103687--- a/lib/list_debug.c
103688+++ b/lib/list_debug.c
103689@@ -11,7 +11,9 @@
103690 #include <linux/bug.h>
103691 #include <linux/kernel.h>
103692 #include <linux/rculist.h>
103693+#include <linux/mm.h>
103694
103695+#ifdef CONFIG_DEBUG_LIST
103696 /*
103697 * Insert a new entry between two known consecutive entries.
103698 *
103699@@ -19,21 +21,40 @@
103700 * the prev/next entries already!
103701 */
103702
103703+static bool __list_add_debug(struct list_head *new,
103704+ struct list_head *prev,
103705+ struct list_head *next)
103706+{
103707+ if (unlikely(next->prev != prev)) {
103708+ printk(KERN_ERR "list_add corruption. next->prev should be "
103709+ "prev (%p), but was %p. (next=%p).\n",
103710+ prev, next->prev, next);
103711+ BUG();
103712+ return false;
103713+ }
103714+ if (unlikely(prev->next != next)) {
103715+ printk(KERN_ERR "list_add corruption. prev->next should be "
103716+ "next (%p), but was %p. (prev=%p).\n",
103717+ next, prev->next, prev);
103718+ BUG();
103719+ return false;
103720+ }
103721+ if (unlikely(new == prev || new == next)) {
103722+ printk(KERN_ERR "list_add double add: new=%p, prev=%p, next=%p.\n",
103723+ new, prev, next);
103724+ BUG();
103725+ return false;
103726+ }
103727+ return true;
103728+}
103729+
103730 void __list_add(struct list_head *new,
103731- struct list_head *prev,
103732- struct list_head *next)
103733+ struct list_head *prev,
103734+ struct list_head *next)
103735 {
103736- WARN(next->prev != prev,
103737- "list_add corruption. next->prev should be "
103738- "prev (%p), but was %p. (next=%p).\n",
103739- prev, next->prev, next);
103740- WARN(prev->next != next,
103741- "list_add corruption. prev->next should be "
103742- "next (%p), but was %p. (prev=%p).\n",
103743- next, prev->next, prev);
103744- WARN(new == prev || new == next,
103745- "list_add double add: new=%p, prev=%p, next=%p.\n",
103746- new, prev, next);
103747+ if (!__list_add_debug(new, prev, next))
103748+ return;
103749+
103750 next->prev = new;
103751 new->next = next;
103752 new->prev = prev;
103753@@ -41,28 +62,46 @@ void __list_add(struct list_head *new,
103754 }
103755 EXPORT_SYMBOL(__list_add);
103756
103757-void __list_del_entry(struct list_head *entry)
103758+static bool __list_del_entry_debug(struct list_head *entry)
103759 {
103760 struct list_head *prev, *next;
103761
103762 prev = entry->prev;
103763 next = entry->next;
103764
103765- if (WARN(next == LIST_POISON1,
103766- "list_del corruption, %p->next is LIST_POISON1 (%p)\n",
103767- entry, LIST_POISON1) ||
103768- WARN(prev == LIST_POISON2,
103769- "list_del corruption, %p->prev is LIST_POISON2 (%p)\n",
103770- entry, LIST_POISON2) ||
103771- WARN(prev->next != entry,
103772- "list_del corruption. prev->next should be %p, "
103773- "but was %p\n", entry, prev->next) ||
103774- WARN(next->prev != entry,
103775- "list_del corruption. next->prev should be %p, "
103776- "but was %p\n", entry, next->prev))
103777+ if (unlikely(next == LIST_POISON1)) {
103778+ printk(KERN_ERR "list_del corruption, %p->next is LIST_POISON1 (%p)\n",
103779+ entry, LIST_POISON1);
103780+ BUG();
103781+ return false;
103782+ }
103783+ if (unlikely(prev == LIST_POISON2)) {
103784+ printk(KERN_ERR "list_del corruption, %p->prev is LIST_POISON2 (%p)\n",
103785+ entry, LIST_POISON2);
103786+ BUG();
103787+ return false;
103788+ }
103789+ if (unlikely(entry->prev->next != entry)) {
103790+ printk(KERN_ERR "list_del corruption. prev->next should be %p, "
103791+ "but was %p\n", entry, prev->next);
103792+ BUG();
103793+ return false;
103794+ }
103795+ if (unlikely(entry->next->prev != entry)) {
103796+ printk(KERN_ERR "list_del corruption. next->prev should be %p, "
103797+ "but was %p\n", entry, next->prev);
103798+ BUG();
103799+ return false;
103800+ }
103801+ return true;
103802+}
103803+
103804+void __list_del_entry(struct list_head *entry)
103805+{
103806+ if (!__list_del_entry_debug(entry))
103807 return;
103808
103809- __list_del(prev, next);
103810+ __list_del(entry->prev, entry->next);
103811 }
103812 EXPORT_SYMBOL(__list_del_entry);
103813
103814@@ -86,15 +125,85 @@ EXPORT_SYMBOL(list_del);
103815 void __list_add_rcu(struct list_head *new,
103816 struct list_head *prev, struct list_head *next)
103817 {
103818- WARN(next->prev != prev,
103819- "list_add_rcu corruption. next->prev should be prev (%p), but was %p. (next=%p).\n",
103820- prev, next->prev, next);
103821- WARN(prev->next != next,
103822- "list_add_rcu corruption. prev->next should be next (%p), but was %p. (prev=%p).\n",
103823- next, prev->next, prev);
103824+ if (!__list_add_debug(new, prev, next))
103825+ return;
103826+
103827 new->next = next;
103828 new->prev = prev;
103829 rcu_assign_pointer(list_next_rcu(prev), new);
103830 next->prev = new;
103831 }
103832 EXPORT_SYMBOL(__list_add_rcu);
103833+#endif
103834+
103835+void __pax_list_add(struct list_head *new, struct list_head *prev, struct list_head *next)
103836+{
103837+#ifdef CONFIG_DEBUG_LIST
103838+ if (!__list_add_debug(new, prev, next))
103839+ return;
103840+#endif
103841+
103842+ pax_open_kernel();
103843+ next->prev = new;
103844+ new->next = next;
103845+ new->prev = prev;
103846+ prev->next = new;
103847+ pax_close_kernel();
103848+}
103849+EXPORT_SYMBOL(__pax_list_add);
103850+
103851+void pax_list_del(struct list_head *entry)
103852+{
103853+#ifdef CONFIG_DEBUG_LIST
103854+ if (!__list_del_entry_debug(entry))
103855+ return;
103856+#endif
103857+
103858+ pax_open_kernel();
103859+ __list_del(entry->prev, entry->next);
103860+ entry->next = LIST_POISON1;
103861+ entry->prev = LIST_POISON2;
103862+ pax_close_kernel();
103863+}
103864+EXPORT_SYMBOL(pax_list_del);
103865+
103866+void pax_list_del_init(struct list_head *entry)
103867+{
103868+ pax_open_kernel();
103869+ __list_del(entry->prev, entry->next);
103870+ INIT_LIST_HEAD(entry);
103871+ pax_close_kernel();
103872+}
103873+EXPORT_SYMBOL(pax_list_del_init);
103874+
103875+void __pax_list_add_rcu(struct list_head *new,
103876+ struct list_head *prev, struct list_head *next)
103877+{
103878+#ifdef CONFIG_DEBUG_LIST
103879+ if (!__list_add_debug(new, prev, next))
103880+ return;
103881+#endif
103882+
103883+ pax_open_kernel();
103884+ new->next = next;
103885+ new->prev = prev;
103886+ rcu_assign_pointer(list_next_rcu(prev), new);
103887+ next->prev = new;
103888+ pax_close_kernel();
103889+}
103890+EXPORT_SYMBOL(__pax_list_add_rcu);
103891+
103892+void pax_list_del_rcu(struct list_head *entry)
103893+{
103894+#ifdef CONFIG_DEBUG_LIST
103895+ if (!__list_del_entry_debug(entry))
103896+ return;
103897+#endif
103898+
103899+ pax_open_kernel();
103900+ __list_del(entry->prev, entry->next);
103901+ entry->next = LIST_POISON1;
103902+ entry->prev = LIST_POISON2;
103903+ pax_close_kernel();
103904+}
103905+EXPORT_SYMBOL(pax_list_del_rcu);
103906diff --git a/lib/lockref.c b/lib/lockref.c
103907index ecb9a66..a044fc5 100644
103908--- a/lib/lockref.c
103909+++ b/lib/lockref.c
103910@@ -48,13 +48,13 @@
103911 void lockref_get(struct lockref *lockref)
103912 {
103913 CMPXCHG_LOOP(
103914- new.count++;
103915+ __lockref_inc(&new);
103916 ,
103917 return;
103918 );
103919
103920 spin_lock(&lockref->lock);
103921- lockref->count++;
103922+ __lockref_inc(lockref);
103923 spin_unlock(&lockref->lock);
103924 }
103925 EXPORT_SYMBOL(lockref_get);
103926@@ -69,8 +69,8 @@ int lockref_get_not_zero(struct lockref *lockref)
103927 int retval;
103928
103929 CMPXCHG_LOOP(
103930- new.count++;
103931- if (old.count <= 0)
103932+ __lockref_inc(&new);
103933+ if (__lockref_read(&old) <= 0)
103934 return 0;
103935 ,
103936 return 1;
103937@@ -78,8 +78,8 @@ int lockref_get_not_zero(struct lockref *lockref)
103938
103939 spin_lock(&lockref->lock);
103940 retval = 0;
103941- if (lockref->count > 0) {
103942- lockref->count++;
103943+ if (__lockref_read(lockref) > 0) {
103944+ __lockref_inc(lockref);
103945 retval = 1;
103946 }
103947 spin_unlock(&lockref->lock);
103948@@ -96,17 +96,17 @@ EXPORT_SYMBOL(lockref_get_not_zero);
103949 int lockref_get_or_lock(struct lockref *lockref)
103950 {
103951 CMPXCHG_LOOP(
103952- new.count++;
103953- if (old.count <= 0)
103954+ __lockref_inc(&new);
103955+ if (__lockref_read(&old) <= 0)
103956 break;
103957 ,
103958 return 1;
103959 );
103960
103961 spin_lock(&lockref->lock);
103962- if (lockref->count <= 0)
103963+ if (__lockref_read(lockref) <= 0)
103964 return 0;
103965- lockref->count++;
103966+ __lockref_inc(lockref);
103967 spin_unlock(&lockref->lock);
103968 return 1;
103969 }
103970@@ -122,11 +122,11 @@ EXPORT_SYMBOL(lockref_get_or_lock);
103971 int lockref_put_return(struct lockref *lockref)
103972 {
103973 CMPXCHG_LOOP(
103974- new.count--;
103975- if (old.count <= 0)
103976+ __lockref_dec(&new);
103977+ if (__lockref_read(&old) <= 0)
103978 return -1;
103979 ,
103980- return new.count;
103981+ return __lockref_read(&new);
103982 );
103983 return -1;
103984 }
103985@@ -140,17 +140,17 @@ EXPORT_SYMBOL(lockref_put_return);
103986 int lockref_put_or_lock(struct lockref *lockref)
103987 {
103988 CMPXCHG_LOOP(
103989- new.count--;
103990- if (old.count <= 1)
103991+ __lockref_dec(&new);
103992+ if (__lockref_read(&old) <= 1)
103993 break;
103994 ,
103995 return 1;
103996 );
103997
103998 spin_lock(&lockref->lock);
103999- if (lockref->count <= 1)
104000+ if (__lockref_read(lockref) <= 1)
104001 return 0;
104002- lockref->count--;
104003+ __lockref_dec(lockref);
104004 spin_unlock(&lockref->lock);
104005 return 1;
104006 }
104007@@ -163,7 +163,7 @@ EXPORT_SYMBOL(lockref_put_or_lock);
104008 void lockref_mark_dead(struct lockref *lockref)
104009 {
104010 assert_spin_locked(&lockref->lock);
104011- lockref->count = -128;
104012+ __lockref_set(lockref, -128);
104013 }
104014 EXPORT_SYMBOL(lockref_mark_dead);
104015
104016@@ -177,8 +177,8 @@ int lockref_get_not_dead(struct lockref *lockref)
104017 int retval;
104018
104019 CMPXCHG_LOOP(
104020- new.count++;
104021- if (old.count < 0)
104022+ __lockref_inc(&new);
104023+ if (__lockref_read(&old) < 0)
104024 return 0;
104025 ,
104026 return 1;
104027@@ -186,8 +186,8 @@ int lockref_get_not_dead(struct lockref *lockref)
104028
104029 spin_lock(&lockref->lock);
104030 retval = 0;
104031- if (lockref->count >= 0) {
104032- lockref->count++;
104033+ if (__lockref_read(lockref) >= 0) {
104034+ __lockref_inc(lockref);
104035 retval = 1;
104036 }
104037 spin_unlock(&lockref->lock);
104038diff --git a/lib/mpi/longlong.h b/lib/mpi/longlong.h
104039index aac5114..a89d041 100644
104040--- a/lib/mpi/longlong.h
104041+++ b/lib/mpi/longlong.h
104042@@ -639,7 +639,7 @@ do { \
104043 ************** MIPS *****************
104044 ***************************************/
104045 #if defined(__mips__) && W_TYPE_SIZE == 32
104046-#if __GNUC__ >= 4 && __GNUC_MINOR__ >= 4
104047+#if (__GNUC__ >= 5) || (__GNUC__ >= 4 && __GNUC_MINOR__ >= 4)
104048 #define umul_ppmm(w1, w0, u, v) \
104049 do { \
104050 UDItype __ll = (UDItype)(u) * (v); \
104051@@ -671,7 +671,7 @@ do { \
104052 ************** MIPS/64 **************
104053 ***************************************/
104054 #if (defined(__mips) && __mips >= 3) && W_TYPE_SIZE == 64
104055-#if __GNUC__ >= 4 && __GNUC_MINOR__ >= 4
104056+#if (__GNUC__ >= 5) || (__GNUC__ >= 4 && __GNUC_MINOR__ >= 4)
104057 #define umul_ppmm(w1, w0, u, v) \
104058 do { \
104059 typedef unsigned int __ll_UTItype __attribute__((mode(TI))); \
104060diff --git a/lib/nlattr.c b/lib/nlattr.c
104061index f5907d2..36072be 100644
104062--- a/lib/nlattr.c
104063+++ b/lib/nlattr.c
104064@@ -278,6 +278,8 @@ int nla_memcpy(void *dest, const struct nlattr *src, int count)
104065 {
104066 int minlen = min_t(int, count, nla_len(src));
104067
104068+ BUG_ON(minlen < 0);
104069+
104070 memcpy(dest, nla_data(src), minlen);
104071 if (count > minlen)
104072 memset(dest + minlen, 0, count - minlen);
104073diff --git a/lib/percpu-refcount.c b/lib/percpu-refcount.c
104074index 6111bcb..02e816b 100644
104075--- a/lib/percpu-refcount.c
104076+++ b/lib/percpu-refcount.c
104077@@ -31,7 +31,7 @@
104078 * atomic_long_t can't hit 0 before we've added up all the percpu refs.
104079 */
104080
104081-#define PERCPU_COUNT_BIAS (1LU << (BITS_PER_LONG - 1))
104082+#define PERCPU_COUNT_BIAS (1LU << (BITS_PER_LONG - 2))
104083
104084 static DECLARE_WAIT_QUEUE_HEAD(percpu_ref_switch_waitq);
104085
104086diff --git a/lib/radix-tree.c b/lib/radix-tree.c
104087index 3d2aa27..a472f20 100644
104088--- a/lib/radix-tree.c
104089+++ b/lib/radix-tree.c
104090@@ -67,7 +67,7 @@ struct radix_tree_preload {
104091 int nr;
104092 struct radix_tree_node *nodes[RADIX_TREE_PRELOAD_SIZE];
104093 };
104094-static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads) = { 0, };
104095+static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads);
104096
104097 static inline void *ptr_to_indirect(void *ptr)
104098 {
104099diff --git a/lib/random32.c b/lib/random32.c
104100index 0bee183..526f12f 100644
104101--- a/lib/random32.c
104102+++ b/lib/random32.c
104103@@ -47,7 +47,7 @@ static inline void prandom_state_selftest(void)
104104 }
104105 #endif
104106
104107-static DEFINE_PER_CPU(struct rnd_state, net_rand_state);
104108+static DEFINE_PER_CPU(struct rnd_state, net_rand_state) __latent_entropy;
104109
104110 /**
104111 * prandom_u32_state - seeded pseudo-random number generator.
104112diff --git a/lib/rbtree.c b/lib/rbtree.c
104113index c16c81a..4dcbda1 100644
104114--- a/lib/rbtree.c
104115+++ b/lib/rbtree.c
104116@@ -380,7 +380,9 @@ static inline void dummy_copy(struct rb_node *old, struct rb_node *new) {}
104117 static inline void dummy_rotate(struct rb_node *old, struct rb_node *new) {}
104118
104119 static const struct rb_augment_callbacks dummy_callbacks = {
104120- dummy_propagate, dummy_copy, dummy_rotate
104121+ .propagate = dummy_propagate,
104122+ .copy = dummy_copy,
104123+ .rotate = dummy_rotate
104124 };
104125
104126 void rb_insert_color(struct rb_node *node, struct rb_root *root)
104127diff --git a/lib/show_mem.c b/lib/show_mem.c
104128index adc98e18..0ce83c2 100644
104129--- a/lib/show_mem.c
104130+++ b/lib/show_mem.c
104131@@ -49,6 +49,6 @@ void show_mem(unsigned int filter)
104132 quicklist_total_size());
104133 #endif
104134 #ifdef CONFIG_MEMORY_FAILURE
104135- printk("%lu pages hwpoisoned\n", atomic_long_read(&num_poisoned_pages));
104136+ printk("%lu pages hwpoisoned\n", atomic_long_read_unchecked(&num_poisoned_pages));
104137 #endif
104138 }
104139diff --git a/lib/strncpy_from_user.c b/lib/strncpy_from_user.c
104140index e0af6ff..fcc9f15 100644
104141--- a/lib/strncpy_from_user.c
104142+++ b/lib/strncpy_from_user.c
104143@@ -22,7 +22,7 @@
104144 */
104145 static inline long do_strncpy_from_user(char *dst, const char __user *src, long count, unsigned long max)
104146 {
104147- const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
104148+ static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
104149 long res = 0;
104150
104151 /*
104152diff --git a/lib/strnlen_user.c b/lib/strnlen_user.c
104153index 1164961..02dccaa 100644
104154--- a/lib/strnlen_user.c
104155+++ b/lib/strnlen_user.c
104156@@ -26,7 +26,7 @@
104157 */
104158 static inline long do_strnlen_user(const char __user *src, unsigned long count, unsigned long max)
104159 {
104160- const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
104161+ static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
104162 long align, res = 0;
104163 unsigned long c;
104164
104165diff --git a/lib/swiotlb.c b/lib/swiotlb.c
104166index 4abda07..b9d3765 100644
104167--- a/lib/swiotlb.c
104168+++ b/lib/swiotlb.c
104169@@ -682,7 +682,7 @@ EXPORT_SYMBOL(swiotlb_alloc_coherent);
104170
104171 void
104172 swiotlb_free_coherent(struct device *hwdev, size_t size, void *vaddr,
104173- dma_addr_t dev_addr)
104174+ dma_addr_t dev_addr, struct dma_attrs *attrs)
104175 {
104176 phys_addr_t paddr = dma_to_phys(hwdev, dev_addr);
104177
104178diff --git a/lib/test-hexdump.c b/lib/test-hexdump.c
104179index daf29a39..56f44ac 100644
104180--- a/lib/test-hexdump.c
104181+++ b/lib/test-hexdump.c
104182@@ -18,26 +18,26 @@ static const unsigned char data_b[] = {
104183
104184 static const unsigned char data_a[] = ".2.{....p..$}.4...1.....L...C...";
104185
104186-static const char *test_data_1_le[] __initconst = {
104187+static const char * const test_data_1_le[] __initconst = {
104188 "be", "32", "db", "7b", "0a", "18", "93", "b2",
104189 "70", "ba", "c4", "24", "7d", "83", "34", "9b",
104190 "a6", "9c", "31", "ad", "9c", "0f", "ac", "e9",
104191 "4c", "d1", "19", "99", "43", "b1", "af", "0c",
104192 };
104193
104194-static const char *test_data_2_le[] __initconst = {
104195+static const char * const test_data_2_le[] __initconst = {
104196 "32be", "7bdb", "180a", "b293",
104197 "ba70", "24c4", "837d", "9b34",
104198 "9ca6", "ad31", "0f9c", "e9ac",
104199 "d14c", "9919", "b143", "0caf",
104200 };
104201
104202-static const char *test_data_4_le[] __initconst = {
104203+static const char * const test_data_4_le[] __initconst = {
104204 "7bdb32be", "b293180a", "24c4ba70", "9b34837d",
104205 "ad319ca6", "e9ac0f9c", "9919d14c", "0cafb143",
104206 };
104207
104208-static const char *test_data_8_le[] __initconst = {
104209+static const char * const test_data_8_le[] __initconst = {
104210 "b293180a7bdb32be", "9b34837d24c4ba70",
104211 "e9ac0f9cad319ca6", "0cafb1439919d14c",
104212 };
104213diff --git a/lib/usercopy.c b/lib/usercopy.c
104214index 4f5b1dd..7cab418 100644
104215--- a/lib/usercopy.c
104216+++ b/lib/usercopy.c
104217@@ -7,3 +7,9 @@ void copy_from_user_overflow(void)
104218 WARN(1, "Buffer overflow detected!\n");
104219 }
104220 EXPORT_SYMBOL(copy_from_user_overflow);
104221+
104222+void copy_to_user_overflow(void)
104223+{
104224+ WARN(1, "Buffer overflow detected!\n");
104225+}
104226+EXPORT_SYMBOL(copy_to_user_overflow);
104227diff --git a/lib/vsprintf.c b/lib/vsprintf.c
104228index b235c96..343ffc1 100644
104229--- a/lib/vsprintf.c
104230+++ b/lib/vsprintf.c
104231@@ -16,6 +16,9 @@
104232 * - scnprintf and vscnprintf
104233 */
104234
104235+#ifdef CONFIG_GRKERNSEC_HIDESYM
104236+#define __INCLUDED_BY_HIDESYM 1
104237+#endif
104238 #include <stdarg.h>
104239 #include <linux/module.h> /* for KSYM_SYMBOL_LEN */
104240 #include <linux/types.h>
104241@@ -626,7 +629,7 @@ char *symbol_string(char *buf, char *end, void *ptr,
104242 #ifdef CONFIG_KALLSYMS
104243 if (*fmt == 'B')
104244 sprint_backtrace(sym, value);
104245- else if (*fmt != 'f' && *fmt != 's')
104246+ else if (*fmt != 'f' && *fmt != 's' && *fmt != 'X')
104247 sprint_symbol(sym, value);
104248 else
104249 sprint_symbol_no_offset(sym, value);
104250@@ -1322,7 +1325,11 @@ char *address_val(char *buf, char *end, const void *addr,
104251 return number(buf, end, num, spec);
104252 }
104253
104254+#ifdef CONFIG_GRKERNSEC_HIDESYM
104255+int kptr_restrict __read_mostly = 2;
104256+#else
104257 int kptr_restrict __read_mostly;
104258+#endif
104259
104260 /*
104261 * Show a '%p' thing. A kernel extension is that the '%p' is followed
104262@@ -1333,8 +1340,10 @@ int kptr_restrict __read_mostly;
104263 *
104264 * - 'F' For symbolic function descriptor pointers with offset
104265 * - 'f' For simple symbolic function names without offset
104266+ * - 'X' For simple symbolic function names without offset approved for use with GRKERNSEC_HIDESYM
104267 * - 'S' For symbolic direct pointers with offset
104268 * - 's' For symbolic direct pointers without offset
104269+ * - 'A' For symbolic direct pointers with offset approved for use with GRKERNSEC_HIDESYM
104270 * - '[FfSs]R' as above with __builtin_extract_return_addr() translation
104271 * - 'B' For backtraced symbolic direct pointers with offset
104272 * - 'R' For decoded struct resource, e.g., [mem 0x0-0x1f 64bit pref]
104273@@ -1417,12 +1426,12 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
104274
104275 if (!ptr && *fmt != 'K') {
104276 /*
104277- * Print (null) with the same width as a pointer so it makes
104278+ * Print (nil) with the same width as a pointer so it makes
104279 * tabular output look nice.
104280 */
104281 if (spec.field_width == -1)
104282 spec.field_width = default_width;
104283- return string(buf, end, "(null)", spec);
104284+ return string(buf, end, "(nil)", spec);
104285 }
104286
104287 switch (*fmt) {
104288@@ -1432,6 +1441,14 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
104289 /* Fallthrough */
104290 case 'S':
104291 case 's':
104292+#ifdef CONFIG_GRKERNSEC_HIDESYM
104293+ break;
104294+#else
104295+ return symbol_string(buf, end, ptr, spec, fmt);
104296+#endif
104297+ case 'X':
104298+ ptr = dereference_function_descriptor(ptr);
104299+ case 'A':
104300 case 'B':
104301 return symbol_string(buf, end, ptr, spec, fmt);
104302 case 'R':
104303@@ -1496,6 +1513,8 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
104304 va_end(va);
104305 return buf;
104306 }
104307+ case 'P':
104308+ break;
104309 case 'K':
104310 /*
104311 * %pK cannot be used in IRQ context because its test
104312@@ -1553,6 +1572,22 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
104313 ((const struct file *)ptr)->f_path.dentry,
104314 spec, fmt);
104315 }
104316+
104317+#ifdef CONFIG_GRKERNSEC_HIDESYM
104318+ /* 'P' = approved pointers to copy to userland,
104319+ as in the /proc/kallsyms case, as we make it display nothing
104320+ for non-root users, and the real contents for root users
104321+ 'X' = approved simple symbols
104322+ Also ignore 'K' pointers, since we force their NULLing for non-root users
104323+ above
104324+ */
104325+ if ((unsigned long)ptr > TASK_SIZE && *fmt != 'P' && *fmt != 'X' && *fmt != 'K' && is_usercopy_object(buf)) {
104326+ printk(KERN_ALERT "grsec: kernel infoleak detected! Please report this log to spender@grsecurity.net.\n");
104327+ dump_stack();
104328+ ptr = NULL;
104329+ }
104330+#endif
104331+
104332 spec.flags |= SMALL;
104333 if (spec.field_width == -1) {
104334 spec.field_width = default_width;
104335@@ -2254,11 +2289,11 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
104336 typeof(type) value; \
104337 if (sizeof(type) == 8) { \
104338 args = PTR_ALIGN(args, sizeof(u32)); \
104339- *(u32 *)&value = *(u32 *)args; \
104340- *((u32 *)&value + 1) = *(u32 *)(args + 4); \
104341+ *(u32 *)&value = *(const u32 *)args; \
104342+ *((u32 *)&value + 1) = *(const u32 *)(args + 4); \
104343 } else { \
104344 args = PTR_ALIGN(args, sizeof(type)); \
104345- value = *(typeof(type) *)args; \
104346+ value = *(const typeof(type) *)args; \
104347 } \
104348 args += sizeof(type); \
104349 value; \
104350@@ -2321,7 +2356,7 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
104351 case FORMAT_TYPE_STR: {
104352 const char *str_arg = args;
104353 args += strlen(str_arg) + 1;
104354- str = string(str, end, (char *)str_arg, spec);
104355+ str = string(str, end, str_arg, spec);
104356 break;
104357 }
104358
104359diff --git a/localversion-grsec b/localversion-grsec
104360new file mode 100644
104361index 0000000..7cd6065
104362--- /dev/null
104363+++ b/localversion-grsec
104364@@ -0,0 +1 @@
104365+-grsec
104366diff --git a/mm/Kconfig b/mm/Kconfig
104367index a03131b..1b1bafb 100644
104368--- a/mm/Kconfig
104369+++ b/mm/Kconfig
104370@@ -342,10 +342,11 @@ config KSM
104371 root has set /sys/kernel/mm/ksm/run to 1 (if CONFIG_SYSFS is set).
104372
104373 config DEFAULT_MMAP_MIN_ADDR
104374- int "Low address space to protect from user allocation"
104375+ int "Low address space to protect from user allocation"
104376 depends on MMU
104377- default 4096
104378- help
104379+ default 32768 if ALPHA || ARM || PARISC || SPARC32
104380+ default 65536
104381+ help
104382 This is the portion of low virtual memory which should be protected
104383 from userspace allocation. Keeping a user from writing to low pages
104384 can help reduce the impact of kernel NULL pointer bugs.
104385@@ -376,7 +377,7 @@ config MEMORY_FAILURE
104386
104387 config HWPOISON_INJECT
104388 tristate "HWPoison pages injector"
104389- depends on MEMORY_FAILURE && DEBUG_KERNEL && PROC_FS
104390+ depends on MEMORY_FAILURE && DEBUG_KERNEL && PROC_FS && !GRKERNSEC
104391 select PROC_PAGE_MONITOR
104392
104393 config NOMMU_INITIAL_TRIM_EXCESS
104394diff --git a/mm/Kconfig.debug b/mm/Kconfig.debug
104395index 957d3da..1d34e20 100644
104396--- a/mm/Kconfig.debug
104397+++ b/mm/Kconfig.debug
104398@@ -10,6 +10,7 @@ config PAGE_EXTENSION
104399 config DEBUG_PAGEALLOC
104400 bool "Debug page memory allocations"
104401 depends on DEBUG_KERNEL
104402+ depends on !PAX_MEMORY_SANITIZE
104403 depends on !HIBERNATION || ARCH_SUPPORTS_DEBUG_PAGEALLOC && !PPC && !SPARC
104404 depends on !KMEMCHECK
104405 select PAGE_EXTENSION
104406diff --git a/mm/backing-dev.c b/mm/backing-dev.c
104407index 000e7b3..aad2605 100644
104408--- a/mm/backing-dev.c
104409+++ b/mm/backing-dev.c
104410@@ -12,7 +12,7 @@
104411 #include <linux/device.h>
104412 #include <trace/events/writeback.h>
104413
104414-static atomic_long_t bdi_seq = ATOMIC_LONG_INIT(0);
104415+static atomic_long_unchecked_t bdi_seq = ATOMIC_LONG_INIT(0);
104416
104417 struct backing_dev_info noop_backing_dev_info = {
104418 .name = "noop",
104419@@ -458,7 +458,7 @@ int bdi_setup_and_register(struct backing_dev_info *bdi, char *name)
104420 return err;
104421
104422 err = bdi_register(bdi, NULL, "%.28s-%ld", name,
104423- atomic_long_inc_return(&bdi_seq));
104424+ atomic_long_inc_return_unchecked(&bdi_seq));
104425 if (err) {
104426 bdi_destroy(bdi);
104427 return err;
104428diff --git a/mm/filemap.c b/mm/filemap.c
104429index ad72420..0a20ef2 100644
104430--- a/mm/filemap.c
104431+++ b/mm/filemap.c
104432@@ -2097,7 +2097,7 @@ int generic_file_mmap(struct file * file, struct vm_area_struct * vma)
104433 struct address_space *mapping = file->f_mapping;
104434
104435 if (!mapping->a_ops->readpage)
104436- return -ENOEXEC;
104437+ return -ENODEV;
104438 file_accessed(file);
104439 vma->vm_ops = &generic_file_vm_ops;
104440 return 0;
104441@@ -2275,6 +2275,7 @@ inline int generic_write_checks(struct file *file, loff_t *pos, size_t *count, i
104442 *pos = i_size_read(inode);
104443
104444 if (limit != RLIM_INFINITY) {
104445+ gr_learn_resource(current, RLIMIT_FSIZE,*pos, 0);
104446 if (*pos >= limit) {
104447 send_sig(SIGXFSZ, current, 0);
104448 return -EFBIG;
104449diff --git a/mm/gup.c b/mm/gup.c
104450index a6e24e2..72dd2cf 100644
104451--- a/mm/gup.c
104452+++ b/mm/gup.c
104453@@ -265,11 +265,6 @@ static int faultin_page(struct task_struct *tsk, struct vm_area_struct *vma,
104454 unsigned int fault_flags = 0;
104455 int ret;
104456
104457- /* For mlock, just skip the stack guard page. */
104458- if ((*flags & FOLL_MLOCK) &&
104459- (stack_guard_page_start(vma, address) ||
104460- stack_guard_page_end(vma, address + PAGE_SIZE)))
104461- return -ENOENT;
104462 if (*flags & FOLL_WRITE)
104463 fault_flags |= FAULT_FLAG_WRITE;
104464 if (nonblocking)
104465@@ -435,14 +430,14 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
104466 if (!(gup_flags & FOLL_FORCE))
104467 gup_flags |= FOLL_NUMA;
104468
104469- do {
104470+ while (nr_pages) {
104471 struct page *page;
104472 unsigned int foll_flags = gup_flags;
104473 unsigned int page_increm;
104474
104475 /* first iteration or cross vma bound */
104476 if (!vma || start >= vma->vm_end) {
104477- vma = find_extend_vma(mm, start);
104478+ vma = find_vma(mm, start);
104479 if (!vma && in_gate_area(mm, start)) {
104480 int ret;
104481 ret = get_gate_page(mm, start & PAGE_MASK,
104482@@ -454,7 +449,7 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
104483 goto next_page;
104484 }
104485
104486- if (!vma || check_vma_flags(vma, gup_flags))
104487+ if (!vma || start < vma->vm_start || check_vma_flags(vma, gup_flags))
104488 return i ? : -EFAULT;
104489 if (is_vm_hugetlb_page(vma)) {
104490 i = follow_hugetlb_page(mm, vma, pages, vmas,
104491@@ -509,7 +504,7 @@ next_page:
104492 i += page_increm;
104493 start += page_increm * PAGE_SIZE;
104494 nr_pages -= page_increm;
104495- } while (nr_pages);
104496+ }
104497 return i;
104498 }
104499 EXPORT_SYMBOL(__get_user_pages);
104500diff --git a/mm/highmem.c b/mm/highmem.c
104501index 123bcd3..0de52ba 100644
104502--- a/mm/highmem.c
104503+++ b/mm/highmem.c
104504@@ -195,8 +195,9 @@ static void flush_all_zero_pkmaps(void)
104505 * So no dangers, even with speculative execution.
104506 */
104507 page = pte_page(pkmap_page_table[i]);
104508+ pax_open_kernel();
104509 pte_clear(&init_mm, PKMAP_ADDR(i), &pkmap_page_table[i]);
104510-
104511+ pax_close_kernel();
104512 set_page_address(page, NULL);
104513 need_flush = 1;
104514 }
104515@@ -259,9 +260,11 @@ start:
104516 }
104517 }
104518 vaddr = PKMAP_ADDR(last_pkmap_nr);
104519+
104520+ pax_open_kernel();
104521 set_pte_at(&init_mm, vaddr,
104522 &(pkmap_page_table[last_pkmap_nr]), mk_pte(page, kmap_prot));
104523-
104524+ pax_close_kernel();
104525 pkmap_count[last_pkmap_nr] = 1;
104526 set_page_address(page, (void *)vaddr);
104527
104528diff --git a/mm/hugetlb.c b/mm/hugetlb.c
104529index caad3c5..4f68807 100644
104530--- a/mm/hugetlb.c
104531+++ b/mm/hugetlb.c
104532@@ -2260,6 +2260,7 @@ static int hugetlb_sysctl_handler_common(bool obey_mempolicy,
104533 struct ctl_table *table, int write,
104534 void __user *buffer, size_t *length, loff_t *ppos)
104535 {
104536+ ctl_table_no_const t;
104537 struct hstate *h = &default_hstate;
104538 unsigned long tmp = h->max_huge_pages;
104539 int ret;
104540@@ -2267,9 +2268,10 @@ static int hugetlb_sysctl_handler_common(bool obey_mempolicy,
104541 if (!hugepages_supported())
104542 return -ENOTSUPP;
104543
104544- table->data = &tmp;
104545- table->maxlen = sizeof(unsigned long);
104546- ret = proc_doulongvec_minmax(table, write, buffer, length, ppos);
104547+ t = *table;
104548+ t.data = &tmp;
104549+ t.maxlen = sizeof(unsigned long);
104550+ ret = proc_doulongvec_minmax(&t, write, buffer, length, ppos);
104551 if (ret)
104552 goto out;
104553
104554@@ -2304,6 +2306,7 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write,
104555 struct hstate *h = &default_hstate;
104556 unsigned long tmp;
104557 int ret;
104558+ ctl_table_no_const hugetlb_table;
104559
104560 if (!hugepages_supported())
104561 return -ENOTSUPP;
104562@@ -2313,9 +2316,10 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write,
104563 if (write && hstate_is_gigantic(h))
104564 return -EINVAL;
104565
104566- table->data = &tmp;
104567- table->maxlen = sizeof(unsigned long);
104568- ret = proc_doulongvec_minmax(table, write, buffer, length, ppos);
104569+ hugetlb_table = *table;
104570+ hugetlb_table.data = &tmp;
104571+ hugetlb_table.maxlen = sizeof(unsigned long);
104572+ ret = proc_doulongvec_minmax(&hugetlb_table, write, buffer, length, ppos);
104573 if (ret)
104574 goto out;
104575
104576@@ -2800,6 +2804,27 @@ static void unmap_ref_private(struct mm_struct *mm, struct vm_area_struct *vma,
104577 i_mmap_unlock_write(mapping);
104578 }
104579
104580+#ifdef CONFIG_PAX_SEGMEXEC
104581+static void pax_mirror_huge_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m)
104582+{
104583+ struct mm_struct *mm = vma->vm_mm;
104584+ struct vm_area_struct *vma_m;
104585+ unsigned long address_m;
104586+ pte_t *ptep_m;
104587+
104588+ vma_m = pax_find_mirror_vma(vma);
104589+ if (!vma_m)
104590+ return;
104591+
104592+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
104593+ address_m = address + SEGMEXEC_TASK_SIZE;
104594+ ptep_m = huge_pte_offset(mm, address_m & HPAGE_MASK);
104595+ get_page(page_m);
104596+ hugepage_add_anon_rmap(page_m, vma_m, address_m);
104597+ set_huge_pte_at(mm, address_m, ptep_m, make_huge_pte(vma_m, page_m, 0));
104598+}
104599+#endif
104600+
104601 /*
104602 * Hugetlb_cow() should be called with page lock of the original hugepage held.
104603 * Called with hugetlb_instantiation_mutex held and pte_page locked so we
104604@@ -2912,6 +2937,11 @@ retry_avoidcopy:
104605 make_huge_pte(vma, new_page, 1));
104606 page_remove_rmap(old_page);
104607 hugepage_add_new_anon_rmap(new_page, vma, address);
104608+
104609+#ifdef CONFIG_PAX_SEGMEXEC
104610+ pax_mirror_huge_pte(vma, address, new_page);
104611+#endif
104612+
104613 /* Make the old page be freed below */
104614 new_page = old_page;
104615 }
104616@@ -3072,6 +3102,10 @@ retry:
104617 && (vma->vm_flags & VM_SHARED)));
104618 set_huge_pte_at(mm, address, ptep, new_pte);
104619
104620+#ifdef CONFIG_PAX_SEGMEXEC
104621+ pax_mirror_huge_pte(vma, address, page);
104622+#endif
104623+
104624 if ((flags & FAULT_FLAG_WRITE) && !(vma->vm_flags & VM_SHARED)) {
104625 /* Optimization, do the COW without a second fault */
104626 ret = hugetlb_cow(mm, vma, address, ptep, new_pte, page, ptl);
104627@@ -3139,6 +3173,10 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
104628 struct address_space *mapping;
104629 int need_wait_lock = 0;
104630
104631+#ifdef CONFIG_PAX_SEGMEXEC
104632+ struct vm_area_struct *vma_m;
104633+#endif
104634+
104635 address &= huge_page_mask(h);
104636
104637 ptep = huge_pte_offset(mm, address);
104638@@ -3152,6 +3190,26 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
104639 VM_FAULT_SET_HINDEX(hstate_index(h));
104640 }
104641
104642+#ifdef CONFIG_PAX_SEGMEXEC
104643+ vma_m = pax_find_mirror_vma(vma);
104644+ if (vma_m) {
104645+ unsigned long address_m;
104646+
104647+ if (vma->vm_start > vma_m->vm_start) {
104648+ address_m = address;
104649+ address -= SEGMEXEC_TASK_SIZE;
104650+ vma = vma_m;
104651+ h = hstate_vma(vma);
104652+ } else
104653+ address_m = address + SEGMEXEC_TASK_SIZE;
104654+
104655+ if (!huge_pte_alloc(mm, address_m, huge_page_size(h)))
104656+ return VM_FAULT_OOM;
104657+ address_m &= HPAGE_MASK;
104658+ unmap_hugepage_range(vma, address_m, address_m + HPAGE_SIZE, NULL);
104659+ }
104660+#endif
104661+
104662 ptep = huge_pte_alloc(mm, address, huge_page_size(h));
104663 if (!ptep)
104664 return VM_FAULT_OOM;
104665diff --git a/mm/internal.h b/mm/internal.h
104666index a96da5b..42ebd54 100644
104667--- a/mm/internal.h
104668+++ b/mm/internal.h
104669@@ -156,6 +156,7 @@ __find_buddy_index(unsigned long page_idx, unsigned int order)
104670
104671 extern int __isolate_free_page(struct page *page, unsigned int order);
104672 extern void __free_pages_bootmem(struct page *page, unsigned int order);
104673+extern void free_compound_page(struct page *page);
104674 extern void prep_compound_page(struct page *page, unsigned long order);
104675 #ifdef CONFIG_MEMORY_FAILURE
104676 extern bool is_free_buddy_page(struct page *page);
104677@@ -411,7 +412,7 @@ extern u32 hwpoison_filter_enable;
104678
104679 extern unsigned long vm_mmap_pgoff(struct file *, unsigned long,
104680 unsigned long, unsigned long,
104681- unsigned long, unsigned long);
104682+ unsigned long, unsigned long) __intentional_overflow(-1);
104683
104684 extern void set_pageblock_order(void);
104685 unsigned long reclaim_clean_pages_from_list(struct zone *zone,
104686diff --git a/mm/kmemleak.c b/mm/kmemleak.c
104687index f0fe4f2..898208c 100644
104688--- a/mm/kmemleak.c
104689+++ b/mm/kmemleak.c
104690@@ -366,7 +366,7 @@ static void print_unreferenced(struct seq_file *seq,
104691
104692 for (i = 0; i < object->trace_len; i++) {
104693 void *ptr = (void *)object->trace[i];
104694- seq_printf(seq, " [<%p>] %pS\n", ptr, ptr);
104695+ seq_printf(seq, " [<%pP>] %pA\n", ptr, ptr);
104696 }
104697 }
104698
104699@@ -1912,7 +1912,7 @@ static int __init kmemleak_late_init(void)
104700 return -ENOMEM;
104701 }
104702
104703- dentry = debugfs_create_file("kmemleak", S_IRUGO, NULL, NULL,
104704+ dentry = debugfs_create_file("kmemleak", S_IRUSR, NULL, NULL,
104705 &kmemleak_fops);
104706 if (!dentry)
104707 pr_warning("Failed to create the debugfs kmemleak file\n");
104708diff --git a/mm/maccess.c b/mm/maccess.c
104709index d53adf9..03a24bf 100644
104710--- a/mm/maccess.c
104711+++ b/mm/maccess.c
104712@@ -26,7 +26,7 @@ long __probe_kernel_read(void *dst, const void *src, size_t size)
104713 set_fs(KERNEL_DS);
104714 pagefault_disable();
104715 ret = __copy_from_user_inatomic(dst,
104716- (__force const void __user *)src, size);
104717+ (const void __force_user *)src, size);
104718 pagefault_enable();
104719 set_fs(old_fs);
104720
104721@@ -53,7 +53,7 @@ long __probe_kernel_write(void *dst, const void *src, size_t size)
104722
104723 set_fs(KERNEL_DS);
104724 pagefault_disable();
104725- ret = __copy_to_user_inatomic((__force void __user *)dst, src, size);
104726+ ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
104727 pagefault_enable();
104728 set_fs(old_fs);
104729
104730diff --git a/mm/madvise.c b/mm/madvise.c
104731index d551475..8fdd7f3 100644
104732--- a/mm/madvise.c
104733+++ b/mm/madvise.c
104734@@ -51,6 +51,10 @@ static long madvise_behavior(struct vm_area_struct *vma,
104735 pgoff_t pgoff;
104736 unsigned long new_flags = vma->vm_flags;
104737
104738+#ifdef CONFIG_PAX_SEGMEXEC
104739+ struct vm_area_struct *vma_m;
104740+#endif
104741+
104742 switch (behavior) {
104743 case MADV_NORMAL:
104744 new_flags = new_flags & ~VM_RAND_READ & ~VM_SEQ_READ;
104745@@ -126,6 +130,13 @@ success:
104746 /*
104747 * vm_flags is protected by the mmap_sem held in write mode.
104748 */
104749+
104750+#ifdef CONFIG_PAX_SEGMEXEC
104751+ vma_m = pax_find_mirror_vma(vma);
104752+ if (vma_m)
104753+ vma_m->vm_flags = new_flags & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT);
104754+#endif
104755+
104756 vma->vm_flags = new_flags;
104757
104758 out:
104759@@ -277,11 +288,27 @@ static long madvise_dontneed(struct vm_area_struct *vma,
104760 struct vm_area_struct **prev,
104761 unsigned long start, unsigned long end)
104762 {
104763+
104764+#ifdef CONFIG_PAX_SEGMEXEC
104765+ struct vm_area_struct *vma_m;
104766+#endif
104767+
104768 *prev = vma;
104769 if (vma->vm_flags & (VM_LOCKED|VM_HUGETLB|VM_PFNMAP))
104770 return -EINVAL;
104771
104772 zap_page_range(vma, start, end - start, NULL);
104773+
104774+#ifdef CONFIG_PAX_SEGMEXEC
104775+ vma_m = pax_find_mirror_vma(vma);
104776+ if (vma_m) {
104777+ if (vma_m->vm_flags & (VM_LOCKED|VM_HUGETLB|VM_PFNMAP))
104778+ return -EINVAL;
104779+
104780+ zap_page_range(vma_m, start + SEGMEXEC_TASK_SIZE, end - start, NULL);
104781+ }
104782+#endif
104783+
104784 return 0;
104785 }
104786
104787@@ -484,6 +511,16 @@ SYSCALL_DEFINE3(madvise, unsigned long, start, size_t, len_in, int, behavior)
104788 if (end < start)
104789 return error;
104790
104791+#ifdef CONFIG_PAX_SEGMEXEC
104792+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
104793+ if (end > SEGMEXEC_TASK_SIZE)
104794+ return error;
104795+ } else
104796+#endif
104797+
104798+ if (end > TASK_SIZE)
104799+ return error;
104800+
104801 error = 0;
104802 if (end == start)
104803 return error;
104804diff --git a/mm/memory-failure.c b/mm/memory-failure.c
104805index 72a5224..51ba846 100644
104806--- a/mm/memory-failure.c
104807+++ b/mm/memory-failure.c
104808@@ -61,7 +61,7 @@ int sysctl_memory_failure_early_kill __read_mostly = 0;
104809
104810 int sysctl_memory_failure_recovery __read_mostly = 1;
104811
104812-atomic_long_t num_poisoned_pages __read_mostly = ATOMIC_LONG_INIT(0);
104813+atomic_long_unchecked_t num_poisoned_pages __read_mostly = ATOMIC_LONG_INIT(0);
104814
104815 #if defined(CONFIG_HWPOISON_INJECT) || defined(CONFIG_HWPOISON_INJECT_MODULE)
104816
104817@@ -198,7 +198,7 @@ static int kill_proc(struct task_struct *t, unsigned long addr, int trapno,
104818 pfn, t->comm, t->pid);
104819 si.si_signo = SIGBUS;
104820 si.si_errno = 0;
104821- si.si_addr = (void *)addr;
104822+ si.si_addr = (void __user *)addr;
104823 #ifdef __ARCH_SI_TRAPNO
104824 si.si_trapno = trapno;
104825 #endif
104826@@ -779,7 +779,7 @@ static struct page_state {
104827 unsigned long res;
104828 char *msg;
104829 int (*action)(struct page *p, unsigned long pfn);
104830-} error_states[] = {
104831+} __do_const error_states[] = {
104832 { reserved, reserved, "reserved kernel", me_kernel },
104833 /*
104834 * free pages are specially detected outside this table:
104835@@ -1087,7 +1087,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
104836 nr_pages = 1 << compound_order(hpage);
104837 else /* normal page or thp */
104838 nr_pages = 1;
104839- atomic_long_add(nr_pages, &num_poisoned_pages);
104840+ atomic_long_add_unchecked(nr_pages, &num_poisoned_pages);
104841
104842 /*
104843 * We need/can do nothing about count=0 pages.
104844@@ -1116,7 +1116,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
104845 if (PageHWPoison(hpage)) {
104846 if ((hwpoison_filter(p) && TestClearPageHWPoison(p))
104847 || (p != hpage && TestSetPageHWPoison(hpage))) {
104848- atomic_long_sub(nr_pages, &num_poisoned_pages);
104849+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
104850 unlock_page(hpage);
104851 return 0;
104852 }
104853@@ -1184,14 +1184,14 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
104854 */
104855 if (!PageHWPoison(p)) {
104856 printk(KERN_ERR "MCE %#lx: just unpoisoned\n", pfn);
104857- atomic_long_sub(nr_pages, &num_poisoned_pages);
104858+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
104859 put_page(hpage);
104860 res = 0;
104861 goto out;
104862 }
104863 if (hwpoison_filter(p)) {
104864 if (TestClearPageHWPoison(p))
104865- atomic_long_sub(nr_pages, &num_poisoned_pages);
104866+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
104867 unlock_page(hpage);
104868 put_page(hpage);
104869 return 0;
104870@@ -1421,7 +1421,7 @@ int unpoison_memory(unsigned long pfn)
104871 return 0;
104872 }
104873 if (TestClearPageHWPoison(p))
104874- atomic_long_dec(&num_poisoned_pages);
104875+ atomic_long_dec_unchecked(&num_poisoned_pages);
104876 pr_info("MCE: Software-unpoisoned free page %#lx\n", pfn);
104877 return 0;
104878 }
104879@@ -1435,7 +1435,7 @@ int unpoison_memory(unsigned long pfn)
104880 */
104881 if (TestClearPageHWPoison(page)) {
104882 pr_info("MCE: Software-unpoisoned page %#lx\n", pfn);
104883- atomic_long_sub(nr_pages, &num_poisoned_pages);
104884+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
104885 freeit = 1;
104886 if (PageHuge(page))
104887 clear_page_hwpoison_huge_page(page);
104888@@ -1560,11 +1560,11 @@ static int soft_offline_huge_page(struct page *page, int flags)
104889 if (PageHuge(page)) {
104890 set_page_hwpoison_huge_page(hpage);
104891 dequeue_hwpoisoned_huge_page(hpage);
104892- atomic_long_add(1 << compound_order(hpage),
104893+ atomic_long_add_unchecked(1 << compound_order(hpage),
104894 &num_poisoned_pages);
104895 } else {
104896 SetPageHWPoison(page);
104897- atomic_long_inc(&num_poisoned_pages);
104898+ atomic_long_inc_unchecked(&num_poisoned_pages);
104899 }
104900 }
104901 return ret;
104902@@ -1603,7 +1603,7 @@ static int __soft_offline_page(struct page *page, int flags)
104903 put_page(page);
104904 pr_info("soft_offline: %#lx: invalidated\n", pfn);
104905 SetPageHWPoison(page);
104906- atomic_long_inc(&num_poisoned_pages);
104907+ atomic_long_inc_unchecked(&num_poisoned_pages);
104908 return 0;
104909 }
104910
104911@@ -1652,7 +1652,7 @@ static int __soft_offline_page(struct page *page, int flags)
104912 if (!is_free_buddy_page(page))
104913 pr_info("soft offline: %#lx: page leaked\n",
104914 pfn);
104915- atomic_long_inc(&num_poisoned_pages);
104916+ atomic_long_inc_unchecked(&num_poisoned_pages);
104917 }
104918 } else {
104919 pr_info("soft offline: %#lx: isolation failed: %d, page count %d, type %lx\n",
104920@@ -1722,11 +1722,11 @@ int soft_offline_page(struct page *page, int flags)
104921 if (PageHuge(page)) {
104922 set_page_hwpoison_huge_page(hpage);
104923 if (!dequeue_hwpoisoned_huge_page(hpage))
104924- atomic_long_add(1 << compound_order(hpage),
104925+ atomic_long_add_unchecked(1 << compound_order(hpage),
104926 &num_poisoned_pages);
104927 } else {
104928 if (!TestSetPageHWPoison(page))
104929- atomic_long_inc(&num_poisoned_pages);
104930+ atomic_long_inc_unchecked(&num_poisoned_pages);
104931 }
104932 }
104933 unset_migratetype_isolate(page, MIGRATE_MOVABLE);
104934diff --git a/mm/memory.c b/mm/memory.c
104935index 97839f5..4bc5530 100644
104936--- a/mm/memory.c
104937+++ b/mm/memory.c
104938@@ -414,6 +414,7 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
104939 free_pte_range(tlb, pmd, addr);
104940 } while (pmd++, addr = next, addr != end);
104941
104942+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_PER_CPU_PGD)
104943 start &= PUD_MASK;
104944 if (start < floor)
104945 return;
104946@@ -429,6 +430,7 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
104947 pud_clear(pud);
104948 pmd_free_tlb(tlb, pmd, start);
104949 mm_dec_nr_pmds(tlb->mm);
104950+#endif
104951 }
104952
104953 static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
104954@@ -448,6 +450,7 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
104955 free_pmd_range(tlb, pud, addr, next, floor, ceiling);
104956 } while (pud++, addr = next, addr != end);
104957
104958+#if !defined(CONFIG_X86_64) || !defined(CONFIG_PAX_PER_CPU_PGD)
104959 start &= PGDIR_MASK;
104960 if (start < floor)
104961 return;
104962@@ -462,6 +465,8 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
104963 pud = pud_offset(pgd, start);
104964 pgd_clear(pgd);
104965 pud_free_tlb(tlb, pud, start);
104966+#endif
104967+
104968 }
104969
104970 /*
104971@@ -691,10 +696,10 @@ static void print_bad_pte(struct vm_area_struct *vma, unsigned long addr,
104972 * Choose text because data symbols depend on CONFIG_KALLSYMS_ALL=y
104973 */
104974 if (vma->vm_ops)
104975- printk(KERN_ALERT "vma->vm_ops->fault: %pSR\n",
104976+ printk(KERN_ALERT "vma->vm_ops->fault: %pAR\n",
104977 vma->vm_ops->fault);
104978 if (vma->vm_file)
104979- printk(KERN_ALERT "vma->vm_file->f_op->mmap: %pSR\n",
104980+ printk(KERN_ALERT "vma->vm_file->f_op->mmap: %pAR\n",
104981 vma->vm_file->f_op->mmap);
104982 dump_stack();
104983 add_taint(TAINT_BAD_PAGE, LOCKDEP_NOW_UNRELIABLE);
104984@@ -1464,6 +1469,10 @@ static int insert_page(struct vm_area_struct *vma, unsigned long addr,
104985 page_add_file_rmap(page);
104986 set_pte_at(mm, addr, pte, mk_pte(page, prot));
104987
104988+#ifdef CONFIG_PAX_SEGMEXEC
104989+ pax_mirror_file_pte(vma, addr, page, ptl);
104990+#endif
104991+
104992 retval = 0;
104993 pte_unmap_unlock(pte, ptl);
104994 return retval;
104995@@ -1508,9 +1517,21 @@ int vm_insert_page(struct vm_area_struct *vma, unsigned long addr,
104996 if (!page_count(page))
104997 return -EINVAL;
104998 if (!(vma->vm_flags & VM_MIXEDMAP)) {
104999+
105000+#ifdef CONFIG_PAX_SEGMEXEC
105001+ struct vm_area_struct *vma_m;
105002+#endif
105003+
105004 BUG_ON(down_read_trylock(&vma->vm_mm->mmap_sem));
105005 BUG_ON(vma->vm_flags & VM_PFNMAP);
105006 vma->vm_flags |= VM_MIXEDMAP;
105007+
105008+#ifdef CONFIG_PAX_SEGMEXEC
105009+ vma_m = pax_find_mirror_vma(vma);
105010+ if (vma_m)
105011+ vma_m->vm_flags |= VM_MIXEDMAP;
105012+#endif
105013+
105014 }
105015 return insert_page(vma, addr, page, vma->vm_page_prot);
105016 }
105017@@ -1593,6 +1614,7 @@ int vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr,
105018 unsigned long pfn)
105019 {
105020 BUG_ON(!(vma->vm_flags & VM_MIXEDMAP));
105021+ BUG_ON(vma->vm_mirror);
105022
105023 if (addr < vma->vm_start || addr >= vma->vm_end)
105024 return -EFAULT;
105025@@ -1840,7 +1862,9 @@ static int apply_to_pmd_range(struct mm_struct *mm, pud_t *pud,
105026
105027 BUG_ON(pud_huge(*pud));
105028
105029- pmd = pmd_alloc(mm, pud, addr);
105030+ pmd = (mm == &init_mm) ?
105031+ pmd_alloc_kernel(mm, pud, addr) :
105032+ pmd_alloc(mm, pud, addr);
105033 if (!pmd)
105034 return -ENOMEM;
105035 do {
105036@@ -1860,7 +1884,9 @@ static int apply_to_pud_range(struct mm_struct *mm, pgd_t *pgd,
105037 unsigned long next;
105038 int err;
105039
105040- pud = pud_alloc(mm, pgd, addr);
105041+ pud = (mm == &init_mm) ?
105042+ pud_alloc_kernel(mm, pgd, addr) :
105043+ pud_alloc(mm, pgd, addr);
105044 if (!pud)
105045 return -ENOMEM;
105046 do {
105047@@ -1982,6 +2008,185 @@ static int do_page_mkwrite(struct vm_area_struct *vma, struct page *page,
105048 return ret;
105049 }
105050
105051+#ifdef CONFIG_PAX_SEGMEXEC
105052+static void pax_unmap_mirror_pte(struct vm_area_struct *vma, unsigned long address, pmd_t *pmd)
105053+{
105054+ struct mm_struct *mm = vma->vm_mm;
105055+ spinlock_t *ptl;
105056+ pte_t *pte, entry;
105057+
105058+ pte = pte_offset_map_lock(mm, pmd, address, &ptl);
105059+ entry = *pte;
105060+ if (!pte_present(entry)) {
105061+ if (!pte_none(entry)) {
105062+ free_swap_and_cache(pte_to_swp_entry(entry));
105063+ pte_clear_not_present_full(mm, address, pte, 0);
105064+ }
105065+ } else {
105066+ struct page *page;
105067+
105068+ flush_cache_page(vma, address, pte_pfn(entry));
105069+ entry = ptep_clear_flush(vma, address, pte);
105070+ BUG_ON(pte_dirty(entry));
105071+ page = vm_normal_page(vma, address, entry);
105072+ if (page) {
105073+ update_hiwater_rss(mm);
105074+ if (PageAnon(page))
105075+ dec_mm_counter_fast(mm, MM_ANONPAGES);
105076+ else
105077+ dec_mm_counter_fast(mm, MM_FILEPAGES);
105078+ page_remove_rmap(page);
105079+ page_cache_release(page);
105080+ }
105081+ }
105082+ pte_unmap_unlock(pte, ptl);
105083+}
105084+
105085+/* PaX: if vma is mirrored, synchronize the mirror's PTE
105086+ *
105087+ * the ptl of the lower mapped page is held on entry and is not released on exit
105088+ * or inside to ensure atomic changes to the PTE states (swapout, mremap, munmap, etc)
105089+ */
105090+static void pax_mirror_anon_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
105091+{
105092+ struct mm_struct *mm = vma->vm_mm;
105093+ unsigned long address_m;
105094+ spinlock_t *ptl_m;
105095+ struct vm_area_struct *vma_m;
105096+ pmd_t *pmd_m;
105097+ pte_t *pte_m, entry_m;
105098+
105099+ BUG_ON(!page_m || !PageAnon(page_m));
105100+
105101+ vma_m = pax_find_mirror_vma(vma);
105102+ if (!vma_m)
105103+ return;
105104+
105105+ BUG_ON(!PageLocked(page_m));
105106+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
105107+ address_m = address + SEGMEXEC_TASK_SIZE;
105108+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
105109+ pte_m = pte_offset_map(pmd_m, address_m);
105110+ ptl_m = pte_lockptr(mm, pmd_m);
105111+ if (ptl != ptl_m) {
105112+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
105113+ if (!pte_none(*pte_m))
105114+ goto out;
105115+ }
105116+
105117+ entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
105118+ page_cache_get(page_m);
105119+ page_add_anon_rmap(page_m, vma_m, address_m);
105120+ inc_mm_counter_fast(mm, MM_ANONPAGES);
105121+ set_pte_at(mm, address_m, pte_m, entry_m);
105122+ update_mmu_cache(vma_m, address_m, pte_m);
105123+out:
105124+ if (ptl != ptl_m)
105125+ spin_unlock(ptl_m);
105126+ pte_unmap(pte_m);
105127+ unlock_page(page_m);
105128+}
105129+
105130+void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
105131+{
105132+ struct mm_struct *mm = vma->vm_mm;
105133+ unsigned long address_m;
105134+ spinlock_t *ptl_m;
105135+ struct vm_area_struct *vma_m;
105136+ pmd_t *pmd_m;
105137+ pte_t *pte_m, entry_m;
105138+
105139+ BUG_ON(!page_m || PageAnon(page_m));
105140+
105141+ vma_m = pax_find_mirror_vma(vma);
105142+ if (!vma_m)
105143+ return;
105144+
105145+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
105146+ address_m = address + SEGMEXEC_TASK_SIZE;
105147+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
105148+ pte_m = pte_offset_map(pmd_m, address_m);
105149+ ptl_m = pte_lockptr(mm, pmd_m);
105150+ if (ptl != ptl_m) {
105151+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
105152+ if (!pte_none(*pte_m))
105153+ goto out;
105154+ }
105155+
105156+ entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
105157+ page_cache_get(page_m);
105158+ page_add_file_rmap(page_m);
105159+ inc_mm_counter_fast(mm, MM_FILEPAGES);
105160+ set_pte_at(mm, address_m, pte_m, entry_m);
105161+ update_mmu_cache(vma_m, address_m, pte_m);
105162+out:
105163+ if (ptl != ptl_m)
105164+ spin_unlock(ptl_m);
105165+ pte_unmap(pte_m);
105166+}
105167+
105168+static void pax_mirror_pfn_pte(struct vm_area_struct *vma, unsigned long address, unsigned long pfn_m, spinlock_t *ptl)
105169+{
105170+ struct mm_struct *mm = vma->vm_mm;
105171+ unsigned long address_m;
105172+ spinlock_t *ptl_m;
105173+ struct vm_area_struct *vma_m;
105174+ pmd_t *pmd_m;
105175+ pte_t *pte_m, entry_m;
105176+
105177+ vma_m = pax_find_mirror_vma(vma);
105178+ if (!vma_m)
105179+ return;
105180+
105181+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
105182+ address_m = address + SEGMEXEC_TASK_SIZE;
105183+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
105184+ pte_m = pte_offset_map(pmd_m, address_m);
105185+ ptl_m = pte_lockptr(mm, pmd_m);
105186+ if (ptl != ptl_m) {
105187+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
105188+ if (!pte_none(*pte_m))
105189+ goto out;
105190+ }
105191+
105192+ entry_m = pfn_pte(pfn_m, vma_m->vm_page_prot);
105193+ set_pte_at(mm, address_m, pte_m, entry_m);
105194+out:
105195+ if (ptl != ptl_m)
105196+ spin_unlock(ptl_m);
105197+ pte_unmap(pte_m);
105198+}
105199+
105200+static void pax_mirror_pte(struct vm_area_struct *vma, unsigned long address, pte_t *pte, pmd_t *pmd, spinlock_t *ptl)
105201+{
105202+ struct page *page_m;
105203+ pte_t entry;
105204+
105205+ if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC))
105206+ goto out;
105207+
105208+ entry = *pte;
105209+ page_m = vm_normal_page(vma, address, entry);
105210+ if (!page_m)
105211+ pax_mirror_pfn_pte(vma, address, pte_pfn(entry), ptl);
105212+ else if (PageAnon(page_m)) {
105213+ if (pax_find_mirror_vma(vma)) {
105214+ pte_unmap_unlock(pte, ptl);
105215+ lock_page(page_m);
105216+ pte = pte_offset_map_lock(vma->vm_mm, pmd, address, &ptl);
105217+ if (pte_same(entry, *pte))
105218+ pax_mirror_anon_pte(vma, address, page_m, ptl);
105219+ else
105220+ unlock_page(page_m);
105221+ }
105222+ } else
105223+ pax_mirror_file_pte(vma, address, page_m, ptl);
105224+
105225+out:
105226+ pte_unmap_unlock(pte, ptl);
105227+}
105228+#endif
105229+
105230 /*
105231 * This routine handles present pages, when users try to write
105232 * to a shared page. It is done by copying the page to a new address
105233@@ -2172,6 +2377,12 @@ gotten:
105234 */
105235 page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
105236 if (likely(pte_same(*page_table, orig_pte))) {
105237+
105238+#ifdef CONFIG_PAX_SEGMEXEC
105239+ if (pax_find_mirror_vma(vma))
105240+ BUG_ON(!trylock_page(new_page));
105241+#endif
105242+
105243 if (old_page) {
105244 if (!PageAnon(old_page)) {
105245 dec_mm_counter_fast(mm, MM_FILEPAGES);
105246@@ -2225,6 +2436,10 @@ gotten:
105247 page_remove_rmap(old_page);
105248 }
105249
105250+#ifdef CONFIG_PAX_SEGMEXEC
105251+ pax_mirror_anon_pte(vma, address, new_page, ptl);
105252+#endif
105253+
105254 /* Free the old page.. */
105255 new_page = old_page;
105256 ret |= VM_FAULT_WRITE;
105257@@ -2483,6 +2698,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
105258 swap_free(entry);
105259 if (vm_swap_full() || (vma->vm_flags & VM_LOCKED) || PageMlocked(page))
105260 try_to_free_swap(page);
105261+
105262+#ifdef CONFIG_PAX_SEGMEXEC
105263+ if ((flags & FAULT_FLAG_WRITE) || !pax_find_mirror_vma(vma))
105264+#endif
105265+
105266 unlock_page(page);
105267 if (page != swapcache) {
105268 /*
105269@@ -2506,6 +2726,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
105270
105271 /* No need to invalidate - it was non-present before */
105272 update_mmu_cache(vma, address, page_table);
105273+
105274+#ifdef CONFIG_PAX_SEGMEXEC
105275+ pax_mirror_anon_pte(vma, address, page, ptl);
105276+#endif
105277+
105278 unlock:
105279 pte_unmap_unlock(page_table, ptl);
105280 out:
105281@@ -2525,40 +2750,6 @@ out_release:
105282 }
105283
105284 /*
105285- * This is like a special single-page "expand_{down|up}wards()",
105286- * except we must first make sure that 'address{-|+}PAGE_SIZE'
105287- * doesn't hit another vma.
105288- */
105289-static inline int check_stack_guard_page(struct vm_area_struct *vma, unsigned long address)
105290-{
105291- address &= PAGE_MASK;
105292- if ((vma->vm_flags & VM_GROWSDOWN) && address == vma->vm_start) {
105293- struct vm_area_struct *prev = vma->vm_prev;
105294-
105295- /*
105296- * Is there a mapping abutting this one below?
105297- *
105298- * That's only ok if it's the same stack mapping
105299- * that has gotten split..
105300- */
105301- if (prev && prev->vm_end == address)
105302- return prev->vm_flags & VM_GROWSDOWN ? 0 : -ENOMEM;
105303-
105304- return expand_downwards(vma, address - PAGE_SIZE);
105305- }
105306- if ((vma->vm_flags & VM_GROWSUP) && address + PAGE_SIZE == vma->vm_end) {
105307- struct vm_area_struct *next = vma->vm_next;
105308-
105309- /* As VM_GROWSDOWN but s/below/above/ */
105310- if (next && next->vm_start == address + PAGE_SIZE)
105311- return next->vm_flags & VM_GROWSUP ? 0 : -ENOMEM;
105312-
105313- return expand_upwards(vma, address + PAGE_SIZE);
105314- }
105315- return 0;
105316-}
105317-
105318-/*
105319 * We enter with non-exclusive mmap_sem (to exclude vma changes,
105320 * but allow concurrent faults), and pte mapped but not yet locked.
105321 * We return with mmap_sem still held, but pte unmapped and unlocked.
105322@@ -2568,27 +2759,23 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
105323 unsigned int flags)
105324 {
105325 struct mem_cgroup *memcg;
105326- struct page *page;
105327+ struct page *page = NULL;
105328 spinlock_t *ptl;
105329 pte_t entry;
105330
105331- pte_unmap(page_table);
105332-
105333- /* Check if we need to add a guard page to the stack */
105334- if (check_stack_guard_page(vma, address) < 0)
105335- return VM_FAULT_SIGSEGV;
105336-
105337- /* Use the zero-page for reads */
105338 if (!(flags & FAULT_FLAG_WRITE) && !mm_forbids_zeropage(mm)) {
105339 entry = pte_mkspecial(pfn_pte(my_zero_pfn(address),
105340 vma->vm_page_prot));
105341- page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
105342+ ptl = pte_lockptr(mm, pmd);
105343+ spin_lock(ptl);
105344 if (!pte_none(*page_table))
105345 goto unlock;
105346 goto setpte;
105347 }
105348
105349 /* Allocate our own private page. */
105350+ pte_unmap(page_table);
105351+
105352 if (unlikely(anon_vma_prepare(vma)))
105353 goto oom;
105354 page = alloc_zeroed_user_highpage_movable(vma, address);
105355@@ -2612,6 +2799,11 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
105356 if (!pte_none(*page_table))
105357 goto release;
105358
105359+#ifdef CONFIG_PAX_SEGMEXEC
105360+ if (pax_find_mirror_vma(vma))
105361+ BUG_ON(!trylock_page(page));
105362+#endif
105363+
105364 inc_mm_counter_fast(mm, MM_ANONPAGES);
105365 page_add_new_anon_rmap(page, vma, address);
105366 mem_cgroup_commit_charge(page, memcg, false);
105367@@ -2621,6 +2813,12 @@ setpte:
105368
105369 /* No need to invalidate - it was non-present before */
105370 update_mmu_cache(vma, address, page_table);
105371+
105372+#ifdef CONFIG_PAX_SEGMEXEC
105373+ if (page)
105374+ pax_mirror_anon_pte(vma, address, page, ptl);
105375+#endif
105376+
105377 unlock:
105378 pte_unmap_unlock(page_table, ptl);
105379 return 0;
105380@@ -2853,6 +3051,11 @@ static int do_read_fault(struct mm_struct *mm, struct vm_area_struct *vma,
105381 return ret;
105382 }
105383 do_set_pte(vma, address, fault_page, pte, false, false);
105384+
105385+#ifdef CONFIG_PAX_SEGMEXEC
105386+ pax_mirror_file_pte(vma, address, fault_page, ptl);
105387+#endif
105388+
105389 unlock_page(fault_page);
105390 unlock_out:
105391 pte_unmap_unlock(pte, ptl);
105392@@ -2904,7 +3107,18 @@ static int do_cow_fault(struct mm_struct *mm, struct vm_area_struct *vma,
105393 }
105394 goto uncharge_out;
105395 }
105396+
105397+#ifdef CONFIG_PAX_SEGMEXEC
105398+ if (pax_find_mirror_vma(vma))
105399+ BUG_ON(!trylock_page(new_page));
105400+#endif
105401+
105402 do_set_pte(vma, address, new_page, pte, true, true);
105403+
105404+#ifdef CONFIG_PAX_SEGMEXEC
105405+ pax_mirror_anon_pte(vma, address, new_page, ptl);
105406+#endif
105407+
105408 mem_cgroup_commit_charge(new_page, memcg, false);
105409 lru_cache_add_active_or_unevictable(new_page, vma);
105410 pte_unmap_unlock(pte, ptl);
105411@@ -2962,6 +3176,11 @@ static int do_shared_fault(struct mm_struct *mm, struct vm_area_struct *vma,
105412 return ret;
105413 }
105414 do_set_pte(vma, address, fault_page, pte, true, false);
105415+
105416+#ifdef CONFIG_PAX_SEGMEXEC
105417+ pax_mirror_file_pte(vma, address, fault_page, ptl);
105418+#endif
105419+
105420 pte_unmap_unlock(pte, ptl);
105421
105422 if (set_page_dirty(fault_page))
105423@@ -3185,6 +3404,12 @@ static int handle_pte_fault(struct mm_struct *mm,
105424 if (flags & FAULT_FLAG_WRITE)
105425 flush_tlb_fix_spurious_fault(vma, address);
105426 }
105427+
105428+#ifdef CONFIG_PAX_SEGMEXEC
105429+ pax_mirror_pte(vma, address, pte, pmd, ptl);
105430+ return 0;
105431+#endif
105432+
105433 unlock:
105434 pte_unmap_unlock(pte, ptl);
105435 return 0;
105436@@ -3204,9 +3429,41 @@ static int __handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
105437 pmd_t *pmd;
105438 pte_t *pte;
105439
105440+#ifdef CONFIG_PAX_SEGMEXEC
105441+ struct vm_area_struct *vma_m;
105442+#endif
105443+
105444 if (unlikely(is_vm_hugetlb_page(vma)))
105445 return hugetlb_fault(mm, vma, address, flags);
105446
105447+#ifdef CONFIG_PAX_SEGMEXEC
105448+ vma_m = pax_find_mirror_vma(vma);
105449+ if (vma_m) {
105450+ unsigned long address_m;
105451+ pgd_t *pgd_m;
105452+ pud_t *pud_m;
105453+ pmd_t *pmd_m;
105454+
105455+ if (vma->vm_start > vma_m->vm_start) {
105456+ address_m = address;
105457+ address -= SEGMEXEC_TASK_SIZE;
105458+ vma = vma_m;
105459+ } else
105460+ address_m = address + SEGMEXEC_TASK_SIZE;
105461+
105462+ pgd_m = pgd_offset(mm, address_m);
105463+ pud_m = pud_alloc(mm, pgd_m, address_m);
105464+ if (!pud_m)
105465+ return VM_FAULT_OOM;
105466+ pmd_m = pmd_alloc(mm, pud_m, address_m);
105467+ if (!pmd_m)
105468+ return VM_FAULT_OOM;
105469+ if (!pmd_present(*pmd_m) && __pte_alloc(mm, vma_m, pmd_m, address_m))
105470+ return VM_FAULT_OOM;
105471+ pax_unmap_mirror_pte(vma_m, address_m, pmd_m);
105472+ }
105473+#endif
105474+
105475 pgd = pgd_offset(mm, address);
105476 pud = pud_alloc(mm, pgd, address);
105477 if (!pud)
105478@@ -3341,6 +3598,23 @@ int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
105479 spin_unlock(&mm->page_table_lock);
105480 return 0;
105481 }
105482+
105483+int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
105484+{
105485+ pud_t *new = pud_alloc_one(mm, address);
105486+ if (!new)
105487+ return -ENOMEM;
105488+
105489+ smp_wmb(); /* See comment in __pte_alloc */
105490+
105491+ spin_lock(&mm->page_table_lock);
105492+ if (pgd_present(*pgd)) /* Another has populated it */
105493+ pud_free(mm, new);
105494+ else
105495+ pgd_populate_kernel(mm, pgd, new);
105496+ spin_unlock(&mm->page_table_lock);
105497+ return 0;
105498+}
105499 #endif /* __PAGETABLE_PUD_FOLDED */
105500
105501 #ifndef __PAGETABLE_PMD_FOLDED
105502@@ -3373,6 +3647,32 @@ int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
105503 spin_unlock(&mm->page_table_lock);
105504 return 0;
105505 }
105506+
105507+int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address)
105508+{
105509+ pmd_t *new = pmd_alloc_one(mm, address);
105510+ if (!new)
105511+ return -ENOMEM;
105512+
105513+ smp_wmb(); /* See comment in __pte_alloc */
105514+
105515+ spin_lock(&mm->page_table_lock);
105516+#ifndef __ARCH_HAS_4LEVEL_HACK
105517+ if (!pud_present(*pud)) {
105518+ mm_inc_nr_pmds(mm);
105519+ pud_populate_kernel(mm, pud, new);
105520+ } else /* Another has populated it */
105521+ pmd_free(mm, new);
105522+#else
105523+ if (!pgd_present(*pud)) {
105524+ mm_inc_nr_pmds(mm);
105525+ pgd_populate_kernel(mm, pud, new);
105526+ } else /* Another has populated it */
105527+ pmd_free(mm, new);
105528+#endif /* __ARCH_HAS_4LEVEL_HACK */
105529+ spin_unlock(&mm->page_table_lock);
105530+ return 0;
105531+}
105532 #endif /* __PAGETABLE_PMD_FOLDED */
105533
105534 static int __follow_pte(struct mm_struct *mm, unsigned long address,
105535@@ -3482,8 +3782,8 @@ out:
105536 return ret;
105537 }
105538
105539-int generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
105540- void *buf, int len, int write)
105541+ssize_t generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
105542+ void *buf, size_t len, int write)
105543 {
105544 resource_size_t phys_addr;
105545 unsigned long prot = 0;
105546@@ -3509,8 +3809,8 @@ EXPORT_SYMBOL_GPL(generic_access_phys);
105547 * Access another process' address space as given in mm. If non-NULL, use the
105548 * given task for page fault accounting.
105549 */
105550-static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
105551- unsigned long addr, void *buf, int len, int write)
105552+static ssize_t __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
105553+ unsigned long addr, void *buf, size_t len, int write)
105554 {
105555 struct vm_area_struct *vma;
105556 void *old_buf = buf;
105557@@ -3518,7 +3818,7 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
105558 down_read(&mm->mmap_sem);
105559 /* ignore errors, just check how much was successfully transferred */
105560 while (len) {
105561- int bytes, ret, offset;
105562+ ssize_t bytes, ret, offset;
105563 void *maddr;
105564 struct page *page = NULL;
105565
105566@@ -3579,8 +3879,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
105567 *
105568 * The caller must hold a reference on @mm.
105569 */
105570-int access_remote_vm(struct mm_struct *mm, unsigned long addr,
105571- void *buf, int len, int write)
105572+ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
105573+ void *buf, size_t len, int write)
105574 {
105575 return __access_remote_vm(NULL, mm, addr, buf, len, write);
105576 }
105577@@ -3590,11 +3890,11 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr,
105578 * Source/target buffer must be kernel space,
105579 * Do not walk the page table directly, use get_user_pages
105580 */
105581-int access_process_vm(struct task_struct *tsk, unsigned long addr,
105582- void *buf, int len, int write)
105583+ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr,
105584+ void *buf, size_t len, int write)
105585 {
105586 struct mm_struct *mm;
105587- int ret;
105588+ ssize_t ret;
105589
105590 mm = get_task_mm(tsk);
105591 if (!mm)
105592diff --git a/mm/mempolicy.c b/mm/mempolicy.c
105593index 0f7d73b..737047f 100644
105594--- a/mm/mempolicy.c
105595+++ b/mm/mempolicy.c
105596@@ -703,6 +703,10 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
105597 unsigned long vmstart;
105598 unsigned long vmend;
105599
105600+#ifdef CONFIG_PAX_SEGMEXEC
105601+ struct vm_area_struct *vma_m;
105602+#endif
105603+
105604 vma = find_vma(mm, start);
105605 if (!vma || vma->vm_start > start)
105606 return -EFAULT;
105607@@ -746,6 +750,16 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
105608 err = vma_replace_policy(vma, new_pol);
105609 if (err)
105610 goto out;
105611+
105612+#ifdef CONFIG_PAX_SEGMEXEC
105613+ vma_m = pax_find_mirror_vma(vma);
105614+ if (vma_m) {
105615+ err = vma_replace_policy(vma_m, new_pol);
105616+ if (err)
105617+ goto out;
105618+ }
105619+#endif
105620+
105621 }
105622
105623 out:
105624@@ -1160,6 +1174,17 @@ static long do_mbind(unsigned long start, unsigned long len,
105625
105626 if (end < start)
105627 return -EINVAL;
105628+
105629+#ifdef CONFIG_PAX_SEGMEXEC
105630+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
105631+ if (end > SEGMEXEC_TASK_SIZE)
105632+ return -EINVAL;
105633+ } else
105634+#endif
105635+
105636+ if (end > TASK_SIZE)
105637+ return -EINVAL;
105638+
105639 if (end == start)
105640 return 0;
105641
105642@@ -1385,8 +1410,7 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
105643 */
105644 tcred = __task_cred(task);
105645 if (!uid_eq(cred->euid, tcred->suid) && !uid_eq(cred->euid, tcred->uid) &&
105646- !uid_eq(cred->uid, tcred->suid) && !uid_eq(cred->uid, tcred->uid) &&
105647- !capable(CAP_SYS_NICE)) {
105648+ !uid_eq(cred->uid, tcred->suid) && !capable(CAP_SYS_NICE)) {
105649 rcu_read_unlock();
105650 err = -EPERM;
105651 goto out_put;
105652@@ -1417,6 +1441,15 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
105653 goto out;
105654 }
105655
105656+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
105657+ if (mm != current->mm &&
105658+ (mm->pax_flags & MF_PAX_RANDMMAP || mm->pax_flags & MF_PAX_SEGMEXEC)) {
105659+ mmput(mm);
105660+ err = -EPERM;
105661+ goto out;
105662+ }
105663+#endif
105664+
105665 err = do_migrate_pages(mm, old, new,
105666 capable(CAP_SYS_NICE) ? MPOL_MF_MOVE_ALL : MPOL_MF_MOVE);
105667
105668diff --git a/mm/migrate.c b/mm/migrate.c
105669index 85e0426..be49beb 100644
105670--- a/mm/migrate.c
105671+++ b/mm/migrate.c
105672@@ -1472,8 +1472,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages,
105673 */
105674 tcred = __task_cred(task);
105675 if (!uid_eq(cred->euid, tcred->suid) && !uid_eq(cred->euid, tcred->uid) &&
105676- !uid_eq(cred->uid, tcred->suid) && !uid_eq(cred->uid, tcred->uid) &&
105677- !capable(CAP_SYS_NICE)) {
105678+ !uid_eq(cred->uid, tcred->suid) && !capable(CAP_SYS_NICE)) {
105679 rcu_read_unlock();
105680 err = -EPERM;
105681 goto out;
105682diff --git a/mm/mlock.c b/mm/mlock.c
105683index 8a54cd2..92f1747 100644
105684--- a/mm/mlock.c
105685+++ b/mm/mlock.c
105686@@ -14,6 +14,7 @@
105687 #include <linux/pagevec.h>
105688 #include <linux/mempolicy.h>
105689 #include <linux/syscalls.h>
105690+#include <linux/security.h>
105691 #include <linux/sched.h>
105692 #include <linux/export.h>
105693 #include <linux/rmap.h>
105694@@ -613,7 +614,7 @@ static int do_mlock(unsigned long start, size_t len, int on)
105695 {
105696 unsigned long nstart, end, tmp;
105697 struct vm_area_struct * vma, * prev;
105698- int error;
105699+ int error = 0;
105700
105701 VM_BUG_ON(start & ~PAGE_MASK);
105702 VM_BUG_ON(len != PAGE_ALIGN(len));
105703@@ -622,6 +623,9 @@ static int do_mlock(unsigned long start, size_t len, int on)
105704 return -EINVAL;
105705 if (end == start)
105706 return 0;
105707+ if (end > TASK_SIZE)
105708+ return -EINVAL;
105709+
105710 vma = find_vma(current->mm, start);
105711 if (!vma || vma->vm_start > start)
105712 return -ENOMEM;
105713@@ -633,6 +637,11 @@ static int do_mlock(unsigned long start, size_t len, int on)
105714 for (nstart = start ; ; ) {
105715 vm_flags_t newflags;
105716
105717+#ifdef CONFIG_PAX_SEGMEXEC
105718+ if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
105719+ break;
105720+#endif
105721+
105722 /* Here we know that vma->vm_start <= nstart < vma->vm_end. */
105723
105724 newflags = vma->vm_flags & ~VM_LOCKED;
105725@@ -746,6 +755,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, start, size_t, len)
105726 locked += current->mm->locked_vm;
105727
105728 /* check against resource limits */
105729+ gr_learn_resource(current, RLIMIT_MEMLOCK, (current->mm->locked_vm << PAGE_SHIFT) + len, 1);
105730 if ((locked <= lock_limit) || capable(CAP_IPC_LOCK))
105731 error = do_mlock(start, len, 1);
105732
105733@@ -783,6 +793,11 @@ static int do_mlockall(int flags)
105734 for (vma = current->mm->mmap; vma ; vma = prev->vm_next) {
105735 vm_flags_t newflags;
105736
105737+#ifdef CONFIG_PAX_SEGMEXEC
105738+ if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
105739+ break;
105740+#endif
105741+
105742 newflags = vma->vm_flags & ~VM_LOCKED;
105743 if (flags & MCL_CURRENT)
105744 newflags |= VM_LOCKED;
105745@@ -814,8 +829,10 @@ SYSCALL_DEFINE1(mlockall, int, flags)
105746 lock_limit >>= PAGE_SHIFT;
105747
105748 ret = -ENOMEM;
105749+
105750+ gr_learn_resource(current, RLIMIT_MEMLOCK, current->mm->total_vm << PAGE_SHIFT, 1);
105751+
105752 down_write(&current->mm->mmap_sem);
105753-
105754 if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
105755 capable(CAP_IPC_LOCK))
105756 ret = do_mlockall(flags);
105757diff --git a/mm/mm_init.c b/mm/mm_init.c
105758index 5f420f7..dd42fb1b 100644
105759--- a/mm/mm_init.c
105760+++ b/mm/mm_init.c
105761@@ -177,7 +177,7 @@ static int __meminit mm_compute_batch_notifier(struct notifier_block *self,
105762 return NOTIFY_OK;
105763 }
105764
105765-static struct notifier_block compute_batch_nb __meminitdata = {
105766+static struct notifier_block compute_batch_nb __meminitconst = {
105767 .notifier_call = mm_compute_batch_notifier,
105768 .priority = IPC_CALLBACK_PRI, /* use lowest priority */
105769 };
105770diff --git a/mm/mmap.c b/mm/mmap.c
105771index 9ec50a3..0476e2d 100644
105772--- a/mm/mmap.c
105773+++ b/mm/mmap.c
105774@@ -41,6 +41,7 @@
105775 #include <linux/notifier.h>
105776 #include <linux/memory.h>
105777 #include <linux/printk.h>
105778+#include <linux/random.h>
105779
105780 #include <asm/uaccess.h>
105781 #include <asm/cacheflush.h>
105782@@ -57,6 +58,16 @@
105783 #define arch_rebalance_pgtables(addr, len) (addr)
105784 #endif
105785
105786+static inline void verify_mm_writelocked(struct mm_struct *mm)
105787+{
105788+#if defined(CONFIG_DEBUG_VM) || defined(CONFIG_PAX)
105789+ if (unlikely(down_read_trylock(&mm->mmap_sem))) {
105790+ up_read(&mm->mmap_sem);
105791+ BUG();
105792+ }
105793+#endif
105794+}
105795+
105796 static void unmap_region(struct mm_struct *mm,
105797 struct vm_area_struct *vma, struct vm_area_struct *prev,
105798 unsigned long start, unsigned long end);
105799@@ -76,16 +87,25 @@ static void unmap_region(struct mm_struct *mm,
105800 * x: (no) no x: (no) yes x: (no) yes x: (yes) yes
105801 *
105802 */
105803-pgprot_t protection_map[16] = {
105804+pgprot_t protection_map[16] __read_only = {
105805 __P000, __P001, __P010, __P011, __P100, __P101, __P110, __P111,
105806 __S000, __S001, __S010, __S011, __S100, __S101, __S110, __S111
105807 };
105808
105809-pgprot_t vm_get_page_prot(unsigned long vm_flags)
105810+pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
105811 {
105812- return __pgprot(pgprot_val(protection_map[vm_flags &
105813+ pgprot_t prot = __pgprot(pgprot_val(protection_map[vm_flags &
105814 (VM_READ|VM_WRITE|VM_EXEC|VM_SHARED)]) |
105815 pgprot_val(arch_vm_get_page_prot(vm_flags)));
105816+
105817+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
105818+ if (!(__supported_pte_mask & _PAGE_NX) &&
105819+ (vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC &&
105820+ (vm_flags & (VM_READ | VM_WRITE)))
105821+ prot = __pgprot(pte_val(pte_exprotect(__pte(pgprot_val(prot)))));
105822+#endif
105823+
105824+ return prot;
105825 }
105826 EXPORT_SYMBOL(vm_get_page_prot);
105827
105828@@ -114,6 +134,7 @@ unsigned long sysctl_overcommit_kbytes __read_mostly;
105829 int sysctl_max_map_count __read_mostly = DEFAULT_MAX_MAP_COUNT;
105830 unsigned long sysctl_user_reserve_kbytes __read_mostly = 1UL << 17; /* 128MB */
105831 unsigned long sysctl_admin_reserve_kbytes __read_mostly = 1UL << 13; /* 8MB */
105832+unsigned long sysctl_heap_stack_gap __read_mostly = 64*1024;
105833 /*
105834 * Make sure vm_committed_as in one cacheline and not cacheline shared with
105835 * other variables. It can be updated by several CPUs frequently.
105836@@ -271,6 +292,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
105837 struct vm_area_struct *next = vma->vm_next;
105838
105839 might_sleep();
105840+ BUG_ON(vma->vm_mirror);
105841 if (vma->vm_ops && vma->vm_ops->close)
105842 vma->vm_ops->close(vma);
105843 if (vma->vm_file)
105844@@ -284,6 +306,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len);
105845
105846 SYSCALL_DEFINE1(brk, unsigned long, brk)
105847 {
105848+ unsigned long rlim;
105849 unsigned long retval;
105850 unsigned long newbrk, oldbrk;
105851 struct mm_struct *mm = current->mm;
105852@@ -314,7 +337,13 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
105853 * segment grow beyond its set limit the in case where the limit is
105854 * not page aligned -Ram Gupta
105855 */
105856- if (check_data_rlimit(rlimit(RLIMIT_DATA), brk, mm->start_brk,
105857+ rlim = rlimit(RLIMIT_DATA);
105858+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
105859+ /* force a minimum 16MB brk heap on setuid/setgid binaries */
105860+ if (rlim < PAGE_SIZE && (get_dumpable(mm) != SUID_DUMP_USER) && gr_is_global_nonroot(current_uid()))
105861+ rlim = 4096 * PAGE_SIZE;
105862+#endif
105863+ if (check_data_rlimit(rlim, brk, mm->start_brk,
105864 mm->end_data, mm->start_data))
105865 goto out;
105866
105867@@ -967,6 +996,12 @@ static int
105868 can_vma_merge_before(struct vm_area_struct *vma, unsigned long vm_flags,
105869 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
105870 {
105871+
105872+#ifdef CONFIG_PAX_SEGMEXEC
105873+ if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_start == SEGMEXEC_TASK_SIZE)
105874+ return 0;
105875+#endif
105876+
105877 if (is_mergeable_vma(vma, file, vm_flags) &&
105878 is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
105879 if (vma->vm_pgoff == vm_pgoff)
105880@@ -986,6 +1021,12 @@ static int
105881 can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags,
105882 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
105883 {
105884+
105885+#ifdef CONFIG_PAX_SEGMEXEC
105886+ if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end == SEGMEXEC_TASK_SIZE)
105887+ return 0;
105888+#endif
105889+
105890 if (is_mergeable_vma(vma, file, vm_flags) &&
105891 is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
105892 pgoff_t vm_pglen;
105893@@ -1035,6 +1076,13 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
105894 struct vm_area_struct *area, *next;
105895 int err;
105896
105897+#ifdef CONFIG_PAX_SEGMEXEC
105898+ unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE, end_m = end + SEGMEXEC_TASK_SIZE;
105899+ struct vm_area_struct *area_m = NULL, *next_m = NULL, *prev_m = NULL;
105900+
105901+ BUG_ON((mm->pax_flags & MF_PAX_SEGMEXEC) && SEGMEXEC_TASK_SIZE < end);
105902+#endif
105903+
105904 /*
105905 * We later require that vma->vm_flags == vm_flags,
105906 * so this tests vma->vm_flags & VM_SPECIAL, too.
105907@@ -1050,6 +1098,15 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
105908 if (next && next->vm_end == end) /* cases 6, 7, 8 */
105909 next = next->vm_next;
105910
105911+#ifdef CONFIG_PAX_SEGMEXEC
105912+ if (prev)
105913+ prev_m = pax_find_mirror_vma(prev);
105914+ if (area)
105915+ area_m = pax_find_mirror_vma(area);
105916+ if (next)
105917+ next_m = pax_find_mirror_vma(next);
105918+#endif
105919+
105920 /*
105921 * Can it merge with the predecessor?
105922 */
105923@@ -1069,9 +1126,24 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
105924 /* cases 1, 6 */
105925 err = vma_adjust(prev, prev->vm_start,
105926 next->vm_end, prev->vm_pgoff, NULL);
105927- } else /* cases 2, 5, 7 */
105928+
105929+#ifdef CONFIG_PAX_SEGMEXEC
105930+ if (!err && prev_m)
105931+ err = vma_adjust(prev_m, prev_m->vm_start,
105932+ next_m->vm_end, prev_m->vm_pgoff, NULL);
105933+#endif
105934+
105935+ } else { /* cases 2, 5, 7 */
105936 err = vma_adjust(prev, prev->vm_start,
105937 end, prev->vm_pgoff, NULL);
105938+
105939+#ifdef CONFIG_PAX_SEGMEXEC
105940+ if (!err && prev_m)
105941+ err = vma_adjust(prev_m, prev_m->vm_start,
105942+ end_m, prev_m->vm_pgoff, NULL);
105943+#endif
105944+
105945+ }
105946 if (err)
105947 return NULL;
105948 khugepaged_enter_vma_merge(prev, vm_flags);
105949@@ -1085,12 +1157,27 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
105950 mpol_equal(policy, vma_policy(next)) &&
105951 can_vma_merge_before(next, vm_flags,
105952 anon_vma, file, pgoff+pglen)) {
105953- if (prev && addr < prev->vm_end) /* case 4 */
105954+ if (prev && addr < prev->vm_end) { /* case 4 */
105955 err = vma_adjust(prev, prev->vm_start,
105956 addr, prev->vm_pgoff, NULL);
105957- else /* cases 3, 8 */
105958+
105959+#ifdef CONFIG_PAX_SEGMEXEC
105960+ if (!err && prev_m)
105961+ err = vma_adjust(prev_m, prev_m->vm_start,
105962+ addr_m, prev_m->vm_pgoff, NULL);
105963+#endif
105964+
105965+ } else { /* cases 3, 8 */
105966 err = vma_adjust(area, addr, next->vm_end,
105967 next->vm_pgoff - pglen, NULL);
105968+
105969+#ifdef CONFIG_PAX_SEGMEXEC
105970+ if (!err && area_m)
105971+ err = vma_adjust(area_m, addr_m, next_m->vm_end,
105972+ next_m->vm_pgoff - pglen, NULL);
105973+#endif
105974+
105975+ }
105976 if (err)
105977 return NULL;
105978 khugepaged_enter_vma_merge(area, vm_flags);
105979@@ -1199,8 +1286,10 @@ none:
105980 void vm_stat_account(struct mm_struct *mm, unsigned long flags,
105981 struct file *file, long pages)
105982 {
105983- const unsigned long stack_flags
105984- = VM_STACK_FLAGS & (VM_GROWSUP|VM_GROWSDOWN);
105985+
105986+#ifdef CONFIG_PAX_RANDMMAP
105987+ if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
105988+#endif
105989
105990 mm->total_vm += pages;
105991
105992@@ -1208,7 +1297,7 @@ void vm_stat_account(struct mm_struct *mm, unsigned long flags,
105993 mm->shared_vm += pages;
105994 if ((flags & (VM_EXEC|VM_WRITE)) == VM_EXEC)
105995 mm->exec_vm += pages;
105996- } else if (flags & stack_flags)
105997+ } else if (flags & (VM_GROWSUP|VM_GROWSDOWN))
105998 mm->stack_vm += pages;
105999 }
106000 #endif /* CONFIG_PROC_FS */
106001@@ -1238,6 +1327,7 @@ static inline int mlock_future_check(struct mm_struct *mm,
106002 locked += mm->locked_vm;
106003 lock_limit = rlimit(RLIMIT_MEMLOCK);
106004 lock_limit >>= PAGE_SHIFT;
106005+ gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
106006 if (locked > lock_limit && !capable(CAP_IPC_LOCK))
106007 return -EAGAIN;
106008 }
106009@@ -1264,7 +1354,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
106010 * (the exception is when the underlying filesystem is noexec
106011 * mounted, in which case we dont add PROT_EXEC.)
106012 */
106013- if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
106014+ if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
106015 if (!(file && (file->f_path.mnt->mnt_flags & MNT_NOEXEC)))
106016 prot |= PROT_EXEC;
106017
106018@@ -1290,7 +1380,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
106019 /* Obtain the address to map to. we verify (or select) it and ensure
106020 * that it represents a valid section of the address space.
106021 */
106022- addr = get_unmapped_area(file, addr, len, pgoff, flags);
106023+ addr = get_unmapped_area(file, addr, len, pgoff, flags | ((prot & PROT_EXEC) ? MAP_EXECUTABLE : 0));
106024 if (addr & ~PAGE_MASK)
106025 return addr;
106026
106027@@ -1301,6 +1391,43 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
106028 vm_flags = calc_vm_prot_bits(prot) | calc_vm_flag_bits(flags) |
106029 mm->def_flags | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC;
106030
106031+#ifdef CONFIG_PAX_MPROTECT
106032+ if (mm->pax_flags & MF_PAX_MPROTECT) {
106033+
106034+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
106035+ if (file && !pgoff && (vm_flags & VM_EXEC) && mm->binfmt &&
106036+ mm->binfmt->handle_mmap)
106037+ mm->binfmt->handle_mmap(file);
106038+#endif
106039+
106040+#ifndef CONFIG_PAX_MPROTECT_COMPAT
106041+ if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC)) {
106042+ gr_log_rwxmmap(file);
106043+
106044+#ifdef CONFIG_PAX_EMUPLT
106045+ vm_flags &= ~VM_EXEC;
106046+#else
106047+ return -EPERM;
106048+#endif
106049+
106050+ }
106051+
106052+ if (!(vm_flags & VM_EXEC))
106053+ vm_flags &= ~VM_MAYEXEC;
106054+#else
106055+ if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
106056+ vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
106057+#endif
106058+ else
106059+ vm_flags &= ~VM_MAYWRITE;
106060+ }
106061+#endif
106062+
106063+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
106064+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && file)
106065+ vm_flags &= ~VM_PAGEEXEC;
106066+#endif
106067+
106068 if (flags & MAP_LOCKED)
106069 if (!can_do_mlock())
106070 return -EPERM;
106071@@ -1388,6 +1515,9 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
106072 vm_flags |= VM_NORESERVE;
106073 }
106074
106075+ if (!gr_acl_handle_mmap(file, prot))
106076+ return -EACCES;
106077+
106078 addr = mmap_region(file, addr, len, vm_flags, pgoff);
106079 if (!IS_ERR_VALUE(addr) &&
106080 ((vm_flags & VM_LOCKED) ||
106081@@ -1481,7 +1611,7 @@ int vma_wants_writenotify(struct vm_area_struct *vma)
106082 vm_flags_t vm_flags = vma->vm_flags;
106083
106084 /* If it was private or non-writable, the write bit is already clear */
106085- if ((vm_flags & (VM_WRITE|VM_SHARED)) != ((VM_WRITE|VM_SHARED)))
106086+ if ((vm_flags & (VM_WRITE|VM_SHARED)) != (VM_WRITE|VM_SHARED))
106087 return 0;
106088
106089 /* The backer wishes to know when pages are first written to? */
106090@@ -1532,7 +1662,22 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
106091 struct rb_node **rb_link, *rb_parent;
106092 unsigned long charged = 0;
106093
106094+#ifdef CONFIG_PAX_SEGMEXEC
106095+ struct vm_area_struct *vma_m = NULL;
106096+#endif
106097+
106098+ /*
106099+ * mm->mmap_sem is required to protect against another thread
106100+ * changing the mappings in case we sleep.
106101+ */
106102+ verify_mm_writelocked(mm);
106103+
106104 /* Check against address space limit. */
106105+
106106+#ifdef CONFIG_PAX_RANDMMAP
106107+ if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (vm_flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
106108+#endif
106109+
106110 if (!may_expand_vm(mm, len >> PAGE_SHIFT)) {
106111 unsigned long nr_pages;
106112
106113@@ -1551,11 +1696,10 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
106114
106115 /* Clear old maps */
106116 error = -ENOMEM;
106117-munmap_back:
106118 if (find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent)) {
106119 if (do_munmap(mm, addr, len))
106120 return -ENOMEM;
106121- goto munmap_back;
106122+ BUG_ON(find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent));
106123 }
106124
106125 /*
106126@@ -1586,6 +1730,16 @@ munmap_back:
106127 goto unacct_error;
106128 }
106129
106130+#ifdef CONFIG_PAX_SEGMEXEC
106131+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vm_flags & VM_EXEC)) {
106132+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
106133+ if (!vma_m) {
106134+ error = -ENOMEM;
106135+ goto free_vma;
106136+ }
106137+ }
106138+#endif
106139+
106140 vma->vm_mm = mm;
106141 vma->vm_start = addr;
106142 vma->vm_end = addr + len;
106143@@ -1616,6 +1770,13 @@ munmap_back:
106144 if (error)
106145 goto unmap_and_free_vma;
106146
106147+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
106148+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && !(vma->vm_flags & VM_SPECIAL)) {
106149+ vma->vm_flags |= VM_PAGEEXEC;
106150+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
106151+ }
106152+#endif
106153+
106154 /* Can addr have changed??
106155 *
106156 * Answer: Yes, several device drivers can do it in their
106157@@ -1634,6 +1795,12 @@ munmap_back:
106158 }
106159
106160 vma_link(mm, vma, prev, rb_link, rb_parent);
106161+
106162+#ifdef CONFIG_PAX_SEGMEXEC
106163+ if (vma_m)
106164+ BUG_ON(pax_mirror_vma(vma_m, vma));
106165+#endif
106166+
106167 /* Once vma denies write, undo our temporary denial count */
106168 if (file) {
106169 if (vm_flags & VM_SHARED)
106170@@ -1646,6 +1813,7 @@ out:
106171 perf_event_mmap(vma);
106172
106173 vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT);
106174+ track_exec_limit(mm, addr, addr + len, vm_flags);
106175 if (vm_flags & VM_LOCKED) {
106176 if (!((vm_flags & VM_SPECIAL) || is_vm_hugetlb_page(vma) ||
106177 vma == get_gate_vma(current->mm)))
106178@@ -1683,6 +1851,12 @@ allow_write_and_free_vma:
106179 if (vm_flags & VM_DENYWRITE)
106180 allow_write_access(file);
106181 free_vma:
106182+
106183+#ifdef CONFIG_PAX_SEGMEXEC
106184+ if (vma_m)
106185+ kmem_cache_free(vm_area_cachep, vma_m);
106186+#endif
106187+
106188 kmem_cache_free(vm_area_cachep, vma);
106189 unacct_error:
106190 if (charged)
106191@@ -1690,7 +1864,63 @@ unacct_error:
106192 return error;
106193 }
106194
106195-unsigned long unmapped_area(struct vm_unmapped_area_info *info)
106196+#ifdef CONFIG_GRKERNSEC_RAND_THREADSTACK
106197+unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags)
106198+{
106199+ if ((mm->pax_flags & MF_PAX_RANDMMAP) && !filp && (flags & MAP_STACK))
106200+ return ((prandom_u32() & 0xFF) + 1) << PAGE_SHIFT;
106201+
106202+ return 0;
106203+}
106204+#endif
106205+
106206+bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len, unsigned long offset)
106207+{
106208+ if (!vma) {
106209+#ifdef CONFIG_STACK_GROWSUP
106210+ if (addr > sysctl_heap_stack_gap)
106211+ vma = find_vma(current->mm, addr - sysctl_heap_stack_gap);
106212+ else
106213+ vma = find_vma(current->mm, 0);
106214+ if (vma && (vma->vm_flags & VM_GROWSUP))
106215+ return false;
106216+#endif
106217+ return true;
106218+ }
106219+
106220+ if (addr + len > vma->vm_start)
106221+ return false;
106222+
106223+ if (vma->vm_flags & VM_GROWSDOWN)
106224+ return sysctl_heap_stack_gap <= vma->vm_start - addr - len;
106225+#ifdef CONFIG_STACK_GROWSUP
106226+ else if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP))
106227+ return addr - vma->vm_prev->vm_end >= sysctl_heap_stack_gap;
106228+#endif
106229+ else if (offset)
106230+ return offset <= vma->vm_start - addr - len;
106231+
106232+ return true;
106233+}
106234+
106235+unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len, unsigned long offset)
106236+{
106237+ if (vma->vm_start < len)
106238+ return -ENOMEM;
106239+
106240+ if (!(vma->vm_flags & VM_GROWSDOWN)) {
106241+ if (offset <= vma->vm_start - len)
106242+ return vma->vm_start - len - offset;
106243+ else
106244+ return -ENOMEM;
106245+ }
106246+
106247+ if (sysctl_heap_stack_gap <= vma->vm_start - len)
106248+ return vma->vm_start - len - sysctl_heap_stack_gap;
106249+ return -ENOMEM;
106250+}
106251+
106252+unsigned long unmapped_area(const struct vm_unmapped_area_info *info)
106253 {
106254 /*
106255 * We implement the search by looking for an rbtree node that
106256@@ -1738,11 +1968,29 @@ unsigned long unmapped_area(struct vm_unmapped_area_info *info)
106257 }
106258 }
106259
106260- gap_start = vma->vm_prev ? vma->vm_prev->vm_end : 0;
106261+ gap_start = vma->vm_prev ? vma->vm_prev->vm_end: 0;
106262 check_current:
106263 /* Check if current node has a suitable gap */
106264 if (gap_start > high_limit)
106265 return -ENOMEM;
106266+
106267+ if (gap_end - gap_start > info->threadstack_offset)
106268+ gap_start += info->threadstack_offset;
106269+ else
106270+ gap_start = gap_end;
106271+
106272+ if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP)) {
106273+ if (gap_end - gap_start > sysctl_heap_stack_gap)
106274+ gap_start += sysctl_heap_stack_gap;
106275+ else
106276+ gap_start = gap_end;
106277+ }
106278+ if (vma->vm_flags & VM_GROWSDOWN) {
106279+ if (gap_end - gap_start > sysctl_heap_stack_gap)
106280+ gap_end -= sysctl_heap_stack_gap;
106281+ else
106282+ gap_end = gap_start;
106283+ }
106284 if (gap_end >= low_limit && gap_end - gap_start >= length)
106285 goto found;
106286
106287@@ -1792,7 +2040,7 @@ found:
106288 return gap_start;
106289 }
106290
106291-unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info)
106292+unsigned long unmapped_area_topdown(const struct vm_unmapped_area_info *info)
106293 {
106294 struct mm_struct *mm = current->mm;
106295 struct vm_area_struct *vma;
106296@@ -1846,6 +2094,24 @@ check_current:
106297 gap_end = vma->vm_start;
106298 if (gap_end < low_limit)
106299 return -ENOMEM;
106300+
106301+ if (gap_end - gap_start > info->threadstack_offset)
106302+ gap_end -= info->threadstack_offset;
106303+ else
106304+ gap_end = gap_start;
106305+
106306+ if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP)) {
106307+ if (gap_end - gap_start > sysctl_heap_stack_gap)
106308+ gap_start += sysctl_heap_stack_gap;
106309+ else
106310+ gap_start = gap_end;
106311+ }
106312+ if (vma->vm_flags & VM_GROWSDOWN) {
106313+ if (gap_end - gap_start > sysctl_heap_stack_gap)
106314+ gap_end -= sysctl_heap_stack_gap;
106315+ else
106316+ gap_end = gap_start;
106317+ }
106318 if (gap_start <= high_limit && gap_end - gap_start >= length)
106319 goto found;
106320
106321@@ -1909,6 +2175,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
106322 struct mm_struct *mm = current->mm;
106323 struct vm_area_struct *vma;
106324 struct vm_unmapped_area_info info;
106325+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
106326
106327 if (len > TASK_SIZE - mmap_min_addr)
106328 return -ENOMEM;
106329@@ -1916,11 +2183,15 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
106330 if (flags & MAP_FIXED)
106331 return addr;
106332
106333+#ifdef CONFIG_PAX_RANDMMAP
106334+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
106335+#endif
106336+
106337 if (addr) {
106338 addr = PAGE_ALIGN(addr);
106339 vma = find_vma(mm, addr);
106340 if (TASK_SIZE - len >= addr && addr >= mmap_min_addr &&
106341- (!vma || addr + len <= vma->vm_start))
106342+ check_heap_stack_gap(vma, addr, len, offset))
106343 return addr;
106344 }
106345
106346@@ -1929,6 +2200,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
106347 info.low_limit = mm->mmap_base;
106348 info.high_limit = TASK_SIZE;
106349 info.align_mask = 0;
106350+ info.threadstack_offset = offset;
106351 return vm_unmapped_area(&info);
106352 }
106353 #endif
106354@@ -1947,6 +2219,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
106355 struct mm_struct *mm = current->mm;
106356 unsigned long addr = addr0;
106357 struct vm_unmapped_area_info info;
106358+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
106359
106360 /* requested length too big for entire address space */
106361 if (len > TASK_SIZE - mmap_min_addr)
106362@@ -1955,12 +2228,16 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
106363 if (flags & MAP_FIXED)
106364 return addr;
106365
106366+#ifdef CONFIG_PAX_RANDMMAP
106367+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
106368+#endif
106369+
106370 /* requesting a specific address */
106371 if (addr) {
106372 addr = PAGE_ALIGN(addr);
106373 vma = find_vma(mm, addr);
106374 if (TASK_SIZE - len >= addr && addr >= mmap_min_addr &&
106375- (!vma || addr + len <= vma->vm_start))
106376+ check_heap_stack_gap(vma, addr, len, offset))
106377 return addr;
106378 }
106379
106380@@ -1969,6 +2246,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
106381 info.low_limit = max(PAGE_SIZE, mmap_min_addr);
106382 info.high_limit = mm->mmap_base;
106383 info.align_mask = 0;
106384+ info.threadstack_offset = offset;
106385 addr = vm_unmapped_area(&info);
106386
106387 /*
106388@@ -1981,6 +2259,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
106389 VM_BUG_ON(addr != -ENOMEM);
106390 info.flags = 0;
106391 info.low_limit = TASK_UNMAPPED_BASE;
106392+
106393+#ifdef CONFIG_PAX_RANDMMAP
106394+ if (mm->pax_flags & MF_PAX_RANDMMAP)
106395+ info.low_limit += mm->delta_mmap;
106396+#endif
106397+
106398 info.high_limit = TASK_SIZE;
106399 addr = vm_unmapped_area(&info);
106400 }
106401@@ -2081,6 +2365,28 @@ find_vma_prev(struct mm_struct *mm, unsigned long addr,
106402 return vma;
106403 }
106404
106405+#ifdef CONFIG_PAX_SEGMEXEC
106406+struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma)
106407+{
106408+ struct vm_area_struct *vma_m;
106409+
106410+ BUG_ON(!vma || vma->vm_start >= vma->vm_end);
106411+ if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC)) {
106412+ BUG_ON(vma->vm_mirror);
106413+ return NULL;
106414+ }
106415+ BUG_ON(vma->vm_start < SEGMEXEC_TASK_SIZE && SEGMEXEC_TASK_SIZE < vma->vm_end);
106416+ vma_m = vma->vm_mirror;
106417+ BUG_ON(!vma_m || vma_m->vm_mirror != vma);
106418+ BUG_ON(vma->vm_file != vma_m->vm_file);
106419+ BUG_ON(vma->vm_end - vma->vm_start != vma_m->vm_end - vma_m->vm_start);
106420+ BUG_ON(vma->vm_pgoff != vma_m->vm_pgoff);
106421+ BUG_ON(vma->anon_vma != vma_m->anon_vma && vma->anon_vma->root != vma_m->anon_vma->root);
106422+ BUG_ON((vma->vm_flags ^ vma_m->vm_flags) & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED));
106423+ return vma_m;
106424+}
106425+#endif
106426+
106427 /*
106428 * Verify that the stack growth is acceptable and
106429 * update accounting. This is shared with both the
106430@@ -2098,8 +2404,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
106431
106432 /* Stack limit test */
106433 actual_size = size;
106434- if (size && (vma->vm_flags & (VM_GROWSUP | VM_GROWSDOWN)))
106435- actual_size -= PAGE_SIZE;
106436+ gr_learn_resource(current, RLIMIT_STACK, actual_size, 1);
106437 if (actual_size > ACCESS_ONCE(rlim[RLIMIT_STACK].rlim_cur))
106438 return -ENOMEM;
106439
106440@@ -2110,6 +2415,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
106441 locked = mm->locked_vm + grow;
106442 limit = ACCESS_ONCE(rlim[RLIMIT_MEMLOCK].rlim_cur);
106443 limit >>= PAGE_SHIFT;
106444+ gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
106445 if (locked > limit && !capable(CAP_IPC_LOCK))
106446 return -ENOMEM;
106447 }
106448@@ -2139,37 +2445,48 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
106449 * PA-RISC uses this for its stack; IA64 for its Register Backing Store.
106450 * vma is the last one with address > vma->vm_end. Have to extend vma.
106451 */
106452+#ifndef CONFIG_IA64
106453+static
106454+#endif
106455 int expand_upwards(struct vm_area_struct *vma, unsigned long address)
106456 {
106457 int error;
106458+ bool locknext;
106459
106460 if (!(vma->vm_flags & VM_GROWSUP))
106461 return -EFAULT;
106462
106463+ /* Also guard against wrapping around to address 0. */
106464+ if (address < PAGE_ALIGN(address+1))
106465+ address = PAGE_ALIGN(address+1);
106466+ else
106467+ return -ENOMEM;
106468+
106469 /*
106470 * We must make sure the anon_vma is allocated
106471 * so that the anon_vma locking is not a noop.
106472 */
106473 if (unlikely(anon_vma_prepare(vma)))
106474 return -ENOMEM;
106475+ locknext = vma->vm_next && (vma->vm_next->vm_flags & VM_GROWSDOWN);
106476+ if (locknext && anon_vma_prepare(vma->vm_next))
106477+ return -ENOMEM;
106478 vma_lock_anon_vma(vma);
106479+ if (locknext)
106480+ vma_lock_anon_vma(vma->vm_next);
106481
106482 /*
106483 * vma->vm_start/vm_end cannot change under us because the caller
106484 * is required to hold the mmap_sem in read mode. We need the
106485- * anon_vma lock to serialize against concurrent expand_stacks.
106486- * Also guard against wrapping around to address 0.
106487+ * anon_vma locks to serialize against concurrent expand_stacks
106488+ * and expand_upwards.
106489 */
106490- if (address < PAGE_ALIGN(address+4))
106491- address = PAGE_ALIGN(address+4);
106492- else {
106493- vma_unlock_anon_vma(vma);
106494- return -ENOMEM;
106495- }
106496 error = 0;
106497
106498 /* Somebody else might have raced and expanded it already */
106499- if (address > vma->vm_end) {
106500+ 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)
106501+ error = -ENOMEM;
106502+ else if (address > vma->vm_end && (!locknext || vma->vm_next->vm_start >= address)) {
106503 unsigned long size, grow;
106504
106505 size = address - vma->vm_start;
106506@@ -2204,6 +2521,8 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address)
106507 }
106508 }
106509 }
106510+ if (locknext)
106511+ vma_unlock_anon_vma(vma->vm_next);
106512 vma_unlock_anon_vma(vma);
106513 khugepaged_enter_vma_merge(vma, vma->vm_flags);
106514 validate_mm(vma->vm_mm);
106515@@ -2218,6 +2537,8 @@ int expand_downwards(struct vm_area_struct *vma,
106516 unsigned long address)
106517 {
106518 int error;
106519+ bool lockprev = false;
106520+ struct vm_area_struct *prev;
106521
106522 /*
106523 * We must make sure the anon_vma is allocated
106524@@ -2231,6 +2552,15 @@ int expand_downwards(struct vm_area_struct *vma,
106525 if (error)
106526 return error;
106527
106528+ prev = vma->vm_prev;
106529+#if defined(CONFIG_STACK_GROWSUP) || defined(CONFIG_IA64)
106530+ lockprev = prev && (prev->vm_flags & VM_GROWSUP);
106531+#endif
106532+ if (lockprev && anon_vma_prepare(prev))
106533+ return -ENOMEM;
106534+ if (lockprev)
106535+ vma_lock_anon_vma(prev);
106536+
106537 vma_lock_anon_vma(vma);
106538
106539 /*
106540@@ -2240,9 +2570,17 @@ int expand_downwards(struct vm_area_struct *vma,
106541 */
106542
106543 /* Somebody else might have raced and expanded it already */
106544- if (address < vma->vm_start) {
106545+ if (prev && (prev->vm_flags & (VM_READ | VM_WRITE | VM_EXEC)) && address - prev->vm_end < sysctl_heap_stack_gap)
106546+ error = -ENOMEM;
106547+ else if (address < vma->vm_start && (!lockprev || prev->vm_end <= address)) {
106548 unsigned long size, grow;
106549
106550+#ifdef CONFIG_PAX_SEGMEXEC
106551+ struct vm_area_struct *vma_m;
106552+
106553+ vma_m = pax_find_mirror_vma(vma);
106554+#endif
106555+
106556 size = vma->vm_end - address;
106557 grow = (vma->vm_start - address) >> PAGE_SHIFT;
106558
106559@@ -2267,13 +2605,27 @@ int expand_downwards(struct vm_area_struct *vma,
106560 vma->vm_pgoff -= grow;
106561 anon_vma_interval_tree_post_update_vma(vma);
106562 vma_gap_update(vma);
106563+
106564+#ifdef CONFIG_PAX_SEGMEXEC
106565+ if (vma_m) {
106566+ anon_vma_interval_tree_pre_update_vma(vma_m);
106567+ vma_m->vm_start -= grow << PAGE_SHIFT;
106568+ vma_m->vm_pgoff -= grow;
106569+ anon_vma_interval_tree_post_update_vma(vma_m);
106570+ vma_gap_update(vma_m);
106571+ }
106572+#endif
106573+
106574 spin_unlock(&vma->vm_mm->page_table_lock);
106575
106576+ track_exec_limit(vma->vm_mm, vma->vm_start, vma->vm_end, vma->vm_flags);
106577 perf_event_mmap(vma);
106578 }
106579 }
106580 }
106581 vma_unlock_anon_vma(vma);
106582+ if (lockprev)
106583+ vma_unlock_anon_vma(prev);
106584 khugepaged_enter_vma_merge(vma, vma->vm_flags);
106585 validate_mm(vma->vm_mm);
106586 return error;
106587@@ -2373,6 +2725,13 @@ static void remove_vma_list(struct mm_struct *mm, struct vm_area_struct *vma)
106588 do {
106589 long nrpages = vma_pages(vma);
106590
106591+#ifdef CONFIG_PAX_SEGMEXEC
106592+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE)) {
106593+ vma = remove_vma(vma);
106594+ continue;
106595+ }
106596+#endif
106597+
106598 if (vma->vm_flags & VM_ACCOUNT)
106599 nr_accounted += nrpages;
106600 vm_stat_account(mm, vma->vm_flags, vma->vm_file, -nrpages);
106601@@ -2417,6 +2776,16 @@ detach_vmas_to_be_unmapped(struct mm_struct *mm, struct vm_area_struct *vma,
106602 insertion_point = (prev ? &prev->vm_next : &mm->mmap);
106603 vma->vm_prev = NULL;
106604 do {
106605+
106606+#ifdef CONFIG_PAX_SEGMEXEC
106607+ if (vma->vm_mirror) {
106608+ BUG_ON(!vma->vm_mirror->vm_mirror || vma->vm_mirror->vm_mirror != vma);
106609+ vma->vm_mirror->vm_mirror = NULL;
106610+ vma->vm_mirror->vm_flags &= ~VM_EXEC;
106611+ vma->vm_mirror = NULL;
106612+ }
106613+#endif
106614+
106615 vma_rb_erase(vma, &mm->mm_rb);
106616 mm->map_count--;
106617 tail_vma = vma;
106618@@ -2444,14 +2813,33 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
106619 struct vm_area_struct *new;
106620 int err = -ENOMEM;
106621
106622+#ifdef CONFIG_PAX_SEGMEXEC
106623+ struct vm_area_struct *vma_m, *new_m = NULL;
106624+ unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE;
106625+#endif
106626+
106627 if (is_vm_hugetlb_page(vma) && (addr &
106628 ~(huge_page_mask(hstate_vma(vma)))))
106629 return -EINVAL;
106630
106631+#ifdef CONFIG_PAX_SEGMEXEC
106632+ vma_m = pax_find_mirror_vma(vma);
106633+#endif
106634+
106635 new = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
106636 if (!new)
106637 goto out_err;
106638
106639+#ifdef CONFIG_PAX_SEGMEXEC
106640+ if (vma_m) {
106641+ new_m = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
106642+ if (!new_m) {
106643+ kmem_cache_free(vm_area_cachep, new);
106644+ goto out_err;
106645+ }
106646+ }
106647+#endif
106648+
106649 /* most fields are the same, copy all, and then fixup */
106650 *new = *vma;
106651
106652@@ -2464,6 +2852,22 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
106653 new->vm_pgoff += ((addr - vma->vm_start) >> PAGE_SHIFT);
106654 }
106655
106656+#ifdef CONFIG_PAX_SEGMEXEC
106657+ if (vma_m) {
106658+ *new_m = *vma_m;
106659+ INIT_LIST_HEAD(&new_m->anon_vma_chain);
106660+ new_m->vm_mirror = new;
106661+ new->vm_mirror = new_m;
106662+
106663+ if (new_below)
106664+ new_m->vm_end = addr_m;
106665+ else {
106666+ new_m->vm_start = addr_m;
106667+ new_m->vm_pgoff += ((addr_m - vma_m->vm_start) >> PAGE_SHIFT);
106668+ }
106669+ }
106670+#endif
106671+
106672 err = vma_dup_policy(vma, new);
106673 if (err)
106674 goto out_free_vma;
106675@@ -2484,6 +2888,38 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
106676 else
106677 err = vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
106678
106679+#ifdef CONFIG_PAX_SEGMEXEC
106680+ if (!err && vma_m) {
106681+ struct mempolicy *pol = vma_policy(new);
106682+
106683+ if (anon_vma_clone(new_m, vma_m))
106684+ goto out_free_mpol;
106685+
106686+ mpol_get(pol);
106687+ set_vma_policy(new_m, pol);
106688+
106689+ if (new_m->vm_file)
106690+ get_file(new_m->vm_file);
106691+
106692+ if (new_m->vm_ops && new_m->vm_ops->open)
106693+ new_m->vm_ops->open(new_m);
106694+
106695+ if (new_below)
106696+ err = vma_adjust(vma_m, addr_m, vma_m->vm_end, vma_m->vm_pgoff +
106697+ ((addr_m - new_m->vm_start) >> PAGE_SHIFT), new_m);
106698+ else
106699+ err = vma_adjust(vma_m, vma_m->vm_start, addr_m, vma_m->vm_pgoff, new_m);
106700+
106701+ if (err) {
106702+ if (new_m->vm_ops && new_m->vm_ops->close)
106703+ new_m->vm_ops->close(new_m);
106704+ if (new_m->vm_file)
106705+ fput(new_m->vm_file);
106706+ mpol_put(pol);
106707+ }
106708+ }
106709+#endif
106710+
106711 /* Success. */
106712 if (!err)
106713 return 0;
106714@@ -2493,10 +2929,18 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
106715 new->vm_ops->close(new);
106716 if (new->vm_file)
106717 fput(new->vm_file);
106718- unlink_anon_vmas(new);
106719 out_free_mpol:
106720 mpol_put(vma_policy(new));
106721 out_free_vma:
106722+
106723+#ifdef CONFIG_PAX_SEGMEXEC
106724+ if (new_m) {
106725+ unlink_anon_vmas(new_m);
106726+ kmem_cache_free(vm_area_cachep, new_m);
106727+ }
106728+#endif
106729+
106730+ unlink_anon_vmas(new);
106731 kmem_cache_free(vm_area_cachep, new);
106732 out_err:
106733 return err;
106734@@ -2509,6 +2953,15 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
106735 int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
106736 unsigned long addr, int new_below)
106737 {
106738+
106739+#ifdef CONFIG_PAX_SEGMEXEC
106740+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
106741+ BUG_ON(vma->vm_end > SEGMEXEC_TASK_SIZE);
106742+ if (mm->map_count >= sysctl_max_map_count-1)
106743+ return -ENOMEM;
106744+ } else
106745+#endif
106746+
106747 if (mm->map_count >= sysctl_max_map_count)
106748 return -ENOMEM;
106749
106750@@ -2520,11 +2973,30 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
106751 * work. This now handles partial unmappings.
106752 * Jeremy Fitzhardinge <jeremy@goop.org>
106753 */
106754+#ifdef CONFIG_PAX_SEGMEXEC
106755 int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
106756 {
106757+ int ret = __do_munmap(mm, start, len);
106758+ if (ret || !(mm->pax_flags & MF_PAX_SEGMEXEC))
106759+ return ret;
106760+
106761+ return __do_munmap(mm, start + SEGMEXEC_TASK_SIZE, len);
106762+}
106763+
106764+int __do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
106765+#else
106766+int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
106767+#endif
106768+{
106769 unsigned long end;
106770 struct vm_area_struct *vma, *prev, *last;
106771
106772+ /*
106773+ * mm->mmap_sem is required to protect against another thread
106774+ * changing the mappings in case we sleep.
106775+ */
106776+ verify_mm_writelocked(mm);
106777+
106778 if ((start & ~PAGE_MASK) || start > TASK_SIZE || len > TASK_SIZE-start)
106779 return -EINVAL;
106780
106781@@ -2602,6 +3074,8 @@ int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
106782 /* Fix up all other VM information */
106783 remove_vma_list(mm, vma);
106784
106785+ track_exec_limit(mm, start, end, 0UL);
106786+
106787 return 0;
106788 }
106789
106790@@ -2610,6 +3084,13 @@ int vm_munmap(unsigned long start, size_t len)
106791 int ret;
106792 struct mm_struct *mm = current->mm;
106793
106794+
106795+#ifdef CONFIG_PAX_SEGMEXEC
106796+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) &&
106797+ (len > SEGMEXEC_TASK_SIZE || start > SEGMEXEC_TASK_SIZE-len))
106798+ return -EINVAL;
106799+#endif
106800+
106801 down_write(&mm->mmap_sem);
106802 ret = do_munmap(mm, start, len);
106803 up_write(&mm->mmap_sem);
106804@@ -2656,6 +3137,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
106805 down_write(&mm->mmap_sem);
106806 vma = find_vma(mm, start);
106807
106808+#ifdef CONFIG_PAX_SEGMEXEC
106809+ if (vma && (mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_MAYEXEC))
106810+ goto out;
106811+#endif
106812+
106813 if (!vma || !(vma->vm_flags & VM_SHARED))
106814 goto out;
106815
106816@@ -2692,16 +3178,6 @@ out:
106817 return ret;
106818 }
106819
106820-static inline void verify_mm_writelocked(struct mm_struct *mm)
106821-{
106822-#ifdef CONFIG_DEBUG_VM
106823- if (unlikely(down_read_trylock(&mm->mmap_sem))) {
106824- WARN_ON(1);
106825- up_read(&mm->mmap_sem);
106826- }
106827-#endif
106828-}
106829-
106830 /*
106831 * this is really a simplified "do_mmap". it only handles
106832 * anonymous maps. eventually we may be able to do some
106833@@ -2715,6 +3191,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
106834 struct rb_node **rb_link, *rb_parent;
106835 pgoff_t pgoff = addr >> PAGE_SHIFT;
106836 int error;
106837+ unsigned long charged;
106838
106839 len = PAGE_ALIGN(len);
106840 if (!len)
106841@@ -2722,10 +3199,24 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
106842
106843 flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags;
106844
106845+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
106846+ if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
106847+ flags &= ~VM_EXEC;
106848+
106849+#ifdef CONFIG_PAX_MPROTECT
106850+ if (mm->pax_flags & MF_PAX_MPROTECT)
106851+ flags &= ~VM_MAYEXEC;
106852+#endif
106853+
106854+ }
106855+#endif
106856+
106857 error = get_unmapped_area(NULL, addr, len, 0, MAP_FIXED);
106858 if (error & ~PAGE_MASK)
106859 return error;
106860
106861+ charged = len >> PAGE_SHIFT;
106862+
106863 error = mlock_future_check(mm, mm->def_flags, len);
106864 if (error)
106865 return error;
106866@@ -2739,21 +3230,20 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
106867 /*
106868 * Clear old maps. this also does some error checking for us
106869 */
106870- munmap_back:
106871 if (find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent)) {
106872 if (do_munmap(mm, addr, len))
106873 return -ENOMEM;
106874- goto munmap_back;
106875+ BUG_ON(find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent));
106876 }
106877
106878 /* Check against address space limits *after* clearing old maps... */
106879- if (!may_expand_vm(mm, len >> PAGE_SHIFT))
106880+ if (!may_expand_vm(mm, charged))
106881 return -ENOMEM;
106882
106883 if (mm->map_count > sysctl_max_map_count)
106884 return -ENOMEM;
106885
106886- if (security_vm_enough_memory_mm(mm, len >> PAGE_SHIFT))
106887+ if (security_vm_enough_memory_mm(mm, charged))
106888 return -ENOMEM;
106889
106890 /* Can we just expand an old private anonymous mapping? */
106891@@ -2767,7 +3257,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
106892 */
106893 vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
106894 if (!vma) {
106895- vm_unacct_memory(len >> PAGE_SHIFT);
106896+ vm_unacct_memory(charged);
106897 return -ENOMEM;
106898 }
106899
106900@@ -2781,10 +3271,11 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
106901 vma_link(mm, vma, prev, rb_link, rb_parent);
106902 out:
106903 perf_event_mmap(vma);
106904- mm->total_vm += len >> PAGE_SHIFT;
106905+ mm->total_vm += charged;
106906 if (flags & VM_LOCKED)
106907- mm->locked_vm += (len >> PAGE_SHIFT);
106908+ mm->locked_vm += charged;
106909 vma->vm_flags |= VM_SOFTDIRTY;
106910+ track_exec_limit(mm, addr, addr + len, flags);
106911 return addr;
106912 }
106913
106914@@ -2846,6 +3337,7 @@ void exit_mmap(struct mm_struct *mm)
106915 while (vma) {
106916 if (vma->vm_flags & VM_ACCOUNT)
106917 nr_accounted += vma_pages(vma);
106918+ vma->vm_mirror = NULL;
106919 vma = remove_vma(vma);
106920 }
106921 vm_unacct_memory(nr_accounted);
106922@@ -2860,6 +3352,13 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma)
106923 struct vm_area_struct *prev;
106924 struct rb_node **rb_link, *rb_parent;
106925
106926+#ifdef CONFIG_PAX_SEGMEXEC
106927+ struct vm_area_struct *vma_m = NULL;
106928+#endif
106929+
106930+ if (security_mmap_addr(vma->vm_start))
106931+ return -EPERM;
106932+
106933 /*
106934 * The vm_pgoff of a purely anonymous vma should be irrelevant
106935 * until its first write fault, when page's anon_vma and index
106936@@ -2883,7 +3382,21 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma)
106937 security_vm_enough_memory_mm(mm, vma_pages(vma)))
106938 return -ENOMEM;
106939
106940+#ifdef CONFIG_PAX_SEGMEXEC
106941+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_EXEC)) {
106942+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
106943+ if (!vma_m)
106944+ return -ENOMEM;
106945+ }
106946+#endif
106947+
106948 vma_link(mm, vma, prev, rb_link, rb_parent);
106949+
106950+#ifdef CONFIG_PAX_SEGMEXEC
106951+ if (vma_m)
106952+ BUG_ON(pax_mirror_vma(vma_m, vma));
106953+#endif
106954+
106955 return 0;
106956 }
106957
106958@@ -2902,6 +3415,8 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
106959 struct rb_node **rb_link, *rb_parent;
106960 bool faulted_in_anon_vma = true;
106961
106962+ BUG_ON(vma->vm_mirror);
106963+
106964 /*
106965 * If anonymous vma has not yet been faulted, update new pgoff
106966 * to match new location, to increase its chance of merging.
106967@@ -2966,6 +3481,39 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
106968 return NULL;
106969 }
106970
106971+#ifdef CONFIG_PAX_SEGMEXEC
106972+long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma)
106973+{
106974+ struct vm_area_struct *prev_m;
106975+ struct rb_node **rb_link_m, *rb_parent_m;
106976+ struct mempolicy *pol_m;
106977+
106978+ BUG_ON(!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC));
106979+ BUG_ON(vma->vm_mirror || vma_m->vm_mirror);
106980+ BUG_ON(!mpol_equal(vma_policy(vma), vma_policy(vma_m)));
106981+ *vma_m = *vma;
106982+ INIT_LIST_HEAD(&vma_m->anon_vma_chain);
106983+ if (anon_vma_clone(vma_m, vma))
106984+ return -ENOMEM;
106985+ pol_m = vma_policy(vma_m);
106986+ mpol_get(pol_m);
106987+ set_vma_policy(vma_m, pol_m);
106988+ vma_m->vm_start += SEGMEXEC_TASK_SIZE;
106989+ vma_m->vm_end += SEGMEXEC_TASK_SIZE;
106990+ vma_m->vm_flags &= ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED);
106991+ vma_m->vm_page_prot = vm_get_page_prot(vma_m->vm_flags);
106992+ if (vma_m->vm_file)
106993+ get_file(vma_m->vm_file);
106994+ if (vma_m->vm_ops && vma_m->vm_ops->open)
106995+ vma_m->vm_ops->open(vma_m);
106996+ BUG_ON(find_vma_links(vma->vm_mm, vma_m->vm_start, vma_m->vm_end, &prev_m, &rb_link_m, &rb_parent_m));
106997+ vma_link(vma->vm_mm, vma_m, prev_m, rb_link_m, rb_parent_m);
106998+ vma_m->vm_mirror = vma;
106999+ vma->vm_mirror = vma_m;
107000+ return 0;
107001+}
107002+#endif
107003+
107004 /*
107005 * Return true if the calling process may expand its vm space by the passed
107006 * number of pages
107007@@ -2977,6 +3525,7 @@ int may_expand_vm(struct mm_struct *mm, unsigned long npages)
107008
107009 lim = rlimit(RLIMIT_AS) >> PAGE_SHIFT;
107010
107011+ gr_learn_resource(current, RLIMIT_AS, (cur + npages) << PAGE_SHIFT, 1);
107012 if (cur + npages > lim)
107013 return 0;
107014 return 1;
107015@@ -3059,6 +3608,22 @@ static struct vm_area_struct *__install_special_mapping(
107016 vma->vm_start = addr;
107017 vma->vm_end = addr + len;
107018
107019+#ifdef CONFIG_PAX_MPROTECT
107020+ if (mm->pax_flags & MF_PAX_MPROTECT) {
107021+#ifndef CONFIG_PAX_MPROTECT_COMPAT
107022+ if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC))
107023+ return ERR_PTR(-EPERM);
107024+ if (!(vm_flags & VM_EXEC))
107025+ vm_flags &= ~VM_MAYEXEC;
107026+#else
107027+ if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
107028+ vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
107029+#endif
107030+ else
107031+ vm_flags &= ~VM_MAYWRITE;
107032+ }
107033+#endif
107034+
107035 vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND | VM_SOFTDIRTY;
107036 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
107037
107038diff --git a/mm/mprotect.c b/mm/mprotect.c
107039index 8858483..8145fa5 100644
107040--- a/mm/mprotect.c
107041+++ b/mm/mprotect.c
107042@@ -24,10 +24,18 @@
107043 #include <linux/migrate.h>
107044 #include <linux/perf_event.h>
107045 #include <linux/ksm.h>
107046+#include <linux/sched/sysctl.h>
107047+
107048+#ifdef CONFIG_PAX_MPROTECT
107049+#include <linux/elf.h>
107050+#include <linux/binfmts.h>
107051+#endif
107052+
107053 #include <asm/uaccess.h>
107054 #include <asm/pgtable.h>
107055 #include <asm/cacheflush.h>
107056 #include <asm/tlbflush.h>
107057+#include <asm/mmu_context.h>
107058
107059 /*
107060 * For a prot_numa update we only hold mmap_sem for read so there is a
107061@@ -252,6 +260,48 @@ unsigned long change_protection(struct vm_area_struct *vma, unsigned long start,
107062 return pages;
107063 }
107064
107065+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
107066+/* called while holding the mmap semaphor for writing except stack expansion */
107067+void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot)
107068+{
107069+ unsigned long oldlimit, newlimit = 0UL;
107070+
107071+ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || (__supported_pte_mask & _PAGE_NX))
107072+ return;
107073+
107074+ spin_lock(&mm->page_table_lock);
107075+ oldlimit = mm->context.user_cs_limit;
107076+ if ((prot & VM_EXEC) && oldlimit < end)
107077+ /* USER_CS limit moved up */
107078+ newlimit = end;
107079+ else if (!(prot & VM_EXEC) && start < oldlimit && oldlimit <= end)
107080+ /* USER_CS limit moved down */
107081+ newlimit = start;
107082+
107083+ if (newlimit) {
107084+ mm->context.user_cs_limit = newlimit;
107085+
107086+#ifdef CONFIG_SMP
107087+ wmb();
107088+ cpus_clear(mm->context.cpu_user_cs_mask);
107089+ cpu_set(smp_processor_id(), mm->context.cpu_user_cs_mask);
107090+#endif
107091+
107092+ set_user_cs(mm->context.user_cs_base, mm->context.user_cs_limit, smp_processor_id());
107093+ }
107094+ spin_unlock(&mm->page_table_lock);
107095+ if (newlimit == end) {
107096+ struct vm_area_struct *vma = find_vma(mm, oldlimit);
107097+
107098+ for (; vma && vma->vm_start < end; vma = vma->vm_next)
107099+ if (is_vm_hugetlb_page(vma))
107100+ hugetlb_change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot);
107101+ else
107102+ change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot, vma_wants_writenotify(vma), 0);
107103+ }
107104+}
107105+#endif
107106+
107107 int
107108 mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
107109 unsigned long start, unsigned long end, unsigned long newflags)
107110@@ -264,11 +314,29 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
107111 int error;
107112 int dirty_accountable = 0;
107113
107114+#ifdef CONFIG_PAX_SEGMEXEC
107115+ struct vm_area_struct *vma_m = NULL;
107116+ unsigned long start_m, end_m;
107117+
107118+ start_m = start + SEGMEXEC_TASK_SIZE;
107119+ end_m = end + SEGMEXEC_TASK_SIZE;
107120+#endif
107121+
107122 if (newflags == oldflags) {
107123 *pprev = vma;
107124 return 0;
107125 }
107126
107127+ if (newflags & (VM_READ | VM_WRITE | VM_EXEC)) {
107128+ struct vm_area_struct *prev = vma->vm_prev, *next = vma->vm_next;
107129+
107130+ if (next && (next->vm_flags & VM_GROWSDOWN) && sysctl_heap_stack_gap > next->vm_start - end)
107131+ return -ENOMEM;
107132+
107133+ if (prev && (prev->vm_flags & VM_GROWSUP) && sysctl_heap_stack_gap > start - prev->vm_end)
107134+ return -ENOMEM;
107135+ }
107136+
107137 /*
107138 * If we make a private mapping writable we increase our commit;
107139 * but (without finer accounting) cannot reduce our commit if we
107140@@ -285,6 +353,42 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
107141 }
107142 }
107143
107144+#ifdef CONFIG_PAX_SEGMEXEC
107145+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && ((oldflags ^ newflags) & VM_EXEC)) {
107146+ if (start != vma->vm_start) {
107147+ error = split_vma(mm, vma, start, 1);
107148+ if (error)
107149+ goto fail;
107150+ BUG_ON(!*pprev || (*pprev)->vm_next == vma);
107151+ *pprev = (*pprev)->vm_next;
107152+ }
107153+
107154+ if (end != vma->vm_end) {
107155+ error = split_vma(mm, vma, end, 0);
107156+ if (error)
107157+ goto fail;
107158+ }
107159+
107160+ if (pax_find_mirror_vma(vma)) {
107161+ error = __do_munmap(mm, start_m, end_m - start_m);
107162+ if (error)
107163+ goto fail;
107164+ } else {
107165+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
107166+ if (!vma_m) {
107167+ error = -ENOMEM;
107168+ goto fail;
107169+ }
107170+ vma->vm_flags = newflags;
107171+ error = pax_mirror_vma(vma_m, vma);
107172+ if (error) {
107173+ vma->vm_flags = oldflags;
107174+ goto fail;
107175+ }
107176+ }
107177+ }
107178+#endif
107179+
107180 /*
107181 * First try to merge with previous and/or next vma.
107182 */
107183@@ -315,7 +419,19 @@ success:
107184 * vm_flags and vm_page_prot are protected by the mmap_sem
107185 * held in write mode.
107186 */
107187+
107188+#ifdef CONFIG_PAX_SEGMEXEC
107189+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (newflags & VM_EXEC) && ((vma->vm_flags ^ newflags) & VM_READ))
107190+ pax_find_mirror_vma(vma)->vm_flags ^= VM_READ;
107191+#endif
107192+
107193 vma->vm_flags = newflags;
107194+
107195+#ifdef CONFIG_PAX_MPROTECT
107196+ if (mm->binfmt && mm->binfmt->handle_mprotect)
107197+ mm->binfmt->handle_mprotect(vma, newflags);
107198+#endif
107199+
107200 dirty_accountable = vma_wants_writenotify(vma);
107201 vma_set_page_prot(vma);
107202
107203@@ -351,6 +467,17 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
107204 end = start + len;
107205 if (end <= start)
107206 return -ENOMEM;
107207+
107208+#ifdef CONFIG_PAX_SEGMEXEC
107209+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
107210+ if (end > SEGMEXEC_TASK_SIZE)
107211+ return -EINVAL;
107212+ } else
107213+#endif
107214+
107215+ if (end > TASK_SIZE)
107216+ return -EINVAL;
107217+
107218 if (!arch_validate_prot(prot))
107219 return -EINVAL;
107220
107221@@ -358,7 +485,7 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
107222 /*
107223 * Does the application expect PROT_READ to imply PROT_EXEC:
107224 */
107225- if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
107226+ if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
107227 prot |= PROT_EXEC;
107228
107229 vm_flags = calc_vm_prot_bits(prot);
107230@@ -390,6 +517,11 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
107231 if (start > vma->vm_start)
107232 prev = vma;
107233
107234+#ifdef CONFIG_PAX_MPROTECT
107235+ if (current->mm->binfmt && current->mm->binfmt->handle_mprotect)
107236+ current->mm->binfmt->handle_mprotect(vma, vm_flags);
107237+#endif
107238+
107239 for (nstart = start ; ; ) {
107240 unsigned long newflags;
107241
107242@@ -400,6 +532,14 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
107243
107244 /* newflags >> 4 shift VM_MAY% in place of VM_% */
107245 if ((newflags & ~(newflags >> 4)) & (VM_READ | VM_WRITE | VM_EXEC)) {
107246+ if (prot & (PROT_WRITE | PROT_EXEC))
107247+ gr_log_rwxmprotect(vma);
107248+
107249+ error = -EACCES;
107250+ goto out;
107251+ }
107252+
107253+ if (!gr_acl_handle_mprotect(vma->vm_file, prot)) {
107254 error = -EACCES;
107255 goto out;
107256 }
107257@@ -414,6 +554,9 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
107258 error = mprotect_fixup(vma, &prev, nstart, tmp, newflags);
107259 if (error)
107260 goto out;
107261+
107262+ track_exec_limit(current->mm, nstart, tmp, vm_flags);
107263+
107264 nstart = tmp;
107265
107266 if (nstart < prev->vm_end)
107267diff --git a/mm/mremap.c b/mm/mremap.c
107268index 2dc44b1..caa1819 100644
107269--- a/mm/mremap.c
107270+++ b/mm/mremap.c
107271@@ -142,6 +142,12 @@ static void move_ptes(struct vm_area_struct *vma, pmd_t *old_pmd,
107272 continue;
107273 pte = ptep_get_and_clear(mm, old_addr, old_pte);
107274 pte = move_pte(pte, new_vma->vm_page_prot, old_addr, new_addr);
107275+
107276+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
107277+ if (!(__supported_pte_mask & _PAGE_NX) && pte_present(pte) && (new_vma->vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC)
107278+ pte = pte_exprotect(pte);
107279+#endif
107280+
107281 pte = move_soft_dirty_pte(pte);
107282 set_pte_at(mm, new_addr, new_pte, pte);
107283 }
107284@@ -350,6 +356,11 @@ static struct vm_area_struct *vma_to_resize(unsigned long addr,
107285 if (is_vm_hugetlb_page(vma))
107286 goto Einval;
107287
107288+#ifdef CONFIG_PAX_SEGMEXEC
107289+ if (pax_find_mirror_vma(vma))
107290+ goto Einval;
107291+#endif
107292+
107293 /* We can't remap across vm area boundaries */
107294 if (old_len > vma->vm_end - addr)
107295 goto Efault;
107296@@ -405,20 +416,25 @@ static unsigned long mremap_to(unsigned long addr, unsigned long old_len,
107297 unsigned long ret = -EINVAL;
107298 unsigned long charged = 0;
107299 unsigned long map_flags;
107300+ unsigned long pax_task_size = TASK_SIZE;
107301
107302 if (new_addr & ~PAGE_MASK)
107303 goto out;
107304
107305- if (new_len > TASK_SIZE || new_addr > TASK_SIZE - new_len)
107306+#ifdef CONFIG_PAX_SEGMEXEC
107307+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
107308+ pax_task_size = SEGMEXEC_TASK_SIZE;
107309+#endif
107310+
107311+ pax_task_size -= PAGE_SIZE;
107312+
107313+ if (new_len > TASK_SIZE || new_addr > pax_task_size - new_len)
107314 goto out;
107315
107316 /* Check if the location we're moving into overlaps the
107317 * old location at all, and fail if it does.
107318 */
107319- if ((new_addr <= addr) && (new_addr+new_len) > addr)
107320- goto out;
107321-
107322- if ((addr <= new_addr) && (addr+old_len) > new_addr)
107323+ if (addr + old_len > new_addr && new_addr + new_len > addr)
107324 goto out;
107325
107326 ret = do_munmap(mm, new_addr, new_len);
107327@@ -487,6 +503,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
107328 unsigned long ret = -EINVAL;
107329 unsigned long charged = 0;
107330 bool locked = false;
107331+ unsigned long pax_task_size = TASK_SIZE;
107332
107333 if (flags & ~(MREMAP_FIXED | MREMAP_MAYMOVE))
107334 return ret;
107335@@ -508,6 +525,17 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
107336 if (!new_len)
107337 return ret;
107338
107339+#ifdef CONFIG_PAX_SEGMEXEC
107340+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
107341+ pax_task_size = SEGMEXEC_TASK_SIZE;
107342+#endif
107343+
107344+ pax_task_size -= PAGE_SIZE;
107345+
107346+ if (new_len > pax_task_size || addr > pax_task_size-new_len ||
107347+ old_len > pax_task_size || addr > pax_task_size-old_len)
107348+ return ret;
107349+
107350 down_write(&current->mm->mmap_sem);
107351
107352 if (flags & MREMAP_FIXED) {
107353@@ -558,6 +586,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
107354 new_addr = addr;
107355 }
107356 ret = addr;
107357+ track_exec_limit(vma->vm_mm, vma->vm_start, addr + new_len, vma->vm_flags);
107358 goto out;
107359 }
107360 }
107361@@ -581,7 +610,12 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
107362 goto out;
107363 }
107364
107365+ map_flags = vma->vm_flags;
107366 ret = move_vma(vma, addr, old_len, new_len, new_addr, &locked);
107367+ if (!(ret & ~PAGE_MASK)) {
107368+ track_exec_limit(current->mm, addr, addr + old_len, 0UL);
107369+ track_exec_limit(current->mm, new_addr, new_addr + new_len, map_flags);
107370+ }
107371 }
107372 out:
107373 if (ret & ~PAGE_MASK)
107374diff --git a/mm/nommu.c b/mm/nommu.c
107375index 3fba2dc9..fdad748 100644
107376--- a/mm/nommu.c
107377+++ b/mm/nommu.c
107378@@ -72,7 +72,6 @@ int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT;
107379 int sysctl_nr_trim_pages = CONFIG_NOMMU_INITIAL_TRIM_EXCESS;
107380 unsigned long sysctl_user_reserve_kbytes __read_mostly = 1UL << 17; /* 128MB */
107381 unsigned long sysctl_admin_reserve_kbytes __read_mostly = 1UL << 13; /* 8MB */
107382-int heap_stack_gap = 0;
107383
107384 atomic_long_t mmap_pages_allocated;
107385
107386@@ -892,15 +891,6 @@ struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)
107387 EXPORT_SYMBOL(find_vma);
107388
107389 /*
107390- * find a VMA
107391- * - we don't extend stack VMAs under NOMMU conditions
107392- */
107393-struct vm_area_struct *find_extend_vma(struct mm_struct *mm, unsigned long addr)
107394-{
107395- return find_vma(mm, addr);
107396-}
107397-
107398-/*
107399 * expand a stack to a given address
107400 * - not supported under NOMMU conditions
107401 */
107402@@ -1585,6 +1575,7 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
107403
107404 /* most fields are the same, copy all, and then fixup */
107405 *new = *vma;
107406+ INIT_LIST_HEAD(&new->anon_vma_chain);
107407 *region = *vma->vm_region;
107408 new->vm_region = region;
107409
107410@@ -2007,8 +1998,8 @@ void filemap_map_pages(struct vm_area_struct *vma, struct vm_fault *vmf)
107411 }
107412 EXPORT_SYMBOL(filemap_map_pages);
107413
107414-static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
107415- unsigned long addr, void *buf, int len, int write)
107416+static ssize_t __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
107417+ unsigned long addr, void *buf, size_t len, int write)
107418 {
107419 struct vm_area_struct *vma;
107420
107421@@ -2049,8 +2040,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
107422 *
107423 * The caller must hold a reference on @mm.
107424 */
107425-int access_remote_vm(struct mm_struct *mm, unsigned long addr,
107426- void *buf, int len, int write)
107427+ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
107428+ void *buf, size_t len, int write)
107429 {
107430 return __access_remote_vm(NULL, mm, addr, buf, len, write);
107431 }
107432@@ -2059,7 +2050,7 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr,
107433 * Access another process' address space.
107434 * - source/target buffer must be kernel space
107435 */
107436-int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write)
107437+ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, size_t len, int write)
107438 {
107439 struct mm_struct *mm;
107440
107441diff --git a/mm/page-writeback.c b/mm/page-writeback.c
107442index ad05f2f..cee723a 100644
107443--- a/mm/page-writeback.c
107444+++ b/mm/page-writeback.c
107445@@ -664,7 +664,7 @@ static long long pos_ratio_polynom(unsigned long setpoint,
107446 * card's bdi_dirty may rush to many times higher than bdi_setpoint.
107447 * - the bdi dirty thresh drops quickly due to change of JBOD workload
107448 */
107449-static unsigned long bdi_position_ratio(struct backing_dev_info *bdi,
107450+static unsigned long __intentional_overflow(-1) bdi_position_ratio(struct backing_dev_info *bdi,
107451 unsigned long thresh,
107452 unsigned long bg_thresh,
107453 unsigned long dirty,
107454diff --git a/mm/page_alloc.c b/mm/page_alloc.c
107455index 40e2942..0eb29a2 100644
107456--- a/mm/page_alloc.c
107457+++ b/mm/page_alloc.c
107458@@ -61,6 +61,7 @@
107459 #include <linux/hugetlb.h>
107460 #include <linux/sched/rt.h>
107461 #include <linux/page_owner.h>
107462+#include <linux/random.h>
107463
107464 #include <asm/sections.h>
107465 #include <asm/tlbflush.h>
107466@@ -357,7 +358,7 @@ out:
107467 * This usage means that zero-order pages may not be compound.
107468 */
107469
107470-static void free_compound_page(struct page *page)
107471+void free_compound_page(struct page *page)
107472 {
107473 __free_pages_ok(page, compound_order(page));
107474 }
107475@@ -480,7 +481,7 @@ static inline void clear_page_guard(struct zone *zone, struct page *page,
107476 __mod_zone_freepage_state(zone, (1 << order), migratetype);
107477 }
107478 #else
107479-struct page_ext_operations debug_guardpage_ops = { NULL, };
107480+struct page_ext_operations debug_guardpage_ops = { .need = NULL, .init = NULL };
107481 static inline void set_page_guard(struct zone *zone, struct page *page,
107482 unsigned int order, int migratetype) {}
107483 static inline void clear_page_guard(struct zone *zone, struct page *page,
107484@@ -783,6 +784,10 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
107485 bool compound = PageCompound(page);
107486 int i, bad = 0;
107487
107488+#ifdef CONFIG_PAX_MEMORY_SANITIZE
107489+ unsigned long index = 1UL << order;
107490+#endif
107491+
107492 VM_BUG_ON_PAGE(PageTail(page), page);
107493 VM_BUG_ON_PAGE(compound && compound_order(page) != order, page);
107494
107495@@ -809,6 +814,12 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
107496 debug_check_no_obj_freed(page_address(page),
107497 PAGE_SIZE << order);
107498 }
107499+
107500+#ifdef CONFIG_PAX_MEMORY_SANITIZE
107501+ for (; index; --index)
107502+ sanitize_highpage(page + index - 1);
107503+#endif
107504+
107505 arch_free_page(page, order);
107506 kernel_map_pages(page, 1 << order, 0);
107507
107508@@ -832,6 +843,20 @@ static void __free_pages_ok(struct page *page, unsigned int order)
107509 local_irq_restore(flags);
107510 }
107511
107512+#ifdef CONFIG_PAX_LATENT_ENTROPY
107513+bool __meminitdata extra_latent_entropy;
107514+
107515+static int __init setup_pax_extra_latent_entropy(char *str)
107516+{
107517+ extra_latent_entropy = true;
107518+ return 0;
107519+}
107520+early_param("pax_extra_latent_entropy", setup_pax_extra_latent_entropy);
107521+
107522+volatile u64 latent_entropy __latent_entropy;
107523+EXPORT_SYMBOL(latent_entropy);
107524+#endif
107525+
107526 void __init __free_pages_bootmem(struct page *page, unsigned int order)
107527 {
107528 unsigned int nr_pages = 1 << order;
107529@@ -847,6 +872,19 @@ void __init __free_pages_bootmem(struct page *page, unsigned int order)
107530 __ClearPageReserved(p);
107531 set_page_count(p, 0);
107532
107533+#ifdef CONFIG_PAX_LATENT_ENTROPY
107534+ if (extra_latent_entropy && !PageHighMem(page) && page_to_pfn(page) < 0x100000) {
107535+ u64 hash = 0;
107536+ size_t index, end = PAGE_SIZE * nr_pages / sizeof hash;
107537+ const u64 *data = lowmem_page_address(page);
107538+
107539+ for (index = 0; index < end; index++)
107540+ hash ^= hash + data[index];
107541+ latent_entropy ^= hash;
107542+ add_device_randomness((const void *)&latent_entropy, sizeof(latent_entropy));
107543+ }
107544+#endif
107545+
107546 page_zone(page)->managed_pages += nr_pages;
107547 set_page_refcounted(page);
107548 __free_pages(page, order);
107549@@ -974,8 +1012,10 @@ static int prep_new_page(struct page *page, unsigned int order, gfp_t gfp_flags,
107550 kernel_map_pages(page, 1 << order, 1);
107551 kasan_alloc_pages(page, order);
107552
107553+#ifndef CONFIG_PAX_MEMORY_SANITIZE
107554 if (gfp_flags & __GFP_ZERO)
107555 prep_zero_page(page, order, gfp_flags);
107556+#endif
107557
107558 if (order && (gfp_flags & __GFP_COMP))
107559 prep_compound_page(page, order);
107560@@ -1699,7 +1739,7 @@ struct page *buffered_rmqueue(struct zone *preferred_zone,
107561 }
107562
107563 __mod_zone_page_state(zone, NR_ALLOC_BATCH, -(1 << order));
107564- if (atomic_long_read(&zone->vm_stat[NR_ALLOC_BATCH]) <= 0 &&
107565+ if (atomic_long_read_unchecked(&zone->vm_stat[NR_ALLOC_BATCH]) <= 0 &&
107566 !test_bit(ZONE_FAIR_DEPLETED, &zone->flags))
107567 set_bit(ZONE_FAIR_DEPLETED, &zone->flags);
107568
107569@@ -2018,7 +2058,7 @@ static void reset_alloc_batches(struct zone *preferred_zone)
107570 do {
107571 mod_zone_page_state(zone, NR_ALLOC_BATCH,
107572 high_wmark_pages(zone) - low_wmark_pages(zone) -
107573- atomic_long_read(&zone->vm_stat[NR_ALLOC_BATCH]));
107574+ atomic_long_read_unchecked(&zone->vm_stat[NR_ALLOC_BATCH]));
107575 clear_bit(ZONE_FAIR_DEPLETED, &zone->flags);
107576 } while (zone++ != preferred_zone);
107577 }
107578@@ -5738,7 +5778,7 @@ static void __setup_per_zone_wmarks(void)
107579
107580 __mod_zone_page_state(zone, NR_ALLOC_BATCH,
107581 high_wmark_pages(zone) - low_wmark_pages(zone) -
107582- atomic_long_read(&zone->vm_stat[NR_ALLOC_BATCH]));
107583+ atomic_long_read_unchecked(&zone->vm_stat[NR_ALLOC_BATCH]));
107584
107585 setup_zone_migrate_reserve(zone);
107586 spin_unlock_irqrestore(&zone->lock, flags);
107587diff --git a/mm/percpu.c b/mm/percpu.c
107588index 73c97a5..508ee25 100644
107589--- a/mm/percpu.c
107590+++ b/mm/percpu.c
107591@@ -131,7 +131,7 @@ static unsigned int pcpu_low_unit_cpu __read_mostly;
107592 static unsigned int pcpu_high_unit_cpu __read_mostly;
107593
107594 /* the address of the first chunk which starts with the kernel static area */
107595-void *pcpu_base_addr __read_mostly;
107596+void *pcpu_base_addr __read_only;
107597 EXPORT_SYMBOL_GPL(pcpu_base_addr);
107598
107599 static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */
107600diff --git a/mm/process_vm_access.c b/mm/process_vm_access.c
107601index b159769..d07037f 100644
107602--- a/mm/process_vm_access.c
107603+++ b/mm/process_vm_access.c
107604@@ -13,6 +13,7 @@
107605 #include <linux/uio.h>
107606 #include <linux/sched.h>
107607 #include <linux/highmem.h>
107608+#include <linux/security.h>
107609 #include <linux/ptrace.h>
107610 #include <linux/slab.h>
107611 #include <linux/syscalls.h>
107612@@ -154,19 +155,19 @@ static ssize_t process_vm_rw_core(pid_t pid, struct iov_iter *iter,
107613 ssize_t iov_len;
107614 size_t total_len = iov_iter_count(iter);
107615
107616+ return -ENOSYS; // PaX: until properly audited
107617+
107618 /*
107619 * Work out how many pages of struct pages we're going to need
107620 * when eventually calling get_user_pages
107621 */
107622 for (i = 0; i < riovcnt; i++) {
107623 iov_len = rvec[i].iov_len;
107624- if (iov_len > 0) {
107625- nr_pages_iov = ((unsigned long)rvec[i].iov_base
107626- + iov_len)
107627- / PAGE_SIZE - (unsigned long)rvec[i].iov_base
107628- / PAGE_SIZE + 1;
107629- nr_pages = max(nr_pages, nr_pages_iov);
107630- }
107631+ if (iov_len <= 0)
107632+ continue;
107633+ nr_pages_iov = ((unsigned long)rvec[i].iov_base + iov_len) / PAGE_SIZE -
107634+ (unsigned long)rvec[i].iov_base / PAGE_SIZE + 1;
107635+ nr_pages = max(nr_pages, nr_pages_iov);
107636 }
107637
107638 if (nr_pages == 0)
107639@@ -194,6 +195,11 @@ static ssize_t process_vm_rw_core(pid_t pid, struct iov_iter *iter,
107640 goto free_proc_pages;
107641 }
107642
107643+ if (gr_handle_ptrace(task, vm_write ? PTRACE_POKETEXT : PTRACE_ATTACH)) {
107644+ rc = -EPERM;
107645+ goto put_task_struct;
107646+ }
107647+
107648 mm = mm_access(task, PTRACE_MODE_ATTACH);
107649 if (!mm || IS_ERR(mm)) {
107650 rc = IS_ERR(mm) ? PTR_ERR(mm) : -ESRCH;
107651diff --git a/mm/rmap.c b/mm/rmap.c
107652index c161a14..8a069bb 100644
107653--- a/mm/rmap.c
107654+++ b/mm/rmap.c
107655@@ -166,6 +166,10 @@ int anon_vma_prepare(struct vm_area_struct *vma)
107656 struct anon_vma *anon_vma = vma->anon_vma;
107657 struct anon_vma_chain *avc;
107658
107659+#ifdef CONFIG_PAX_SEGMEXEC
107660+ struct anon_vma_chain *avc_m = NULL;
107661+#endif
107662+
107663 might_sleep();
107664 if (unlikely(!anon_vma)) {
107665 struct mm_struct *mm = vma->vm_mm;
107666@@ -175,6 +179,12 @@ int anon_vma_prepare(struct vm_area_struct *vma)
107667 if (!avc)
107668 goto out_enomem;
107669
107670+#ifdef CONFIG_PAX_SEGMEXEC
107671+ avc_m = anon_vma_chain_alloc(GFP_KERNEL);
107672+ if (!avc_m)
107673+ goto out_enomem_free_avc;
107674+#endif
107675+
107676 anon_vma = find_mergeable_anon_vma(vma);
107677 allocated = NULL;
107678 if (!anon_vma) {
107679@@ -188,6 +198,19 @@ int anon_vma_prepare(struct vm_area_struct *vma)
107680 /* page_table_lock to protect against threads */
107681 spin_lock(&mm->page_table_lock);
107682 if (likely(!vma->anon_vma)) {
107683+
107684+#ifdef CONFIG_PAX_SEGMEXEC
107685+ struct vm_area_struct *vma_m = pax_find_mirror_vma(vma);
107686+
107687+ if (vma_m) {
107688+ BUG_ON(vma_m->anon_vma);
107689+ vma_m->anon_vma = anon_vma;
107690+ anon_vma_chain_link(vma_m, avc_m, anon_vma);
107691+ anon_vma->degree++;
107692+ avc_m = NULL;
107693+ }
107694+#endif
107695+
107696 vma->anon_vma = anon_vma;
107697 anon_vma_chain_link(vma, avc, anon_vma);
107698 /* vma reference or self-parent link for new root */
107699@@ -200,12 +223,24 @@ int anon_vma_prepare(struct vm_area_struct *vma)
107700
107701 if (unlikely(allocated))
107702 put_anon_vma(allocated);
107703+
107704+#ifdef CONFIG_PAX_SEGMEXEC
107705+ if (unlikely(avc_m))
107706+ anon_vma_chain_free(avc_m);
107707+#endif
107708+
107709 if (unlikely(avc))
107710 anon_vma_chain_free(avc);
107711 }
107712 return 0;
107713
107714 out_enomem_free_avc:
107715+
107716+#ifdef CONFIG_PAX_SEGMEXEC
107717+ if (avc_m)
107718+ anon_vma_chain_free(avc_m);
107719+#endif
107720+
107721 anon_vma_chain_free(avc);
107722 out_enomem:
107723 return -ENOMEM;
107724@@ -249,7 +284,7 @@ static inline void unlock_anon_vma_root(struct anon_vma *root)
107725 * good chance of avoiding scanning the whole hierarchy when it searches where
107726 * page is mapped.
107727 */
107728-int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src)
107729+int anon_vma_clone(struct vm_area_struct *dst, const struct vm_area_struct *src)
107730 {
107731 struct anon_vma_chain *avc, *pavc;
107732 struct anon_vma *root = NULL;
107733@@ -303,7 +338,7 @@ int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src)
107734 * the corresponding VMA in the parent process is attached to.
107735 * Returns 0 on success, non-zero on failure.
107736 */
107737-int anon_vma_fork(struct vm_area_struct *vma, struct vm_area_struct *pvma)
107738+int anon_vma_fork(struct vm_area_struct *vma, const struct vm_area_struct *pvma)
107739 {
107740 struct anon_vma_chain *avc;
107741 struct anon_vma *anon_vma;
107742@@ -423,8 +458,10 @@ static void anon_vma_ctor(void *data)
107743 void __init anon_vma_init(void)
107744 {
107745 anon_vma_cachep = kmem_cache_create("anon_vma", sizeof(struct anon_vma),
107746- 0, SLAB_DESTROY_BY_RCU|SLAB_PANIC, anon_vma_ctor);
107747- anon_vma_chain_cachep = KMEM_CACHE(anon_vma_chain, SLAB_PANIC);
107748+ 0, SLAB_DESTROY_BY_RCU|SLAB_PANIC|SLAB_NO_SANITIZE,
107749+ anon_vma_ctor);
107750+ anon_vma_chain_cachep = KMEM_CACHE(anon_vma_chain,
107751+ SLAB_PANIC|SLAB_NO_SANITIZE);
107752 }
107753
107754 /*
107755diff --git a/mm/shmem.c b/mm/shmem.c
107756index cf2d0ca..ec06b8b 100644
107757--- a/mm/shmem.c
107758+++ b/mm/shmem.c
107759@@ -33,7 +33,7 @@
107760 #include <linux/swap.h>
107761 #include <linux/aio.h>
107762
107763-static struct vfsmount *shm_mnt;
107764+struct vfsmount *shm_mnt;
107765
107766 #ifdef CONFIG_SHMEM
107767 /*
107768@@ -80,7 +80,7 @@ static struct vfsmount *shm_mnt;
107769 #define BOGO_DIRENT_SIZE 20
107770
107771 /* Symlink up to this size is kmalloc'ed instead of using a swappable page */
107772-#define SHORT_SYMLINK_LEN 128
107773+#define SHORT_SYMLINK_LEN 64
107774
107775 /*
107776 * shmem_fallocate communicates with shmem_fault or shmem_writepage via
107777@@ -2555,6 +2555,11 @@ static const struct xattr_handler *shmem_xattr_handlers[] = {
107778 static int shmem_xattr_validate(const char *name)
107779 {
107780 struct { const char *prefix; size_t len; } arr[] = {
107781+
107782+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
107783+ { XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN},
107784+#endif
107785+
107786 { XATTR_SECURITY_PREFIX, XATTR_SECURITY_PREFIX_LEN },
107787 { XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN }
107788 };
107789@@ -2610,6 +2615,15 @@ static int shmem_setxattr(struct dentry *dentry, const char *name,
107790 if (err)
107791 return err;
107792
107793+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
107794+ if (!strncmp(name, XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN)) {
107795+ if (strcmp(name, XATTR_NAME_PAX_FLAGS))
107796+ return -EOPNOTSUPP;
107797+ if (size > 8)
107798+ return -EINVAL;
107799+ }
107800+#endif
107801+
107802 return simple_xattr_set(&info->xattrs, name, value, size, flags);
107803 }
107804
107805@@ -2993,8 +3007,7 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent)
107806 int err = -ENOMEM;
107807
107808 /* Round up to L1_CACHE_BYTES to resist false sharing */
107809- sbinfo = kzalloc(max((int)sizeof(struct shmem_sb_info),
107810- L1_CACHE_BYTES), GFP_KERNEL);
107811+ sbinfo = kzalloc(max(sizeof(struct shmem_sb_info), L1_CACHE_BYTES), GFP_KERNEL);
107812 if (!sbinfo)
107813 return -ENOMEM;
107814
107815diff --git a/mm/slab.c b/mm/slab.c
107816index c4b89ea..20990be 100644
107817--- a/mm/slab.c
107818+++ b/mm/slab.c
107819@@ -314,10 +314,12 @@ static void kmem_cache_node_init(struct kmem_cache_node *parent)
107820 if ((x)->max_freeable < i) \
107821 (x)->max_freeable = i; \
107822 } while (0)
107823-#define STATS_INC_ALLOCHIT(x) atomic_inc(&(x)->allochit)
107824-#define STATS_INC_ALLOCMISS(x) atomic_inc(&(x)->allocmiss)
107825-#define STATS_INC_FREEHIT(x) atomic_inc(&(x)->freehit)
107826-#define STATS_INC_FREEMISS(x) atomic_inc(&(x)->freemiss)
107827+#define STATS_INC_ALLOCHIT(x) atomic_inc_unchecked(&(x)->allochit)
107828+#define STATS_INC_ALLOCMISS(x) atomic_inc_unchecked(&(x)->allocmiss)
107829+#define STATS_INC_FREEHIT(x) atomic_inc_unchecked(&(x)->freehit)
107830+#define STATS_INC_FREEMISS(x) atomic_inc_unchecked(&(x)->freemiss)
107831+#define STATS_INC_SANITIZED(x) atomic_inc_unchecked(&(x)->sanitized)
107832+#define STATS_INC_NOT_SANITIZED(x) atomic_inc_unchecked(&(x)->not_sanitized)
107833 #else
107834 #define STATS_INC_ACTIVE(x) do { } while (0)
107835 #define STATS_DEC_ACTIVE(x) do { } while (0)
107836@@ -334,6 +336,8 @@ static void kmem_cache_node_init(struct kmem_cache_node *parent)
107837 #define STATS_INC_ALLOCMISS(x) do { } while (0)
107838 #define STATS_INC_FREEHIT(x) do { } while (0)
107839 #define STATS_INC_FREEMISS(x) do { } while (0)
107840+#define STATS_INC_SANITIZED(x) do { } while (0)
107841+#define STATS_INC_NOT_SANITIZED(x) do { } while (0)
107842 #endif
107843
107844 #if DEBUG
107845@@ -450,7 +454,7 @@ static inline void *index_to_obj(struct kmem_cache *cache, struct page *page,
107846 * reciprocal_divide(offset, cache->reciprocal_buffer_size)
107847 */
107848 static inline unsigned int obj_to_index(const struct kmem_cache *cache,
107849- const struct page *page, void *obj)
107850+ const struct page *page, const void *obj)
107851 {
107852 u32 offset = (obj - page->s_mem);
107853 return reciprocal_divide(offset, cache->reciprocal_buffer_size);
107854@@ -1438,7 +1442,7 @@ void __init kmem_cache_init(void)
107855 * structures first. Without this, further allocations will bug.
107856 */
107857 kmalloc_caches[INDEX_NODE] = create_kmalloc_cache("kmalloc-node",
107858- kmalloc_size(INDEX_NODE), ARCH_KMALLOC_FLAGS);
107859+ kmalloc_size(INDEX_NODE), SLAB_USERCOPY | ARCH_KMALLOC_FLAGS);
107860 slab_state = PARTIAL_NODE;
107861
107862 slab_early_init = 0;
107863@@ -2059,7 +2063,7 @@ __kmem_cache_alias(const char *name, size_t size, size_t align,
107864
107865 cachep = find_mergeable(size, align, flags, name, ctor);
107866 if (cachep) {
107867- cachep->refcount++;
107868+ atomic_inc(&cachep->refcount);
107869
107870 /*
107871 * Adjust the object sizes so that we clear
107872@@ -3357,6 +3361,20 @@ static inline void __cache_free(struct kmem_cache *cachep, void *objp,
107873 struct array_cache *ac = cpu_cache_get(cachep);
107874
107875 check_irq_off();
107876+
107877+#ifdef CONFIG_PAX_MEMORY_SANITIZE
107878+ if (cachep->flags & (SLAB_POISON | SLAB_NO_SANITIZE))
107879+ STATS_INC_NOT_SANITIZED(cachep);
107880+ else {
107881+ memset(objp, PAX_MEMORY_SANITIZE_VALUE, cachep->object_size);
107882+
107883+ if (cachep->ctor)
107884+ cachep->ctor(objp);
107885+
107886+ STATS_INC_SANITIZED(cachep);
107887+ }
107888+#endif
107889+
107890 kmemleak_free_recursive(objp, cachep->flags);
107891 objp = cache_free_debugcheck(cachep, objp, caller);
107892
107893@@ -3469,7 +3487,7 @@ __do_kmalloc_node(size_t size, gfp_t flags, int node, unsigned long caller)
107894 return kmem_cache_alloc_node_trace(cachep, flags, node, size);
107895 }
107896
107897-void *__kmalloc_node(size_t size, gfp_t flags, int node)
107898+void * __size_overflow(1) __kmalloc_node(size_t size, gfp_t flags, int node)
107899 {
107900 return __do_kmalloc_node(size, flags, node, _RET_IP_);
107901 }
107902@@ -3489,7 +3507,7 @@ EXPORT_SYMBOL(__kmalloc_node_track_caller);
107903 * @flags: the type of memory to allocate (see kmalloc).
107904 * @caller: function caller for debug tracking of the caller
107905 */
107906-static __always_inline void *__do_kmalloc(size_t size, gfp_t flags,
107907+static __always_inline void * __size_overflow(1) __do_kmalloc(size_t size, gfp_t flags,
107908 unsigned long caller)
107909 {
107910 struct kmem_cache *cachep;
107911@@ -3562,6 +3580,7 @@ void kfree(const void *objp)
107912
107913 if (unlikely(ZERO_OR_NULL_PTR(objp)))
107914 return;
107915+ VM_BUG_ON(!virt_addr_valid(objp));
107916 local_irq_save(flags);
107917 kfree_debugcheck(objp);
107918 c = virt_to_cache(objp);
107919@@ -3981,14 +4000,22 @@ void slabinfo_show_stats(struct seq_file *m, struct kmem_cache *cachep)
107920 }
107921 /* cpu stats */
107922 {
107923- unsigned long allochit = atomic_read(&cachep->allochit);
107924- unsigned long allocmiss = atomic_read(&cachep->allocmiss);
107925- unsigned long freehit = atomic_read(&cachep->freehit);
107926- unsigned long freemiss = atomic_read(&cachep->freemiss);
107927+ unsigned long allochit = atomic_read_unchecked(&cachep->allochit);
107928+ unsigned long allocmiss = atomic_read_unchecked(&cachep->allocmiss);
107929+ unsigned long freehit = atomic_read_unchecked(&cachep->freehit);
107930+ unsigned long freemiss = atomic_read_unchecked(&cachep->freemiss);
107931
107932 seq_printf(m, " : cpustat %6lu %6lu %6lu %6lu",
107933 allochit, allocmiss, freehit, freemiss);
107934 }
107935+#ifdef CONFIG_PAX_MEMORY_SANITIZE
107936+ {
107937+ unsigned long sanitized = atomic_read_unchecked(&cachep->sanitized);
107938+ unsigned long not_sanitized = atomic_read_unchecked(&cachep->not_sanitized);
107939+
107940+ seq_printf(m, " : pax %6lu %6lu", sanitized, not_sanitized);
107941+ }
107942+#endif
107943 #endif
107944 }
107945
107946@@ -4196,13 +4223,69 @@ static const struct file_operations proc_slabstats_operations = {
107947 static int __init slab_proc_init(void)
107948 {
107949 #ifdef CONFIG_DEBUG_SLAB_LEAK
107950- proc_create("slab_allocators", 0, NULL, &proc_slabstats_operations);
107951+ proc_create("slab_allocators", S_IRUSR, NULL, &proc_slabstats_operations);
107952 #endif
107953 return 0;
107954 }
107955 module_init(slab_proc_init);
107956 #endif
107957
107958+bool is_usercopy_object(const void *ptr)
107959+{
107960+ struct page *page;
107961+ struct kmem_cache *cachep;
107962+
107963+ if (ZERO_OR_NULL_PTR(ptr))
107964+ return false;
107965+
107966+ if (!slab_is_available())
107967+ return false;
107968+
107969+ if (!virt_addr_valid(ptr))
107970+ return false;
107971+
107972+ page = virt_to_head_page(ptr);
107973+
107974+ if (!PageSlab(page))
107975+ return false;
107976+
107977+ cachep = page->slab_cache;
107978+ return cachep->flags & SLAB_USERCOPY;
107979+}
107980+
107981+#ifdef CONFIG_PAX_USERCOPY
107982+const char *check_heap_object(const void *ptr, unsigned long n)
107983+{
107984+ struct page *page;
107985+ struct kmem_cache *cachep;
107986+ unsigned int objnr;
107987+ unsigned long offset;
107988+
107989+ if (ZERO_OR_NULL_PTR(ptr))
107990+ return "<null>";
107991+
107992+ if (!virt_addr_valid(ptr))
107993+ return NULL;
107994+
107995+ page = virt_to_head_page(ptr);
107996+
107997+ if (!PageSlab(page))
107998+ return NULL;
107999+
108000+ cachep = page->slab_cache;
108001+ if (!(cachep->flags & SLAB_USERCOPY))
108002+ return cachep->name;
108003+
108004+ objnr = obj_to_index(cachep, page, ptr);
108005+ BUG_ON(objnr >= cachep->num);
108006+ offset = ptr - index_to_obj(cachep, page, objnr) - obj_offset(cachep);
108007+ if (offset <= cachep->object_size && n <= cachep->object_size - offset)
108008+ return NULL;
108009+
108010+ return cachep->name;
108011+}
108012+#endif
108013+
108014 /**
108015 * ksize - get the actual amount of memory allocated for a given object
108016 * @objp: Pointer to the object
108017diff --git a/mm/slab.h b/mm/slab.h
108018index 4c3ac12..7b2e470 100644
108019--- a/mm/slab.h
108020+++ b/mm/slab.h
108021@@ -22,7 +22,7 @@ struct kmem_cache {
108022 unsigned int align; /* Alignment as calculated */
108023 unsigned long flags; /* Active flags on the slab */
108024 const char *name; /* Slab name for sysfs */
108025- int refcount; /* Use counter */
108026+ atomic_t refcount; /* Use counter */
108027 void (*ctor)(void *); /* Called on object slot creation */
108028 struct list_head list; /* List of all slab caches on the system */
108029 };
108030@@ -66,6 +66,20 @@ extern struct list_head slab_caches;
108031 /* The slab cache that manages slab cache information */
108032 extern struct kmem_cache *kmem_cache;
108033
108034+#ifdef CONFIG_PAX_MEMORY_SANITIZE
108035+#ifdef CONFIG_X86_64
108036+#define PAX_MEMORY_SANITIZE_VALUE '\xfe'
108037+#else
108038+#define PAX_MEMORY_SANITIZE_VALUE '\xff'
108039+#endif
108040+enum pax_sanitize_mode {
108041+ PAX_SANITIZE_SLAB_OFF = 0,
108042+ PAX_SANITIZE_SLAB_FAST,
108043+ PAX_SANITIZE_SLAB_FULL,
108044+};
108045+extern enum pax_sanitize_mode pax_sanitize_slab;
108046+#endif
108047+
108048 unsigned long calculate_alignment(unsigned long flags,
108049 unsigned long align, unsigned long size);
108050
108051@@ -114,7 +128,8 @@ static inline unsigned long kmem_cache_flags(unsigned long object_size,
108052
108053 /* Legal flag mask for kmem_cache_create(), for various configurations */
108054 #define SLAB_CORE_FLAGS (SLAB_HWCACHE_ALIGN | SLAB_CACHE_DMA | SLAB_PANIC | \
108055- SLAB_DESTROY_BY_RCU | SLAB_DEBUG_OBJECTS )
108056+ SLAB_DESTROY_BY_RCU | SLAB_DEBUG_OBJECTS | \
108057+ SLAB_USERCOPY | SLAB_NO_SANITIZE)
108058
108059 #if defined(CONFIG_DEBUG_SLAB)
108060 #define SLAB_DEBUG_FLAGS (SLAB_RED_ZONE | SLAB_POISON | SLAB_STORE_USER)
108061@@ -315,6 +330,9 @@ static inline struct kmem_cache *cache_from_obj(struct kmem_cache *s, void *x)
108062 return s;
108063
108064 page = virt_to_head_page(x);
108065+
108066+ BUG_ON(!PageSlab(page));
108067+
108068 cachep = page->slab_cache;
108069 if (slab_equal_or_root(cachep, s))
108070 return cachep;
108071diff --git a/mm/slab_common.c b/mm/slab_common.c
108072index 999bb34..9843aea 100644
108073--- a/mm/slab_common.c
108074+++ b/mm/slab_common.c
108075@@ -25,11 +25,35 @@
108076
108077 #include "slab.h"
108078
108079-enum slab_state slab_state;
108080+enum slab_state slab_state __read_only;
108081 LIST_HEAD(slab_caches);
108082 DEFINE_MUTEX(slab_mutex);
108083 struct kmem_cache *kmem_cache;
108084
108085+#ifdef CONFIG_PAX_MEMORY_SANITIZE
108086+enum pax_sanitize_mode pax_sanitize_slab __read_only = PAX_SANITIZE_SLAB_FAST;
108087+static int __init pax_sanitize_slab_setup(char *str)
108088+{
108089+ if (!str)
108090+ return 0;
108091+
108092+ if (!strcmp(str, "0") || !strcmp(str, "off")) {
108093+ pr_info("PaX slab sanitization: %s\n", "disabled");
108094+ pax_sanitize_slab = PAX_SANITIZE_SLAB_OFF;
108095+ } else if (!strcmp(str, "1") || !strcmp(str, "fast")) {
108096+ pr_info("PaX slab sanitization: %s\n", "fast");
108097+ pax_sanitize_slab = PAX_SANITIZE_SLAB_FAST;
108098+ } else if (!strcmp(str, "full")) {
108099+ pr_info("PaX slab sanitization: %s\n", "full");
108100+ pax_sanitize_slab = PAX_SANITIZE_SLAB_FULL;
108101+ } else
108102+ pr_err("PaX slab sanitization: unsupported option '%s'\n", str);
108103+
108104+ return 0;
108105+}
108106+early_param("pax_sanitize_slab", pax_sanitize_slab_setup);
108107+#endif
108108+
108109 /*
108110 * Set of flags that will prevent slab merging
108111 */
108112@@ -44,7 +68,7 @@ struct kmem_cache *kmem_cache;
108113 * Merge control. If this is set then no merging of slab caches will occur.
108114 * (Could be removed. This was introduced to pacify the merge skeptics.)
108115 */
108116-static int slab_nomerge;
108117+static int slab_nomerge = 1;
108118
108119 static int __init setup_slab_nomerge(char *str)
108120 {
108121@@ -217,7 +241,7 @@ int slab_unmergeable(struct kmem_cache *s)
108122 /*
108123 * We may have set a slab to be unmergeable during bootstrap.
108124 */
108125- if (s->refcount < 0)
108126+ if (atomic_read(&s->refcount) < 0)
108127 return 1;
108128
108129 return 0;
108130@@ -321,7 +345,7 @@ do_kmem_cache_create(const char *name, size_t object_size, size_t size,
108131 if (err)
108132 goto out_free_cache;
108133
108134- s->refcount = 1;
108135+ atomic_set(&s->refcount, 1);
108136 list_add(&s->list, &slab_caches);
108137 out:
108138 if (err)
108139@@ -386,6 +410,13 @@ kmem_cache_create(const char *name, size_t size, size_t align,
108140 */
108141 flags &= CACHE_CREATE_MASK;
108142
108143+#ifdef CONFIG_PAX_MEMORY_SANITIZE
108144+ if (pax_sanitize_slab == PAX_SANITIZE_SLAB_OFF || (flags & SLAB_DESTROY_BY_RCU))
108145+ flags |= SLAB_NO_SANITIZE;
108146+ else if (pax_sanitize_slab == PAX_SANITIZE_SLAB_FULL)
108147+ flags &= ~SLAB_NO_SANITIZE;
108148+#endif
108149+
108150 s = __kmem_cache_alias(name, size, align, flags, ctor);
108151 if (s)
108152 goto out_unlock;
108153@@ -456,7 +487,7 @@ static void do_kmem_cache_release(struct list_head *release,
108154 rcu_barrier();
108155
108156 list_for_each_entry_safe(s, s2, release, list) {
108157-#ifdef SLAB_SUPPORTS_SYSFS
108158+#if defined(SLAB_SUPPORTS_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
108159 sysfs_slab_remove(s);
108160 #else
108161 slab_kmem_cache_release(s);
108162@@ -625,8 +656,7 @@ void kmem_cache_destroy(struct kmem_cache *s)
108163
108164 mutex_lock(&slab_mutex);
108165
108166- s->refcount--;
108167- if (s->refcount)
108168+ if (!atomic_dec_and_test(&s->refcount))
108169 goto out_unlock;
108170
108171 for_each_memcg_cache_safe(c, c2, s) {
108172@@ -691,7 +721,7 @@ void __init create_boot_cache(struct kmem_cache *s, const char *name, size_t siz
108173 panic("Creation of kmalloc slab %s size=%zu failed. Reason %d\n",
108174 name, size, err);
108175
108176- s->refcount = -1; /* Exempt from merging for now */
108177+ atomic_set(&s->refcount, -1); /* Exempt from merging for now */
108178 }
108179
108180 struct kmem_cache *__init create_kmalloc_cache(const char *name, size_t size,
108181@@ -704,7 +734,7 @@ struct kmem_cache *__init create_kmalloc_cache(const char *name, size_t size,
108182
108183 create_boot_cache(s, name, size, flags);
108184 list_add(&s->list, &slab_caches);
108185- s->refcount = 1;
108186+ atomic_set(&s->refcount, 1);
108187 return s;
108188 }
108189
108190@@ -716,6 +746,11 @@ struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
108191 EXPORT_SYMBOL(kmalloc_dma_caches);
108192 #endif
108193
108194+#ifdef CONFIG_PAX_USERCOPY_SLABS
108195+struct kmem_cache *kmalloc_usercopy_caches[KMALLOC_SHIFT_HIGH + 1];
108196+EXPORT_SYMBOL(kmalloc_usercopy_caches);
108197+#endif
108198+
108199 /*
108200 * Conversion table for small slabs sizes / 8 to the index in the
108201 * kmalloc array. This is necessary for slabs < 192 since we have non power
108202@@ -780,6 +815,13 @@ struct kmem_cache *kmalloc_slab(size_t size, gfp_t flags)
108203 return kmalloc_dma_caches[index];
108204
108205 #endif
108206+
108207+#ifdef CONFIG_PAX_USERCOPY_SLABS
108208+ if (unlikely((flags & GFP_USERCOPY)))
108209+ return kmalloc_usercopy_caches[index];
108210+
108211+#endif
108212+
108213 return kmalloc_caches[index];
108214 }
108215
108216@@ -836,7 +878,7 @@ void __init create_kmalloc_caches(unsigned long flags)
108217 for (i = KMALLOC_SHIFT_LOW; i <= KMALLOC_SHIFT_HIGH; i++) {
108218 if (!kmalloc_caches[i]) {
108219 kmalloc_caches[i] = create_kmalloc_cache(NULL,
108220- 1 << i, flags);
108221+ 1 << i, SLAB_USERCOPY | flags);
108222 }
108223
108224 /*
108225@@ -845,10 +887,10 @@ void __init create_kmalloc_caches(unsigned long flags)
108226 * earlier power of two caches
108227 */
108228 if (KMALLOC_MIN_SIZE <= 32 && !kmalloc_caches[1] && i == 6)
108229- kmalloc_caches[1] = create_kmalloc_cache(NULL, 96, flags);
108230+ kmalloc_caches[1] = create_kmalloc_cache(NULL, 96, SLAB_USERCOPY | flags);
108231
108232 if (KMALLOC_MIN_SIZE <= 64 && !kmalloc_caches[2] && i == 7)
108233- kmalloc_caches[2] = create_kmalloc_cache(NULL, 192, flags);
108234+ kmalloc_caches[2] = create_kmalloc_cache(NULL, 192, SLAB_USERCOPY | flags);
108235 }
108236
108237 /* Kmalloc array is now usable */
108238@@ -881,6 +923,23 @@ void __init create_kmalloc_caches(unsigned long flags)
108239 }
108240 }
108241 #endif
108242+
108243+#ifdef CONFIG_PAX_USERCOPY_SLABS
108244+ for (i = 0; i <= KMALLOC_SHIFT_HIGH; i++) {
108245+ struct kmem_cache *s = kmalloc_caches[i];
108246+
108247+ if (s) {
108248+ int size = kmalloc_size(i);
108249+ char *n = kasprintf(GFP_NOWAIT,
108250+ "usercopy-kmalloc-%d", size);
108251+
108252+ BUG_ON(!n);
108253+ kmalloc_usercopy_caches[i] = create_kmalloc_cache(n,
108254+ size, SLAB_USERCOPY | flags);
108255+ }
108256+ }
108257+#endif
108258+
108259 }
108260 #endif /* !CONFIG_SLOB */
108261
108262@@ -940,6 +999,9 @@ static void print_slabinfo_header(struct seq_file *m)
108263 seq_puts(m, " : globalstat <listallocs> <maxobjs> <grown> <reaped> "
108264 "<error> <maxfreeable> <nodeallocs> <remotefrees> <alienoverflow>");
108265 seq_puts(m, " : cpustat <allochit> <allocmiss> <freehit> <freemiss>");
108266+#ifdef CONFIG_PAX_MEMORY_SANITIZE
108267+ seq_puts(m, " : pax <sanitized> <not_sanitized>");
108268+#endif
108269 #endif
108270 seq_putc(m, '\n');
108271 }
108272@@ -1069,7 +1131,7 @@ static int __init slab_proc_init(void)
108273 module_init(slab_proc_init);
108274 #endif /* CONFIG_SLABINFO */
108275
108276-static __always_inline void *__do_krealloc(const void *p, size_t new_size,
108277+static __always_inline void * __size_overflow(2) __do_krealloc(const void *p, size_t new_size,
108278 gfp_t flags)
108279 {
108280 void *ret;
108281diff --git a/mm/slob.c b/mm/slob.c
108282index 94a7fed..cf3fb1a 100644
108283--- a/mm/slob.c
108284+++ b/mm/slob.c
108285@@ -157,7 +157,7 @@ static void set_slob(slob_t *s, slobidx_t size, slob_t *next)
108286 /*
108287 * Return the size of a slob block.
108288 */
108289-static slobidx_t slob_units(slob_t *s)
108290+static slobidx_t slob_units(const slob_t *s)
108291 {
108292 if (s->units > 0)
108293 return s->units;
108294@@ -167,7 +167,7 @@ static slobidx_t slob_units(slob_t *s)
108295 /*
108296 * Return the next free slob block pointer after this one.
108297 */
108298-static slob_t *slob_next(slob_t *s)
108299+static slob_t *slob_next(const slob_t *s)
108300 {
108301 slob_t *base = (slob_t *)((unsigned long)s & PAGE_MASK);
108302 slobidx_t next;
108303@@ -182,14 +182,14 @@ static slob_t *slob_next(slob_t *s)
108304 /*
108305 * Returns true if s is the last free block in its page.
108306 */
108307-static int slob_last(slob_t *s)
108308+static int slob_last(const slob_t *s)
108309 {
108310 return !((unsigned long)slob_next(s) & ~PAGE_MASK);
108311 }
108312
108313-static void *slob_new_pages(gfp_t gfp, int order, int node)
108314+static struct page *slob_new_pages(gfp_t gfp, unsigned int order, int node)
108315 {
108316- void *page;
108317+ struct page *page;
108318
108319 #ifdef CONFIG_NUMA
108320 if (node != NUMA_NO_NODE)
108321@@ -201,14 +201,18 @@ static void *slob_new_pages(gfp_t gfp, int order, int node)
108322 if (!page)
108323 return NULL;
108324
108325- return page_address(page);
108326+ __SetPageSlab(page);
108327+ return page;
108328 }
108329
108330-static void slob_free_pages(void *b, int order)
108331+static void slob_free_pages(struct page *sp, int order)
108332 {
108333 if (current->reclaim_state)
108334 current->reclaim_state->reclaimed_slab += 1 << order;
108335- free_pages((unsigned long)b, order);
108336+ __ClearPageSlab(sp);
108337+ page_mapcount_reset(sp);
108338+ sp->private = 0;
108339+ __free_pages(sp, order);
108340 }
108341
108342 /*
108343@@ -313,15 +317,15 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node)
108344
108345 /* Not enough space: must allocate a new page */
108346 if (!b) {
108347- b = slob_new_pages(gfp & ~__GFP_ZERO, 0, node);
108348- if (!b)
108349+ sp = slob_new_pages(gfp & ~__GFP_ZERO, 0, node);
108350+ if (!sp)
108351 return NULL;
108352- sp = virt_to_page(b);
108353- __SetPageSlab(sp);
108354+ b = page_address(sp);
108355
108356 spin_lock_irqsave(&slob_lock, flags);
108357 sp->units = SLOB_UNITS(PAGE_SIZE);
108358 sp->freelist = b;
108359+ sp->private = 0;
108360 INIT_LIST_HEAD(&sp->lru);
108361 set_slob(b, SLOB_UNITS(PAGE_SIZE), b + SLOB_UNITS(PAGE_SIZE));
108362 set_slob_page_free(sp, slob_list);
108363@@ -337,7 +341,7 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node)
108364 /*
108365 * slob_free: entry point into the slob allocator.
108366 */
108367-static void slob_free(void *block, int size)
108368+static void slob_free(struct kmem_cache *c, void *block, int size)
108369 {
108370 struct page *sp;
108371 slob_t *prev, *next, *b = (slob_t *)block;
108372@@ -359,12 +363,15 @@ static void slob_free(void *block, int size)
108373 if (slob_page_free(sp))
108374 clear_slob_page_free(sp);
108375 spin_unlock_irqrestore(&slob_lock, flags);
108376- __ClearPageSlab(sp);
108377- page_mapcount_reset(sp);
108378- slob_free_pages(b, 0);
108379+ slob_free_pages(sp, 0);
108380 return;
108381 }
108382
108383+#ifdef CONFIG_PAX_MEMORY_SANITIZE
108384+ if (pax_sanitize_slab && !(c && (c->flags & SLAB_NO_SANITIZE)))
108385+ memset(block, PAX_MEMORY_SANITIZE_VALUE, size);
108386+#endif
108387+
108388 if (!slob_page_free(sp)) {
108389 /* This slob page is about to become partially free. Easy! */
108390 sp->units = units;
108391@@ -424,11 +431,10 @@ out:
108392 */
108393
108394 static __always_inline void *
108395-__do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
108396+__do_kmalloc_node_align(size_t size, gfp_t gfp, int node, unsigned long caller, int align)
108397 {
108398- unsigned int *m;
108399- int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
108400- void *ret;
108401+ slob_t *m;
108402+ void *ret = NULL;
108403
108404 gfp &= gfp_allowed_mask;
108405
108406@@ -442,27 +448,45 @@ __do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
108407
108408 if (!m)
108409 return NULL;
108410- *m = size;
108411+ BUILD_BUG_ON(ARCH_KMALLOC_MINALIGN < 2 * SLOB_UNIT);
108412+ BUILD_BUG_ON(ARCH_SLAB_MINALIGN < 2 * SLOB_UNIT);
108413+ m[0].units = size;
108414+ m[1].units = align;
108415 ret = (void *)m + align;
108416
108417 trace_kmalloc_node(caller, ret,
108418 size, size + align, gfp, node);
108419 } else {
108420 unsigned int order = get_order(size);
108421+ struct page *page;
108422
108423 if (likely(order))
108424 gfp |= __GFP_COMP;
108425- ret = slob_new_pages(gfp, order, node);
108426+ page = slob_new_pages(gfp, order, node);
108427+ if (page) {
108428+ ret = page_address(page);
108429+ page->private = size;
108430+ }
108431
108432 trace_kmalloc_node(caller, ret,
108433 size, PAGE_SIZE << order, gfp, node);
108434 }
108435
108436- kmemleak_alloc(ret, size, 1, gfp);
108437 return ret;
108438 }
108439
108440-void *__kmalloc(size_t size, gfp_t gfp)
108441+static __always_inline void *
108442+__do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
108443+{
108444+ int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
108445+ void *ret = __do_kmalloc_node_align(size, gfp, node, caller, align);
108446+
108447+ if (!ZERO_OR_NULL_PTR(ret))
108448+ kmemleak_alloc(ret, size, 1, gfp);
108449+ return ret;
108450+}
108451+
108452+void * __size_overflow(1) __kmalloc(size_t size, gfp_t gfp)
108453 {
108454 return __do_kmalloc_node(size, gfp, NUMA_NO_NODE, _RET_IP_);
108455 }
108456@@ -491,34 +515,112 @@ void kfree(const void *block)
108457 return;
108458 kmemleak_free(block);
108459
108460+ VM_BUG_ON(!virt_addr_valid(block));
108461 sp = virt_to_page(block);
108462- if (PageSlab(sp)) {
108463+ VM_BUG_ON(!PageSlab(sp));
108464+ if (!sp->private) {
108465 int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
108466- unsigned int *m = (unsigned int *)(block - align);
108467- slob_free(m, *m + align);
108468- } else
108469+ slob_t *m = (slob_t *)(block - align);
108470+ slob_free(NULL, m, m[0].units + align);
108471+ } else {
108472+ __ClearPageSlab(sp);
108473+ page_mapcount_reset(sp);
108474+ sp->private = 0;
108475 __free_pages(sp, compound_order(sp));
108476+ }
108477 }
108478 EXPORT_SYMBOL(kfree);
108479
108480+bool is_usercopy_object(const void *ptr)
108481+{
108482+ if (!slab_is_available())
108483+ return false;
108484+
108485+ // PAX: TODO
108486+
108487+ return false;
108488+}
108489+
108490+#ifdef CONFIG_PAX_USERCOPY
108491+const char *check_heap_object(const void *ptr, unsigned long n)
108492+{
108493+ struct page *page;
108494+ const slob_t *free;
108495+ const void *base;
108496+ unsigned long flags;
108497+
108498+ if (ZERO_OR_NULL_PTR(ptr))
108499+ return "<null>";
108500+
108501+ if (!virt_addr_valid(ptr))
108502+ return NULL;
108503+
108504+ page = virt_to_head_page(ptr);
108505+ if (!PageSlab(page))
108506+ return NULL;
108507+
108508+ if (page->private) {
108509+ base = page;
108510+ if (base <= ptr && n <= page->private - (ptr - base))
108511+ return NULL;
108512+ return "<slob>";
108513+ }
108514+
108515+ /* some tricky double walking to find the chunk */
108516+ spin_lock_irqsave(&slob_lock, flags);
108517+ base = (void *)((unsigned long)ptr & PAGE_MASK);
108518+ free = page->freelist;
108519+
108520+ while (!slob_last(free) && (void *)free <= ptr) {
108521+ base = free + slob_units(free);
108522+ free = slob_next(free);
108523+ }
108524+
108525+ while (base < (void *)free) {
108526+ slobidx_t m = ((slob_t *)base)[0].units, align = ((slob_t *)base)[1].units;
108527+ int size = SLOB_UNIT * SLOB_UNITS(m + align);
108528+ int offset;
108529+
108530+ if (ptr < base + align)
108531+ break;
108532+
108533+ offset = ptr - base - align;
108534+ if (offset >= m) {
108535+ base += size;
108536+ continue;
108537+ }
108538+
108539+ if (n > m - offset)
108540+ break;
108541+
108542+ spin_unlock_irqrestore(&slob_lock, flags);
108543+ return NULL;
108544+ }
108545+
108546+ spin_unlock_irqrestore(&slob_lock, flags);
108547+ return "<slob>";
108548+}
108549+#endif
108550+
108551 /* can't use ksize for kmem_cache_alloc memory, only kmalloc */
108552 size_t ksize(const void *block)
108553 {
108554 struct page *sp;
108555 int align;
108556- unsigned int *m;
108557+ slob_t *m;
108558
108559 BUG_ON(!block);
108560 if (unlikely(block == ZERO_SIZE_PTR))
108561 return 0;
108562
108563 sp = virt_to_page(block);
108564- if (unlikely(!PageSlab(sp)))
108565- return PAGE_SIZE << compound_order(sp);
108566+ VM_BUG_ON(!PageSlab(sp));
108567+ if (sp->private)
108568+ return sp->private;
108569
108570 align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
108571- m = (unsigned int *)(block - align);
108572- return SLOB_UNITS(*m) * SLOB_UNIT;
108573+ m = (slob_t *)(block - align);
108574+ return SLOB_UNITS(m[0].units) * SLOB_UNIT;
108575 }
108576 EXPORT_SYMBOL(ksize);
108577
108578@@ -534,23 +636,33 @@ int __kmem_cache_create(struct kmem_cache *c, unsigned long flags)
108579
108580 void *slob_alloc_node(struct kmem_cache *c, gfp_t flags, int node)
108581 {
108582- void *b;
108583+ void *b = NULL;
108584
108585 flags &= gfp_allowed_mask;
108586
108587 lockdep_trace_alloc(flags);
108588
108589+#ifdef CONFIG_PAX_USERCOPY_SLABS
108590+ b = __do_kmalloc_node_align(c->size, flags, node, _RET_IP_, c->align);
108591+#else
108592 if (c->size < PAGE_SIZE) {
108593 b = slob_alloc(c->size, flags, c->align, node);
108594 trace_kmem_cache_alloc_node(_RET_IP_, b, c->object_size,
108595 SLOB_UNITS(c->size) * SLOB_UNIT,
108596 flags, node);
108597 } else {
108598- b = slob_new_pages(flags, get_order(c->size), node);
108599+ struct page *sp;
108600+
108601+ sp = slob_new_pages(flags, get_order(c->size), node);
108602+ if (sp) {
108603+ b = page_address(sp);
108604+ sp->private = c->size;
108605+ }
108606 trace_kmem_cache_alloc_node(_RET_IP_, b, c->object_size,
108607 PAGE_SIZE << get_order(c->size),
108608 flags, node);
108609 }
108610+#endif
108611
108612 if (b && c->ctor)
108613 c->ctor(b);
108614@@ -567,7 +679,7 @@ void *kmem_cache_alloc(struct kmem_cache *cachep, gfp_t flags)
108615 EXPORT_SYMBOL(kmem_cache_alloc);
108616
108617 #ifdef CONFIG_NUMA
108618-void *__kmalloc_node(size_t size, gfp_t gfp, int node)
108619+void * __size_overflow(1) __kmalloc_node(size_t size, gfp_t gfp, int node)
108620 {
108621 return __do_kmalloc_node(size, gfp, node, _RET_IP_);
108622 }
108623@@ -580,12 +692,16 @@ void *kmem_cache_alloc_node(struct kmem_cache *cachep, gfp_t gfp, int node)
108624 EXPORT_SYMBOL(kmem_cache_alloc_node);
108625 #endif
108626
108627-static void __kmem_cache_free(void *b, int size)
108628+static void __kmem_cache_free(struct kmem_cache *c, void *b, int size)
108629 {
108630- if (size < PAGE_SIZE)
108631- slob_free(b, size);
108632+ struct page *sp;
108633+
108634+ sp = virt_to_page(b);
108635+ BUG_ON(!PageSlab(sp));
108636+ if (!sp->private)
108637+ slob_free(c, b, size);
108638 else
108639- slob_free_pages(b, get_order(size));
108640+ slob_free_pages(sp, get_order(size));
108641 }
108642
108643 static void kmem_rcu_free(struct rcu_head *head)
108644@@ -593,22 +709,36 @@ static void kmem_rcu_free(struct rcu_head *head)
108645 struct slob_rcu *slob_rcu = (struct slob_rcu *)head;
108646 void *b = (void *)slob_rcu - (slob_rcu->size - sizeof(struct slob_rcu));
108647
108648- __kmem_cache_free(b, slob_rcu->size);
108649+ __kmem_cache_free(NULL, b, slob_rcu->size);
108650 }
108651
108652 void kmem_cache_free(struct kmem_cache *c, void *b)
108653 {
108654+ int size = c->size;
108655+
108656+#ifdef CONFIG_PAX_USERCOPY_SLABS
108657+ if (size + c->align < PAGE_SIZE) {
108658+ size += c->align;
108659+ b -= c->align;
108660+ }
108661+#endif
108662+
108663 kmemleak_free_recursive(b, c->flags);
108664 if (unlikely(c->flags & SLAB_DESTROY_BY_RCU)) {
108665 struct slob_rcu *slob_rcu;
108666- slob_rcu = b + (c->size - sizeof(struct slob_rcu));
108667- slob_rcu->size = c->size;
108668+ slob_rcu = b + (size - sizeof(struct slob_rcu));
108669+ slob_rcu->size = size;
108670 call_rcu(&slob_rcu->head, kmem_rcu_free);
108671 } else {
108672- __kmem_cache_free(b, c->size);
108673+ __kmem_cache_free(c, b, size);
108674 }
108675
108676+#ifdef CONFIG_PAX_USERCOPY_SLABS
108677+ trace_kfree(_RET_IP_, b);
108678+#else
108679 trace_kmem_cache_free(_RET_IP_, b);
108680+#endif
108681+
108682 }
108683 EXPORT_SYMBOL(kmem_cache_free);
108684
108685diff --git a/mm/slub.c b/mm/slub.c
108686index 82c4737..55c316a 100644
108687--- a/mm/slub.c
108688+++ b/mm/slub.c
108689@@ -198,7 +198,7 @@ struct track {
108690
108691 enum track_item { TRACK_ALLOC, TRACK_FREE };
108692
108693-#ifdef CONFIG_SYSFS
108694+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
108695 static int sysfs_slab_add(struct kmem_cache *);
108696 static int sysfs_slab_alias(struct kmem_cache *, const char *);
108697 static void memcg_propagate_slab_attrs(struct kmem_cache *s);
108698@@ -556,7 +556,7 @@ static void print_track(const char *s, struct track *t)
108699 if (!t->addr)
108700 return;
108701
108702- pr_err("INFO: %s in %pS age=%lu cpu=%u pid=%d\n",
108703+ pr_err("INFO: %s in %pA age=%lu cpu=%u pid=%d\n",
108704 s, (void *)t->addr, jiffies - t->when, t->cpu, t->pid);
108705 #ifdef CONFIG_STACKTRACE
108706 {
108707@@ -2709,6 +2709,14 @@ static __always_inline void slab_free(struct kmem_cache *s,
108708
108709 slab_free_hook(s, x);
108710
108711+#ifdef CONFIG_PAX_MEMORY_SANITIZE
108712+ if (!(s->flags & SLAB_NO_SANITIZE)) {
108713+ memset(x, PAX_MEMORY_SANITIZE_VALUE, s->object_size);
108714+ if (s->ctor)
108715+ s->ctor(x);
108716+ }
108717+#endif
108718+
108719 redo:
108720 /*
108721 * Determine the currently cpus per cpu slab.
108722@@ -3050,6 +3058,9 @@ static int calculate_sizes(struct kmem_cache *s, int forced_order)
108723 s->inuse = size;
108724
108725 if (((flags & (SLAB_DESTROY_BY_RCU | SLAB_POISON)) ||
108726+#ifdef CONFIG_PAX_MEMORY_SANITIZE
108727+ (!(flags & SLAB_NO_SANITIZE)) ||
108728+#endif
108729 s->ctor)) {
108730 /*
108731 * Relocate free pointer after the object if it is not
108732@@ -3304,7 +3315,7 @@ static int __init setup_slub_min_objects(char *str)
108733
108734 __setup("slub_min_objects=", setup_slub_min_objects);
108735
108736-void *__kmalloc(size_t size, gfp_t flags)
108737+void * __size_overflow(1) __kmalloc(size_t size, gfp_t flags)
108738 {
108739 struct kmem_cache *s;
108740 void *ret;
108741@@ -3342,7 +3353,7 @@ static void *kmalloc_large_node(size_t size, gfp_t flags, int node)
108742 return ptr;
108743 }
108744
108745-void *__kmalloc_node(size_t size, gfp_t flags, int node)
108746+void * __size_overflow(1) __kmalloc_node(size_t size, gfp_t flags, int node)
108747 {
108748 struct kmem_cache *s;
108749 void *ret;
108750@@ -3390,6 +3401,59 @@ static size_t __ksize(const void *object)
108751 return slab_ksize(page->slab_cache);
108752 }
108753
108754+bool is_usercopy_object(const void *ptr)
108755+{
108756+ struct page *page;
108757+ struct kmem_cache *s;
108758+
108759+ if (ZERO_OR_NULL_PTR(ptr))
108760+ return false;
108761+
108762+ if (!slab_is_available())
108763+ return false;
108764+
108765+ if (!virt_addr_valid(ptr))
108766+ return false;
108767+
108768+ page = virt_to_head_page(ptr);
108769+
108770+ if (!PageSlab(page))
108771+ return false;
108772+
108773+ s = page->slab_cache;
108774+ return s->flags & SLAB_USERCOPY;
108775+}
108776+
108777+#ifdef CONFIG_PAX_USERCOPY
108778+const char *check_heap_object(const void *ptr, unsigned long n)
108779+{
108780+ struct page *page;
108781+ struct kmem_cache *s;
108782+ unsigned long offset;
108783+
108784+ if (ZERO_OR_NULL_PTR(ptr))
108785+ return "<null>";
108786+
108787+ if (!virt_addr_valid(ptr))
108788+ return NULL;
108789+
108790+ page = virt_to_head_page(ptr);
108791+
108792+ if (!PageSlab(page))
108793+ return NULL;
108794+
108795+ s = page->slab_cache;
108796+ if (!(s->flags & SLAB_USERCOPY))
108797+ return s->name;
108798+
108799+ offset = (ptr - page_address(page)) % s->size;
108800+ if (offset <= s->object_size && n <= s->object_size - offset)
108801+ return NULL;
108802+
108803+ return s->name;
108804+}
108805+#endif
108806+
108807 size_t ksize(const void *object)
108808 {
108809 size_t size = __ksize(object);
108810@@ -3410,6 +3474,7 @@ void kfree(const void *x)
108811 if (unlikely(ZERO_OR_NULL_PTR(x)))
108812 return;
108813
108814+ VM_BUG_ON(!virt_addr_valid(x));
108815 page = virt_to_head_page(x);
108816 if (unlikely(!PageSlab(page))) {
108817 BUG_ON(!PageCompound(page));
108818@@ -3726,7 +3791,7 @@ __kmem_cache_alias(const char *name, size_t size, size_t align,
108819
108820 s = find_mergeable(size, align, flags, name, ctor);
108821 if (s) {
108822- s->refcount++;
108823+ atomic_inc(&s->refcount);
108824
108825 /*
108826 * Adjust the object sizes so that we clear
108827@@ -3742,7 +3807,7 @@ __kmem_cache_alias(const char *name, size_t size, size_t align,
108828 }
108829
108830 if (sysfs_slab_alias(s, name)) {
108831- s->refcount--;
108832+ atomic_dec(&s->refcount);
108833 s = NULL;
108834 }
108835 }
108836@@ -3859,7 +3924,7 @@ void *__kmalloc_node_track_caller(size_t size, gfp_t gfpflags,
108837 }
108838 #endif
108839
108840-#ifdef CONFIG_SYSFS
108841+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
108842 static int count_inuse(struct page *page)
108843 {
108844 return page->inuse;
108845@@ -4140,7 +4205,11 @@ static int list_locations(struct kmem_cache *s, char *buf,
108846 len += sprintf(buf + len, "%7ld ", l->count);
108847
108848 if (l->addr)
108849+#ifdef CONFIG_GRKERNSEC_HIDESYM
108850+ len += sprintf(buf + len, "%pS", NULL);
108851+#else
108852 len += sprintf(buf + len, "%pS", (void *)l->addr);
108853+#endif
108854 else
108855 len += sprintf(buf + len, "<not-available>");
108856
108857@@ -4238,12 +4307,12 @@ static void __init resiliency_test(void)
108858 validate_slab_cache(kmalloc_caches[9]);
108859 }
108860 #else
108861-#ifdef CONFIG_SYSFS
108862+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
108863 static void resiliency_test(void) {};
108864 #endif
108865 #endif
108866
108867-#ifdef CONFIG_SYSFS
108868+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
108869 enum slab_stat_type {
108870 SL_ALL, /* All slabs */
108871 SL_PARTIAL, /* Only partially allocated slabs */
108872@@ -4480,13 +4549,17 @@ static ssize_t ctor_show(struct kmem_cache *s, char *buf)
108873 {
108874 if (!s->ctor)
108875 return 0;
108876+#ifdef CONFIG_GRKERNSEC_HIDESYM
108877+ return sprintf(buf, "%pS\n", NULL);
108878+#else
108879 return sprintf(buf, "%pS\n", s->ctor);
108880+#endif
108881 }
108882 SLAB_ATTR_RO(ctor);
108883
108884 static ssize_t aliases_show(struct kmem_cache *s, char *buf)
108885 {
108886- return sprintf(buf, "%d\n", s->refcount < 0 ? 0 : s->refcount - 1);
108887+ return sprintf(buf, "%d\n", atomic_read(&s->refcount) < 0 ? 0 : atomic_read(&s->refcount) - 1);
108888 }
108889 SLAB_ATTR_RO(aliases);
108890
108891@@ -4574,6 +4647,22 @@ static ssize_t cache_dma_show(struct kmem_cache *s, char *buf)
108892 SLAB_ATTR_RO(cache_dma);
108893 #endif
108894
108895+#ifdef CONFIG_PAX_USERCOPY_SLABS
108896+static ssize_t usercopy_show(struct kmem_cache *s, char *buf)
108897+{
108898+ return sprintf(buf, "%d\n", !!(s->flags & SLAB_USERCOPY));
108899+}
108900+SLAB_ATTR_RO(usercopy);
108901+#endif
108902+
108903+#ifdef CONFIG_PAX_MEMORY_SANITIZE
108904+static ssize_t sanitize_show(struct kmem_cache *s, char *buf)
108905+{
108906+ return sprintf(buf, "%d\n", !(s->flags & SLAB_NO_SANITIZE));
108907+}
108908+SLAB_ATTR_RO(sanitize);
108909+#endif
108910+
108911 static ssize_t destroy_by_rcu_show(struct kmem_cache *s, char *buf)
108912 {
108913 return sprintf(buf, "%d\n", !!(s->flags & SLAB_DESTROY_BY_RCU));
108914@@ -4629,7 +4718,7 @@ static ssize_t trace_store(struct kmem_cache *s, const char *buf,
108915 * as well as cause other issues like converting a mergeable
108916 * cache into an umergeable one.
108917 */
108918- if (s->refcount > 1)
108919+ if (atomic_read(&s->refcount) > 1)
108920 return -EINVAL;
108921
108922 s->flags &= ~SLAB_TRACE;
108923@@ -4749,7 +4838,7 @@ static ssize_t failslab_show(struct kmem_cache *s, char *buf)
108924 static ssize_t failslab_store(struct kmem_cache *s, const char *buf,
108925 size_t length)
108926 {
108927- if (s->refcount > 1)
108928+ if (atomic_read(&s->refcount) > 1)
108929 return -EINVAL;
108930
108931 s->flags &= ~SLAB_FAILSLAB;
108932@@ -4916,6 +5005,12 @@ static struct attribute *slab_attrs[] = {
108933 #ifdef CONFIG_ZONE_DMA
108934 &cache_dma_attr.attr,
108935 #endif
108936+#ifdef CONFIG_PAX_USERCOPY_SLABS
108937+ &usercopy_attr.attr,
108938+#endif
108939+#ifdef CONFIG_PAX_MEMORY_SANITIZE
108940+ &sanitize_attr.attr,
108941+#endif
108942 #ifdef CONFIG_NUMA
108943 &remote_node_defrag_ratio_attr.attr,
108944 #endif
108945@@ -5157,6 +5252,7 @@ static char *create_unique_id(struct kmem_cache *s)
108946 return name;
108947 }
108948
108949+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
108950 static int sysfs_slab_add(struct kmem_cache *s)
108951 {
108952 int err;
108953@@ -5230,6 +5326,7 @@ void sysfs_slab_remove(struct kmem_cache *s)
108954 kobject_del(&s->kobj);
108955 kobject_put(&s->kobj);
108956 }
108957+#endif
108958
108959 /*
108960 * Need to buffer aliases during bootup until sysfs becomes
108961@@ -5243,6 +5340,7 @@ struct saved_alias {
108962
108963 static struct saved_alias *alias_list;
108964
108965+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
108966 static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
108967 {
108968 struct saved_alias *al;
108969@@ -5265,6 +5363,7 @@ static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
108970 alias_list = al;
108971 return 0;
108972 }
108973+#endif
108974
108975 static int __init slab_sysfs_init(void)
108976 {
108977diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c
108978index 4cba9c2..b4f9fcc 100644
108979--- a/mm/sparse-vmemmap.c
108980+++ b/mm/sparse-vmemmap.c
108981@@ -131,7 +131,7 @@ pud_t * __meminit vmemmap_pud_populate(pgd_t *pgd, unsigned long addr, int node)
108982 void *p = vmemmap_alloc_block(PAGE_SIZE, node);
108983 if (!p)
108984 return NULL;
108985- pud_populate(&init_mm, pud, p);
108986+ pud_populate_kernel(&init_mm, pud, p);
108987 }
108988 return pud;
108989 }
108990@@ -143,7 +143,7 @@ pgd_t * __meminit vmemmap_pgd_populate(unsigned long addr, int node)
108991 void *p = vmemmap_alloc_block(PAGE_SIZE, node);
108992 if (!p)
108993 return NULL;
108994- pgd_populate(&init_mm, pgd, p);
108995+ pgd_populate_kernel(&init_mm, pgd, p);
108996 }
108997 return pgd;
108998 }
108999diff --git a/mm/sparse.c b/mm/sparse.c
109000index d1b48b6..6e8590e 100644
109001--- a/mm/sparse.c
109002+++ b/mm/sparse.c
109003@@ -750,7 +750,7 @@ static void clear_hwpoisoned_pages(struct page *memmap, int nr_pages)
109004
109005 for (i = 0; i < PAGES_PER_SECTION; i++) {
109006 if (PageHWPoison(&memmap[i])) {
109007- atomic_long_sub(1, &num_poisoned_pages);
109008+ atomic_long_sub_unchecked(1, &num_poisoned_pages);
109009 ClearPageHWPoison(&memmap[i]);
109010 }
109011 }
109012diff --git a/mm/swap.c b/mm/swap.c
109013index cd3a5e6..40c0c8f 100644
109014--- a/mm/swap.c
109015+++ b/mm/swap.c
109016@@ -31,6 +31,7 @@
109017 #include <linux/memcontrol.h>
109018 #include <linux/gfp.h>
109019 #include <linux/uio.h>
109020+#include <linux/hugetlb.h>
109021
109022 #include "internal.h"
109023
109024@@ -77,6 +78,8 @@ static void __put_compound_page(struct page *page)
109025
109026 __page_cache_release(page);
109027 dtor = get_compound_page_dtor(page);
109028+ if (!PageHuge(page))
109029+ BUG_ON(dtor != free_compound_page);
109030 (*dtor)(page);
109031 }
109032
109033diff --git a/mm/swapfile.c b/mm/swapfile.c
109034index 63f55cc..31874e6 100644
109035--- a/mm/swapfile.c
109036+++ b/mm/swapfile.c
109037@@ -84,7 +84,7 @@ static DEFINE_MUTEX(swapon_mutex);
109038
109039 static DECLARE_WAIT_QUEUE_HEAD(proc_poll_wait);
109040 /* Activity counter to indicate that a swapon or swapoff has occurred */
109041-static atomic_t proc_poll_event = ATOMIC_INIT(0);
109042+static atomic_unchecked_t proc_poll_event = ATOMIC_INIT(0);
109043
109044 static inline unsigned char swap_count(unsigned char ent)
109045 {
109046@@ -1944,7 +1944,7 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
109047 spin_unlock(&swap_lock);
109048
109049 err = 0;
109050- atomic_inc(&proc_poll_event);
109051+ atomic_inc_unchecked(&proc_poll_event);
109052 wake_up_interruptible(&proc_poll_wait);
109053
109054 out_dput:
109055@@ -1961,8 +1961,8 @@ static unsigned swaps_poll(struct file *file, poll_table *wait)
109056
109057 poll_wait(file, &proc_poll_wait, wait);
109058
109059- if (seq->poll_event != atomic_read(&proc_poll_event)) {
109060- seq->poll_event = atomic_read(&proc_poll_event);
109061+ if (seq->poll_event != atomic_read_unchecked(&proc_poll_event)) {
109062+ seq->poll_event = atomic_read_unchecked(&proc_poll_event);
109063 return POLLIN | POLLRDNORM | POLLERR | POLLPRI;
109064 }
109065
109066@@ -2060,7 +2060,7 @@ static int swaps_open(struct inode *inode, struct file *file)
109067 return ret;
109068
109069 seq = file->private_data;
109070- seq->poll_event = atomic_read(&proc_poll_event);
109071+ seq->poll_event = atomic_read_unchecked(&proc_poll_event);
109072 return 0;
109073 }
109074
109075@@ -2520,7 +2520,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
109076 (frontswap_map) ? "FS" : "");
109077
109078 mutex_unlock(&swapon_mutex);
109079- atomic_inc(&proc_poll_event);
109080+ atomic_inc_unchecked(&proc_poll_event);
109081 wake_up_interruptible(&proc_poll_wait);
109082
109083 if (S_ISREG(inode->i_mode))
109084diff --git a/mm/util.c b/mm/util.c
109085index 3981ae9..28b585b 100644
109086--- a/mm/util.c
109087+++ b/mm/util.c
109088@@ -233,6 +233,12 @@ struct task_struct *task_of_stack(struct task_struct *task,
109089 void arch_pick_mmap_layout(struct mm_struct *mm)
109090 {
109091 mm->mmap_base = TASK_UNMAPPED_BASE;
109092+
109093+#ifdef CONFIG_PAX_RANDMMAP
109094+ if (mm->pax_flags & MF_PAX_RANDMMAP)
109095+ mm->mmap_base += mm->delta_mmap;
109096+#endif
109097+
109098 mm->get_unmapped_area = arch_get_unmapped_area;
109099 }
109100 #endif
109101@@ -403,6 +409,9 @@ int get_cmdline(struct task_struct *task, char *buffer, int buflen)
109102 if (!mm->arg_end)
109103 goto out_mm; /* Shh! No looking before we're done */
109104
109105+ if (gr_acl_handle_procpidmem(task))
109106+ goto out_mm;
109107+
109108 len = mm->arg_end - mm->arg_start;
109109
109110 if (len > buflen)
109111diff --git a/mm/vmalloc.c b/mm/vmalloc.c
109112index 49abccf..7bd1931 100644
109113--- a/mm/vmalloc.c
109114+++ b/mm/vmalloc.c
109115@@ -39,20 +39,65 @@ struct vfree_deferred {
109116 struct work_struct wq;
109117 };
109118 static DEFINE_PER_CPU(struct vfree_deferred, vfree_deferred);
109119+static DEFINE_PER_CPU(struct vfree_deferred, vunmap_deferred);
109120+
109121+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
109122+struct stack_deferred_llist {
109123+ struct llist_head list;
109124+ void *stack;
109125+ void *lowmem_stack;
109126+};
109127+
109128+struct stack_deferred {
109129+ struct stack_deferred_llist list;
109130+ struct work_struct wq;
109131+};
109132+
109133+static DEFINE_PER_CPU(struct stack_deferred, stack_deferred);
109134+#endif
109135
109136 static void __vunmap(const void *, int);
109137
109138-static void free_work(struct work_struct *w)
109139+static void vfree_work(struct work_struct *w)
109140 {
109141 struct vfree_deferred *p = container_of(w, struct vfree_deferred, wq);
109142 struct llist_node *llnode = llist_del_all(&p->list);
109143 while (llnode) {
109144- void *p = llnode;
109145+ void *x = llnode;
109146 llnode = llist_next(llnode);
109147- __vunmap(p, 1);
109148+ __vunmap(x, 1);
109149 }
109150 }
109151
109152+static void vunmap_work(struct work_struct *w)
109153+{
109154+ struct vfree_deferred *p = container_of(w, struct vfree_deferred, wq);
109155+ struct llist_node *llnode = llist_del_all(&p->list);
109156+ while (llnode) {
109157+ void *x = llnode;
109158+ llnode = llist_next(llnode);
109159+ __vunmap(x, 0);
109160+ }
109161+}
109162+
109163+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
109164+static void unmap_work(struct work_struct *w)
109165+{
109166+ struct stack_deferred *p = container_of(w, struct stack_deferred, wq);
109167+ struct llist_node *llnode = llist_del_all(&p->list.list);
109168+ while (llnode) {
109169+ struct stack_deferred_llist *x =
109170+ llist_entry((struct llist_head *)llnode,
109171+ struct stack_deferred_llist, list);
109172+ void *stack = ACCESS_ONCE(x->stack);
109173+ void *lowmem_stack = ACCESS_ONCE(x->lowmem_stack);
109174+ llnode = llist_next(llnode);
109175+ __vunmap(stack, 0);
109176+ free_kmem_pages((unsigned long)lowmem_stack, THREAD_SIZE_ORDER);
109177+ }
109178+}
109179+#endif
109180+
109181 /*** Page table manipulation functions ***/
109182
109183 static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end)
109184@@ -61,8 +106,19 @@ static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end)
109185
109186 pte = pte_offset_kernel(pmd, addr);
109187 do {
109188- pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
109189- WARN_ON(!pte_none(ptent) && !pte_present(ptent));
109190+
109191+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
109192+ if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr < (unsigned long)MODULES_EXEC_END) {
109193+ BUG_ON(!pte_exec(*pte));
109194+ set_pte_at(&init_mm, addr, pte, pfn_pte(__pa(addr) >> PAGE_SHIFT, PAGE_KERNEL_EXEC));
109195+ continue;
109196+ }
109197+#endif
109198+
109199+ {
109200+ pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
109201+ WARN_ON(!pte_none(ptent) && !pte_present(ptent));
109202+ }
109203 } while (pte++, addr += PAGE_SIZE, addr != end);
109204 }
109205
109206@@ -122,16 +178,29 @@ static int vmap_pte_range(pmd_t *pmd, unsigned long addr,
109207 pte = pte_alloc_kernel(pmd, addr);
109208 if (!pte)
109209 return -ENOMEM;
109210+
109211+ pax_open_kernel();
109212 do {
109213 struct page *page = pages[*nr];
109214
109215- if (WARN_ON(!pte_none(*pte)))
109216+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
109217+ if (pgprot_val(prot) & _PAGE_NX)
109218+#endif
109219+
109220+ if (!pte_none(*pte)) {
109221+ pax_close_kernel();
109222+ WARN_ON(1);
109223 return -EBUSY;
109224- if (WARN_ON(!page))
109225+ }
109226+ if (!page) {
109227+ pax_close_kernel();
109228+ WARN_ON(1);
109229 return -ENOMEM;
109230+ }
109231 set_pte_at(&init_mm, addr, pte, mk_pte(page, prot));
109232 (*nr)++;
109233 } while (pte++, addr += PAGE_SIZE, addr != end);
109234+ pax_close_kernel();
109235 return 0;
109236 }
109237
109238@@ -141,7 +210,7 @@ static int vmap_pmd_range(pud_t *pud, unsigned long addr,
109239 pmd_t *pmd;
109240 unsigned long next;
109241
109242- pmd = pmd_alloc(&init_mm, pud, addr);
109243+ pmd = pmd_alloc_kernel(&init_mm, pud, addr);
109244 if (!pmd)
109245 return -ENOMEM;
109246 do {
109247@@ -158,7 +227,7 @@ static int vmap_pud_range(pgd_t *pgd, unsigned long addr,
109248 pud_t *pud;
109249 unsigned long next;
109250
109251- pud = pud_alloc(&init_mm, pgd, addr);
109252+ pud = pud_alloc_kernel(&init_mm, pgd, addr);
109253 if (!pud)
109254 return -ENOMEM;
109255 do {
109256@@ -218,6 +287,12 @@ int is_vmalloc_or_module_addr(const void *x)
109257 if (addr >= MODULES_VADDR && addr < MODULES_END)
109258 return 1;
109259 #endif
109260+
109261+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
109262+ if (x >= (const void *)MODULES_EXEC_VADDR && x < (const void *)MODULES_EXEC_END)
109263+ return 1;
109264+#endif
109265+
109266 return is_vmalloc_addr(x);
109267 }
109268
109269@@ -238,8 +313,14 @@ struct page *vmalloc_to_page(const void *vmalloc_addr)
109270
109271 if (!pgd_none(*pgd)) {
109272 pud_t *pud = pud_offset(pgd, addr);
109273+#ifdef CONFIG_X86
109274+ if (!pud_large(*pud))
109275+#endif
109276 if (!pud_none(*pud)) {
109277 pmd_t *pmd = pmd_offset(pud, addr);
109278+#ifdef CONFIG_X86
109279+ if (!pmd_large(*pmd))
109280+#endif
109281 if (!pmd_none(*pmd)) {
109282 pte_t *ptep, pte;
109283
109284@@ -341,7 +422,7 @@ static void purge_vmap_area_lazy(void);
109285 * Allocate a region of KVA of the specified size and alignment, within the
109286 * vstart and vend.
109287 */
109288-static struct vmap_area *alloc_vmap_area(unsigned long size,
109289+static struct vmap_area * __size_overflow(1) alloc_vmap_area(unsigned long size,
109290 unsigned long align,
109291 unsigned long vstart, unsigned long vend,
109292 int node, gfp_t gfp_mask)
109293@@ -1182,13 +1263,27 @@ void __init vmalloc_init(void)
109294 for_each_possible_cpu(i) {
109295 struct vmap_block_queue *vbq;
109296 struct vfree_deferred *p;
109297+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
109298+ struct stack_deferred *p2;
109299+#endif
109300
109301 vbq = &per_cpu(vmap_block_queue, i);
109302 spin_lock_init(&vbq->lock);
109303 INIT_LIST_HEAD(&vbq->free);
109304+
109305 p = &per_cpu(vfree_deferred, i);
109306 init_llist_head(&p->list);
109307- INIT_WORK(&p->wq, free_work);
109308+ INIT_WORK(&p->wq, vfree_work);
109309+
109310+ p = &per_cpu(vunmap_deferred, i);
109311+ init_llist_head(&p->list);
109312+ INIT_WORK(&p->wq, vunmap_work);
109313+
109314+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
109315+ p2 = &per_cpu(stack_deferred, i);
109316+ init_llist_head(&p2->list.list);
109317+ INIT_WORK(&p2->wq, unmap_work);
109318+#endif
109319 }
109320
109321 /* Import existing vmlist entries. */
109322@@ -1313,6 +1408,16 @@ static struct vm_struct *__get_vm_area_node(unsigned long size,
109323 struct vm_struct *area;
109324
109325 BUG_ON(in_interrupt());
109326+
109327+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
109328+ if (flags & VM_KERNEXEC) {
109329+ if (start != VMALLOC_START || end != VMALLOC_END)
109330+ return NULL;
109331+ start = (unsigned long)MODULES_EXEC_VADDR;
109332+ end = (unsigned long)MODULES_EXEC_END;
109333+ }
109334+#endif
109335+
109336 if (flags & VM_IOREMAP)
109337 align = 1ul << clamp(fls(size), PAGE_SHIFT, IOREMAP_MAX_ORDER);
109338
109339@@ -1510,13 +1615,36 @@ EXPORT_SYMBOL(vfree);
109340 */
109341 void vunmap(const void *addr)
109342 {
109343- BUG_ON(in_interrupt());
109344- might_sleep();
109345- if (addr)
109346+ if (!addr)
109347+ return;
109348+ if (unlikely(in_interrupt())) {
109349+ struct vfree_deferred *p = this_cpu_ptr(&vunmap_deferred);
109350+ if (llist_add((struct llist_node *)addr, &p->list))
109351+ schedule_work(&p->wq);
109352+ } else {
109353+ might_sleep();
109354 __vunmap(addr, 0);
109355+ }
109356 }
109357 EXPORT_SYMBOL(vunmap);
109358
109359+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
109360+void unmap_process_stacks(struct task_struct *task)
109361+{
109362+ if (unlikely(in_interrupt())) {
109363+ struct stack_deferred *p = this_cpu_ptr(&stack_deferred);
109364+ struct stack_deferred_llist *list = task->stack;
109365+ list->stack = task->stack;
109366+ list->lowmem_stack = task->lowmem_stack;
109367+ if (llist_add((struct llist_node *)&list->list, &p->list.list))
109368+ schedule_work(&p->wq);
109369+ } else {
109370+ __vunmap(task->stack, 0);
109371+ free_kmem_pages((unsigned long)task->lowmem_stack, THREAD_SIZE_ORDER);
109372+ }
109373+}
109374+#endif
109375+
109376 /**
109377 * vmap - map an array of pages into virtually contiguous space
109378 * @pages: array of page pointers
109379@@ -1537,6 +1665,11 @@ void *vmap(struct page **pages, unsigned int count,
109380 if (count > totalram_pages)
109381 return NULL;
109382
109383+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
109384+ if (!(pgprot_val(prot) & _PAGE_NX))
109385+ flags |= VM_KERNEXEC;
109386+#endif
109387+
109388 area = get_vm_area_caller((count << PAGE_SHIFT), flags,
109389 __builtin_return_address(0));
109390 if (!area)
109391@@ -1641,6 +1774,14 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align,
109392 if (!size || (size >> PAGE_SHIFT) > totalram_pages)
109393 goto fail;
109394
109395+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
109396+ if (!(pgprot_val(prot) & _PAGE_NX)) {
109397+ vm_flags |= VM_KERNEXEC;
109398+ start = VMALLOC_START;
109399+ end = VMALLOC_END;
109400+ }
109401+#endif
109402+
109403 area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNINITIALIZED |
109404 vm_flags, start, end, node, gfp_mask, caller);
109405 if (!area)
109406@@ -1817,10 +1958,9 @@ EXPORT_SYMBOL(vzalloc_node);
109407 * For tight control over page level allocator and protection flags
109408 * use __vmalloc() instead.
109409 */
109410-
109411 void *vmalloc_exec(unsigned long size)
109412 {
109413- return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL_EXEC,
109414+ return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, PAGE_KERNEL_EXEC,
109415 NUMA_NO_NODE, __builtin_return_address(0));
109416 }
109417
109418@@ -2127,6 +2267,8 @@ int remap_vmalloc_range_partial(struct vm_area_struct *vma, unsigned long uaddr,
109419 {
109420 struct vm_struct *area;
109421
109422+ BUG_ON(vma->vm_mirror);
109423+
109424 size = PAGE_ALIGN(size);
109425
109426 if (!PAGE_ALIGNED(uaddr) || !PAGE_ALIGNED(kaddr))
109427@@ -2609,7 +2751,11 @@ static int s_show(struct seq_file *m, void *p)
109428 v->addr, v->addr + v->size, v->size);
109429
109430 if (v->caller)
109431+#ifdef CONFIG_GRKERNSEC_HIDESYM
109432+ seq_printf(m, " %pK", v->caller);
109433+#else
109434 seq_printf(m, " %pS", v->caller);
109435+#endif
109436
109437 if (v->nr_pages)
109438 seq_printf(m, " pages=%d", v->nr_pages);
109439diff --git a/mm/vmstat.c b/mm/vmstat.c
109440index 4f5cd97..9fb715a 100644
109441--- a/mm/vmstat.c
109442+++ b/mm/vmstat.c
109443@@ -27,6 +27,7 @@
109444 #include <linux/mm_inline.h>
109445 #include <linux/page_ext.h>
109446 #include <linux/page_owner.h>
109447+#include <linux/grsecurity.h>
109448
109449 #include "internal.h"
109450
109451@@ -86,7 +87,7 @@ void vm_events_fold_cpu(int cpu)
109452 *
109453 * vm_stat contains the global counters
109454 */
109455-atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
109456+atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
109457 EXPORT_SYMBOL(vm_stat);
109458
109459 #ifdef CONFIG_SMP
109460@@ -438,7 +439,7 @@ static int fold_diff(int *diff)
109461
109462 for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
109463 if (diff[i]) {
109464- atomic_long_add(diff[i], &vm_stat[i]);
109465+ atomic_long_add_unchecked(diff[i], &vm_stat[i]);
109466 changes++;
109467 }
109468 return changes;
109469@@ -476,7 +477,7 @@ static int refresh_cpu_vm_stats(void)
109470 v = this_cpu_xchg(p->vm_stat_diff[i], 0);
109471 if (v) {
109472
109473- atomic_long_add(v, &zone->vm_stat[i]);
109474+ atomic_long_add_unchecked(v, &zone->vm_stat[i]);
109475 global_diff[i] += v;
109476 #ifdef CONFIG_NUMA
109477 /* 3 seconds idle till flush */
109478@@ -540,7 +541,7 @@ void cpu_vm_stats_fold(int cpu)
109479
109480 v = p->vm_stat_diff[i];
109481 p->vm_stat_diff[i] = 0;
109482- atomic_long_add(v, &zone->vm_stat[i]);
109483+ atomic_long_add_unchecked(v, &zone->vm_stat[i]);
109484 global_diff[i] += v;
109485 }
109486 }
109487@@ -560,8 +561,8 @@ void drain_zonestat(struct zone *zone, struct per_cpu_pageset *pset)
109488 if (pset->vm_stat_diff[i]) {
109489 int v = pset->vm_stat_diff[i];
109490 pset->vm_stat_diff[i] = 0;
109491- atomic_long_add(v, &zone->vm_stat[i]);
109492- atomic_long_add(v, &vm_stat[i]);
109493+ atomic_long_add_unchecked(v, &zone->vm_stat[i]);
109494+ atomic_long_add_unchecked(v, &vm_stat[i]);
109495 }
109496 }
109497 #endif
109498@@ -1293,10 +1294,22 @@ static void *vmstat_start(struct seq_file *m, loff_t *pos)
109499 stat_items_size += sizeof(struct vm_event_state);
109500 #endif
109501
109502- v = kmalloc(stat_items_size, GFP_KERNEL);
109503+ v = kzalloc(stat_items_size, GFP_KERNEL);
109504 m->private = v;
109505 if (!v)
109506 return ERR_PTR(-ENOMEM);
109507+
109508+#ifdef CONFIG_GRKERNSEC_PROC_ADD
109509+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
109510+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)
109511+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
109512+ && !in_group_p(grsec_proc_gid)
109513+#endif
109514+ )
109515+ return (unsigned long *)m->private + *pos;
109516+#endif
109517+#endif
109518+
109519 for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
109520 v[i] = global_page_state(i);
109521 v += NR_VM_ZONE_STAT_ITEMS;
109522@@ -1528,10 +1541,16 @@ static int __init setup_vmstat(void)
109523 cpu_notifier_register_done();
109524 #endif
109525 #ifdef CONFIG_PROC_FS
109526- proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations);
109527- proc_create("pagetypeinfo", S_IRUGO, NULL, &pagetypeinfo_file_ops);
109528- proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
109529- proc_create("zoneinfo", S_IRUGO, NULL, &proc_zoneinfo_file_operations);
109530+ {
109531+ mode_t gr_mode = S_IRUGO;
109532+#ifdef CONFIG_GRKERNSEC_PROC_ADD
109533+ gr_mode = S_IRUSR;
109534+#endif
109535+ proc_create("buddyinfo", gr_mode, NULL, &fragmentation_file_operations);
109536+ proc_create("pagetypeinfo", gr_mode, NULL, &pagetypeinfo_file_ops);
109537+ proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
109538+ proc_create("zoneinfo", gr_mode, NULL, &proc_zoneinfo_file_operations);
109539+ }
109540 #endif
109541 return 0;
109542 }
109543diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
109544index 64c6bed..b79a5de 100644
109545--- a/net/8021q/vlan.c
109546+++ b/net/8021q/vlan.c
109547@@ -481,7 +481,7 @@ out:
109548 return NOTIFY_DONE;
109549 }
109550
109551-static struct notifier_block vlan_notifier_block __read_mostly = {
109552+static struct notifier_block vlan_notifier_block = {
109553 .notifier_call = vlan_device_event,
109554 };
109555
109556@@ -556,8 +556,7 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg)
109557 err = -EPERM;
109558 if (!ns_capable(net->user_ns, CAP_NET_ADMIN))
109559 break;
109560- if ((args.u.name_type >= 0) &&
109561- (args.u.name_type < VLAN_NAME_TYPE_HIGHEST)) {
109562+ if (args.u.name_type < VLAN_NAME_TYPE_HIGHEST) {
109563 struct vlan_net *vn;
109564
109565 vn = net_generic(net, vlan_net_id);
109566diff --git a/net/8021q/vlan_netlink.c b/net/8021q/vlan_netlink.c
109567index c92b52f..006c052 100644
109568--- a/net/8021q/vlan_netlink.c
109569+++ b/net/8021q/vlan_netlink.c
109570@@ -245,7 +245,7 @@ static struct net *vlan_get_link_net(const struct net_device *dev)
109571 return dev_net(real_dev);
109572 }
109573
109574-struct rtnl_link_ops vlan_link_ops __read_mostly = {
109575+struct rtnl_link_ops vlan_link_ops = {
109576 .kind = "vlan",
109577 .maxtype = IFLA_VLAN_MAX,
109578 .policy = vlan_policy,
109579diff --git a/net/9p/client.c b/net/9p/client.c
109580index e86a9bea..e91f70e 100644
109581--- a/net/9p/client.c
109582+++ b/net/9p/client.c
109583@@ -596,7 +596,7 @@ static int p9_check_zc_errors(struct p9_client *c, struct p9_req_t *req,
109584 len - inline_len);
109585 } else {
109586 err = copy_from_user(ename + inline_len,
109587- uidata, len - inline_len);
109588+ (char __force_user *)uidata, len - inline_len);
109589 if (err) {
109590 err = -EFAULT;
109591 goto out_err;
109592@@ -1570,7 +1570,7 @@ p9_client_read(struct p9_fid *fid, char *data, char __user *udata, u64 offset,
109593 kernel_buf = 1;
109594 indata = data;
109595 } else
109596- indata = (__force char *)udata;
109597+ indata = (__force_kernel char *)udata;
109598 /*
109599 * response header len is 11
109600 * PDU Header(7) + IO Size (4)
109601@@ -1645,7 +1645,7 @@ p9_client_write(struct p9_fid *fid, char *data, const char __user *udata,
109602 kernel_buf = 1;
109603 odata = data;
109604 } else
109605- odata = (char *)udata;
109606+ odata = (char __force_kernel *)udata;
109607 req = p9_client_zc_rpc(clnt, P9_TWRITE, NULL, odata, 0, rsize,
109608 P9_ZC_HDR_SZ, kernel_buf, "dqd",
109609 fid->fid, offset, rsize);
109610diff --git a/net/9p/mod.c b/net/9p/mod.c
109611index 6ab36ae..6f1841b 100644
109612--- a/net/9p/mod.c
109613+++ b/net/9p/mod.c
109614@@ -84,7 +84,7 @@ static LIST_HEAD(v9fs_trans_list);
109615 void v9fs_register_trans(struct p9_trans_module *m)
109616 {
109617 spin_lock(&v9fs_trans_lock);
109618- list_add_tail(&m->list, &v9fs_trans_list);
109619+ pax_list_add_tail((struct list_head *)&m->list, &v9fs_trans_list);
109620 spin_unlock(&v9fs_trans_lock);
109621 }
109622 EXPORT_SYMBOL(v9fs_register_trans);
109623@@ -97,7 +97,7 @@ EXPORT_SYMBOL(v9fs_register_trans);
109624 void v9fs_unregister_trans(struct p9_trans_module *m)
109625 {
109626 spin_lock(&v9fs_trans_lock);
109627- list_del_init(&m->list);
109628+ pax_list_del_init((struct list_head *)&m->list);
109629 spin_unlock(&v9fs_trans_lock);
109630 }
109631 EXPORT_SYMBOL(v9fs_unregister_trans);
109632diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c
109633index 80d08f6..de63fd1 100644
109634--- a/net/9p/trans_fd.c
109635+++ b/net/9p/trans_fd.c
109636@@ -428,7 +428,7 @@ static int p9_fd_write(struct p9_client *client, void *v, int len)
109637 oldfs = get_fs();
109638 set_fs(get_ds());
109639 /* The cast to a user pointer is valid due to the set_fs() */
109640- ret = vfs_write(ts->wr, (__force void __user *)v, len, &ts->wr->f_pos);
109641+ ret = vfs_write(ts->wr, (void __force_user *)v, len, &ts->wr->f_pos);
109642 set_fs(oldfs);
109643
109644 if (ret <= 0 && ret != -ERESTARTSYS && ret != -EAGAIN)
109645diff --git a/net/appletalk/atalk_proc.c b/net/appletalk/atalk_proc.c
109646index af46bc4..f9adfcd 100644
109647--- a/net/appletalk/atalk_proc.c
109648+++ b/net/appletalk/atalk_proc.c
109649@@ -256,7 +256,7 @@ int __init atalk_proc_init(void)
109650 struct proc_dir_entry *p;
109651 int rc = -ENOMEM;
109652
109653- atalk_proc_dir = proc_mkdir("atalk", init_net.proc_net);
109654+ atalk_proc_dir = proc_mkdir_restrict("atalk", init_net.proc_net);
109655 if (!atalk_proc_dir)
109656 goto out;
109657
109658diff --git a/net/atm/atm_misc.c b/net/atm/atm_misc.c
109659index 876fbe8..8bbea9f 100644
109660--- a/net/atm/atm_misc.c
109661+++ b/net/atm/atm_misc.c
109662@@ -17,7 +17,7 @@ int atm_charge(struct atm_vcc *vcc, int truesize)
109663 if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf)
109664 return 1;
109665 atm_return(vcc, truesize);
109666- atomic_inc(&vcc->stats->rx_drop);
109667+ atomic_inc_unchecked(&vcc->stats->rx_drop);
109668 return 0;
109669 }
109670 EXPORT_SYMBOL(atm_charge);
109671@@ -39,7 +39,7 @@ struct sk_buff *atm_alloc_charge(struct atm_vcc *vcc, int pdu_size,
109672 }
109673 }
109674 atm_return(vcc, guess);
109675- atomic_inc(&vcc->stats->rx_drop);
109676+ atomic_inc_unchecked(&vcc->stats->rx_drop);
109677 return NULL;
109678 }
109679 EXPORT_SYMBOL(atm_alloc_charge);
109680@@ -86,7 +86,7 @@ EXPORT_SYMBOL(atm_pcr_goal);
109681
109682 void sonet_copy_stats(struct k_sonet_stats *from, struct sonet_stats *to)
109683 {
109684-#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
109685+#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
109686 __SONET_ITEMS
109687 #undef __HANDLE_ITEM
109688 }
109689@@ -94,7 +94,7 @@ EXPORT_SYMBOL(sonet_copy_stats);
109690
109691 void sonet_subtract_stats(struct k_sonet_stats *from, struct sonet_stats *to)
109692 {
109693-#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
109694+#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i,&from->i)
109695 __SONET_ITEMS
109696 #undef __HANDLE_ITEM
109697 }
109698diff --git a/net/atm/lec.c b/net/atm/lec.c
109699index 4b98f89..5a2f6cb 100644
109700--- a/net/atm/lec.c
109701+++ b/net/atm/lec.c
109702@@ -111,9 +111,9 @@ static inline void lec_arp_put(struct lec_arp_table *entry)
109703 }
109704
109705 static struct lane2_ops lane2_ops = {
109706- lane2_resolve, /* resolve, spec 3.1.3 */
109707- lane2_associate_req, /* associate_req, spec 3.1.4 */
109708- NULL /* associate indicator, spec 3.1.5 */
109709+ .resolve = lane2_resolve,
109710+ .associate_req = lane2_associate_req,
109711+ .associate_indicator = NULL
109712 };
109713
109714 static unsigned char bus_mac[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
109715diff --git a/net/atm/lec.h b/net/atm/lec.h
109716index 4149db1..f2ab682 100644
109717--- a/net/atm/lec.h
109718+++ b/net/atm/lec.h
109719@@ -48,7 +48,7 @@ struct lane2_ops {
109720 const u8 *tlvs, u32 sizeoftlvs);
109721 void (*associate_indicator) (struct net_device *dev, const u8 *mac_addr,
109722 const u8 *tlvs, u32 sizeoftlvs);
109723-};
109724+} __no_const;
109725
109726 /*
109727 * ATM LAN Emulation supports both LLC & Dix Ethernet EtherType
109728diff --git a/net/atm/mpoa_caches.c b/net/atm/mpoa_caches.c
109729index d1b2d9a..d549f7f 100644
109730--- a/net/atm/mpoa_caches.c
109731+++ b/net/atm/mpoa_caches.c
109732@@ -535,30 +535,30 @@ static void eg_destroy_cache(struct mpoa_client *mpc)
109733
109734
109735 static struct in_cache_ops ingress_ops = {
109736- in_cache_add_entry, /* add_entry */
109737- in_cache_get, /* get */
109738- in_cache_get_with_mask, /* get_with_mask */
109739- in_cache_get_by_vcc, /* get_by_vcc */
109740- in_cache_put, /* put */
109741- in_cache_remove_entry, /* remove_entry */
109742- cache_hit, /* cache_hit */
109743- clear_count_and_expired, /* clear_count */
109744- check_resolving_entries, /* check_resolving */
109745- refresh_entries, /* refresh */
109746- in_destroy_cache /* destroy_cache */
109747+ .add_entry = in_cache_add_entry,
109748+ .get = in_cache_get,
109749+ .get_with_mask = in_cache_get_with_mask,
109750+ .get_by_vcc = in_cache_get_by_vcc,
109751+ .put = in_cache_put,
109752+ .remove_entry = in_cache_remove_entry,
109753+ .cache_hit = cache_hit,
109754+ .clear_count = clear_count_and_expired,
109755+ .check_resolving = check_resolving_entries,
109756+ .refresh = refresh_entries,
109757+ .destroy_cache = in_destroy_cache
109758 };
109759
109760 static struct eg_cache_ops egress_ops = {
109761- eg_cache_add_entry, /* add_entry */
109762- eg_cache_get_by_cache_id, /* get_by_cache_id */
109763- eg_cache_get_by_tag, /* get_by_tag */
109764- eg_cache_get_by_vcc, /* get_by_vcc */
109765- eg_cache_get_by_src_ip, /* get_by_src_ip */
109766- eg_cache_put, /* put */
109767- eg_cache_remove_entry, /* remove_entry */
109768- update_eg_cache_entry, /* update */
109769- clear_expired, /* clear_expired */
109770- eg_destroy_cache /* destroy_cache */
109771+ .add_entry = eg_cache_add_entry,
109772+ .get_by_cache_id = eg_cache_get_by_cache_id,
109773+ .get_by_tag = eg_cache_get_by_tag,
109774+ .get_by_vcc = eg_cache_get_by_vcc,
109775+ .get_by_src_ip = eg_cache_get_by_src_ip,
109776+ .put = eg_cache_put,
109777+ .remove_entry = eg_cache_remove_entry,
109778+ .update = update_eg_cache_entry,
109779+ .clear_expired = clear_expired,
109780+ .destroy_cache = eg_destroy_cache
109781 };
109782
109783
109784diff --git a/net/atm/proc.c b/net/atm/proc.c
109785index bbb6461..cf04016 100644
109786--- a/net/atm/proc.c
109787+++ b/net/atm/proc.c
109788@@ -45,9 +45,9 @@ static void add_stats(struct seq_file *seq, const char *aal,
109789 const struct k_atm_aal_stats *stats)
109790 {
109791 seq_printf(seq, "%s ( %d %d %d %d %d )", aal,
109792- atomic_read(&stats->tx), atomic_read(&stats->tx_err),
109793- atomic_read(&stats->rx), atomic_read(&stats->rx_err),
109794- atomic_read(&stats->rx_drop));
109795+ atomic_read_unchecked(&stats->tx),atomic_read_unchecked(&stats->tx_err),
109796+ atomic_read_unchecked(&stats->rx),atomic_read_unchecked(&stats->rx_err),
109797+ atomic_read_unchecked(&stats->rx_drop));
109798 }
109799
109800 static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev)
109801diff --git a/net/atm/resources.c b/net/atm/resources.c
109802index 0447d5d..3cf4728 100644
109803--- a/net/atm/resources.c
109804+++ b/net/atm/resources.c
109805@@ -160,7 +160,7 @@ EXPORT_SYMBOL(atm_dev_deregister);
109806 static void copy_aal_stats(struct k_atm_aal_stats *from,
109807 struct atm_aal_stats *to)
109808 {
109809-#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
109810+#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
109811 __AAL_STAT_ITEMS
109812 #undef __HANDLE_ITEM
109813 }
109814@@ -168,7 +168,7 @@ static void copy_aal_stats(struct k_atm_aal_stats *from,
109815 static void subtract_aal_stats(struct k_atm_aal_stats *from,
109816 struct atm_aal_stats *to)
109817 {
109818-#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
109819+#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i, &from->i)
109820 __AAL_STAT_ITEMS
109821 #undef __HANDLE_ITEM
109822 }
109823diff --git a/net/ax25/sysctl_net_ax25.c b/net/ax25/sysctl_net_ax25.c
109824index 919a5ce..cc6b444 100644
109825--- a/net/ax25/sysctl_net_ax25.c
109826+++ b/net/ax25/sysctl_net_ax25.c
109827@@ -152,7 +152,7 @@ int ax25_register_dev_sysctl(ax25_dev *ax25_dev)
109828 {
109829 char path[sizeof("net/ax25/") + IFNAMSIZ];
109830 int k;
109831- struct ctl_table *table;
109832+ ctl_table_no_const *table;
109833
109834 table = kmemdup(ax25_param_table, sizeof(ax25_param_table), GFP_KERNEL);
109835 if (!table)
109836diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
109837index 00e00e0..710fcd2 100644
109838--- a/net/batman-adv/bat_iv_ogm.c
109839+++ b/net/batman-adv/bat_iv_ogm.c
109840@@ -312,7 +312,7 @@ static int batadv_iv_ogm_iface_enable(struct batadv_hard_iface *hard_iface)
109841
109842 /* randomize initial seqno to avoid collision */
109843 get_random_bytes(&random_seqno, sizeof(random_seqno));
109844- atomic_set(&hard_iface->bat_iv.ogm_seqno, random_seqno);
109845+ atomic_set_unchecked(&hard_iface->bat_iv.ogm_seqno, random_seqno);
109846
109847 hard_iface->bat_iv.ogm_buff_len = BATADV_OGM_HLEN;
109848 ogm_buff = kmalloc(hard_iface->bat_iv.ogm_buff_len, GFP_ATOMIC);
109849@@ -917,9 +917,9 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface)
109850 batadv_ogm_packet->tvlv_len = htons(tvlv_len);
109851
109852 /* change sequence number to network order */
109853- seqno = (uint32_t)atomic_read(&hard_iface->bat_iv.ogm_seqno);
109854+ seqno = (uint32_t)atomic_read_unchecked(&hard_iface->bat_iv.ogm_seqno);
109855 batadv_ogm_packet->seqno = htonl(seqno);
109856- atomic_inc(&hard_iface->bat_iv.ogm_seqno);
109857+ atomic_inc_unchecked(&hard_iface->bat_iv.ogm_seqno);
109858
109859 batadv_iv_ogm_slide_own_bcast_window(hard_iface);
109860
109861@@ -1596,7 +1596,7 @@ static void batadv_iv_ogm_process(const struct sk_buff *skb, int ogm_offset,
109862 return;
109863
109864 /* could be changed by schedule_own_packet() */
109865- if_incoming_seqno = atomic_read(&if_incoming->bat_iv.ogm_seqno);
109866+ if_incoming_seqno = atomic_read_unchecked(&if_incoming->bat_iv.ogm_seqno);
109867
109868 if (ogm_packet->flags & BATADV_DIRECTLINK)
109869 has_directlink_flag = true;
109870diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c
109871index 3d1dcaa..4699f4e 100644
109872--- a/net/batman-adv/fragmentation.c
109873+++ b/net/batman-adv/fragmentation.c
109874@@ -449,7 +449,7 @@ bool batadv_frag_send_packet(struct sk_buff *skb,
109875 frag_header.packet_type = BATADV_UNICAST_FRAG;
109876 frag_header.version = BATADV_COMPAT_VERSION;
109877 frag_header.ttl = BATADV_TTL;
109878- frag_header.seqno = htons(atomic_inc_return(&bat_priv->frag_seqno));
109879+ frag_header.seqno = htons(atomic_inc_return_unchecked(&bat_priv->frag_seqno));
109880 frag_header.reserved = 0;
109881 frag_header.no = 0;
109882 frag_header.total_size = htons(skb->len);
109883diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
109884index 5ec31d7..e371631 100644
109885--- a/net/batman-adv/soft-interface.c
109886+++ b/net/batman-adv/soft-interface.c
109887@@ -295,7 +295,7 @@ send:
109888 primary_if->net_dev->dev_addr);
109889
109890 /* set broadcast sequence number */
109891- seqno = atomic_inc_return(&bat_priv->bcast_seqno);
109892+ seqno = atomic_inc_return_unchecked(&bat_priv->bcast_seqno);
109893 bcast_packet->seqno = htonl(seqno);
109894
109895 batadv_add_bcast_packet_to_list(bat_priv, skb, brd_delay);
109896@@ -760,7 +760,7 @@ static int batadv_softif_init_late(struct net_device *dev)
109897 atomic_set(&bat_priv->batman_queue_left, BATADV_BATMAN_QUEUE_LEN);
109898
109899 atomic_set(&bat_priv->mesh_state, BATADV_MESH_INACTIVE);
109900- atomic_set(&bat_priv->bcast_seqno, 1);
109901+ atomic_set_unchecked(&bat_priv->bcast_seqno, 1);
109902 atomic_set(&bat_priv->tt.vn, 0);
109903 atomic_set(&bat_priv->tt.local_changes, 0);
109904 atomic_set(&bat_priv->tt.ogm_append_cnt, 0);
109905@@ -774,7 +774,7 @@ static int batadv_softif_init_late(struct net_device *dev)
109906
109907 /* randomize initial seqno to avoid collision */
109908 get_random_bytes(&random_seqno, sizeof(random_seqno));
109909- atomic_set(&bat_priv->frag_seqno, random_seqno);
109910+ atomic_set_unchecked(&bat_priv->frag_seqno, random_seqno);
109911
109912 bat_priv->primary_if = NULL;
109913 bat_priv->num_ifaces = 0;
109914@@ -982,7 +982,7 @@ int batadv_softif_is_valid(const struct net_device *net_dev)
109915 return 0;
109916 }
109917
109918-struct rtnl_link_ops batadv_link_ops __read_mostly = {
109919+struct rtnl_link_ops batadv_link_ops = {
109920 .kind = "batadv",
109921 .priv_size = sizeof(struct batadv_priv),
109922 .setup = batadv_softif_init_early,
109923diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
109924index 9398c3f..0e79657 100644
109925--- a/net/batman-adv/types.h
109926+++ b/net/batman-adv/types.h
109927@@ -67,7 +67,7 @@ enum batadv_dhcp_recipient {
109928 struct batadv_hard_iface_bat_iv {
109929 unsigned char *ogm_buff;
109930 int ogm_buff_len;
109931- atomic_t ogm_seqno;
109932+ atomic_unchecked_t ogm_seqno;
109933 };
109934
109935 /**
109936@@ -766,7 +766,7 @@ struct batadv_priv {
109937 atomic_t bonding;
109938 atomic_t fragmentation;
109939 atomic_t packet_size_max;
109940- atomic_t frag_seqno;
109941+ atomic_unchecked_t frag_seqno;
109942 #ifdef CONFIG_BATMAN_ADV_BLA
109943 atomic_t bridge_loop_avoidance;
109944 #endif
109945@@ -785,7 +785,7 @@ struct batadv_priv {
109946 #endif
109947 uint32_t isolation_mark;
109948 uint32_t isolation_mark_mask;
109949- atomic_t bcast_seqno;
109950+ atomic_unchecked_t bcast_seqno;
109951 atomic_t bcast_queue_left;
109952 atomic_t batman_queue_left;
109953 char num_ifaces;
109954diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
109955index 1d65c5b..43e55fd 100644
109956--- a/net/bluetooth/hci_sock.c
109957+++ b/net/bluetooth/hci_sock.c
109958@@ -1042,7 +1042,7 @@ static int hci_sock_setsockopt(struct socket *sock, int level, int optname,
109959 uf.event_mask[1] = *((u32 *) f->event_mask + 1);
109960 }
109961
109962- len = min_t(unsigned int, len, sizeof(uf));
109963+ len = min((size_t)len, sizeof(uf));
109964 if (copy_from_user(&uf, optval, len)) {
109965 err = -EFAULT;
109966 break;
109967diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
109968index 6ba33f9..4afc26f 100644
109969--- a/net/bluetooth/l2cap_core.c
109970+++ b/net/bluetooth/l2cap_core.c
109971@@ -3534,8 +3534,10 @@ static int l2cap_parse_conf_rsp(struct l2cap_chan *chan, void *rsp, int len,
109972 break;
109973
109974 case L2CAP_CONF_RFC:
109975- if (olen == sizeof(rfc))
109976- memcpy(&rfc, (void *)val, olen);
109977+ if (olen != sizeof(rfc))
109978+ break;
109979+
109980+ memcpy(&rfc, (void *)val, olen);
109981
109982 if (test_bit(CONF_STATE2_DEVICE, &chan->conf_state) &&
109983 rfc.mode != chan->mode)
109984diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
109985index 60694f0..32623ed 100644
109986--- a/net/bluetooth/l2cap_sock.c
109987+++ b/net/bluetooth/l2cap_sock.c
109988@@ -633,7 +633,8 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
109989 struct sock *sk = sock->sk;
109990 struct l2cap_chan *chan = l2cap_pi(sk)->chan;
109991 struct l2cap_options opts;
109992- int len, err = 0;
109993+ int err = 0;
109994+ size_t len = optlen;
109995 u32 opt;
109996
109997 BT_DBG("sk %p", sk);
109998@@ -660,7 +661,7 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
109999 opts.max_tx = chan->max_tx;
110000 opts.txwin_size = chan->tx_win;
110001
110002- len = min_t(unsigned int, sizeof(opts), optlen);
110003+ len = min(sizeof(opts), len);
110004 if (copy_from_user((char *) &opts, optval, len)) {
110005 err = -EFAULT;
110006 break;
110007@@ -747,7 +748,8 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
110008 struct bt_security sec;
110009 struct bt_power pwr;
110010 struct l2cap_conn *conn;
110011- int len, err = 0;
110012+ int err = 0;
110013+ size_t len = optlen;
110014 u32 opt;
110015
110016 BT_DBG("sk %p", sk);
110017@@ -771,7 +773,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
110018
110019 sec.level = BT_SECURITY_LOW;
110020
110021- len = min_t(unsigned int, sizeof(sec), optlen);
110022+ len = min(sizeof(sec), len);
110023 if (copy_from_user((char *) &sec, optval, len)) {
110024 err = -EFAULT;
110025 break;
110026@@ -867,7 +869,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
110027
110028 pwr.force_active = BT_POWER_FORCE_ACTIVE_ON;
110029
110030- len = min_t(unsigned int, sizeof(pwr), optlen);
110031+ len = min(sizeof(pwr), len);
110032 if (copy_from_user((char *) &pwr, optval, len)) {
110033 err = -EFAULT;
110034 break;
110035diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
110036index 3c6d2c8..6afc970 100644
110037--- a/net/bluetooth/rfcomm/sock.c
110038+++ b/net/bluetooth/rfcomm/sock.c
110039@@ -686,7 +686,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
110040 struct sock *sk = sock->sk;
110041 struct bt_security sec;
110042 int err = 0;
110043- size_t len;
110044+ size_t len = optlen;
110045 u32 opt;
110046
110047 BT_DBG("sk %p", sk);
110048@@ -708,7 +708,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
110049
110050 sec.level = BT_SECURITY_LOW;
110051
110052- len = min_t(unsigned int, sizeof(sec), optlen);
110053+ len = min(sizeof(sec), len);
110054 if (copy_from_user((char *) &sec, optval, len)) {
110055 err = -EFAULT;
110056 break;
110057diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c
110058index 8e385a0..a5bdd8e 100644
110059--- a/net/bluetooth/rfcomm/tty.c
110060+++ b/net/bluetooth/rfcomm/tty.c
110061@@ -752,7 +752,7 @@ static int rfcomm_tty_open(struct tty_struct *tty, struct file *filp)
110062 BT_DBG("tty %p id %d", tty, tty->index);
110063
110064 BT_DBG("dev %p dst %pMR channel %d opened %d", dev, &dev->dst,
110065- dev->channel, dev->port.count);
110066+ dev->channel, atomic_read(&dev->port.count));
110067
110068 err = tty_port_open(&dev->port, tty, filp);
110069 if (err)
110070@@ -775,7 +775,7 @@ static void rfcomm_tty_close(struct tty_struct *tty, struct file *filp)
110071 struct rfcomm_dev *dev = (struct rfcomm_dev *) tty->driver_data;
110072
110073 BT_DBG("tty %p dev %p dlc %p opened %d", tty, dev, dev->dlc,
110074- dev->port.count);
110075+ atomic_read(&dev->port.count));
110076
110077 tty_port_close(&dev->port, tty, filp);
110078 }
110079diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
110080index 4fbcea0..69a6786 100644
110081--- a/net/bridge/br_netlink.c
110082+++ b/net/bridge/br_netlink.c
110083@@ -726,7 +726,7 @@ static struct rtnl_af_ops br_af_ops __read_mostly = {
110084 .get_link_af_size = br_get_link_af_size,
110085 };
110086
110087-struct rtnl_link_ops br_link_ops __read_mostly = {
110088+struct rtnl_link_ops br_link_ops = {
110089 .kind = "bridge",
110090 .priv_size = sizeof(struct net_bridge),
110091 .setup = br_dev_setup,
110092diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
110093index 91180a7..1301daa 100644
110094--- a/net/bridge/netfilter/ebtables.c
110095+++ b/net/bridge/netfilter/ebtables.c
110096@@ -1533,7 +1533,7 @@ static int do_ebt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
110097 tmp.valid_hooks = t->table->valid_hooks;
110098 }
110099 mutex_unlock(&ebt_mutex);
110100- if (copy_to_user(user, &tmp, *len) != 0) {
110101+ if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
110102 BUGPRINT("c2u Didn't work\n");
110103 ret = -EFAULT;
110104 break;
110105@@ -2339,7 +2339,7 @@ static int compat_do_ebt_get_ctl(struct sock *sk, int cmd,
110106 goto out;
110107 tmp.valid_hooks = t->valid_hooks;
110108
110109- if (copy_to_user(user, &tmp, *len) != 0) {
110110+ if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
110111 ret = -EFAULT;
110112 break;
110113 }
110114@@ -2350,7 +2350,7 @@ static int compat_do_ebt_get_ctl(struct sock *sk, int cmd,
110115 tmp.entries_size = t->table->entries_size;
110116 tmp.valid_hooks = t->table->valid_hooks;
110117
110118- if (copy_to_user(user, &tmp, *len) != 0) {
110119+ if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
110120 ret = -EFAULT;
110121 break;
110122 }
110123diff --git a/net/caif/cfctrl.c b/net/caif/cfctrl.c
110124index f5afda1..dcf770a 100644
110125--- a/net/caif/cfctrl.c
110126+++ b/net/caif/cfctrl.c
110127@@ -10,6 +10,7 @@
110128 #include <linux/spinlock.h>
110129 #include <linux/slab.h>
110130 #include <linux/pkt_sched.h>
110131+#include <linux/sched.h>
110132 #include <net/caif/caif_layer.h>
110133 #include <net/caif/cfpkt.h>
110134 #include <net/caif/cfctrl.h>
110135@@ -43,8 +44,8 @@ struct cflayer *cfctrl_create(void)
110136 memset(&dev_info, 0, sizeof(dev_info));
110137 dev_info.id = 0xff;
110138 cfsrvl_init(&this->serv, 0, &dev_info, false);
110139- atomic_set(&this->req_seq_no, 1);
110140- atomic_set(&this->rsp_seq_no, 1);
110141+ atomic_set_unchecked(&this->req_seq_no, 1);
110142+ atomic_set_unchecked(&this->rsp_seq_no, 1);
110143 this->serv.layer.receive = cfctrl_recv;
110144 sprintf(this->serv.layer.name, "ctrl");
110145 this->serv.layer.ctrlcmd = cfctrl_ctrlcmd;
110146@@ -130,8 +131,8 @@ static void cfctrl_insert_req(struct cfctrl *ctrl,
110147 struct cfctrl_request_info *req)
110148 {
110149 spin_lock_bh(&ctrl->info_list_lock);
110150- atomic_inc(&ctrl->req_seq_no);
110151- req->sequence_no = atomic_read(&ctrl->req_seq_no);
110152+ atomic_inc_unchecked(&ctrl->req_seq_no);
110153+ req->sequence_no = atomic_read_unchecked(&ctrl->req_seq_no);
110154 list_add_tail(&req->list, &ctrl->list);
110155 spin_unlock_bh(&ctrl->info_list_lock);
110156 }
110157@@ -149,7 +150,7 @@ static struct cfctrl_request_info *cfctrl_remove_req(struct cfctrl *ctrl,
110158 if (p != first)
110159 pr_warn("Requests are not received in order\n");
110160
110161- atomic_set(&ctrl->rsp_seq_no,
110162+ atomic_set_unchecked(&ctrl->rsp_seq_no,
110163 p->sequence_no);
110164 list_del(&p->list);
110165 goto out;
110166diff --git a/net/caif/chnl_net.c b/net/caif/chnl_net.c
110167index 67a4a36..8d28068 100644
110168--- a/net/caif/chnl_net.c
110169+++ b/net/caif/chnl_net.c
110170@@ -515,7 +515,7 @@ static const struct nla_policy ipcaif_policy[IFLA_CAIF_MAX + 1] = {
110171 };
110172
110173
110174-static struct rtnl_link_ops ipcaif_link_ops __read_mostly = {
110175+static struct rtnl_link_ops ipcaif_link_ops = {
110176 .kind = "caif",
110177 .priv_size = sizeof(struct chnl_net),
110178 .setup = ipcaif_net_setup,
110179diff --git a/net/can/af_can.c b/net/can/af_can.c
110180index 32d710e..93bcf05 100644
110181--- a/net/can/af_can.c
110182+++ b/net/can/af_can.c
110183@@ -884,7 +884,7 @@ static const struct net_proto_family can_family_ops = {
110184 };
110185
110186 /* notifier block for netdevice event */
110187-static struct notifier_block can_netdev_notifier __read_mostly = {
110188+static struct notifier_block can_netdev_notifier = {
110189 .notifier_call = can_notifier,
110190 };
110191
110192diff --git a/net/can/bcm.c b/net/can/bcm.c
110193index ee9ffd9..dfdf3d4 100644
110194--- a/net/can/bcm.c
110195+++ b/net/can/bcm.c
110196@@ -1619,7 +1619,7 @@ static int __init bcm_module_init(void)
110197 }
110198
110199 /* create /proc/net/can-bcm directory */
110200- proc_dir = proc_mkdir("can-bcm", init_net.proc_net);
110201+ proc_dir = proc_mkdir_restrict("can-bcm", init_net.proc_net);
110202 return 0;
110203 }
110204
110205diff --git a/net/can/gw.c b/net/can/gw.c
110206index a6f448e..5902171 100644
110207--- a/net/can/gw.c
110208+++ b/net/can/gw.c
110209@@ -80,7 +80,6 @@ MODULE_PARM_DESC(max_hops,
110210 "default: " __stringify(CGW_DEFAULT_HOPS) ")");
110211
110212 static HLIST_HEAD(cgw_list);
110213-static struct notifier_block notifier;
110214
110215 static struct kmem_cache *cgw_cache __read_mostly;
110216
110217@@ -948,6 +947,10 @@ static int cgw_remove_job(struct sk_buff *skb, struct nlmsghdr *nlh)
110218 return err;
110219 }
110220
110221+static struct notifier_block notifier = {
110222+ .notifier_call = cgw_notifier
110223+};
110224+
110225 static __init int cgw_module_init(void)
110226 {
110227 /* sanitize given module parameter */
110228@@ -963,7 +966,6 @@ static __init int cgw_module_init(void)
110229 return -ENOMEM;
110230
110231 /* set notifier */
110232- notifier.notifier_call = cgw_notifier;
110233 register_netdevice_notifier(&notifier);
110234
110235 if (__rtnl_register(PF_CAN, RTM_GETROUTE, NULL, cgw_dump_jobs, NULL)) {
110236diff --git a/net/can/proc.c b/net/can/proc.c
110237index 1a19b98..df2b4ec 100644
110238--- a/net/can/proc.c
110239+++ b/net/can/proc.c
110240@@ -514,7 +514,7 @@ static void can_remove_proc_readentry(const char *name)
110241 void can_init_proc(void)
110242 {
110243 /* create /proc/net/can directory */
110244- can_dir = proc_mkdir("can", init_net.proc_net);
110245+ can_dir = proc_mkdir_restrict("can", init_net.proc_net);
110246
110247 if (!can_dir) {
110248 printk(KERN_INFO "can: failed to create /proc/net/can . "
110249diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
110250index a9f4ae4..ee19b92 100644
110251--- a/net/ceph/messenger.c
110252+++ b/net/ceph/messenger.c
110253@@ -188,7 +188,7 @@ static void con_fault(struct ceph_connection *con);
110254 #define MAX_ADDR_STR_LEN 64 /* 54 is enough */
110255
110256 static char addr_str[ADDR_STR_COUNT][MAX_ADDR_STR_LEN];
110257-static atomic_t addr_str_seq = ATOMIC_INIT(0);
110258+static atomic_unchecked_t addr_str_seq = ATOMIC_INIT(0);
110259
110260 static struct page *zero_page; /* used in certain error cases */
110261
110262@@ -199,7 +199,7 @@ const char *ceph_pr_addr(const struct sockaddr_storage *ss)
110263 struct sockaddr_in *in4 = (struct sockaddr_in *) ss;
110264 struct sockaddr_in6 *in6 = (struct sockaddr_in6 *) ss;
110265
110266- i = atomic_inc_return(&addr_str_seq) & ADDR_STR_COUNT_MASK;
110267+ i = atomic_inc_return_unchecked(&addr_str_seq) & ADDR_STR_COUNT_MASK;
110268 s = addr_str[i];
110269
110270 switch (ss->ss_family) {
110271diff --git a/net/compat.c b/net/compat.c
110272index f7bd286..76ea56a 100644
110273--- a/net/compat.c
110274+++ b/net/compat.c
110275@@ -100,20 +100,20 @@ ssize_t get_compat_msghdr(struct msghdr *kmsg,
110276
110277 #define CMSG_COMPAT_FIRSTHDR(msg) \
110278 (((msg)->msg_controllen) >= sizeof(struct compat_cmsghdr) ? \
110279- (struct compat_cmsghdr __user *)((msg)->msg_control) : \
110280+ (struct compat_cmsghdr __force_user *)((msg)->msg_control) : \
110281 (struct compat_cmsghdr __user *)NULL)
110282
110283 #define CMSG_COMPAT_OK(ucmlen, ucmsg, mhdr) \
110284 ((ucmlen) >= sizeof(struct compat_cmsghdr) && \
110285 (ucmlen) <= (unsigned long) \
110286 ((mhdr)->msg_controllen - \
110287- ((char *)(ucmsg) - (char *)(mhdr)->msg_control)))
110288+ ((char __force_kernel *)(ucmsg) - (char *)(mhdr)->msg_control)))
110289
110290 static inline struct compat_cmsghdr __user *cmsg_compat_nxthdr(struct msghdr *msg,
110291 struct compat_cmsghdr __user *cmsg, int cmsg_len)
110292 {
110293 char __user *ptr = (char __user *)cmsg + CMSG_COMPAT_ALIGN(cmsg_len);
110294- if ((unsigned long)(ptr + 1 - (char __user *)msg->msg_control) >
110295+ if ((unsigned long)(ptr + 1 - (char __force_user *)msg->msg_control) >
110296 msg->msg_controllen)
110297 return NULL;
110298 return (struct compat_cmsghdr __user *)ptr;
110299@@ -203,7 +203,7 @@ Efault:
110300
110301 int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *data)
110302 {
110303- struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
110304+ struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
110305 struct compat_cmsghdr cmhdr;
110306 struct compat_timeval ctv;
110307 struct compat_timespec cts[3];
110308@@ -259,7 +259,7 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat
110309
110310 void scm_detach_fds_compat(struct msghdr *kmsg, struct scm_cookie *scm)
110311 {
110312- struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
110313+ struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
110314 int fdmax = (kmsg->msg_controllen - sizeof(struct compat_cmsghdr)) / sizeof(int);
110315 int fdnum = scm->fp->count;
110316 struct file **fp = scm->fp->fp;
110317@@ -347,7 +347,7 @@ static int do_set_sock_timeout(struct socket *sock, int level,
110318 return -EFAULT;
110319 old_fs = get_fs();
110320 set_fs(KERNEL_DS);
110321- err = sock_setsockopt(sock, level, optname, (char *)&ktime, sizeof(ktime));
110322+ err = sock_setsockopt(sock, level, optname, (char __force_user *)&ktime, sizeof(ktime));
110323 set_fs(old_fs);
110324
110325 return err;
110326@@ -408,7 +408,7 @@ static int do_get_sock_timeout(struct socket *sock, int level, int optname,
110327 len = sizeof(ktime);
110328 old_fs = get_fs();
110329 set_fs(KERNEL_DS);
110330- err = sock_getsockopt(sock, level, optname, (char *) &ktime, &len);
110331+ err = sock_getsockopt(sock, level, optname, (char __force_user *) &ktime, (int __force_user *)&len);
110332 set_fs(old_fs);
110333
110334 if (!err) {
110335@@ -551,7 +551,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
110336 case MCAST_JOIN_GROUP:
110337 case MCAST_LEAVE_GROUP:
110338 {
110339- struct compat_group_req __user *gr32 = (void *)optval;
110340+ struct compat_group_req __user *gr32 = (void __user *)optval;
110341 struct group_req __user *kgr =
110342 compat_alloc_user_space(sizeof(struct group_req));
110343 u32 interface;
110344@@ -572,7 +572,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
110345 case MCAST_BLOCK_SOURCE:
110346 case MCAST_UNBLOCK_SOURCE:
110347 {
110348- struct compat_group_source_req __user *gsr32 = (void *)optval;
110349+ struct compat_group_source_req __user *gsr32 = (void __user *)optval;
110350 struct group_source_req __user *kgsr = compat_alloc_user_space(
110351 sizeof(struct group_source_req));
110352 u32 interface;
110353@@ -593,7 +593,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
110354 }
110355 case MCAST_MSFILTER:
110356 {
110357- struct compat_group_filter __user *gf32 = (void *)optval;
110358+ struct compat_group_filter __user *gf32 = (void __user *)optval;
110359 struct group_filter __user *kgf;
110360 u32 interface, fmode, numsrc;
110361
110362@@ -631,7 +631,7 @@ int compat_mc_getsockopt(struct sock *sock, int level, int optname,
110363 char __user *optval, int __user *optlen,
110364 int (*getsockopt)(struct sock *, int, int, char __user *, int __user *))
110365 {
110366- struct compat_group_filter __user *gf32 = (void *)optval;
110367+ struct compat_group_filter __user *gf32 = (void __user *)optval;
110368 struct group_filter __user *kgf;
110369 int __user *koptlen;
110370 u32 interface, fmode, numsrc;
110371@@ -775,7 +775,7 @@ COMPAT_SYSCALL_DEFINE2(socketcall, int, call, u32 __user *, args)
110372
110373 if (call < SYS_SOCKET || call > SYS_SENDMMSG)
110374 return -EINVAL;
110375- if (copy_from_user(a, args, nas[call]))
110376+ if (nas[call] > sizeof a || copy_from_user(a, args, nas[call]))
110377 return -EFAULT;
110378 a0 = a[0];
110379 a1 = a[1];
110380diff --git a/net/core/datagram.c b/net/core/datagram.c
110381index df493d6..1145766 100644
110382--- a/net/core/datagram.c
110383+++ b/net/core/datagram.c
110384@@ -302,7 +302,7 @@ int skb_kill_datagram(struct sock *sk, struct sk_buff *skb, unsigned int flags)
110385 }
110386
110387 kfree_skb(skb);
110388- atomic_inc(&sk->sk_drops);
110389+ atomic_inc_unchecked(&sk->sk_drops);
110390 sk_mem_reclaim_partial(sk);
110391
110392 return err;
110393diff --git a/net/core/dev.c b/net/core/dev.c
110394index e977e15..74b19b0 100644
110395--- a/net/core/dev.c
110396+++ b/net/core/dev.c
110397@@ -1681,14 +1681,14 @@ int __dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
110398 {
110399 if (skb_shinfo(skb)->tx_flags & SKBTX_DEV_ZEROCOPY) {
110400 if (skb_copy_ubufs(skb, GFP_ATOMIC)) {
110401- atomic_long_inc(&dev->rx_dropped);
110402+ atomic_long_inc_unchecked(&dev->rx_dropped);
110403 kfree_skb(skb);
110404 return NET_RX_DROP;
110405 }
110406 }
110407
110408 if (unlikely(!is_skb_forwardable(dev, skb))) {
110409- atomic_long_inc(&dev->rx_dropped);
110410+ atomic_long_inc_unchecked(&dev->rx_dropped);
110411 kfree_skb(skb);
110412 return NET_RX_DROP;
110413 }
110414@@ -2987,7 +2987,7 @@ recursion_alert:
110415 drop:
110416 rcu_read_unlock_bh();
110417
110418- atomic_long_inc(&dev->tx_dropped);
110419+ atomic_long_inc_unchecked(&dev->tx_dropped);
110420 kfree_skb_list(skb);
110421 return rc;
110422 out:
110423@@ -3336,7 +3336,7 @@ enqueue:
110424
110425 local_irq_restore(flags);
110426
110427- atomic_long_inc(&skb->dev->rx_dropped);
110428+ atomic_long_inc_unchecked(&skb->dev->rx_dropped);
110429 kfree_skb(skb);
110430 return NET_RX_DROP;
110431 }
110432@@ -3413,7 +3413,7 @@ int netif_rx_ni(struct sk_buff *skb)
110433 }
110434 EXPORT_SYMBOL(netif_rx_ni);
110435
110436-static void net_tx_action(struct softirq_action *h)
110437+static __latent_entropy void net_tx_action(void)
110438 {
110439 struct softnet_data *sd = this_cpu_ptr(&softnet_data);
110440
110441@@ -3751,7 +3751,7 @@ ncls:
110442 ret = pt_prev->func(skb, skb->dev, pt_prev, orig_dev);
110443 } else {
110444 drop:
110445- atomic_long_inc(&skb->dev->rx_dropped);
110446+ atomic_long_inc_unchecked(&skb->dev->rx_dropped);
110447 kfree_skb(skb);
110448 /* Jamal, now you will not able to escape explaining
110449 * me how you were going to use this. :-)
110450@@ -4640,7 +4640,7 @@ out_unlock:
110451 return work;
110452 }
110453
110454-static void net_rx_action(struct softirq_action *h)
110455+static __latent_entropy void net_rx_action(void)
110456 {
110457 struct softnet_data *sd = this_cpu_ptr(&softnet_data);
110458 unsigned long time_limit = jiffies + 2;
110459@@ -6676,8 +6676,8 @@ struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev,
110460 } else {
110461 netdev_stats_to_stats64(storage, &dev->stats);
110462 }
110463- storage->rx_dropped += atomic_long_read(&dev->rx_dropped);
110464- storage->tx_dropped += atomic_long_read(&dev->tx_dropped);
110465+ storage->rx_dropped += atomic_long_read_unchecked(&dev->rx_dropped);
110466+ storage->tx_dropped += atomic_long_read_unchecked(&dev->tx_dropped);
110467 return storage;
110468 }
110469 EXPORT_SYMBOL(dev_get_stats);
110470diff --git a/net/core/dev_ioctl.c b/net/core/dev_ioctl.c
110471index b94b1d2..da3ed7c 100644
110472--- a/net/core/dev_ioctl.c
110473+++ b/net/core/dev_ioctl.c
110474@@ -368,8 +368,13 @@ void dev_load(struct net *net, const char *name)
110475 no_module = !dev;
110476 if (no_module && capable(CAP_NET_ADMIN))
110477 no_module = request_module("netdev-%s", name);
110478- if (no_module && capable(CAP_SYS_MODULE))
110479+ if (no_module && capable(CAP_SYS_MODULE)) {
110480+#ifdef CONFIG_GRKERNSEC_MODHARDEN
110481+ ___request_module(true, "grsec_modharden_netdev", "%s", name);
110482+#else
110483 request_module("%s", name);
110484+#endif
110485+ }
110486 }
110487 EXPORT_SYMBOL(dev_load);
110488
110489diff --git a/net/core/filter.c b/net/core/filter.c
110490index f6bdc2b..76eba8e 100644
110491--- a/net/core/filter.c
110492+++ b/net/core/filter.c
110493@@ -533,7 +533,11 @@ do_pass:
110494
110495 /* Unknown instruction. */
110496 default:
110497- goto err;
110498+ WARN(1, KERN_ALERT "Unknown sock filter code:%u jt:%u tf:%u k:%u\n",
110499+ fp->code, fp->jt, fp->jf, fp->k);
110500+ kfree(addrs);
110501+ BUG();
110502+ return -EINVAL;
110503 }
110504
110505 insn++;
110506@@ -577,7 +581,7 @@ static int check_load_and_stores(const struct sock_filter *filter, int flen)
110507 u16 *masks, memvalid = 0; /* One bit per cell, 16 cells */
110508 int pc, ret = 0;
110509
110510- BUILD_BUG_ON(BPF_MEMWORDS > 16);
110511+ BUILD_BUG_ON(BPF_MEMWORDS != 16);
110512
110513 masks = kmalloc_array(flen, sizeof(*masks), GFP_KERNEL);
110514 if (!masks)
110515@@ -992,7 +996,7 @@ int bpf_prog_create(struct bpf_prog **pfp, struct sock_fprog_kern *fprog)
110516 if (!fp)
110517 return -ENOMEM;
110518
110519- memcpy(fp->insns, fprog->filter, fsize);
110520+ memcpy(fp->insns, (void __force_kernel *)fprog->filter, fsize);
110521
110522 fp->len = fprog->len;
110523 /* Since unattached filters are not copied back to user
110524diff --git a/net/core/flow.c b/net/core/flow.c
110525index 1033725..340f65d 100644
110526--- a/net/core/flow.c
110527+++ b/net/core/flow.c
110528@@ -65,7 +65,7 @@ static void flow_cache_new_hashrnd(unsigned long arg)
110529 static int flow_entry_valid(struct flow_cache_entry *fle,
110530 struct netns_xfrm *xfrm)
110531 {
110532- if (atomic_read(&xfrm->flow_cache_genid) != fle->genid)
110533+ if (atomic_read_unchecked(&xfrm->flow_cache_genid) != fle->genid)
110534 return 0;
110535 if (fle->object && !fle->object->ops->check(fle->object))
110536 return 0;
110537@@ -242,7 +242,7 @@ flow_cache_lookup(struct net *net, const struct flowi *key, u16 family, u8 dir,
110538 hlist_add_head(&fle->u.hlist, &fcp->hash_table[hash]);
110539 fcp->hash_count++;
110540 }
110541- } else if (likely(fle->genid == atomic_read(&net->xfrm.flow_cache_genid))) {
110542+ } else if (likely(fle->genid == atomic_read_unchecked(&net->xfrm.flow_cache_genid))) {
110543 flo = fle->object;
110544 if (!flo)
110545 goto ret_object;
110546@@ -263,7 +263,7 @@ nocache:
110547 }
110548 flo = resolver(net, key, family, dir, flo, ctx);
110549 if (fle) {
110550- fle->genid = atomic_read(&net->xfrm.flow_cache_genid);
110551+ fle->genid = atomic_read_unchecked(&net->xfrm.flow_cache_genid);
110552 if (!IS_ERR(flo))
110553 fle->object = flo;
110554 else
110555diff --git a/net/core/neighbour.c b/net/core/neighbour.c
110556index 70fe9e1..c55e69d 100644
110557--- a/net/core/neighbour.c
110558+++ b/net/core/neighbour.c
110559@@ -971,6 +971,8 @@ int __neigh_event_send(struct neighbour *neigh, struct sk_buff *skb)
110560 rc = 0;
110561 if (neigh->nud_state & (NUD_CONNECTED | NUD_DELAY | NUD_PROBE))
110562 goto out_unlock_bh;
110563+ if (neigh->dead)
110564+ goto out_dead;
110565
110566 if (!(neigh->nud_state & (NUD_STALE | NUD_INCOMPLETE))) {
110567 if (NEIGH_VAR(neigh->parms, MCAST_PROBES) +
110568@@ -1027,6 +1029,13 @@ out_unlock_bh:
110569 write_unlock(&neigh->lock);
110570 local_bh_enable();
110571 return rc;
110572+
110573+out_dead:
110574+ if (neigh->nud_state & NUD_STALE)
110575+ goto out_unlock_bh;
110576+ write_unlock_bh(&neigh->lock);
110577+ kfree_skb(skb);
110578+ return 1;
110579 }
110580 EXPORT_SYMBOL(__neigh_event_send);
110581
110582@@ -1090,6 +1099,8 @@ int neigh_update(struct neighbour *neigh, const u8 *lladdr, u8 new,
110583 if (!(flags & NEIGH_UPDATE_F_ADMIN) &&
110584 (old & (NUD_NOARP | NUD_PERMANENT)))
110585 goto out;
110586+ if (neigh->dead)
110587+ goto out;
110588
110589 if (!(new & NUD_VALID)) {
110590 neigh_del_timer(neigh);
110591@@ -1239,6 +1250,8 @@ EXPORT_SYMBOL(neigh_update);
110592 */
110593 void __neigh_set_probe_once(struct neighbour *neigh)
110594 {
110595+ if (neigh->dead)
110596+ return;
110597 neigh->updated = jiffies;
110598 if (!(neigh->nud_state & NUD_FAILED))
110599 return;
110600@@ -2806,7 +2819,7 @@ static int proc_unres_qlen(struct ctl_table *ctl, int write,
110601 void __user *buffer, size_t *lenp, loff_t *ppos)
110602 {
110603 int size, ret;
110604- struct ctl_table tmp = *ctl;
110605+ ctl_table_no_const tmp = *ctl;
110606
110607 tmp.extra1 = &zero;
110608 tmp.extra2 = &unres_qlen_max;
110609@@ -2868,7 +2881,7 @@ static int neigh_proc_dointvec_zero_intmax(struct ctl_table *ctl, int write,
110610 void __user *buffer,
110611 size_t *lenp, loff_t *ppos)
110612 {
110613- struct ctl_table tmp = *ctl;
110614+ ctl_table_no_const tmp = *ctl;
110615 int ret;
110616
110617 tmp.extra1 = &zero;
110618diff --git a/net/core/net-procfs.c b/net/core/net-procfs.c
110619index 2bf8329..2eb1423 100644
110620--- a/net/core/net-procfs.c
110621+++ b/net/core/net-procfs.c
110622@@ -79,7 +79,13 @@ static void dev_seq_printf_stats(struct seq_file *seq, struct net_device *dev)
110623 struct rtnl_link_stats64 temp;
110624 const struct rtnl_link_stats64 *stats = dev_get_stats(dev, &temp);
110625
110626- seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
110627+ if (gr_proc_is_restricted())
110628+ seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
110629+ "%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n",
110630+ dev->name, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL,
110631+ 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL);
110632+ else
110633+ seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
110634 "%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n",
110635 dev->name, stats->rx_bytes, stats->rx_packets,
110636 stats->rx_errors,
110637@@ -166,7 +172,7 @@ static int softnet_seq_show(struct seq_file *seq, void *v)
110638 return 0;
110639 }
110640
110641-static const struct seq_operations dev_seq_ops = {
110642+const struct seq_operations dev_seq_ops = {
110643 .start = dev_seq_start,
110644 .next = dev_seq_next,
110645 .stop = dev_seq_stop,
110646@@ -196,7 +202,7 @@ static const struct seq_operations softnet_seq_ops = {
110647
110648 static int softnet_seq_open(struct inode *inode, struct file *file)
110649 {
110650- return seq_open(file, &softnet_seq_ops);
110651+ return seq_open_restrict(file, &softnet_seq_ops);
110652 }
110653
110654 static const struct file_operations softnet_seq_fops = {
110655@@ -283,8 +289,13 @@ static int ptype_seq_show(struct seq_file *seq, void *v)
110656 else
110657 seq_printf(seq, "%04x", ntohs(pt->type));
110658
110659+#ifdef CONFIG_GRKERNSEC_HIDESYM
110660+ seq_printf(seq, " %-8s %pf\n",
110661+ pt->dev ? pt->dev->name : "", NULL);
110662+#else
110663 seq_printf(seq, " %-8s %pf\n",
110664 pt->dev ? pt->dev->name : "", pt->func);
110665+#endif
110666 }
110667
110668 return 0;
110669diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
110670index f2aa73b..0d1a1ea 100644
110671--- a/net/core/net-sysfs.c
110672+++ b/net/core/net-sysfs.c
110673@@ -279,7 +279,7 @@ static ssize_t carrier_changes_show(struct device *dev,
110674 {
110675 struct net_device *netdev = to_net_dev(dev);
110676 return sprintf(buf, fmt_dec,
110677- atomic_read(&netdev->carrier_changes));
110678+ atomic_read_unchecked(&netdev->carrier_changes));
110679 }
110680 static DEVICE_ATTR_RO(carrier_changes);
110681
110682diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
110683index 70d3450..eb7c528 100644
110684--- a/net/core/net_namespace.c
110685+++ b/net/core/net_namespace.c
110686@@ -663,7 +663,7 @@ static int __register_pernet_operations(struct list_head *list,
110687 int error;
110688 LIST_HEAD(net_exit_list);
110689
110690- list_add_tail(&ops->list, list);
110691+ pax_list_add_tail((struct list_head *)&ops->list, list);
110692 if (ops->init || (ops->id && ops->size)) {
110693 for_each_net(net) {
110694 error = ops_init(ops, net);
110695@@ -676,7 +676,7 @@ static int __register_pernet_operations(struct list_head *list,
110696
110697 out_undo:
110698 /* If I have an error cleanup all namespaces I initialized */
110699- list_del(&ops->list);
110700+ pax_list_del((struct list_head *)&ops->list);
110701 ops_exit_list(ops, &net_exit_list);
110702 ops_free_list(ops, &net_exit_list);
110703 return error;
110704@@ -687,7 +687,7 @@ static void __unregister_pernet_operations(struct pernet_operations *ops)
110705 struct net *net;
110706 LIST_HEAD(net_exit_list);
110707
110708- list_del(&ops->list);
110709+ pax_list_del((struct list_head *)&ops->list);
110710 for_each_net(net)
110711 list_add_tail(&net->exit_list, &net_exit_list);
110712 ops_exit_list(ops, &net_exit_list);
110713@@ -821,7 +821,7 @@ int register_pernet_device(struct pernet_operations *ops)
110714 mutex_lock(&net_mutex);
110715 error = register_pernet_operations(&pernet_list, ops);
110716 if (!error && (first_device == &pernet_list))
110717- first_device = &ops->list;
110718+ first_device = (struct list_head *)&ops->list;
110719 mutex_unlock(&net_mutex);
110720 return error;
110721 }
110722diff --git a/net/core/netpoll.c b/net/core/netpoll.c
110723index c126a87..10ad89d 100644
110724--- a/net/core/netpoll.c
110725+++ b/net/core/netpoll.c
110726@@ -377,7 +377,7 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
110727 struct udphdr *udph;
110728 struct iphdr *iph;
110729 struct ethhdr *eth;
110730- static atomic_t ip_ident;
110731+ static atomic_unchecked_t ip_ident;
110732 struct ipv6hdr *ip6h;
110733
110734 udp_len = len + sizeof(*udph);
110735@@ -448,7 +448,7 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
110736 put_unaligned(0x45, (unsigned char *)iph);
110737 iph->tos = 0;
110738 put_unaligned(htons(ip_len), &(iph->tot_len));
110739- iph->id = htons(atomic_inc_return(&ip_ident));
110740+ iph->id = htons(atomic_inc_return_unchecked(&ip_ident));
110741 iph->frag_off = 0;
110742 iph->ttl = 64;
110743 iph->protocol = IPPROTO_UDP;
110744diff --git a/net/core/pktgen.c b/net/core/pktgen.c
110745index 508155b..fad080f 100644
110746--- a/net/core/pktgen.c
110747+++ b/net/core/pktgen.c
110748@@ -3755,7 +3755,7 @@ static int __net_init pg_net_init(struct net *net)
110749 pn->net = net;
110750 INIT_LIST_HEAD(&pn->pktgen_threads);
110751 pn->pktgen_exiting = false;
110752- pn->proc_dir = proc_mkdir(PG_PROC_DIR, pn->net->proc_net);
110753+ pn->proc_dir = proc_mkdir_restrict(PG_PROC_DIR, pn->net->proc_net);
110754 if (!pn->proc_dir) {
110755 pr_warn("cannot create /proc/net/%s\n", PG_PROC_DIR);
110756 return -ENODEV;
110757diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
110758index a2b90e1..7882f75 100644
110759--- a/net/core/rtnetlink.c
110760+++ b/net/core/rtnetlink.c
110761@@ -61,7 +61,7 @@ struct rtnl_link {
110762 rtnl_doit_func doit;
110763 rtnl_dumpit_func dumpit;
110764 rtnl_calcit_func calcit;
110765-};
110766+} __no_const;
110767
110768 static DEFINE_MUTEX(rtnl_mutex);
110769
110770@@ -307,10 +307,13 @@ int __rtnl_link_register(struct rtnl_link_ops *ops)
110771 * to use the ops for creating device. So do not
110772 * fill up dellink as well. That disables rtnl_dellink.
110773 */
110774- if (ops->setup && !ops->dellink)
110775- ops->dellink = unregister_netdevice_queue;
110776+ if (ops->setup && !ops->dellink) {
110777+ pax_open_kernel();
110778+ *(void **)&ops->dellink = unregister_netdevice_queue;
110779+ pax_close_kernel();
110780+ }
110781
110782- list_add_tail(&ops->list, &link_ops);
110783+ pax_list_add_tail((struct list_head *)&ops->list, &link_ops);
110784 return 0;
110785 }
110786 EXPORT_SYMBOL_GPL(__rtnl_link_register);
110787@@ -357,7 +360,7 @@ void __rtnl_link_unregister(struct rtnl_link_ops *ops)
110788 for_each_net(net) {
110789 __rtnl_kill_links(net, ops);
110790 }
110791- list_del(&ops->list);
110792+ pax_list_del((struct list_head *)&ops->list);
110793 }
110794 EXPORT_SYMBOL_GPL(__rtnl_link_unregister);
110795
110796@@ -1047,7 +1050,7 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev,
110797 (dev->ifalias &&
110798 nla_put_string(skb, IFLA_IFALIAS, dev->ifalias)) ||
110799 nla_put_u32(skb, IFLA_CARRIER_CHANGES,
110800- atomic_read(&dev->carrier_changes)))
110801+ atomic_read_unchecked(&dev->carrier_changes)))
110802 goto nla_put_failure;
110803
110804 if (1) {
110805diff --git a/net/core/scm.c b/net/core/scm.c
110806index 3b6899b..cf36238 100644
110807--- a/net/core/scm.c
110808+++ b/net/core/scm.c
110809@@ -209,7 +209,7 @@ EXPORT_SYMBOL(__scm_send);
110810 int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
110811 {
110812 struct cmsghdr __user *cm
110813- = (__force struct cmsghdr __user *)msg->msg_control;
110814+ = (struct cmsghdr __force_user *)msg->msg_control;
110815 struct cmsghdr cmhdr;
110816 int cmlen = CMSG_LEN(len);
110817 int err;
110818@@ -232,7 +232,7 @@ int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
110819 err = -EFAULT;
110820 if (copy_to_user(cm, &cmhdr, sizeof cmhdr))
110821 goto out;
110822- if (copy_to_user(CMSG_DATA(cm), data, cmlen - sizeof(struct cmsghdr)))
110823+ if (copy_to_user((void __force_user *)CMSG_DATA((void __force_kernel *)cm), data, cmlen - sizeof(struct cmsghdr)))
110824 goto out;
110825 cmlen = CMSG_SPACE(len);
110826 if (msg->msg_controllen < cmlen)
110827@@ -248,7 +248,7 @@ EXPORT_SYMBOL(put_cmsg);
110828 void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
110829 {
110830 struct cmsghdr __user *cm
110831- = (__force struct cmsghdr __user*)msg->msg_control;
110832+ = (struct cmsghdr __force_user *)msg->msg_control;
110833
110834 int fdmax = 0;
110835 int fdnum = scm->fp->count;
110836@@ -268,7 +268,7 @@ void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
110837 if (fdnum < fdmax)
110838 fdmax = fdnum;
110839
110840- for (i=0, cmfptr=(__force int __user *)CMSG_DATA(cm); i<fdmax;
110841+ for (i=0, cmfptr=(int __force_user *)CMSG_DATA((void __force_kernel *)cm); i<fdmax;
110842 i++, cmfptr++)
110843 {
110844 struct socket *sock;
110845diff --git a/net/core/skbuff.c b/net/core/skbuff.c
110846index e9f9a15..6eb024e 100644
110847--- a/net/core/skbuff.c
110848+++ b/net/core/skbuff.c
110849@@ -2139,7 +2139,7 @@ EXPORT_SYMBOL(__skb_checksum);
110850 __wsum skb_checksum(const struct sk_buff *skb, int offset,
110851 int len, __wsum csum)
110852 {
110853- const struct skb_checksum_ops ops = {
110854+ static const struct skb_checksum_ops ops = {
110855 .update = csum_partial_ext,
110856 .combine = csum_block_add_ext,
110857 };
110858@@ -3379,12 +3379,14 @@ void __init skb_init(void)
110859 skbuff_head_cache = kmem_cache_create("skbuff_head_cache",
110860 sizeof(struct sk_buff),
110861 0,
110862- SLAB_HWCACHE_ALIGN|SLAB_PANIC,
110863+ SLAB_HWCACHE_ALIGN|SLAB_PANIC|
110864+ SLAB_NO_SANITIZE,
110865 NULL);
110866 skbuff_fclone_cache = kmem_cache_create("skbuff_fclone_cache",
110867 sizeof(struct sk_buff_fclones),
110868 0,
110869- SLAB_HWCACHE_ALIGN|SLAB_PANIC,
110870+ SLAB_HWCACHE_ALIGN|SLAB_PANIC|
110871+ SLAB_NO_SANITIZE,
110872 NULL);
110873 }
110874
110875diff --git a/net/core/sock.c b/net/core/sock.c
110876index 71e3e5f..ab90920 100644
110877--- a/net/core/sock.c
110878+++ b/net/core/sock.c
110879@@ -443,7 +443,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
110880 struct sk_buff_head *list = &sk->sk_receive_queue;
110881
110882 if (atomic_read(&sk->sk_rmem_alloc) >= sk->sk_rcvbuf) {
110883- atomic_inc(&sk->sk_drops);
110884+ atomic_inc_unchecked(&sk->sk_drops);
110885 trace_sock_rcvqueue_full(sk, skb);
110886 return -ENOMEM;
110887 }
110888@@ -453,7 +453,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
110889 return err;
110890
110891 if (!sk_rmem_schedule(sk, skb, skb->truesize)) {
110892- atomic_inc(&sk->sk_drops);
110893+ atomic_inc_unchecked(&sk->sk_drops);
110894 return -ENOBUFS;
110895 }
110896
110897@@ -466,7 +466,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
110898 skb_dst_force(skb);
110899
110900 spin_lock_irqsave(&list->lock, flags);
110901- skb->dropcount = atomic_read(&sk->sk_drops);
110902+ skb->dropcount = atomic_read_unchecked(&sk->sk_drops);
110903 __skb_queue_tail(list, skb);
110904 spin_unlock_irqrestore(&list->lock, flags);
110905
110906@@ -486,7 +486,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
110907 skb->dev = NULL;
110908
110909 if (sk_rcvqueues_full(sk, sk->sk_rcvbuf)) {
110910- atomic_inc(&sk->sk_drops);
110911+ atomic_inc_unchecked(&sk->sk_drops);
110912 goto discard_and_relse;
110913 }
110914 if (nested)
110915@@ -504,7 +504,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
110916 mutex_release(&sk->sk_lock.dep_map, 1, _RET_IP_);
110917 } else if (sk_add_backlog(sk, skb, sk->sk_rcvbuf)) {
110918 bh_unlock_sock(sk);
110919- atomic_inc(&sk->sk_drops);
110920+ atomic_inc_unchecked(&sk->sk_drops);
110921 goto discard_and_relse;
110922 }
110923
110924@@ -910,6 +910,7 @@ set_rcvbuf:
110925 }
110926 break;
110927
110928+#ifndef GRKERNSEC_BPF_HARDEN
110929 case SO_ATTACH_BPF:
110930 ret = -EINVAL;
110931 if (optlen == sizeof(u32)) {
110932@@ -922,7 +923,7 @@ set_rcvbuf:
110933 ret = sk_attach_bpf(ufd, sk);
110934 }
110935 break;
110936-
110937+#endif
110938 case SO_DETACH_FILTER:
110939 ret = sk_detach_filter(sk);
110940 break;
110941@@ -1026,12 +1027,12 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
110942 struct timeval tm;
110943 } v;
110944
110945- int lv = sizeof(int);
110946- int len;
110947+ unsigned int lv = sizeof(int);
110948+ unsigned int len;
110949
110950 if (get_user(len, optlen))
110951 return -EFAULT;
110952- if (len < 0)
110953+ if (len > INT_MAX)
110954 return -EINVAL;
110955
110956 memset(&v, 0, sizeof(v));
110957@@ -1169,11 +1170,11 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
110958
110959 case SO_PEERNAME:
110960 {
110961- char address[128];
110962+ char address[_K_SS_MAXSIZE];
110963
110964 if (sock->ops->getname(sock, (struct sockaddr *)address, &lv, 2))
110965 return -ENOTCONN;
110966- if (lv < len)
110967+ if (lv < len || sizeof address < len)
110968 return -EINVAL;
110969 if (copy_to_user(optval, address, len))
110970 return -EFAULT;
110971@@ -1258,7 +1259,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
110972
110973 if (len > lv)
110974 len = lv;
110975- if (copy_to_user(optval, &v, len))
110976+ if (len > sizeof(v) || copy_to_user(optval, &v, len))
110977 return -EFAULT;
110978 lenout:
110979 if (put_user(len, optlen))
110980@@ -2375,7 +2376,7 @@ void sock_init_data(struct socket *sock, struct sock *sk)
110981 */
110982 smp_wmb();
110983 atomic_set(&sk->sk_refcnt, 1);
110984- atomic_set(&sk->sk_drops, 0);
110985+ atomic_set_unchecked(&sk->sk_drops, 0);
110986 }
110987 EXPORT_SYMBOL(sock_init_data);
110988
110989@@ -2503,6 +2504,7 @@ void sock_enable_timestamp(struct sock *sk, int flag)
110990 int sock_recv_errqueue(struct sock *sk, struct msghdr *msg, int len,
110991 int level, int type)
110992 {
110993+ struct sock_extended_err ee;
110994 struct sock_exterr_skb *serr;
110995 struct sk_buff *skb;
110996 int copied, err;
110997@@ -2524,7 +2526,8 @@ int sock_recv_errqueue(struct sock *sk, struct msghdr *msg, int len,
110998 sock_recv_timestamp(msg, sk, skb);
110999
111000 serr = SKB_EXT_ERR(skb);
111001- put_cmsg(msg, level, type, sizeof(serr->ee), &serr->ee);
111002+ ee = serr->ee;
111003+ put_cmsg(msg, level, type, sizeof ee, &ee);
111004
111005 msg->msg_flags |= MSG_ERRQUEUE;
111006 err = copied;
111007diff --git a/net/core/sock_diag.c b/net/core/sock_diag.c
111008index ad704c7..ca48aff 100644
111009--- a/net/core/sock_diag.c
111010+++ b/net/core/sock_diag.c
111011@@ -9,26 +9,33 @@
111012 #include <linux/inet_diag.h>
111013 #include <linux/sock_diag.h>
111014
111015-static const struct sock_diag_handler *sock_diag_handlers[AF_MAX];
111016+static const struct sock_diag_handler *sock_diag_handlers[AF_MAX] __read_only;
111017 static int (*inet_rcv_compat)(struct sk_buff *skb, struct nlmsghdr *nlh);
111018 static DEFINE_MUTEX(sock_diag_table_mutex);
111019
111020 int sock_diag_check_cookie(void *sk, __u32 *cookie)
111021 {
111022+#ifndef CONFIG_GRKERNSEC_HIDESYM
111023 if ((cookie[0] != INET_DIAG_NOCOOKIE ||
111024 cookie[1] != INET_DIAG_NOCOOKIE) &&
111025 ((u32)(unsigned long)sk != cookie[0] ||
111026 (u32)((((unsigned long)sk) >> 31) >> 1) != cookie[1]))
111027 return -ESTALE;
111028 else
111029+#endif
111030 return 0;
111031 }
111032 EXPORT_SYMBOL_GPL(sock_diag_check_cookie);
111033
111034 void sock_diag_save_cookie(void *sk, __u32 *cookie)
111035 {
111036+#ifdef CONFIG_GRKERNSEC_HIDESYM
111037+ cookie[0] = 0;
111038+ cookie[1] = 0;
111039+#else
111040 cookie[0] = (u32)(unsigned long)sk;
111041 cookie[1] = (u32)(((unsigned long)sk >> 31) >> 1);
111042+#endif
111043 }
111044 EXPORT_SYMBOL_GPL(sock_diag_save_cookie);
111045
111046@@ -110,8 +117,11 @@ int sock_diag_register(const struct sock_diag_handler *hndl)
111047 mutex_lock(&sock_diag_table_mutex);
111048 if (sock_diag_handlers[hndl->family])
111049 err = -EBUSY;
111050- else
111051+ else {
111052+ pax_open_kernel();
111053 sock_diag_handlers[hndl->family] = hndl;
111054+ pax_close_kernel();
111055+ }
111056 mutex_unlock(&sock_diag_table_mutex);
111057
111058 return err;
111059@@ -127,7 +137,9 @@ void sock_diag_unregister(const struct sock_diag_handler *hnld)
111060
111061 mutex_lock(&sock_diag_table_mutex);
111062 BUG_ON(sock_diag_handlers[family] != hnld);
111063+ pax_open_kernel();
111064 sock_diag_handlers[family] = NULL;
111065+ pax_close_kernel();
111066 mutex_unlock(&sock_diag_table_mutex);
111067 }
111068 EXPORT_SYMBOL_GPL(sock_diag_unregister);
111069diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c
111070index 8ce351f..2c388f7 100644
111071--- a/net/core/sysctl_net_core.c
111072+++ b/net/core/sysctl_net_core.c
111073@@ -36,7 +36,7 @@ static int rps_sock_flow_sysctl(struct ctl_table *table, int write,
111074 {
111075 unsigned int orig_size, size;
111076 int ret, i;
111077- struct ctl_table tmp = {
111078+ ctl_table_no_const tmp = {
111079 .data = &size,
111080 .maxlen = sizeof(size),
111081 .mode = table->mode
111082@@ -204,7 +204,7 @@ static int set_default_qdisc(struct ctl_table *table, int write,
111083 void __user *buffer, size_t *lenp, loff_t *ppos)
111084 {
111085 char id[IFNAMSIZ];
111086- struct ctl_table tbl = {
111087+ ctl_table_no_const tbl = {
111088 .data = id,
111089 .maxlen = IFNAMSIZ,
111090 };
111091@@ -222,7 +222,7 @@ static int set_default_qdisc(struct ctl_table *table, int write,
111092 static int proc_do_rss_key(struct ctl_table *table, int write,
111093 void __user *buffer, size_t *lenp, loff_t *ppos)
111094 {
111095- struct ctl_table fake_table;
111096+ ctl_table_no_const fake_table;
111097 char buf[NETDEV_RSS_KEY_LEN * 3];
111098
111099 snprintf(buf, sizeof(buf), "%*phC", NETDEV_RSS_KEY_LEN, netdev_rss_key);
111100@@ -286,7 +286,7 @@ static struct ctl_table net_core_table[] = {
111101 .mode = 0444,
111102 .proc_handler = proc_do_rss_key,
111103 },
111104-#ifdef CONFIG_BPF_JIT
111105+#if defined(CONFIG_BPF_JIT) && !defined(CONFIG_GRKERNSEC_BPF_HARDEN)
111106 {
111107 .procname = "bpf_jit_enable",
111108 .data = &bpf_jit_enable,
111109@@ -411,13 +411,12 @@ static struct ctl_table netns_core_table[] = {
111110
111111 static __net_init int sysctl_core_net_init(struct net *net)
111112 {
111113- struct ctl_table *tbl;
111114+ ctl_table_no_const *tbl = NULL;
111115
111116 net->core.sysctl_somaxconn = SOMAXCONN;
111117
111118- tbl = netns_core_table;
111119 if (!net_eq(net, &init_net)) {
111120- tbl = kmemdup(tbl, sizeof(netns_core_table), GFP_KERNEL);
111121+ tbl = kmemdup(netns_core_table, sizeof(netns_core_table), GFP_KERNEL);
111122 if (tbl == NULL)
111123 goto err_dup;
111124
111125@@ -427,17 +426,16 @@ static __net_init int sysctl_core_net_init(struct net *net)
111126 if (net->user_ns != &init_user_ns) {
111127 tbl[0].procname = NULL;
111128 }
111129- }
111130-
111131- net->core.sysctl_hdr = register_net_sysctl(net, "net/core", tbl);
111132+ net->core.sysctl_hdr = register_net_sysctl(net, "net/core", tbl);
111133+ } else
111134+ net->core.sysctl_hdr = register_net_sysctl(net, "net/core", netns_core_table);
111135 if (net->core.sysctl_hdr == NULL)
111136 goto err_reg;
111137
111138 return 0;
111139
111140 err_reg:
111141- if (tbl != netns_core_table)
111142- kfree(tbl);
111143+ kfree(tbl);
111144 err_dup:
111145 return -ENOMEM;
111146 }
111147@@ -452,7 +450,7 @@ static __net_exit void sysctl_core_net_exit(struct net *net)
111148 kfree(tbl);
111149 }
111150
111151-static __net_initdata struct pernet_operations sysctl_core_ops = {
111152+static __net_initconst struct pernet_operations sysctl_core_ops = {
111153 .init = sysctl_core_net_init,
111154 .exit = sysctl_core_net_exit,
111155 };
111156diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c
111157index 8102286..a0c2755 100644
111158--- a/net/decnet/af_decnet.c
111159+++ b/net/decnet/af_decnet.c
111160@@ -466,6 +466,7 @@ static struct proto dn_proto = {
111161 .sysctl_rmem = sysctl_decnet_rmem,
111162 .max_header = DN_MAX_NSP_DATA_HEADER + 64,
111163 .obj_size = sizeof(struct dn_sock),
111164+ .slab_flags = SLAB_USERCOPY,
111165 };
111166
111167 static struct sock *dn_alloc_sock(struct net *net, struct socket *sock, gfp_t gfp)
111168diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c
111169index b2c26b0..41f803e 100644
111170--- a/net/decnet/dn_dev.c
111171+++ b/net/decnet/dn_dev.c
111172@@ -201,7 +201,7 @@ static struct dn_dev_sysctl_table {
111173 .extra1 = &min_t3,
111174 .extra2 = &max_t3
111175 },
111176- {0}
111177+ { }
111178 },
111179 };
111180
111181diff --git a/net/decnet/sysctl_net_decnet.c b/net/decnet/sysctl_net_decnet.c
111182index 5325b54..a0d4d69 100644
111183--- a/net/decnet/sysctl_net_decnet.c
111184+++ b/net/decnet/sysctl_net_decnet.c
111185@@ -174,7 +174,7 @@ static int dn_node_address_handler(struct ctl_table *table, int write,
111186
111187 if (len > *lenp) len = *lenp;
111188
111189- if (copy_to_user(buffer, addr, len))
111190+ if (len > sizeof addr || copy_to_user(buffer, addr, len))
111191 return -EFAULT;
111192
111193 *lenp = len;
111194@@ -237,7 +237,7 @@ static int dn_def_dev_handler(struct ctl_table *table, int write,
111195
111196 if (len > *lenp) len = *lenp;
111197
111198- if (copy_to_user(buffer, devname, len))
111199+ if (len > sizeof devname || copy_to_user(buffer, devname, len))
111200 return -EFAULT;
111201
111202 *lenp = len;
111203diff --git a/net/hsr/hsr_netlink.c b/net/hsr/hsr_netlink.c
111204index a2c7e4c..3dc9f67 100644
111205--- a/net/hsr/hsr_netlink.c
111206+++ b/net/hsr/hsr_netlink.c
111207@@ -102,7 +102,7 @@ nla_put_failure:
111208 return -EMSGSIZE;
111209 }
111210
111211-static struct rtnl_link_ops hsr_link_ops __read_mostly = {
111212+static struct rtnl_link_ops hsr_link_ops = {
111213 .kind = "hsr",
111214 .maxtype = IFLA_HSR_MAX,
111215 .policy = hsr_policy,
111216diff --git a/net/ieee802154/6lowpan/core.c b/net/ieee802154/6lowpan/core.c
111217index 055fbb7..c0dbe60 100644
111218--- a/net/ieee802154/6lowpan/core.c
111219+++ b/net/ieee802154/6lowpan/core.c
111220@@ -217,7 +217,7 @@ static void lowpan_dellink(struct net_device *dev, struct list_head *head)
111221 dev_put(real_dev);
111222 }
111223
111224-static struct rtnl_link_ops lowpan_link_ops __read_mostly = {
111225+static struct rtnl_link_ops lowpan_link_ops = {
111226 .kind = "lowpan",
111227 .priv_size = sizeof(struct lowpan_dev_info),
111228 .setup = lowpan_setup,
111229diff --git a/net/ieee802154/6lowpan/reassembly.c b/net/ieee802154/6lowpan/reassembly.c
111230index f46e4d1..30231f1 100644
111231--- a/net/ieee802154/6lowpan/reassembly.c
111232+++ b/net/ieee802154/6lowpan/reassembly.c
111233@@ -435,14 +435,13 @@ static struct ctl_table lowpan_frags_ctl_table[] = {
111234
111235 static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
111236 {
111237- struct ctl_table *table;
111238+ ctl_table_no_const *table = NULL;
111239 struct ctl_table_header *hdr;
111240 struct netns_ieee802154_lowpan *ieee802154_lowpan =
111241 net_ieee802154_lowpan(net);
111242
111243- table = lowpan_frags_ns_ctl_table;
111244 if (!net_eq(net, &init_net)) {
111245- table = kmemdup(table, sizeof(lowpan_frags_ns_ctl_table),
111246+ table = kmemdup(lowpan_frags_ns_ctl_table, sizeof(lowpan_frags_ns_ctl_table),
111247 GFP_KERNEL);
111248 if (table == NULL)
111249 goto err_alloc;
111250@@ -457,9 +456,9 @@ static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
111251 /* Don't export sysctls to unprivileged users */
111252 if (net->user_ns != &init_user_ns)
111253 table[0].procname = NULL;
111254- }
111255-
111256- hdr = register_net_sysctl(net, "net/ieee802154/6lowpan", table);
111257+ hdr = register_net_sysctl(net, "net/ieee802154/6lowpan", table);
111258+ } else
111259+ hdr = register_net_sysctl(net, "net/ieee802154/6lowpan", lowpan_frags_ns_ctl_table);
111260 if (hdr == NULL)
111261 goto err_reg;
111262
111263@@ -467,8 +466,7 @@ static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
111264 return 0;
111265
111266 err_reg:
111267- if (!net_eq(net, &init_net))
111268- kfree(table);
111269+ kfree(table);
111270 err_alloc:
111271 return -ENOMEM;
111272 }
111273diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
111274index d2e49ba..f78e8aa 100644
111275--- a/net/ipv4/af_inet.c
111276+++ b/net/ipv4/af_inet.c
111277@@ -1390,7 +1390,7 @@ int inet_recv_error(struct sock *sk, struct msghdr *msg, int len, int *addr_len)
111278 return ip_recv_error(sk, msg, len, addr_len);
111279 #if IS_ENABLED(CONFIG_IPV6)
111280 if (sk->sk_family == AF_INET6)
111281- return pingv6_ops.ipv6_recv_error(sk, msg, len, addr_len);
111282+ return pingv6_ops->ipv6_recv_error(sk, msg, len, addr_len);
111283 #endif
111284 return -EINVAL;
111285 }
111286diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
111287index 3a8985c..9d2a870 100644
111288--- a/net/ipv4/devinet.c
111289+++ b/net/ipv4/devinet.c
111290@@ -69,7 +69,8 @@
111291
111292 static struct ipv4_devconf ipv4_devconf = {
111293 .data = {
111294- [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 1,
111295+ [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 0,
111296+ [IPV4_DEVCONF_RP_FILTER - 1] = 1,
111297 [IPV4_DEVCONF_SEND_REDIRECTS - 1] = 1,
111298 [IPV4_DEVCONF_SECURE_REDIRECTS - 1] = 1,
111299 [IPV4_DEVCONF_SHARED_MEDIA - 1] = 1,
111300@@ -80,7 +81,8 @@ static struct ipv4_devconf ipv4_devconf = {
111301
111302 static struct ipv4_devconf ipv4_devconf_dflt = {
111303 .data = {
111304- [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 1,
111305+ [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 0,
111306+ [IPV4_DEVCONF_RP_FILTER - 1] = 1,
111307 [IPV4_DEVCONF_SEND_REDIRECTS - 1] = 1,
111308 [IPV4_DEVCONF_SECURE_REDIRECTS - 1] = 1,
111309 [IPV4_DEVCONF_SHARED_MEDIA - 1] = 1,
111310@@ -1549,7 +1551,7 @@ static int inet_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb)
111311 idx = 0;
111312 head = &net->dev_index_head[h];
111313 rcu_read_lock();
111314- cb->seq = atomic_read(&net->ipv4.dev_addr_genid) ^
111315+ cb->seq = atomic_read_unchecked(&net->ipv4.dev_addr_genid) ^
111316 net->dev_base_seq;
111317 hlist_for_each_entry_rcu(dev, head, index_hlist) {
111318 if (idx < s_idx)
111319@@ -1868,7 +1870,7 @@ static int inet_netconf_dump_devconf(struct sk_buff *skb,
111320 idx = 0;
111321 head = &net->dev_index_head[h];
111322 rcu_read_lock();
111323- cb->seq = atomic_read(&net->ipv4.dev_addr_genid) ^
111324+ cb->seq = atomic_read_unchecked(&net->ipv4.dev_addr_genid) ^
111325 net->dev_base_seq;
111326 hlist_for_each_entry_rcu(dev, head, index_hlist) {
111327 if (idx < s_idx)
111328@@ -2103,7 +2105,7 @@ static int ipv4_doint_and_flush(struct ctl_table *ctl, int write,
111329 #define DEVINET_SYSCTL_FLUSHING_ENTRY(attr, name) \
111330 DEVINET_SYSCTL_COMPLEX_ENTRY(attr, name, ipv4_doint_and_flush)
111331
111332-static struct devinet_sysctl_table {
111333+static const struct devinet_sysctl_table {
111334 struct ctl_table_header *sysctl_header;
111335 struct ctl_table devinet_vars[__IPV4_DEVCONF_MAX];
111336 } devinet_sysctl = {
111337@@ -2235,7 +2237,7 @@ static __net_init int devinet_init_net(struct net *net)
111338 int err;
111339 struct ipv4_devconf *all, *dflt;
111340 #ifdef CONFIG_SYSCTL
111341- struct ctl_table *tbl = ctl_forward_entry;
111342+ ctl_table_no_const *tbl = NULL;
111343 struct ctl_table_header *forw_hdr;
111344 #endif
111345
111346@@ -2253,7 +2255,7 @@ static __net_init int devinet_init_net(struct net *net)
111347 goto err_alloc_dflt;
111348
111349 #ifdef CONFIG_SYSCTL
111350- tbl = kmemdup(tbl, sizeof(ctl_forward_entry), GFP_KERNEL);
111351+ tbl = kmemdup(ctl_forward_entry, sizeof(ctl_forward_entry), GFP_KERNEL);
111352 if (tbl == NULL)
111353 goto err_alloc_ctl;
111354
111355@@ -2273,7 +2275,10 @@ static __net_init int devinet_init_net(struct net *net)
111356 goto err_reg_dflt;
111357
111358 err = -ENOMEM;
111359- forw_hdr = register_net_sysctl(net, "net/ipv4", tbl);
111360+ if (!net_eq(net, &init_net))
111361+ forw_hdr = register_net_sysctl(net, "net/ipv4", tbl);
111362+ else
111363+ forw_hdr = register_net_sysctl(net, "net/ipv4", ctl_forward_entry);
111364 if (forw_hdr == NULL)
111365 goto err_reg_ctl;
111366 net->ipv4.forw_hdr = forw_hdr;
111367@@ -2289,8 +2294,7 @@ err_reg_ctl:
111368 err_reg_dflt:
111369 __devinet_sysctl_unregister(all);
111370 err_reg_all:
111371- if (tbl != ctl_forward_entry)
111372- kfree(tbl);
111373+ kfree(tbl);
111374 err_alloc_ctl:
111375 #endif
111376 if (dflt != &ipv4_devconf_dflt)
111377diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
111378index 23b9b3e..60cf0c4 100644
111379--- a/net/ipv4/fib_frontend.c
111380+++ b/net/ipv4/fib_frontend.c
111381@@ -1020,12 +1020,12 @@ static int fib_inetaddr_event(struct notifier_block *this, unsigned long event,
111382 #ifdef CONFIG_IP_ROUTE_MULTIPATH
111383 fib_sync_up(dev);
111384 #endif
111385- atomic_inc(&net->ipv4.dev_addr_genid);
111386+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
111387 rt_cache_flush(dev_net(dev));
111388 break;
111389 case NETDEV_DOWN:
111390 fib_del_ifaddr(ifa, NULL);
111391- atomic_inc(&net->ipv4.dev_addr_genid);
111392+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
111393 if (ifa->ifa_dev->ifa_list == NULL) {
111394 /* Last address was deleted from this interface.
111395 * Disable IP.
111396@@ -1063,7 +1063,7 @@ static int fib_netdev_event(struct notifier_block *this, unsigned long event, vo
111397 #ifdef CONFIG_IP_ROUTE_MULTIPATH
111398 fib_sync_up(dev);
111399 #endif
111400- atomic_inc(&net->ipv4.dev_addr_genid);
111401+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
111402 rt_cache_flush(net);
111403 break;
111404 case NETDEV_DOWN:
111405diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
111406index 1e2090e..351a724 100644
111407--- a/net/ipv4/fib_semantics.c
111408+++ b/net/ipv4/fib_semantics.c
111409@@ -753,7 +753,7 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh)
111410 nh->nh_saddr = inet_select_addr(nh->nh_dev,
111411 nh->nh_gw,
111412 nh->nh_parent->fib_scope);
111413- nh->nh_saddr_genid = atomic_read(&net->ipv4.dev_addr_genid);
111414+ nh->nh_saddr_genid = atomic_read_unchecked(&net->ipv4.dev_addr_genid);
111415
111416 return nh->nh_saddr;
111417 }
111418diff --git a/net/ipv4/fou.c b/net/ipv4/fou.c
111419index ff069f6..335e752 100644
111420--- a/net/ipv4/fou.c
111421+++ b/net/ipv4/fou.c
111422@@ -771,12 +771,12 @@ EXPORT_SYMBOL(gue_build_header);
111423
111424 #ifdef CONFIG_NET_FOU_IP_TUNNELS
111425
111426-static const struct ip_tunnel_encap_ops __read_mostly fou_iptun_ops = {
111427+static const struct ip_tunnel_encap_ops fou_iptun_ops = {
111428 .encap_hlen = fou_encap_hlen,
111429 .build_header = fou_build_header,
111430 };
111431
111432-static const struct ip_tunnel_encap_ops __read_mostly gue_iptun_ops = {
111433+static const struct ip_tunnel_encap_ops gue_iptun_ops = {
111434 .encap_hlen = gue_encap_hlen,
111435 .build_header = gue_build_header,
111436 };
111437diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
111438index 9111a4e..3576905 100644
111439--- a/net/ipv4/inet_hashtables.c
111440+++ b/net/ipv4/inet_hashtables.c
111441@@ -18,6 +18,7 @@
111442 #include <linux/sched.h>
111443 #include <linux/slab.h>
111444 #include <linux/wait.h>
111445+#include <linux/security.h>
111446
111447 #include <net/inet_connection_sock.h>
111448 #include <net/inet_hashtables.h>
111449@@ -49,6 +50,8 @@ static unsigned int inet_sk_ehashfn(const struct sock *sk)
111450 return inet_ehashfn(net, laddr, lport, faddr, fport);
111451 }
111452
111453+extern void gr_update_task_in_ip_table(const struct inet_sock *inet);
111454+
111455 /*
111456 * Allocate and initialize a new local port bind bucket.
111457 * The bindhash mutex for snum's hash chain must be held here.
111458@@ -554,6 +557,8 @@ ok:
111459 twrefcnt += inet_twsk_bind_unhash(tw, hinfo);
111460 spin_unlock(&head->lock);
111461
111462+ gr_update_task_in_ip_table(inet_sk(sk));
111463+
111464 if (tw) {
111465 inet_twsk_deschedule(tw, death_row);
111466 while (twrefcnt) {
111467diff --git a/net/ipv4/inetpeer.c b/net/ipv4/inetpeer.c
111468index 241afd7..31b95d5 100644
111469--- a/net/ipv4/inetpeer.c
111470+++ b/net/ipv4/inetpeer.c
111471@@ -461,7 +461,7 @@ relookup:
111472 if (p) {
111473 p->daddr = *daddr;
111474 atomic_set(&p->refcnt, 1);
111475- atomic_set(&p->rid, 0);
111476+ atomic_set_unchecked(&p->rid, 0);
111477 p->metrics[RTAX_LOCK-1] = INETPEER_METRICS_NEW;
111478 p->rate_tokens = 0;
111479 /* 60*HZ is arbitrary, but chosen enough high so that the first
111480diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
111481index 145a50c..5dd8cc5 100644
111482--- a/net/ipv4/ip_fragment.c
111483+++ b/net/ipv4/ip_fragment.c
111484@@ -268,7 +268,7 @@ static int ip_frag_too_far(struct ipq *qp)
111485 return 0;
111486
111487 start = qp->rid;
111488- end = atomic_inc_return(&peer->rid);
111489+ end = atomic_inc_return_unchecked(&peer->rid);
111490 qp->rid = end;
111491
111492 rc = qp->q.fragments && (end - start) > max;
111493@@ -748,12 +748,11 @@ static struct ctl_table ip4_frags_ctl_table[] = {
111494
111495 static int __net_init ip4_frags_ns_ctl_register(struct net *net)
111496 {
111497- struct ctl_table *table;
111498+ ctl_table_no_const *table = NULL;
111499 struct ctl_table_header *hdr;
111500
111501- table = ip4_frags_ns_ctl_table;
111502 if (!net_eq(net, &init_net)) {
111503- table = kmemdup(table, sizeof(ip4_frags_ns_ctl_table), GFP_KERNEL);
111504+ table = kmemdup(ip4_frags_ns_ctl_table, sizeof(ip4_frags_ns_ctl_table), GFP_KERNEL);
111505 if (table == NULL)
111506 goto err_alloc;
111507
111508@@ -767,9 +766,10 @@ static int __net_init ip4_frags_ns_ctl_register(struct net *net)
111509 /* Don't export sysctls to unprivileged users */
111510 if (net->user_ns != &init_user_ns)
111511 table[0].procname = NULL;
111512- }
111513+ hdr = register_net_sysctl(net, "net/ipv4", table);
111514+ } else
111515+ hdr = register_net_sysctl(net, "net/ipv4", ip4_frags_ns_ctl_table);
111516
111517- hdr = register_net_sysctl(net, "net/ipv4", table);
111518 if (hdr == NULL)
111519 goto err_reg;
111520
111521@@ -777,8 +777,7 @@ static int __net_init ip4_frags_ns_ctl_register(struct net *net)
111522 return 0;
111523
111524 err_reg:
111525- if (!net_eq(net, &init_net))
111526- kfree(table);
111527+ kfree(table);
111528 err_alloc:
111529 return -ENOMEM;
111530 }
111531diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
111532index 6207275f..00323a2 100644
111533--- a/net/ipv4/ip_gre.c
111534+++ b/net/ipv4/ip_gre.c
111535@@ -115,7 +115,7 @@ static bool log_ecn_error = true;
111536 module_param(log_ecn_error, bool, 0644);
111537 MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");
111538
111539-static struct rtnl_link_ops ipgre_link_ops __read_mostly;
111540+static struct rtnl_link_ops ipgre_link_ops;
111541 static int ipgre_tunnel_init(struct net_device *dev);
111542
111543 static int ipgre_net_id __read_mostly;
111544@@ -817,7 +817,7 @@ static const struct nla_policy ipgre_policy[IFLA_GRE_MAX + 1] = {
111545 [IFLA_GRE_ENCAP_DPORT] = { .type = NLA_U16 },
111546 };
111547
111548-static struct rtnl_link_ops ipgre_link_ops __read_mostly = {
111549+static struct rtnl_link_ops ipgre_link_ops = {
111550 .kind = "gre",
111551 .maxtype = IFLA_GRE_MAX,
111552 .policy = ipgre_policy,
111553@@ -832,7 +832,7 @@ static struct rtnl_link_ops ipgre_link_ops __read_mostly = {
111554 .get_link_net = ip_tunnel_get_link_net,
111555 };
111556
111557-static struct rtnl_link_ops ipgre_tap_ops __read_mostly = {
111558+static struct rtnl_link_ops ipgre_tap_ops = {
111559 .kind = "gretap",
111560 .maxtype = IFLA_GRE_MAX,
111561 .policy = ipgre_policy,
111562diff --git a/net/ipv4/ip_input.c b/net/ipv4/ip_input.c
111563index 3d4da2c..40f9c29 100644
111564--- a/net/ipv4/ip_input.c
111565+++ b/net/ipv4/ip_input.c
111566@@ -147,6 +147,10 @@
111567 #include <linux/mroute.h>
111568 #include <linux/netlink.h>
111569
111570+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
111571+extern int grsec_enable_blackhole;
111572+#endif
111573+
111574 /*
111575 * Process Router Attention IP option (RFC 2113)
111576 */
111577@@ -223,6 +227,9 @@ static int ip_local_deliver_finish(struct sk_buff *skb)
111578 if (!raw) {
111579 if (xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb)) {
111580 IP_INC_STATS_BH(net, IPSTATS_MIB_INUNKNOWNPROTOS);
111581+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
111582+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
111583+#endif
111584 icmp_send(skb, ICMP_DEST_UNREACH,
111585 ICMP_PROT_UNREACH, 0);
111586 }
111587diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
111588index 5cd9927..8610b9f 100644
111589--- a/net/ipv4/ip_sockglue.c
111590+++ b/net/ipv4/ip_sockglue.c
111591@@ -1254,7 +1254,8 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
111592 len = min_t(unsigned int, len, opt->optlen);
111593 if (put_user(len, optlen))
111594 return -EFAULT;
111595- if (copy_to_user(optval, opt->__data, len))
111596+ if ((len > (sizeof(optbuf) - sizeof(struct ip_options))) ||
111597+ copy_to_user(optval, opt->__data, len))
111598 return -EFAULT;
111599 return 0;
111600 }
111601@@ -1388,7 +1389,7 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
111602 if (sk->sk_type != SOCK_STREAM)
111603 return -ENOPROTOOPT;
111604
111605- msg.msg_control = (__force void *) optval;
111606+ msg.msg_control = (__force_kernel void *) optval;
111607 msg.msg_controllen = len;
111608 msg.msg_flags = flags;
111609
111610diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c
111611index 94efe14..1453fcc 100644
111612--- a/net/ipv4/ip_vti.c
111613+++ b/net/ipv4/ip_vti.c
111614@@ -45,7 +45,7 @@
111615 #include <net/net_namespace.h>
111616 #include <net/netns/generic.h>
111617
111618-static struct rtnl_link_ops vti_link_ops __read_mostly;
111619+static struct rtnl_link_ops vti_link_ops;
111620
111621 static int vti_net_id __read_mostly;
111622 static int vti_tunnel_init(struct net_device *dev);
111623@@ -519,7 +519,7 @@ static const struct nla_policy vti_policy[IFLA_VTI_MAX + 1] = {
111624 [IFLA_VTI_REMOTE] = { .len = FIELD_SIZEOF(struct iphdr, daddr) },
111625 };
111626
111627-static struct rtnl_link_ops vti_link_ops __read_mostly = {
111628+static struct rtnl_link_ops vti_link_ops = {
111629 .kind = "vti",
111630 .maxtype = IFLA_VTI_MAX,
111631 .policy = vti_policy,
111632diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
111633index b26376e..fc3d733 100644
111634--- a/net/ipv4/ipconfig.c
111635+++ b/net/ipv4/ipconfig.c
111636@@ -333,7 +333,7 @@ static int __init ic_devinet_ioctl(unsigned int cmd, struct ifreq *arg)
111637
111638 mm_segment_t oldfs = get_fs();
111639 set_fs(get_ds());
111640- res = devinet_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
111641+ res = devinet_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
111642 set_fs(oldfs);
111643 return res;
111644 }
111645@@ -344,7 +344,7 @@ static int __init ic_dev_ioctl(unsigned int cmd, struct ifreq *arg)
111646
111647 mm_segment_t oldfs = get_fs();
111648 set_fs(get_ds());
111649- res = dev_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
111650+ res = dev_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
111651 set_fs(oldfs);
111652 return res;
111653 }
111654@@ -355,7 +355,7 @@ static int __init ic_route_ioctl(unsigned int cmd, struct rtentry *arg)
111655
111656 mm_segment_t oldfs = get_fs();
111657 set_fs(get_ds());
111658- res = ip_rt_ioctl(&init_net, cmd, (void __user *) arg);
111659+ res = ip_rt_ioctl(&init_net, cmd, (void __force_user *) arg);
111660 set_fs(oldfs);
111661 return res;
111662 }
111663diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
111664index 915d215..48d1db7 100644
111665--- a/net/ipv4/ipip.c
111666+++ b/net/ipv4/ipip.c
111667@@ -124,7 +124,7 @@ MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");
111668 static int ipip_net_id __read_mostly;
111669
111670 static int ipip_tunnel_init(struct net_device *dev);
111671-static struct rtnl_link_ops ipip_link_ops __read_mostly;
111672+static struct rtnl_link_ops ipip_link_ops;
111673
111674 static int ipip_err(struct sk_buff *skb, u32 info)
111675 {
111676@@ -487,7 +487,7 @@ static const struct nla_policy ipip_policy[IFLA_IPTUN_MAX + 1] = {
111677 [IFLA_IPTUN_ENCAP_DPORT] = { .type = NLA_U16 },
111678 };
111679
111680-static struct rtnl_link_ops ipip_link_ops __read_mostly = {
111681+static struct rtnl_link_ops ipip_link_ops = {
111682 .kind = "ipip",
111683 .maxtype = IFLA_IPTUN_MAX,
111684 .policy = ipip_policy,
111685diff --git a/net/ipv4/netfilter/arp_tables.c b/net/ipv4/netfilter/arp_tables.c
111686index f95b6f9..2ee2097 100644
111687--- a/net/ipv4/netfilter/arp_tables.c
111688+++ b/net/ipv4/netfilter/arp_tables.c
111689@@ -885,14 +885,14 @@ static int compat_table_info(const struct xt_table_info *info,
111690 #endif
111691
111692 static int get_info(struct net *net, void __user *user,
111693- const int *len, int compat)
111694+ int len, int compat)
111695 {
111696 char name[XT_TABLE_MAXNAMELEN];
111697 struct xt_table *t;
111698 int ret;
111699
111700- if (*len != sizeof(struct arpt_getinfo)) {
111701- duprintf("length %u != %Zu\n", *len,
111702+ if (len != sizeof(struct arpt_getinfo)) {
111703+ duprintf("length %u != %Zu\n", len,
111704 sizeof(struct arpt_getinfo));
111705 return -EINVAL;
111706 }
111707@@ -929,7 +929,7 @@ static int get_info(struct net *net, void __user *user,
111708 info.size = private->size;
111709 strcpy(info.name, name);
111710
111711- if (copy_to_user(user, &info, *len) != 0)
111712+ if (copy_to_user(user, &info, len) != 0)
111713 ret = -EFAULT;
111714 else
111715 ret = 0;
111716@@ -1690,7 +1690,7 @@ static int compat_do_arpt_get_ctl(struct sock *sk, int cmd, void __user *user,
111717
111718 switch (cmd) {
111719 case ARPT_SO_GET_INFO:
111720- ret = get_info(sock_net(sk), user, len, 1);
111721+ ret = get_info(sock_net(sk), user, *len, 1);
111722 break;
111723 case ARPT_SO_GET_ENTRIES:
111724 ret = compat_get_entries(sock_net(sk), user, len);
111725@@ -1735,7 +1735,7 @@ static int do_arpt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len
111726
111727 switch (cmd) {
111728 case ARPT_SO_GET_INFO:
111729- ret = get_info(sock_net(sk), user, len, 0);
111730+ ret = get_info(sock_net(sk), user, *len, 0);
111731 break;
111732
111733 case ARPT_SO_GET_ENTRIES:
111734diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c
111735index cf5e82f..75a20f5 100644
111736--- a/net/ipv4/netfilter/ip_tables.c
111737+++ b/net/ipv4/netfilter/ip_tables.c
111738@@ -1073,14 +1073,14 @@ static int compat_table_info(const struct xt_table_info *info,
111739 #endif
111740
111741 static int get_info(struct net *net, void __user *user,
111742- const int *len, int compat)
111743+ int len, int compat)
111744 {
111745 char name[XT_TABLE_MAXNAMELEN];
111746 struct xt_table *t;
111747 int ret;
111748
111749- if (*len != sizeof(struct ipt_getinfo)) {
111750- duprintf("length %u != %zu\n", *len,
111751+ if (len != sizeof(struct ipt_getinfo)) {
111752+ duprintf("length %u != %zu\n", len,
111753 sizeof(struct ipt_getinfo));
111754 return -EINVAL;
111755 }
111756@@ -1117,7 +1117,7 @@ static int get_info(struct net *net, void __user *user,
111757 info.size = private->size;
111758 strcpy(info.name, name);
111759
111760- if (copy_to_user(user, &info, *len) != 0)
111761+ if (copy_to_user(user, &info, len) != 0)
111762 ret = -EFAULT;
111763 else
111764 ret = 0;
111765@@ -1973,7 +1973,7 @@ compat_do_ipt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
111766
111767 switch (cmd) {
111768 case IPT_SO_GET_INFO:
111769- ret = get_info(sock_net(sk), user, len, 1);
111770+ ret = get_info(sock_net(sk), user, *len, 1);
111771 break;
111772 case IPT_SO_GET_ENTRIES:
111773 ret = compat_get_entries(sock_net(sk), user, len);
111774@@ -2020,7 +2020,7 @@ do_ipt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
111775
111776 switch (cmd) {
111777 case IPT_SO_GET_INFO:
111778- ret = get_info(sock_net(sk), user, len, 0);
111779+ ret = get_info(sock_net(sk), user, *len, 0);
111780 break;
111781
111782 case IPT_SO_GET_ENTRIES:
111783diff --git a/net/ipv4/netfilter/ipt_CLUSTERIP.c b/net/ipv4/netfilter/ipt_CLUSTERIP.c
111784index e90f83a..3e6acca 100644
111785--- a/net/ipv4/netfilter/ipt_CLUSTERIP.c
111786+++ b/net/ipv4/netfilter/ipt_CLUSTERIP.c
111787@@ -720,7 +720,7 @@ static int clusterip_net_init(struct net *net)
111788 spin_lock_init(&cn->lock);
111789
111790 #ifdef CONFIG_PROC_FS
111791- cn->procdir = proc_mkdir("ipt_CLUSTERIP", net->proc_net);
111792+ cn->procdir = proc_mkdir_restrict("ipt_CLUSTERIP", net->proc_net);
111793 if (!cn->procdir) {
111794 pr_err("Unable to proc dir entry\n");
111795 return -ENOMEM;
111796diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
111797index 787b0d6..ab6c0ba 100644
111798--- a/net/ipv4/ping.c
111799+++ b/net/ipv4/ping.c
111800@@ -59,7 +59,7 @@ struct ping_table {
111801 };
111802
111803 static struct ping_table ping_table;
111804-struct pingv6_ops pingv6_ops;
111805+struct pingv6_ops *pingv6_ops;
111806 EXPORT_SYMBOL_GPL(pingv6_ops);
111807
111808 static u16 ping_port_rover;
111809@@ -359,7 +359,7 @@ static int ping_check_bind_addr(struct sock *sk, struct inet_sock *isk,
111810 return -ENODEV;
111811 }
111812 }
111813- has_addr = pingv6_ops.ipv6_chk_addr(net, &addr->sin6_addr, dev,
111814+ has_addr = pingv6_ops->ipv6_chk_addr(net, &addr->sin6_addr, dev,
111815 scoped);
111816 rcu_read_unlock();
111817
111818@@ -567,7 +567,7 @@ void ping_err(struct sk_buff *skb, int offset, u32 info)
111819 }
111820 #if IS_ENABLED(CONFIG_IPV6)
111821 } else if (skb->protocol == htons(ETH_P_IPV6)) {
111822- harderr = pingv6_ops.icmpv6_err_convert(type, code, &err);
111823+ harderr = pingv6_ops->icmpv6_err_convert(type, code, &err);
111824 #endif
111825 }
111826
111827@@ -585,7 +585,7 @@ void ping_err(struct sk_buff *skb, int offset, u32 info)
111828 info, (u8 *)icmph);
111829 #if IS_ENABLED(CONFIG_IPV6)
111830 } else if (family == AF_INET6) {
111831- pingv6_ops.ipv6_icmp_error(sk, skb, err, 0,
111832+ pingv6_ops->ipv6_icmp_error(sk, skb, err, 0,
111833 info, (u8 *)icmph);
111834 #endif
111835 }
111836@@ -919,10 +919,10 @@ int ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
111837 }
111838
111839 if (inet6_sk(sk)->rxopt.all)
111840- pingv6_ops.ip6_datagram_recv_common_ctl(sk, msg, skb);
111841+ pingv6_ops->ip6_datagram_recv_common_ctl(sk, msg, skb);
111842 if (skb->protocol == htons(ETH_P_IPV6) &&
111843 inet6_sk(sk)->rxopt.all)
111844- pingv6_ops.ip6_datagram_recv_specific_ctl(sk, msg, skb);
111845+ pingv6_ops->ip6_datagram_recv_specific_ctl(sk, msg, skb);
111846 else if (skb->protocol == htons(ETH_P_IP) && isk->cmsg_flags)
111847 ip_cmsg_recv(msg, skb);
111848 #endif
111849@@ -1117,7 +1117,7 @@ static void ping_v4_format_sock(struct sock *sp, struct seq_file *f,
111850 from_kuid_munged(seq_user_ns(f), sock_i_uid(sp)),
111851 0, sock_i_ino(sp),
111852 atomic_read(&sp->sk_refcnt), sp,
111853- atomic_read(&sp->sk_drops));
111854+ atomic_read_unchecked(&sp->sk_drops));
111855 }
111856
111857 static int ping_v4_seq_show(struct seq_file *seq, void *v)
111858diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
111859index f027a70..2e64edc 100644
111860--- a/net/ipv4/raw.c
111861+++ b/net/ipv4/raw.c
111862@@ -324,7 +324,7 @@ static int raw_rcv_skb(struct sock *sk, struct sk_buff *skb)
111863 int raw_rcv(struct sock *sk, struct sk_buff *skb)
111864 {
111865 if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb)) {
111866- atomic_inc(&sk->sk_drops);
111867+ atomic_inc_unchecked(&sk->sk_drops);
111868 kfree_skb(skb);
111869 return NET_RX_DROP;
111870 }
111871@@ -773,16 +773,20 @@ static int raw_init(struct sock *sk)
111872
111873 static int raw_seticmpfilter(struct sock *sk, char __user *optval, int optlen)
111874 {
111875+ struct icmp_filter filter;
111876+
111877 if (optlen > sizeof(struct icmp_filter))
111878 optlen = sizeof(struct icmp_filter);
111879- if (copy_from_user(&raw_sk(sk)->filter, optval, optlen))
111880+ if (copy_from_user(&filter, optval, optlen))
111881 return -EFAULT;
111882+ raw_sk(sk)->filter = filter;
111883 return 0;
111884 }
111885
111886 static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *optlen)
111887 {
111888 int len, ret = -EFAULT;
111889+ struct icmp_filter filter;
111890
111891 if (get_user(len, optlen))
111892 goto out;
111893@@ -792,8 +796,8 @@ static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *o
111894 if (len > sizeof(struct icmp_filter))
111895 len = sizeof(struct icmp_filter);
111896 ret = -EFAULT;
111897- if (put_user(len, optlen) ||
111898- copy_to_user(optval, &raw_sk(sk)->filter, len))
111899+ filter = raw_sk(sk)->filter;
111900+ if (put_user(len, optlen) || len > sizeof filter || copy_to_user(optval, &filter, len))
111901 goto out;
111902 ret = 0;
111903 out: return ret;
111904@@ -1022,7 +1026,7 @@ static void raw_sock_seq_show(struct seq_file *seq, struct sock *sp, int i)
111905 0, 0L, 0,
111906 from_kuid_munged(seq_user_ns(seq), sock_i_uid(sp)),
111907 0, sock_i_ino(sp),
111908- atomic_read(&sp->sk_refcnt), sp, atomic_read(&sp->sk_drops));
111909+ atomic_read(&sp->sk_refcnt), sp, atomic_read_unchecked(&sp->sk_drops));
111910 }
111911
111912 static int raw_seq_show(struct seq_file *seq, void *v)
111913diff --git a/net/ipv4/route.c b/net/ipv4/route.c
111914index e262a08..d1fc3be 100644
111915--- a/net/ipv4/route.c
111916+++ b/net/ipv4/route.c
111917@@ -228,7 +228,7 @@ static const struct seq_operations rt_cache_seq_ops = {
111918
111919 static int rt_cache_seq_open(struct inode *inode, struct file *file)
111920 {
111921- return seq_open(file, &rt_cache_seq_ops);
111922+ return seq_open_restrict(file, &rt_cache_seq_ops);
111923 }
111924
111925 static const struct file_operations rt_cache_seq_fops = {
111926@@ -319,7 +319,7 @@ static const struct seq_operations rt_cpu_seq_ops = {
111927
111928 static int rt_cpu_seq_open(struct inode *inode, struct file *file)
111929 {
111930- return seq_open(file, &rt_cpu_seq_ops);
111931+ return seq_open_restrict(file, &rt_cpu_seq_ops);
111932 }
111933
111934 static const struct file_operations rt_cpu_seq_fops = {
111935@@ -357,7 +357,7 @@ static int rt_acct_proc_show(struct seq_file *m, void *v)
111936
111937 static int rt_acct_proc_open(struct inode *inode, struct file *file)
111938 {
111939- return single_open(file, rt_acct_proc_show, NULL);
111940+ return single_open_restrict(file, rt_acct_proc_show, NULL);
111941 }
111942
111943 static const struct file_operations rt_acct_proc_fops = {
111944@@ -459,11 +459,11 @@ static struct neighbour *ipv4_neigh_lookup(const struct dst_entry *dst,
111945
111946 #define IP_IDENTS_SZ 2048u
111947 struct ip_ident_bucket {
111948- atomic_t id;
111949+ atomic_unchecked_t id;
111950 u32 stamp32;
111951 };
111952
111953-static struct ip_ident_bucket *ip_idents __read_mostly;
111954+static struct ip_ident_bucket ip_idents[IP_IDENTS_SZ] __read_mostly;
111955
111956 /* In order to protect privacy, we add a perturbation to identifiers
111957 * if one generator is seldom used. This makes hard for an attacker
111958@@ -479,7 +479,7 @@ u32 ip_idents_reserve(u32 hash, int segs)
111959 if (old != now && cmpxchg(&bucket->stamp32, old, now) == old)
111960 delta = prandom_u32_max(now - old);
111961
111962- return atomic_add_return(segs + delta, &bucket->id) - segs;
111963+ return atomic_add_return_unchecked(segs + delta, &bucket->id) - segs;
111964 }
111965 EXPORT_SYMBOL(ip_idents_reserve);
111966
111967@@ -2643,34 +2643,34 @@ static struct ctl_table ipv4_route_flush_table[] = {
111968 .maxlen = sizeof(int),
111969 .mode = 0200,
111970 .proc_handler = ipv4_sysctl_rtcache_flush,
111971+ .extra1 = &init_net,
111972 },
111973 { },
111974 };
111975
111976 static __net_init int sysctl_route_net_init(struct net *net)
111977 {
111978- struct ctl_table *tbl;
111979+ ctl_table_no_const *tbl = NULL;
111980
111981- tbl = ipv4_route_flush_table;
111982 if (!net_eq(net, &init_net)) {
111983- tbl = kmemdup(tbl, sizeof(ipv4_route_flush_table), GFP_KERNEL);
111984+ tbl = kmemdup(ipv4_route_flush_table, sizeof(ipv4_route_flush_table), GFP_KERNEL);
111985 if (tbl == NULL)
111986 goto err_dup;
111987
111988 /* Don't export sysctls to unprivileged users */
111989 if (net->user_ns != &init_user_ns)
111990 tbl[0].procname = NULL;
111991- }
111992- tbl[0].extra1 = net;
111993+ tbl[0].extra1 = net;
111994+ net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", tbl);
111995+ } else
111996+ net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", ipv4_route_flush_table);
111997
111998- net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", tbl);
111999 if (net->ipv4.route_hdr == NULL)
112000 goto err_reg;
112001 return 0;
112002
112003 err_reg:
112004- if (tbl != ipv4_route_flush_table)
112005- kfree(tbl);
112006+ kfree(tbl);
112007 err_dup:
112008 return -ENOMEM;
112009 }
112010@@ -2693,8 +2693,8 @@ static __net_initdata struct pernet_operations sysctl_route_ops = {
112011
112012 static __net_init int rt_genid_init(struct net *net)
112013 {
112014- atomic_set(&net->ipv4.rt_genid, 0);
112015- atomic_set(&net->fnhe_genid, 0);
112016+ atomic_set_unchecked(&net->ipv4.rt_genid, 0);
112017+ atomic_set_unchecked(&net->fnhe_genid, 0);
112018 get_random_bytes(&net->ipv4.dev_addr_genid,
112019 sizeof(net->ipv4.dev_addr_genid));
112020 return 0;
112021@@ -2738,11 +2738,7 @@ int __init ip_rt_init(void)
112022 int rc = 0;
112023 int cpu;
112024
112025- ip_idents = kmalloc(IP_IDENTS_SZ * sizeof(*ip_idents), GFP_KERNEL);
112026- if (!ip_idents)
112027- panic("IP: failed to allocate ip_idents\n");
112028-
112029- prandom_bytes(ip_idents, IP_IDENTS_SZ * sizeof(*ip_idents));
112030+ prandom_bytes(ip_idents, sizeof(ip_idents));
112031
112032 for_each_possible_cpu(cpu) {
112033 struct uncached_list *ul = &per_cpu(rt_uncached_list, cpu);
112034diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
112035index d151539..5f5e247 100644
112036--- a/net/ipv4/sysctl_net_ipv4.c
112037+++ b/net/ipv4/sysctl_net_ipv4.c
112038@@ -60,7 +60,7 @@ static int ipv4_local_port_range(struct ctl_table *table, int write,
112039 container_of(table->data, struct net, ipv4.ip_local_ports.range);
112040 int ret;
112041 int range[2];
112042- struct ctl_table tmp = {
112043+ ctl_table_no_const tmp = {
112044 .data = &range,
112045 .maxlen = sizeof(range),
112046 .mode = table->mode,
112047@@ -118,7 +118,7 @@ static int ipv4_ping_group_range(struct ctl_table *table, int write,
112048 int ret;
112049 gid_t urange[2];
112050 kgid_t low, high;
112051- struct ctl_table tmp = {
112052+ ctl_table_no_const tmp = {
112053 .data = &urange,
112054 .maxlen = sizeof(urange),
112055 .mode = table->mode,
112056@@ -149,7 +149,7 @@ static int proc_tcp_congestion_control(struct ctl_table *ctl, int write,
112057 void __user *buffer, size_t *lenp, loff_t *ppos)
112058 {
112059 char val[TCP_CA_NAME_MAX];
112060- struct ctl_table tbl = {
112061+ ctl_table_no_const tbl = {
112062 .data = val,
112063 .maxlen = TCP_CA_NAME_MAX,
112064 };
112065@@ -168,7 +168,7 @@ static int proc_tcp_available_congestion_control(struct ctl_table *ctl,
112066 void __user *buffer, size_t *lenp,
112067 loff_t *ppos)
112068 {
112069- struct ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX, };
112070+ ctl_table_no_const tbl = { .maxlen = TCP_CA_BUF_MAX, };
112071 int ret;
112072
112073 tbl.data = kmalloc(tbl.maxlen, GFP_USER);
112074@@ -185,7 +185,7 @@ static int proc_allowed_congestion_control(struct ctl_table *ctl,
112075 void __user *buffer, size_t *lenp,
112076 loff_t *ppos)
112077 {
112078- struct ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX };
112079+ ctl_table_no_const tbl = { .maxlen = TCP_CA_BUF_MAX };
112080 int ret;
112081
112082 tbl.data = kmalloc(tbl.maxlen, GFP_USER);
112083@@ -204,7 +204,7 @@ static int proc_tcp_fastopen_key(struct ctl_table *ctl, int write,
112084 void __user *buffer, size_t *lenp,
112085 loff_t *ppos)
112086 {
112087- struct ctl_table tbl = { .maxlen = (TCP_FASTOPEN_KEY_LENGTH * 2 + 10) };
112088+ ctl_table_no_const tbl = { .maxlen = (TCP_FASTOPEN_KEY_LENGTH * 2 + 10) };
112089 struct tcp_fastopen_context *ctxt;
112090 int ret;
112091 u32 user_key[4]; /* 16 bytes, matching TCP_FASTOPEN_KEY_LENGTH */
112092@@ -888,13 +888,12 @@ static struct ctl_table ipv4_net_table[] = {
112093
112094 static __net_init int ipv4_sysctl_init_net(struct net *net)
112095 {
112096- struct ctl_table *table;
112097+ ctl_table_no_const *table = NULL;
112098
112099- table = ipv4_net_table;
112100 if (!net_eq(net, &init_net)) {
112101 int i;
112102
112103- table = kmemdup(table, sizeof(ipv4_net_table), GFP_KERNEL);
112104+ table = kmemdup(ipv4_net_table, sizeof(ipv4_net_table), GFP_KERNEL);
112105 if (table == NULL)
112106 goto err_alloc;
112107
112108@@ -903,7 +902,10 @@ static __net_init int ipv4_sysctl_init_net(struct net *net)
112109 table[i].data += (void *)net - (void *)&init_net;
112110 }
112111
112112- net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", table);
112113+ if (!net_eq(net, &init_net))
112114+ net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", table);
112115+ else
112116+ net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", ipv4_net_table);
112117 if (net->ipv4.ipv4_hdr == NULL)
112118 goto err_reg;
112119
112120diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
112121index 995a225..e1e9183 100644
112122--- a/net/ipv4/tcp.c
112123+++ b/net/ipv4/tcp.c
112124@@ -520,8 +520,10 @@ unsigned int tcp_poll(struct file *file, struct socket *sock, poll_table *wait)
112125
112126 /* Race breaker. If space is freed after
112127 * wspace test but before the flags are set,
112128- * IO signal will be lost.
112129+ * IO signal will be lost. Memory barrier
112130+ * pairs with the input side.
112131 */
112132+ smp_mb__after_atomic();
112133 if (sk_stream_is_writeable(sk))
112134 mask |= POLLOUT | POLLWRNORM;
112135 }
112136diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
112137index f501ac04..0c5a1b2 100644
112138--- a/net/ipv4/tcp_input.c
112139+++ b/net/ipv4/tcp_input.c
112140@@ -767,7 +767,7 @@ static void tcp_update_pacing_rate(struct sock *sk)
112141 * without any lock. We want to make sure compiler wont store
112142 * intermediate values in this location.
112143 */
112144- ACCESS_ONCE(sk->sk_pacing_rate) = min_t(u64, rate,
112145+ ACCESS_ONCE_RW(sk->sk_pacing_rate) = min_t(u64, rate,
112146 sk->sk_max_pacing_rate);
112147 }
112148
112149@@ -4541,7 +4541,7 @@ static struct sk_buff *tcp_collapse_one(struct sock *sk, struct sk_buff *skb,
112150 * simplifies code)
112151 */
112152 static void
112153-tcp_collapse(struct sock *sk, struct sk_buff_head *list,
112154+__intentional_overflow(5,6) tcp_collapse(struct sock *sk, struct sk_buff_head *list,
112155 struct sk_buff *head, struct sk_buff *tail,
112156 u32 start, u32 end)
112157 {
112158@@ -4799,6 +4799,8 @@ static void tcp_check_space(struct sock *sk)
112159 {
112160 if (sock_flag(sk, SOCK_QUEUE_SHRUNK)) {
112161 sock_reset_flag(sk, SOCK_QUEUE_SHRUNK);
112162+ /* pairs with tcp_poll() */
112163+ smp_mb__after_atomic();
112164 if (sk->sk_socket &&
112165 test_bit(SOCK_NOSPACE, &sk->sk_socket->flags))
112166 tcp_new_space(sk);
112167@@ -5525,6 +5527,7 @@ discard:
112168 tcp_paws_reject(&tp->rx_opt, 0))
112169 goto discard_and_undo;
112170
112171+#ifndef CONFIG_GRKERNSEC_NO_SIMULT_CONNECT
112172 if (th->syn) {
112173 /* We see SYN without ACK. It is attempt of
112174 * simultaneous connect with crossed SYNs.
112175@@ -5575,6 +5578,7 @@ discard:
112176 goto discard;
112177 #endif
112178 }
112179+#endif
112180 /* "fifth, if neither of the SYN or RST bits is set then
112181 * drop the segment and return."
112182 */
112183@@ -5621,7 +5625,7 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
112184 goto discard;
112185
112186 if (th->syn) {
112187- if (th->fin)
112188+ if (th->fin || th->urg || th->psh)
112189 goto discard;
112190 if (icsk->icsk_af_ops->conn_request(sk, skb) < 0)
112191 return 1;
112192diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
112193index f1756ee..8908cb0 100644
112194--- a/net/ipv4/tcp_ipv4.c
112195+++ b/net/ipv4/tcp_ipv4.c
112196@@ -89,6 +89,10 @@ int sysctl_tcp_tw_reuse __read_mostly;
112197 int sysctl_tcp_low_latency __read_mostly;
112198 EXPORT_SYMBOL(sysctl_tcp_low_latency);
112199
112200+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
112201+extern int grsec_enable_blackhole;
112202+#endif
112203+
112204 #ifdef CONFIG_TCP_MD5SIG
112205 static int tcp_v4_md5_hash_hdr(char *md5_hash, const struct tcp_md5sig_key *key,
112206 __be32 daddr, __be32 saddr, const struct tcphdr *th);
112207@@ -1475,6 +1479,9 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)
112208 return 0;
112209
112210 reset:
112211+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
112212+ if (!grsec_enable_blackhole)
112213+#endif
112214 tcp_v4_send_reset(rsk, skb);
112215 discard:
112216 kfree_skb(skb);
112217@@ -1639,12 +1646,19 @@ int tcp_v4_rcv(struct sk_buff *skb)
112218 TCP_SKB_CB(skb)->sacked = 0;
112219
112220 sk = __inet_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
112221- if (!sk)
112222+ if (!sk) {
112223+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
112224+ ret = 1;
112225+#endif
112226 goto no_tcp_socket;
112227-
112228+ }
112229 process:
112230- if (sk->sk_state == TCP_TIME_WAIT)
112231+ if (sk->sk_state == TCP_TIME_WAIT) {
112232+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
112233+ ret = 2;
112234+#endif
112235 goto do_time_wait;
112236+ }
112237
112238 if (unlikely(iph->ttl < inet_sk(sk)->min_ttl)) {
112239 NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
112240@@ -1700,6 +1714,10 @@ csum_error:
112241 bad_packet:
112242 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
112243 } else {
112244+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
112245+ if (!grsec_enable_blackhole || (ret == 1 &&
112246+ (skb->dev->flags & IFF_LOOPBACK)))
112247+#endif
112248 tcp_v4_send_reset(NULL, skb);
112249 }
112250
112251diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
112252index 50277af..defe393 100644
112253--- a/net/ipv4/tcp_minisocks.c
112254+++ b/net/ipv4/tcp_minisocks.c
112255@@ -27,6 +27,10 @@
112256 #include <net/inet_common.h>
112257 #include <net/xfrm.h>
112258
112259+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
112260+extern int grsec_enable_blackhole;
112261+#endif
112262+
112263 int sysctl_tcp_syncookies __read_mostly = 1;
112264 EXPORT_SYMBOL(sysctl_tcp_syncookies);
112265
112266@@ -788,7 +792,10 @@ embryonic_reset:
112267 * avoid becoming vulnerable to outside attack aiming at
112268 * resetting legit local connections.
112269 */
112270- req->rsk_ops->send_reset(sk, skb);
112271+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
112272+ if (!grsec_enable_blackhole)
112273+#endif
112274+ req->rsk_ops->send_reset(sk, skb);
112275 } else if (fastopen) { /* received a valid RST pkt */
112276 reqsk_fastopen_remove(sk, req, true);
112277 tcp_reset(sk);
112278diff --git a/net/ipv4/tcp_probe.c b/net/ipv4/tcp_probe.c
112279index ebf5ff5..4d1ff32 100644
112280--- a/net/ipv4/tcp_probe.c
112281+++ b/net/ipv4/tcp_probe.c
112282@@ -236,7 +236,7 @@ static ssize_t tcpprobe_read(struct file *file, char __user *buf,
112283 if (cnt + width >= len)
112284 break;
112285
112286- if (copy_to_user(buf + cnt, tbuf, width))
112287+ if (width > sizeof tbuf || copy_to_user(buf + cnt, tbuf, width))
112288 return -EFAULT;
112289 cnt += width;
112290 }
112291diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
112292index 0732b78..a82bdc6 100644
112293--- a/net/ipv4/tcp_timer.c
112294+++ b/net/ipv4/tcp_timer.c
112295@@ -22,6 +22,10 @@
112296 #include <linux/gfp.h>
112297 #include <net/tcp.h>
112298
112299+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
112300+extern int grsec_lastack_retries;
112301+#endif
112302+
112303 int sysctl_tcp_syn_retries __read_mostly = TCP_SYN_RETRIES;
112304 int sysctl_tcp_synack_retries __read_mostly = TCP_SYNACK_RETRIES;
112305 int sysctl_tcp_keepalive_time __read_mostly = TCP_KEEPALIVE_TIME;
112306@@ -194,6 +198,13 @@ static int tcp_write_timeout(struct sock *sk)
112307 }
112308 }
112309
112310+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
112311+ if ((sk->sk_state == TCP_LAST_ACK) &&
112312+ (grsec_lastack_retries > 0) &&
112313+ (grsec_lastack_retries < retry_until))
112314+ retry_until = grsec_lastack_retries;
112315+#endif
112316+
112317 if (retransmits_timed_out(sk, retry_until,
112318 syn_set ? 0 : icsk->icsk_user_timeout, syn_set)) {
112319 /* Has it gone just too far? */
112320diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
112321index 51f1745..4bc0427 100644
112322--- a/net/ipv4/udp.c
112323+++ b/net/ipv4/udp.c
112324@@ -87,6 +87,7 @@
112325 #include <linux/types.h>
112326 #include <linux/fcntl.h>
112327 #include <linux/module.h>
112328+#include <linux/security.h>
112329 #include <linux/socket.h>
112330 #include <linux/sockios.h>
112331 #include <linux/igmp.h>
112332@@ -115,6 +116,10 @@
112333 #include <net/busy_poll.h>
112334 #include "udp_impl.h"
112335
112336+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
112337+extern int grsec_enable_blackhole;
112338+#endif
112339+
112340 struct udp_table udp_table __read_mostly;
112341 EXPORT_SYMBOL(udp_table);
112342
112343@@ -609,6 +614,9 @@ static inline bool __udp_is_mcast_sock(struct net *net, struct sock *sk,
112344 return true;
112345 }
112346
112347+extern int gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb);
112348+extern int gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr);
112349+
112350 /*
112351 * This routine is called by the ICMP module when it gets some
112352 * sort of error condition. If err < 0 then the socket should
112353@@ -946,9 +954,18 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
112354 dport = usin->sin_port;
112355 if (dport == 0)
112356 return -EINVAL;
112357+
112358+ err = gr_search_udp_sendmsg(sk, usin);
112359+ if (err)
112360+ return err;
112361 } else {
112362 if (sk->sk_state != TCP_ESTABLISHED)
112363 return -EDESTADDRREQ;
112364+
112365+ err = gr_search_udp_sendmsg(sk, NULL);
112366+ if (err)
112367+ return err;
112368+
112369 daddr = inet->inet_daddr;
112370 dport = inet->inet_dport;
112371 /* Open fast path for connected socket.
112372@@ -1196,7 +1213,7 @@ static unsigned int first_packet_length(struct sock *sk)
112373 IS_UDPLITE(sk));
112374 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
112375 IS_UDPLITE(sk));
112376- atomic_inc(&sk->sk_drops);
112377+ atomic_inc_unchecked(&sk->sk_drops);
112378 __skb_unlink(skb, rcvq);
112379 __skb_queue_tail(&list_kill, skb);
112380 }
112381@@ -1276,6 +1293,10 @@ try_again:
112382 if (!skb)
112383 goto out;
112384
112385+ err = gr_search_udp_recvmsg(sk, skb);
112386+ if (err)
112387+ goto out_free;
112388+
112389 ulen = skb->len - sizeof(struct udphdr);
112390 copied = len;
112391 if (copied > ulen)
112392@@ -1308,7 +1329,7 @@ try_again:
112393 if (unlikely(err)) {
112394 trace_kfree_skb(skb, udp_recvmsg);
112395 if (!peeked) {
112396- atomic_inc(&sk->sk_drops);
112397+ atomic_inc_unchecked(&sk->sk_drops);
112398 UDP_INC_STATS_USER(sock_net(sk),
112399 UDP_MIB_INERRORS, is_udplite);
112400 }
112401@@ -1604,7 +1625,7 @@ csum_error:
112402 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite);
112403 drop:
112404 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
112405- atomic_inc(&sk->sk_drops);
112406+ atomic_inc_unchecked(&sk->sk_drops);
112407 kfree_skb(skb);
112408 return -1;
112409 }
112410@@ -1623,7 +1644,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
112411 skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
112412
112413 if (!skb1) {
112414- atomic_inc(&sk->sk_drops);
112415+ atomic_inc_unchecked(&sk->sk_drops);
112416 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
112417 IS_UDPLITE(sk));
112418 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
112419@@ -1829,6 +1850,9 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
112420 goto csum_error;
112421
112422 UDP_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
112423+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
112424+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
112425+#endif
112426 icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
112427
112428 /*
112429@@ -2426,7 +2450,7 @@ static void udp4_format_sock(struct sock *sp, struct seq_file *f,
112430 from_kuid_munged(seq_user_ns(f), sock_i_uid(sp)),
112431 0, sock_i_ino(sp),
112432 atomic_read(&sp->sk_refcnt), sp,
112433- atomic_read(&sp->sk_drops));
112434+ atomic_read_unchecked(&sp->sk_drops));
112435 }
112436
112437 int udp4_seq_show(struct seq_file *seq, void *v)
112438diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c
112439index 6156f68..d6ab46d 100644
112440--- a/net/ipv4/xfrm4_policy.c
112441+++ b/net/ipv4/xfrm4_policy.c
112442@@ -186,11 +186,11 @@ _decode_session4(struct sk_buff *skb, struct flowi *fl, int reverse)
112443 fl4->flowi4_tos = iph->tos;
112444 }
112445
112446-static inline int xfrm4_garbage_collect(struct dst_ops *ops)
112447+static int xfrm4_garbage_collect(struct dst_ops *ops)
112448 {
112449 struct net *net = container_of(ops, struct net, xfrm.xfrm4_dst_ops);
112450
112451- xfrm4_policy_afinfo.garbage_collect(net);
112452+ xfrm_garbage_collect_deferred(net);
112453 return (dst_entries_get_slow(ops) > ops->gc_thresh * 2);
112454 }
112455
112456@@ -269,19 +269,18 @@ static struct ctl_table xfrm4_policy_table[] = {
112457
112458 static int __net_init xfrm4_net_init(struct net *net)
112459 {
112460- struct ctl_table *table;
112461+ ctl_table_no_const *table = NULL;
112462 struct ctl_table_header *hdr;
112463
112464- table = xfrm4_policy_table;
112465 if (!net_eq(net, &init_net)) {
112466- table = kmemdup(table, sizeof(xfrm4_policy_table), GFP_KERNEL);
112467+ table = kmemdup(xfrm4_policy_table, sizeof(xfrm4_policy_table), GFP_KERNEL);
112468 if (!table)
112469 goto err_alloc;
112470
112471 table[0].data = &net->xfrm.xfrm4_dst_ops.gc_thresh;
112472- }
112473-
112474- hdr = register_net_sysctl(net, "net/ipv4", table);
112475+ hdr = register_net_sysctl(net, "net/ipv4", table);
112476+ } else
112477+ hdr = register_net_sysctl(net, "net/ipv4", xfrm4_policy_table);
112478 if (!hdr)
112479 goto err_reg;
112480
112481@@ -289,8 +288,7 @@ static int __net_init xfrm4_net_init(struct net *net)
112482 return 0;
112483
112484 err_reg:
112485- if (!net_eq(net, &init_net))
112486- kfree(table);
112487+ kfree(table);
112488 err_alloc:
112489 return -ENOMEM;
112490 }
112491diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
112492index b603002..0de5c88 100644
112493--- a/net/ipv6/addrconf.c
112494+++ b/net/ipv6/addrconf.c
112495@@ -171,7 +171,7 @@ static struct ipv6_devconf ipv6_devconf __read_mostly = {
112496 .hop_limit = IPV6_DEFAULT_HOPLIMIT,
112497 .mtu6 = IPV6_MIN_MTU,
112498 .accept_ra = 1,
112499- .accept_redirects = 1,
112500+ .accept_redirects = 0,
112501 .autoconf = 1,
112502 .force_mld_version = 0,
112503 .mldv1_unsolicited_report_interval = 10 * HZ,
112504@@ -209,7 +209,7 @@ static struct ipv6_devconf ipv6_devconf_dflt __read_mostly = {
112505 .hop_limit = IPV6_DEFAULT_HOPLIMIT,
112506 .mtu6 = IPV6_MIN_MTU,
112507 .accept_ra = 1,
112508- .accept_redirects = 1,
112509+ .accept_redirects = 0,
112510 .autoconf = 1,
112511 .force_mld_version = 0,
112512 .mldv1_unsolicited_report_interval = 10 * HZ,
112513@@ -607,7 +607,7 @@ static int inet6_netconf_dump_devconf(struct sk_buff *skb,
112514 idx = 0;
112515 head = &net->dev_index_head[h];
112516 rcu_read_lock();
112517- cb->seq = atomic_read(&net->ipv6.dev_addr_genid) ^
112518+ cb->seq = atomic_read_unchecked(&net->ipv6.dev_addr_genid) ^
112519 net->dev_base_seq;
112520 hlist_for_each_entry_rcu(dev, head, index_hlist) {
112521 if (idx < s_idx)
112522@@ -2438,7 +2438,7 @@ int addrconf_set_dstaddr(struct net *net, void __user *arg)
112523 p.iph.ihl = 5;
112524 p.iph.protocol = IPPROTO_IPV6;
112525 p.iph.ttl = 64;
112526- ifr.ifr_ifru.ifru_data = (__force void __user *)&p;
112527+ ifr.ifr_ifru.ifru_data = (void __force_user *)&p;
112528
112529 if (ops->ndo_do_ioctl) {
112530 mm_segment_t oldfs = get_fs();
112531@@ -3587,16 +3587,23 @@ static const struct file_operations if6_fops = {
112532 .release = seq_release_net,
112533 };
112534
112535+extern void register_ipv6_seq_ops_addr(struct seq_operations *addr);
112536+extern void unregister_ipv6_seq_ops_addr(void);
112537+
112538 static int __net_init if6_proc_net_init(struct net *net)
112539 {
112540- if (!proc_create("if_inet6", S_IRUGO, net->proc_net, &if6_fops))
112541+ register_ipv6_seq_ops_addr(&if6_seq_ops);
112542+ if (!proc_create("if_inet6", S_IRUGO, net->proc_net, &if6_fops)) {
112543+ unregister_ipv6_seq_ops_addr();
112544 return -ENOMEM;
112545+ }
112546 return 0;
112547 }
112548
112549 static void __net_exit if6_proc_net_exit(struct net *net)
112550 {
112551 remove_proc_entry("if_inet6", net->proc_net);
112552+ unregister_ipv6_seq_ops_addr();
112553 }
112554
112555 static struct pernet_operations if6_proc_net_ops = {
112556@@ -4215,7 +4222,7 @@ static int inet6_dump_addr(struct sk_buff *skb, struct netlink_callback *cb,
112557 s_ip_idx = ip_idx = cb->args[2];
112558
112559 rcu_read_lock();
112560- cb->seq = atomic_read(&net->ipv6.dev_addr_genid) ^ net->dev_base_seq;
112561+ cb->seq = atomic_read_unchecked(&net->ipv6.dev_addr_genid) ^ net->dev_base_seq;
112562 for (h = s_h; h < NETDEV_HASHENTRIES; h++, s_idx = 0) {
112563 idx = 0;
112564 head = &net->dev_index_head[h];
112565@@ -4864,7 +4871,7 @@ static void __ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)
112566 rt_genid_bump_ipv6(net);
112567 break;
112568 }
112569- atomic_inc(&net->ipv6.dev_addr_genid);
112570+ atomic_inc_unchecked(&net->ipv6.dev_addr_genid);
112571 }
112572
112573 static void ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)
112574@@ -4884,7 +4891,7 @@ int addrconf_sysctl_forward(struct ctl_table *ctl, int write,
112575 int *valp = ctl->data;
112576 int val = *valp;
112577 loff_t pos = *ppos;
112578- struct ctl_table lctl;
112579+ ctl_table_no_const lctl;
112580 int ret;
112581
112582 /*
112583@@ -4909,7 +4916,7 @@ int addrconf_sysctl_mtu(struct ctl_table *ctl, int write,
112584 {
112585 struct inet6_dev *idev = ctl->extra1;
112586 int min_mtu = IPV6_MIN_MTU;
112587- struct ctl_table lctl;
112588+ ctl_table_no_const lctl;
112589
112590 lctl = *ctl;
112591 lctl.extra1 = &min_mtu;
112592@@ -4984,7 +4991,7 @@ int addrconf_sysctl_disable(struct ctl_table *ctl, int write,
112593 int *valp = ctl->data;
112594 int val = *valp;
112595 loff_t pos = *ppos;
112596- struct ctl_table lctl;
112597+ ctl_table_no_const lctl;
112598 int ret;
112599
112600 /*
112601diff --git a/net/ipv6/addrconf_core.c b/net/ipv6/addrconf_core.c
112602index 98cc4cd..0768c4e 100644
112603--- a/net/ipv6/addrconf_core.c
112604+++ b/net/ipv6/addrconf_core.c
112605@@ -133,6 +133,14 @@ static void snmp6_free_dev(struct inet6_dev *idev)
112606 free_percpu(idev->stats.ipv6);
112607 }
112608
112609+static void in6_dev_finish_destroy_rcu(struct rcu_head *head)
112610+{
112611+ struct inet6_dev *idev = container_of(head, struct inet6_dev, rcu);
112612+
112613+ snmp6_free_dev(idev);
112614+ kfree(idev);
112615+}
112616+
112617 /* Nobody refers to this device, we may destroy it. */
112618
112619 void in6_dev_finish_destroy(struct inet6_dev *idev)
112620@@ -151,7 +159,6 @@ void in6_dev_finish_destroy(struct inet6_dev *idev)
112621 pr_warn("Freeing alive inet6 device %p\n", idev);
112622 return;
112623 }
112624- snmp6_free_dev(idev);
112625- kfree_rcu(idev, rcu);
112626+ call_rcu(&idev->rcu, in6_dev_finish_destroy_rcu);
112627 }
112628 EXPORT_SYMBOL(in6_dev_finish_destroy);
112629diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
112630index e8c4400..a4cd5da 100644
112631--- a/net/ipv6/af_inet6.c
112632+++ b/net/ipv6/af_inet6.c
112633@@ -766,7 +766,7 @@ static int __net_init inet6_net_init(struct net *net)
112634 net->ipv6.sysctl.icmpv6_time = 1*HZ;
112635 net->ipv6.sysctl.flowlabel_consistency = 1;
112636 net->ipv6.sysctl.auto_flowlabels = 0;
112637- atomic_set(&net->ipv6.fib6_sernum, 1);
112638+ atomic_set_unchecked(&net->ipv6.fib6_sernum, 1);
112639
112640 err = ipv6_init_mibs(net);
112641 if (err)
112642diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c
112643index ace8dac..bd6942d 100644
112644--- a/net/ipv6/datagram.c
112645+++ b/net/ipv6/datagram.c
112646@@ -957,5 +957,5 @@ void ip6_dgram_sock_seq_show(struct seq_file *seq, struct sock *sp,
112647 0,
112648 sock_i_ino(sp),
112649 atomic_read(&sp->sk_refcnt), sp,
112650- atomic_read(&sp->sk_drops));
112651+ atomic_read_unchecked(&sp->sk_drops));
112652 }
112653diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
112654index a5e9519..16b7412 100644
112655--- a/net/ipv6/icmp.c
112656+++ b/net/ipv6/icmp.c
112657@@ -1005,7 +1005,7 @@ static struct ctl_table ipv6_icmp_table_template[] = {
112658
112659 struct ctl_table * __net_init ipv6_icmp_sysctl_init(struct net *net)
112660 {
112661- struct ctl_table *table;
112662+ ctl_table_no_const *table;
112663
112664 table = kmemdup(ipv6_icmp_table_template,
112665 sizeof(ipv6_icmp_table_template),
112666diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
112667index 263ef41..88c7be8 100644
112668--- a/net/ipv6/ip6_fib.c
112669+++ b/net/ipv6/ip6_fib.c
112670@@ -99,9 +99,9 @@ static int fib6_new_sernum(struct net *net)
112671 int new, old;
112672
112673 do {
112674- old = atomic_read(&net->ipv6.fib6_sernum);
112675+ old = atomic_read_unchecked(&net->ipv6.fib6_sernum);
112676 new = old < INT_MAX ? old + 1 : 1;
112677- } while (atomic_cmpxchg(&net->ipv6.fib6_sernum,
112678+ } while (atomic_cmpxchg_unchecked(&net->ipv6.fib6_sernum,
112679 old, new) != old);
112680 return new;
112681 }
112682diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c
112683index bc28b7d..a08feea 100644
112684--- a/net/ipv6/ip6_gre.c
112685+++ b/net/ipv6/ip6_gre.c
112686@@ -71,8 +71,8 @@ struct ip6gre_net {
112687 struct net_device *fb_tunnel_dev;
112688 };
112689
112690-static struct rtnl_link_ops ip6gre_link_ops __read_mostly;
112691-static struct rtnl_link_ops ip6gre_tap_ops __read_mostly;
112692+static struct rtnl_link_ops ip6gre_link_ops;
112693+static struct rtnl_link_ops ip6gre_tap_ops;
112694 static int ip6gre_tunnel_init(struct net_device *dev);
112695 static void ip6gre_tunnel_setup(struct net_device *dev);
112696 static void ip6gre_tunnel_link(struct ip6gre_net *ign, struct ip6_tnl *t);
112697@@ -1289,7 +1289,7 @@ static void ip6gre_fb_tunnel_init(struct net_device *dev)
112698 }
112699
112700
112701-static struct inet6_protocol ip6gre_protocol __read_mostly = {
112702+static struct inet6_protocol ip6gre_protocol = {
112703 .handler = ip6gre_rcv,
112704 .err_handler = ip6gre_err,
112705 .flags = INET6_PROTO_NOPOLICY|INET6_PROTO_FINAL,
112706@@ -1650,7 +1650,7 @@ static const struct nla_policy ip6gre_policy[IFLA_GRE_MAX + 1] = {
112707 [IFLA_GRE_FLAGS] = { .type = NLA_U32 },
112708 };
112709
112710-static struct rtnl_link_ops ip6gre_link_ops __read_mostly = {
112711+static struct rtnl_link_ops ip6gre_link_ops = {
112712 .kind = "ip6gre",
112713 .maxtype = IFLA_GRE_MAX,
112714 .policy = ip6gre_policy,
112715@@ -1665,7 +1665,7 @@ static struct rtnl_link_ops ip6gre_link_ops __read_mostly = {
112716 .get_link_net = ip6_tnl_get_link_net,
112717 };
112718
112719-static struct rtnl_link_ops ip6gre_tap_ops __read_mostly = {
112720+static struct rtnl_link_ops ip6gre_tap_ops = {
112721 .kind = "ip6gretap",
112722 .maxtype = IFLA_GRE_MAX,
112723 .policy = ip6gre_policy,
112724diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
112725index ddd94ec..b7cfefb 100644
112726--- a/net/ipv6/ip6_tunnel.c
112727+++ b/net/ipv6/ip6_tunnel.c
112728@@ -86,7 +86,7 @@ static u32 HASH(const struct in6_addr *addr1, const struct in6_addr *addr2)
112729
112730 static int ip6_tnl_dev_init(struct net_device *dev);
112731 static void ip6_tnl_dev_setup(struct net_device *dev);
112732-static struct rtnl_link_ops ip6_link_ops __read_mostly;
112733+static struct rtnl_link_ops ip6_link_ops;
112734
112735 static int ip6_tnl_net_id __read_mostly;
112736 struct ip6_tnl_net {
112737@@ -1780,7 +1780,7 @@ static const struct nla_policy ip6_tnl_policy[IFLA_IPTUN_MAX + 1] = {
112738 [IFLA_IPTUN_PROTO] = { .type = NLA_U8 },
112739 };
112740
112741-static struct rtnl_link_ops ip6_link_ops __read_mostly = {
112742+static struct rtnl_link_ops ip6_link_ops = {
112743 .kind = "ip6tnl",
112744 .maxtype = IFLA_IPTUN_MAX,
112745 .policy = ip6_tnl_policy,
112746diff --git a/net/ipv6/ip6_vti.c b/net/ipv6/ip6_vti.c
112747index 5fb9e21..92bf04b 100644
112748--- a/net/ipv6/ip6_vti.c
112749+++ b/net/ipv6/ip6_vti.c
112750@@ -62,7 +62,7 @@ static u32 HASH(const struct in6_addr *addr1, const struct in6_addr *addr2)
112751
112752 static int vti6_dev_init(struct net_device *dev);
112753 static void vti6_dev_setup(struct net_device *dev);
112754-static struct rtnl_link_ops vti6_link_ops __read_mostly;
112755+static struct rtnl_link_ops vti6_link_ops;
112756
112757 static int vti6_net_id __read_mostly;
112758 struct vti6_net {
112759@@ -1004,7 +1004,7 @@ static const struct nla_policy vti6_policy[IFLA_VTI_MAX + 1] = {
112760 [IFLA_VTI_OKEY] = { .type = NLA_U32 },
112761 };
112762
112763-static struct rtnl_link_ops vti6_link_ops __read_mostly = {
112764+static struct rtnl_link_ops vti6_link_ops = {
112765 .kind = "vti6",
112766 .maxtype = IFLA_VTI_MAX,
112767 .policy = vti6_policy,
112768diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
112769index 8d766d9..dcdfea7 100644
112770--- a/net/ipv6/ipv6_sockglue.c
112771+++ b/net/ipv6/ipv6_sockglue.c
112772@@ -989,7 +989,7 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,
112773 if (sk->sk_type != SOCK_STREAM)
112774 return -ENOPROTOOPT;
112775
112776- msg.msg_control = optval;
112777+ msg.msg_control = (void __force_kernel *)optval;
112778 msg.msg_controllen = len;
112779 msg.msg_flags = flags;
112780
112781diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
112782index bb00c6f..16c90d7 100644
112783--- a/net/ipv6/netfilter/ip6_tables.c
112784+++ b/net/ipv6/netfilter/ip6_tables.c
112785@@ -1083,14 +1083,14 @@ static int compat_table_info(const struct xt_table_info *info,
112786 #endif
112787
112788 static int get_info(struct net *net, void __user *user,
112789- const int *len, int compat)
112790+ int len, int compat)
112791 {
112792 char name[XT_TABLE_MAXNAMELEN];
112793 struct xt_table *t;
112794 int ret;
112795
112796- if (*len != sizeof(struct ip6t_getinfo)) {
112797- duprintf("length %u != %zu\n", *len,
112798+ if (len != sizeof(struct ip6t_getinfo)) {
112799+ duprintf("length %u != %zu\n", len,
112800 sizeof(struct ip6t_getinfo));
112801 return -EINVAL;
112802 }
112803@@ -1127,7 +1127,7 @@ static int get_info(struct net *net, void __user *user,
112804 info.size = private->size;
112805 strcpy(info.name, name);
112806
112807- if (copy_to_user(user, &info, *len) != 0)
112808+ if (copy_to_user(user, &info, len) != 0)
112809 ret = -EFAULT;
112810 else
112811 ret = 0;
112812@@ -1983,7 +1983,7 @@ compat_do_ip6t_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
112813
112814 switch (cmd) {
112815 case IP6T_SO_GET_INFO:
112816- ret = get_info(sock_net(sk), user, len, 1);
112817+ ret = get_info(sock_net(sk), user, *len, 1);
112818 break;
112819 case IP6T_SO_GET_ENTRIES:
112820 ret = compat_get_entries(sock_net(sk), user, len);
112821@@ -2030,7 +2030,7 @@ do_ip6t_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
112822
112823 switch (cmd) {
112824 case IP6T_SO_GET_INFO:
112825- ret = get_info(sock_net(sk), user, len, 0);
112826+ ret = get_info(sock_net(sk), user, *len, 0);
112827 break;
112828
112829 case IP6T_SO_GET_ENTRIES:
112830diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c
112831index 6f187c8..34b367f 100644
112832--- a/net/ipv6/netfilter/nf_conntrack_reasm.c
112833+++ b/net/ipv6/netfilter/nf_conntrack_reasm.c
112834@@ -96,12 +96,11 @@ static struct ctl_table nf_ct_frag6_sysctl_table[] = {
112835
112836 static int nf_ct_frag6_sysctl_register(struct net *net)
112837 {
112838- struct ctl_table *table;
112839+ ctl_table_no_const *table = NULL;
112840 struct ctl_table_header *hdr;
112841
112842- table = nf_ct_frag6_sysctl_table;
112843 if (!net_eq(net, &init_net)) {
112844- table = kmemdup(table, sizeof(nf_ct_frag6_sysctl_table),
112845+ table = kmemdup(nf_ct_frag6_sysctl_table, sizeof(nf_ct_frag6_sysctl_table),
112846 GFP_KERNEL);
112847 if (table == NULL)
112848 goto err_alloc;
112849@@ -112,9 +111,9 @@ static int nf_ct_frag6_sysctl_register(struct net *net)
112850 table[2].data = &net->nf_frag.frags.high_thresh;
112851 table[2].extra1 = &net->nf_frag.frags.low_thresh;
112852 table[2].extra2 = &init_net.nf_frag.frags.high_thresh;
112853- }
112854-
112855- hdr = register_net_sysctl(net, "net/netfilter", table);
112856+ hdr = register_net_sysctl(net, "net/netfilter", table);
112857+ } else
112858+ hdr = register_net_sysctl(net, "net/netfilter", nf_ct_frag6_sysctl_table);
112859 if (hdr == NULL)
112860 goto err_reg;
112861
112862@@ -122,8 +121,7 @@ static int nf_ct_frag6_sysctl_register(struct net *net)
112863 return 0;
112864
112865 err_reg:
112866- if (!net_eq(net, &init_net))
112867- kfree(table);
112868+ kfree(table);
112869 err_alloc:
112870 return -ENOMEM;
112871 }
112872diff --git a/net/ipv6/ping.c b/net/ipv6/ping.c
112873index a2dfff6..1e52e6d 100644
112874--- a/net/ipv6/ping.c
112875+++ b/net/ipv6/ping.c
112876@@ -241,6 +241,24 @@ static struct pernet_operations ping_v6_net_ops = {
112877 };
112878 #endif
112879
112880+static struct pingv6_ops real_pingv6_ops = {
112881+ .ipv6_recv_error = ipv6_recv_error,
112882+ .ip6_datagram_recv_common_ctl = ip6_datagram_recv_common_ctl,
112883+ .ip6_datagram_recv_specific_ctl = ip6_datagram_recv_specific_ctl,
112884+ .icmpv6_err_convert = icmpv6_err_convert,
112885+ .ipv6_icmp_error = ipv6_icmp_error,
112886+ .ipv6_chk_addr = ipv6_chk_addr,
112887+};
112888+
112889+static struct pingv6_ops dummy_pingv6_ops = {
112890+ .ipv6_recv_error = dummy_ipv6_recv_error,
112891+ .ip6_datagram_recv_common_ctl = dummy_ip6_datagram_recv_ctl,
112892+ .ip6_datagram_recv_specific_ctl = dummy_ip6_datagram_recv_ctl,
112893+ .icmpv6_err_convert = dummy_icmpv6_err_convert,
112894+ .ipv6_icmp_error = dummy_ipv6_icmp_error,
112895+ .ipv6_chk_addr = dummy_ipv6_chk_addr,
112896+};
112897+
112898 int __init pingv6_init(void)
112899 {
112900 #ifdef CONFIG_PROC_FS
112901@@ -248,13 +266,7 @@ int __init pingv6_init(void)
112902 if (ret)
112903 return ret;
112904 #endif
112905- pingv6_ops.ipv6_recv_error = ipv6_recv_error;
112906- pingv6_ops.ip6_datagram_recv_common_ctl = ip6_datagram_recv_common_ctl;
112907- pingv6_ops.ip6_datagram_recv_specific_ctl =
112908- ip6_datagram_recv_specific_ctl;
112909- pingv6_ops.icmpv6_err_convert = icmpv6_err_convert;
112910- pingv6_ops.ipv6_icmp_error = ipv6_icmp_error;
112911- pingv6_ops.ipv6_chk_addr = ipv6_chk_addr;
112912+ pingv6_ops = &real_pingv6_ops;
112913 return inet6_register_protosw(&pingv6_protosw);
112914 }
112915
112916@@ -263,14 +275,9 @@ int __init pingv6_init(void)
112917 */
112918 void pingv6_exit(void)
112919 {
112920- pingv6_ops.ipv6_recv_error = dummy_ipv6_recv_error;
112921- pingv6_ops.ip6_datagram_recv_common_ctl = dummy_ip6_datagram_recv_ctl;
112922- pingv6_ops.ip6_datagram_recv_specific_ctl = dummy_ip6_datagram_recv_ctl;
112923- pingv6_ops.icmpv6_err_convert = dummy_icmpv6_err_convert;
112924- pingv6_ops.ipv6_icmp_error = dummy_ipv6_icmp_error;
112925- pingv6_ops.ipv6_chk_addr = dummy_ipv6_chk_addr;
112926 #ifdef CONFIG_PROC_FS
112927 unregister_pernet_subsys(&ping_v6_net_ops);
112928 #endif
112929+ pingv6_ops = &dummy_pingv6_ops;
112930 inet6_unregister_protosw(&pingv6_protosw);
112931 }
112932diff --git a/net/ipv6/proc.c b/net/ipv6/proc.c
112933index 679253d0..70b653c 100644
112934--- a/net/ipv6/proc.c
112935+++ b/net/ipv6/proc.c
112936@@ -310,7 +310,7 @@ static int __net_init ipv6_proc_init_net(struct net *net)
112937 if (!proc_create("snmp6", S_IRUGO, net->proc_net, &snmp6_seq_fops))
112938 goto proc_snmp6_fail;
112939
112940- net->mib.proc_net_devsnmp6 = proc_mkdir("dev_snmp6", net->proc_net);
112941+ net->mib.proc_net_devsnmp6 = proc_mkdir_restrict("dev_snmp6", net->proc_net);
112942 if (!net->mib.proc_net_devsnmp6)
112943 goto proc_dev_snmp6_fail;
112944 return 0;
112945diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
112946index dae7f1a..783b20d 100644
112947--- a/net/ipv6/raw.c
112948+++ b/net/ipv6/raw.c
112949@@ -388,7 +388,7 @@ static inline int rawv6_rcv_skb(struct sock *sk, struct sk_buff *skb)
112950 {
112951 if ((raw6_sk(sk)->checksum || rcu_access_pointer(sk->sk_filter)) &&
112952 skb_checksum_complete(skb)) {
112953- atomic_inc(&sk->sk_drops);
112954+ atomic_inc_unchecked(&sk->sk_drops);
112955 kfree_skb(skb);
112956 return NET_RX_DROP;
112957 }
112958@@ -416,7 +416,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
112959 struct raw6_sock *rp = raw6_sk(sk);
112960
112961 if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb)) {
112962- atomic_inc(&sk->sk_drops);
112963+ atomic_inc_unchecked(&sk->sk_drops);
112964 kfree_skb(skb);
112965 return NET_RX_DROP;
112966 }
112967@@ -440,7 +440,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
112968
112969 if (inet->hdrincl) {
112970 if (skb_checksum_complete(skb)) {
112971- atomic_inc(&sk->sk_drops);
112972+ atomic_inc_unchecked(&sk->sk_drops);
112973 kfree_skb(skb);
112974 return NET_RX_DROP;
112975 }
112976@@ -609,7 +609,7 @@ out:
112977 return err;
112978 }
112979
112980-static int rawv6_send_hdrinc(struct sock *sk, struct msghdr *msg, int length,
112981+static int rawv6_send_hdrinc(struct sock *sk, struct msghdr *msg, unsigned int length,
112982 struct flowi6 *fl6, struct dst_entry **dstp,
112983 unsigned int flags)
112984 {
112985@@ -915,12 +915,15 @@ do_confirm:
112986 static int rawv6_seticmpfilter(struct sock *sk, int level, int optname,
112987 char __user *optval, int optlen)
112988 {
112989+ struct icmp6_filter filter;
112990+
112991 switch (optname) {
112992 case ICMPV6_FILTER:
112993 if (optlen > sizeof(struct icmp6_filter))
112994 optlen = sizeof(struct icmp6_filter);
112995- if (copy_from_user(&raw6_sk(sk)->filter, optval, optlen))
112996+ if (copy_from_user(&filter, optval, optlen))
112997 return -EFAULT;
112998+ raw6_sk(sk)->filter = filter;
112999 return 0;
113000 default:
113001 return -ENOPROTOOPT;
113002@@ -933,6 +936,7 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
113003 char __user *optval, int __user *optlen)
113004 {
113005 int len;
113006+ struct icmp6_filter filter;
113007
113008 switch (optname) {
113009 case ICMPV6_FILTER:
113010@@ -944,7 +948,8 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
113011 len = sizeof(struct icmp6_filter);
113012 if (put_user(len, optlen))
113013 return -EFAULT;
113014- if (copy_to_user(optval, &raw6_sk(sk)->filter, len))
113015+ filter = raw6_sk(sk)->filter;
113016+ if (len > sizeof filter || copy_to_user(optval, &filter, len))
113017 return -EFAULT;
113018 return 0;
113019 default:
113020diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c
113021index d7d70e6..bd5e9fc 100644
113022--- a/net/ipv6/reassembly.c
113023+++ b/net/ipv6/reassembly.c
113024@@ -626,12 +626,11 @@ static struct ctl_table ip6_frags_ctl_table[] = {
113025
113026 static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
113027 {
113028- struct ctl_table *table;
113029+ ctl_table_no_const *table = NULL;
113030 struct ctl_table_header *hdr;
113031
113032- table = ip6_frags_ns_ctl_table;
113033 if (!net_eq(net, &init_net)) {
113034- table = kmemdup(table, sizeof(ip6_frags_ns_ctl_table), GFP_KERNEL);
113035+ table = kmemdup(ip6_frags_ns_ctl_table, sizeof(ip6_frags_ns_ctl_table), GFP_KERNEL);
113036 if (table == NULL)
113037 goto err_alloc;
113038
113039@@ -645,9 +644,10 @@ static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
113040 /* Don't export sysctls to unprivileged users */
113041 if (net->user_ns != &init_user_ns)
113042 table[0].procname = NULL;
113043- }
113044+ hdr = register_net_sysctl(net, "net/ipv6", table);
113045+ } else
113046+ hdr = register_net_sysctl(net, "net/ipv6", ip6_frags_ns_ctl_table);
113047
113048- hdr = register_net_sysctl(net, "net/ipv6", table);
113049 if (hdr == NULL)
113050 goto err_reg;
113051
113052@@ -655,8 +655,7 @@ static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
113053 return 0;
113054
113055 err_reg:
113056- if (!net_eq(net, &init_net))
113057- kfree(table);
113058+ kfree(table);
113059 err_alloc:
113060 return -ENOMEM;
113061 }
113062diff --git a/net/ipv6/route.c b/net/ipv6/route.c
113063index 4688bd4..584453d 100644
113064--- a/net/ipv6/route.c
113065+++ b/net/ipv6/route.c
113066@@ -3029,7 +3029,7 @@ struct ctl_table ipv6_route_table_template[] = {
113067
113068 struct ctl_table * __net_init ipv6_route_sysctl_init(struct net *net)
113069 {
113070- struct ctl_table *table;
113071+ ctl_table_no_const *table;
113072
113073 table = kmemdup(ipv6_route_table_template,
113074 sizeof(ipv6_route_table_template),
113075diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
113076index e4cbd57..02b1aaa 100644
113077--- a/net/ipv6/sit.c
113078+++ b/net/ipv6/sit.c
113079@@ -74,7 +74,7 @@ static void ipip6_tunnel_setup(struct net_device *dev);
113080 static void ipip6_dev_free(struct net_device *dev);
113081 static bool check_6rd(struct ip_tunnel *tunnel, const struct in6_addr *v6dst,
113082 __be32 *v4dst);
113083-static struct rtnl_link_ops sit_link_ops __read_mostly;
113084+static struct rtnl_link_ops sit_link_ops;
113085
113086 static int sit_net_id __read_mostly;
113087 struct sit_net {
113088@@ -1751,7 +1751,7 @@ static void ipip6_dellink(struct net_device *dev, struct list_head *head)
113089 unregister_netdevice_queue(dev, head);
113090 }
113091
113092-static struct rtnl_link_ops sit_link_ops __read_mostly = {
113093+static struct rtnl_link_ops sit_link_ops = {
113094 .kind = "sit",
113095 .maxtype = IFLA_IPTUN_MAX,
113096 .policy = ipip6_policy,
113097diff --git a/net/ipv6/sysctl_net_ipv6.c b/net/ipv6/sysctl_net_ipv6.c
113098index c5c10fa..2577d51 100644
113099--- a/net/ipv6/sysctl_net_ipv6.c
113100+++ b/net/ipv6/sysctl_net_ipv6.c
113101@@ -78,7 +78,7 @@ static struct ctl_table ipv6_rotable[] = {
113102
113103 static int __net_init ipv6_sysctl_net_init(struct net *net)
113104 {
113105- struct ctl_table *ipv6_table;
113106+ ctl_table_no_const *ipv6_table;
113107 struct ctl_table *ipv6_route_table;
113108 struct ctl_table *ipv6_icmp_table;
113109 int err;
113110diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
113111index 5ca3bc8..8c53c81 100644
113112--- a/net/ipv6/tcp_ipv6.c
113113+++ b/net/ipv6/tcp_ipv6.c
113114@@ -104,6 +104,10 @@ static void inet6_sk_rx_dst_set(struct sock *sk, const struct sk_buff *skb)
113115 }
113116 }
113117
113118+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
113119+extern int grsec_enable_blackhole;
113120+#endif
113121+
113122 static void tcp_v6_hash(struct sock *sk)
113123 {
113124 if (sk->sk_state != TCP_CLOSE) {
113125@@ -1345,6 +1349,9 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)
113126 return 0;
113127
113128 reset:
113129+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
113130+ if (!grsec_enable_blackhole)
113131+#endif
113132 tcp_v6_send_reset(sk, skb);
113133 discard:
113134 if (opt_skb)
113135@@ -1454,12 +1461,20 @@ static int tcp_v6_rcv(struct sk_buff *skb)
113136
113137 sk = __inet6_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest,
113138 inet6_iif(skb));
113139- if (!sk)
113140+ if (!sk) {
113141+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
113142+ ret = 1;
113143+#endif
113144 goto no_tcp_socket;
113145+ }
113146
113147 process:
113148- if (sk->sk_state == TCP_TIME_WAIT)
113149+ if (sk->sk_state == TCP_TIME_WAIT) {
113150+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
113151+ ret = 2;
113152+#endif
113153 goto do_time_wait;
113154+ }
113155
113156 if (hdr->hop_limit < inet6_sk(sk)->min_hopcount) {
113157 NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
113158@@ -1510,6 +1525,10 @@ csum_error:
113159 bad_packet:
113160 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
113161 } else {
113162+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
113163+ if (!grsec_enable_blackhole || (ret == 1 &&
113164+ (skb->dev->flags & IFF_LOOPBACK)))
113165+#endif
113166 tcp_v6_send_reset(NULL, skb);
113167 }
113168
113169diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
113170index 1c9512a..786b8d6 100644
113171--- a/net/ipv6/udp.c
113172+++ b/net/ipv6/udp.c
113173@@ -76,6 +76,10 @@ static unsigned int udp6_ehashfn(struct net *net,
113174 udp_ipv6_hash_secret + net_hash_mix(net));
113175 }
113176
113177+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
113178+extern int grsec_enable_blackhole;
113179+#endif
113180+
113181 int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2)
113182 {
113183 const struct in6_addr *sk2_rcv_saddr6 = inet6_rcv_saddr(sk2);
113184@@ -448,7 +452,7 @@ try_again:
113185 if (unlikely(err)) {
113186 trace_kfree_skb(skb, udpv6_recvmsg);
113187 if (!peeked) {
113188- atomic_inc(&sk->sk_drops);
113189+ atomic_inc_unchecked(&sk->sk_drops);
113190 if (is_udp4)
113191 UDP_INC_STATS_USER(sock_net(sk),
113192 UDP_MIB_INERRORS,
113193@@ -712,7 +716,7 @@ csum_error:
113194 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite);
113195 drop:
113196 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
113197- atomic_inc(&sk->sk_drops);
113198+ atomic_inc_unchecked(&sk->sk_drops);
113199 kfree_skb(skb);
113200 return -1;
113201 }
113202@@ -753,7 +757,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
113203 if (likely(skb1 == NULL))
113204 skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
113205 if (!skb1) {
113206- atomic_inc(&sk->sk_drops);
113207+ atomic_inc_unchecked(&sk->sk_drops);
113208 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
113209 IS_UDPLITE(sk));
113210 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
113211@@ -937,6 +941,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
113212 goto csum_error;
113213
113214 UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
113215+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
113216+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
113217+#endif
113218 icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0);
113219
113220 kfree_skb(skb);
113221diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c
113222index 8d2d01b4..313511e 100644
113223--- a/net/ipv6/xfrm6_policy.c
113224+++ b/net/ipv6/xfrm6_policy.c
113225@@ -224,11 +224,11 @@ _decode_session6(struct sk_buff *skb, struct flowi *fl, int reverse)
113226 }
113227 }
113228
113229-static inline int xfrm6_garbage_collect(struct dst_ops *ops)
113230+static int xfrm6_garbage_collect(struct dst_ops *ops)
113231 {
113232 struct net *net = container_of(ops, struct net, xfrm.xfrm6_dst_ops);
113233
113234- xfrm6_policy_afinfo.garbage_collect(net);
113235+ xfrm_garbage_collect_deferred(net);
113236 return dst_entries_get_fast(ops) > ops->gc_thresh * 2;
113237 }
113238
113239@@ -341,19 +341,19 @@ static struct ctl_table xfrm6_policy_table[] = {
113240
113241 static int __net_init xfrm6_net_init(struct net *net)
113242 {
113243- struct ctl_table *table;
113244+ ctl_table_no_const *table = NULL;
113245 struct ctl_table_header *hdr;
113246
113247- table = xfrm6_policy_table;
113248 if (!net_eq(net, &init_net)) {
113249- table = kmemdup(table, sizeof(xfrm6_policy_table), GFP_KERNEL);
113250+ table = kmemdup(xfrm6_policy_table, sizeof(xfrm6_policy_table), GFP_KERNEL);
113251 if (!table)
113252 goto err_alloc;
113253
113254 table[0].data = &net->xfrm.xfrm6_dst_ops.gc_thresh;
113255- }
113256+ hdr = register_net_sysctl(net, "net/ipv6", table);
113257+ } else
113258+ hdr = register_net_sysctl(net, "net/ipv6", xfrm6_policy_table);
113259
113260- hdr = register_net_sysctl(net, "net/ipv6", table);
113261 if (!hdr)
113262 goto err_reg;
113263
113264@@ -361,8 +361,7 @@ static int __net_init xfrm6_net_init(struct net *net)
113265 return 0;
113266
113267 err_reg:
113268- if (!net_eq(net, &init_net))
113269- kfree(table);
113270+ kfree(table);
113271 err_alloc:
113272 return -ENOMEM;
113273 }
113274diff --git a/net/ipx/ipx_proc.c b/net/ipx/ipx_proc.c
113275index c1d247e..9e5949d 100644
113276--- a/net/ipx/ipx_proc.c
113277+++ b/net/ipx/ipx_proc.c
113278@@ -289,7 +289,7 @@ int __init ipx_proc_init(void)
113279 struct proc_dir_entry *p;
113280 int rc = -ENOMEM;
113281
113282- ipx_proc_dir = proc_mkdir("ipx", init_net.proc_net);
113283+ ipx_proc_dir = proc_mkdir_restrict("ipx", init_net.proc_net);
113284
113285 if (!ipx_proc_dir)
113286 goto out;
113287diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c
113288index 683346d..cb0e12d 100644
113289--- a/net/irda/ircomm/ircomm_tty.c
113290+++ b/net/irda/ircomm/ircomm_tty.c
113291@@ -310,10 +310,10 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
113292 add_wait_queue(&port->open_wait, &wait);
113293
113294 pr_debug("%s(%d):block_til_ready before block on %s open_count=%d\n",
113295- __FILE__, __LINE__, tty->driver->name, port->count);
113296+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
113297
113298 spin_lock_irqsave(&port->lock, flags);
113299- port->count--;
113300+ atomic_dec(&port->count);
113301 port->blocked_open++;
113302 spin_unlock_irqrestore(&port->lock, flags);
113303
113304@@ -348,7 +348,7 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
113305 }
113306
113307 pr_debug("%s(%d):block_til_ready blocking on %s open_count=%d\n",
113308- __FILE__, __LINE__, tty->driver->name, port->count);
113309+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
113310
113311 schedule();
113312 }
113313@@ -358,12 +358,12 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
113314
113315 spin_lock_irqsave(&port->lock, flags);
113316 if (!tty_hung_up_p(filp))
113317- port->count++;
113318+ atomic_inc(&port->count);
113319 port->blocked_open--;
113320 spin_unlock_irqrestore(&port->lock, flags);
113321
113322 pr_debug("%s(%d):block_til_ready after blocking on %s open_count=%d\n",
113323- __FILE__, __LINE__, tty->driver->name, port->count);
113324+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
113325
113326 if (!retval)
113327 port->flags |= ASYNC_NORMAL_ACTIVE;
113328@@ -433,12 +433,12 @@ static int ircomm_tty_open(struct tty_struct *tty, struct file *filp)
113329
113330 /* ++ is not atomic, so this should be protected - Jean II */
113331 spin_lock_irqsave(&self->port.lock, flags);
113332- self->port.count++;
113333+ atomic_inc(&self->port.count);
113334 spin_unlock_irqrestore(&self->port.lock, flags);
113335 tty_port_tty_set(&self->port, tty);
113336
113337 pr_debug("%s(), %s%d, count = %d\n", __func__ , tty->driver->name,
113338- self->line, self->port.count);
113339+ self->line, atomic_read(&self->port.count));
113340
113341 /* Not really used by us, but lets do it anyway */
113342 self->port.low_latency = (self->port.flags & ASYNC_LOW_LATENCY) ? 1 : 0;
113343@@ -961,7 +961,7 @@ static void ircomm_tty_hangup(struct tty_struct *tty)
113344 tty_kref_put(port->tty);
113345 }
113346 port->tty = NULL;
113347- port->count = 0;
113348+ atomic_set(&port->count, 0);
113349 spin_unlock_irqrestore(&port->lock, flags);
113350
113351 wake_up_interruptible(&port->open_wait);
113352@@ -1308,7 +1308,7 @@ static void ircomm_tty_line_info(struct ircomm_tty_cb *self, struct seq_file *m)
113353 seq_putc(m, '\n');
113354
113355 seq_printf(m, "Role: %s\n", self->client ? "client" : "server");
113356- seq_printf(m, "Open count: %d\n", self->port.count);
113357+ seq_printf(m, "Open count: %d\n", atomic_read(&self->port.count));
113358 seq_printf(m, "Max data size: %d\n", self->max_data_size);
113359 seq_printf(m, "Max header size: %d\n", self->max_header_size);
113360
113361diff --git a/net/irda/irproc.c b/net/irda/irproc.c
113362index b9ac598..f88cc56 100644
113363--- a/net/irda/irproc.c
113364+++ b/net/irda/irproc.c
113365@@ -66,7 +66,7 @@ void __init irda_proc_register(void)
113366 {
113367 int i;
113368
113369- proc_irda = proc_mkdir("irda", init_net.proc_net);
113370+ proc_irda = proc_mkdir_restrict("irda", init_net.proc_net);
113371 if (proc_irda == NULL)
113372 return;
113373
113374diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
113375index 53d9311..cbaf99f 100644
113376--- a/net/iucv/af_iucv.c
113377+++ b/net/iucv/af_iucv.c
113378@@ -686,10 +686,10 @@ static void __iucv_auto_name(struct iucv_sock *iucv)
113379 {
113380 char name[12];
113381
113382- sprintf(name, "%08x", atomic_inc_return(&iucv_sk_list.autobind_name));
113383+ sprintf(name, "%08x", atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
113384 while (__iucv_get_sock_by_name(name)) {
113385 sprintf(name, "%08x",
113386- atomic_inc_return(&iucv_sk_list.autobind_name));
113387+ atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
113388 }
113389 memcpy(iucv->src_name, name, 8);
113390 }
113391diff --git a/net/iucv/iucv.c b/net/iucv/iucv.c
113392index 2a6a1fd..6c112b0 100644
113393--- a/net/iucv/iucv.c
113394+++ b/net/iucv/iucv.c
113395@@ -702,7 +702,7 @@ static int iucv_cpu_notify(struct notifier_block *self,
113396 return NOTIFY_OK;
113397 }
113398
113399-static struct notifier_block __refdata iucv_cpu_notifier = {
113400+static struct notifier_block iucv_cpu_notifier = {
113401 .notifier_call = iucv_cpu_notify,
113402 };
113403
113404diff --git a/net/key/af_key.c b/net/key/af_key.c
113405index f8ac939..1e189bf 100644
113406--- a/net/key/af_key.c
113407+++ b/net/key/af_key.c
113408@@ -3049,10 +3049,10 @@ static int pfkey_send_policy_notify(struct xfrm_policy *xp, int dir, const struc
113409 static u32 get_acqseq(void)
113410 {
113411 u32 res;
113412- static atomic_t acqseq;
113413+ static atomic_unchecked_t acqseq;
113414
113415 do {
113416- res = atomic_inc_return(&acqseq);
113417+ res = atomic_inc_return_unchecked(&acqseq);
113418 } while (!res);
113419 return res;
113420 }
113421diff --git a/net/l2tp/l2tp_eth.c b/net/l2tp/l2tp_eth.c
113422index 781b3a2..73a7434 100644
113423--- a/net/l2tp/l2tp_eth.c
113424+++ b/net/l2tp/l2tp_eth.c
113425@@ -42,12 +42,12 @@ struct l2tp_eth {
113426 struct sock *tunnel_sock;
113427 struct l2tp_session *session;
113428 struct list_head list;
113429- atomic_long_t tx_bytes;
113430- atomic_long_t tx_packets;
113431- atomic_long_t tx_dropped;
113432- atomic_long_t rx_bytes;
113433- atomic_long_t rx_packets;
113434- atomic_long_t rx_errors;
113435+ atomic_long_unchecked_t tx_bytes;
113436+ atomic_long_unchecked_t tx_packets;
113437+ atomic_long_unchecked_t tx_dropped;
113438+ atomic_long_unchecked_t rx_bytes;
113439+ atomic_long_unchecked_t rx_packets;
113440+ atomic_long_unchecked_t rx_errors;
113441 };
113442
113443 /* via l2tp_session_priv() */
113444@@ -98,10 +98,10 @@ static int l2tp_eth_dev_xmit(struct sk_buff *skb, struct net_device *dev)
113445 int ret = l2tp_xmit_skb(session, skb, session->hdr_len);
113446
113447 if (likely(ret == NET_XMIT_SUCCESS)) {
113448- atomic_long_add(len, &priv->tx_bytes);
113449- atomic_long_inc(&priv->tx_packets);
113450+ atomic_long_add_unchecked(len, &priv->tx_bytes);
113451+ atomic_long_inc_unchecked(&priv->tx_packets);
113452 } else {
113453- atomic_long_inc(&priv->tx_dropped);
113454+ atomic_long_inc_unchecked(&priv->tx_dropped);
113455 }
113456 return NETDEV_TX_OK;
113457 }
113458@@ -111,12 +111,12 @@ static struct rtnl_link_stats64 *l2tp_eth_get_stats64(struct net_device *dev,
113459 {
113460 struct l2tp_eth *priv = netdev_priv(dev);
113461
113462- stats->tx_bytes = atomic_long_read(&priv->tx_bytes);
113463- stats->tx_packets = atomic_long_read(&priv->tx_packets);
113464- stats->tx_dropped = atomic_long_read(&priv->tx_dropped);
113465- stats->rx_bytes = atomic_long_read(&priv->rx_bytes);
113466- stats->rx_packets = atomic_long_read(&priv->rx_packets);
113467- stats->rx_errors = atomic_long_read(&priv->rx_errors);
113468+ stats->tx_bytes = atomic_long_read_unchecked(&priv->tx_bytes);
113469+ stats->tx_packets = atomic_long_read_unchecked(&priv->tx_packets);
113470+ stats->tx_dropped = atomic_long_read_unchecked(&priv->tx_dropped);
113471+ stats->rx_bytes = atomic_long_read_unchecked(&priv->rx_bytes);
113472+ stats->rx_packets = atomic_long_read_unchecked(&priv->rx_packets);
113473+ stats->rx_errors = atomic_long_read_unchecked(&priv->rx_errors);
113474 return stats;
113475 }
113476
113477@@ -167,15 +167,15 @@ static void l2tp_eth_dev_recv(struct l2tp_session *session, struct sk_buff *skb,
113478 nf_reset(skb);
113479
113480 if (dev_forward_skb(dev, skb) == NET_RX_SUCCESS) {
113481- atomic_long_inc(&priv->rx_packets);
113482- atomic_long_add(data_len, &priv->rx_bytes);
113483+ atomic_long_inc_unchecked(&priv->rx_packets);
113484+ atomic_long_add_unchecked(data_len, &priv->rx_bytes);
113485 } else {
113486- atomic_long_inc(&priv->rx_errors);
113487+ atomic_long_inc_unchecked(&priv->rx_errors);
113488 }
113489 return;
113490
113491 error:
113492- atomic_long_inc(&priv->rx_errors);
113493+ atomic_long_inc_unchecked(&priv->rx_errors);
113494 kfree_skb(skb);
113495 }
113496
113497diff --git a/net/l2tp/l2tp_ip.c b/net/l2tp/l2tp_ip.c
113498index 05dfc8aa..df6cfd7 100644
113499--- a/net/l2tp/l2tp_ip.c
113500+++ b/net/l2tp/l2tp_ip.c
113501@@ -608,7 +608,7 @@ static struct inet_protosw l2tp_ip_protosw = {
113502 .ops = &l2tp_ip_ops,
113503 };
113504
113505-static struct net_protocol l2tp_ip_protocol __read_mostly = {
113506+static const struct net_protocol l2tp_ip_protocol = {
113507 .handler = l2tp_ip_recv,
113508 .netns_ok = 1,
113509 };
113510diff --git a/net/l2tp/l2tp_ip6.c b/net/l2tp/l2tp_ip6.c
113511index 8611f1b..bc60a2d 100644
113512--- a/net/l2tp/l2tp_ip6.c
113513+++ b/net/l2tp/l2tp_ip6.c
113514@@ -757,7 +757,7 @@ static struct inet_protosw l2tp_ip6_protosw = {
113515 .ops = &l2tp_ip6_ops,
113516 };
113517
113518-static struct inet6_protocol l2tp_ip6_protocol __read_mostly = {
113519+static const struct inet6_protocol l2tp_ip6_protocol = {
113520 .handler = l2tp_ip6_recv,
113521 };
113522
113523diff --git a/net/llc/llc_proc.c b/net/llc/llc_proc.c
113524index 1a3c7e0..80f8b0c 100644
113525--- a/net/llc/llc_proc.c
113526+++ b/net/llc/llc_proc.c
113527@@ -247,7 +247,7 @@ int __init llc_proc_init(void)
113528 int rc = -ENOMEM;
113529 struct proc_dir_entry *p;
113530
113531- llc_proc_dir = proc_mkdir("llc", init_net.proc_net);
113532+ llc_proc_dir = proc_mkdir_restrict("llc", init_net.proc_net);
113533 if (!llc_proc_dir)
113534 goto out;
113535
113536diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
113537index dd4ff36..3462997 100644
113538--- a/net/mac80211/cfg.c
113539+++ b/net/mac80211/cfg.c
113540@@ -581,7 +581,7 @@ static int ieee80211_set_monitor_channel(struct wiphy *wiphy,
113541 ret = ieee80211_vif_use_channel(sdata, chandef,
113542 IEEE80211_CHANCTX_EXCLUSIVE);
113543 }
113544- } else if (local->open_count == local->monitors) {
113545+ } else if (local_read(&local->open_count) == local->monitors) {
113546 local->_oper_chandef = *chandef;
113547 ieee80211_hw_config(local, 0);
113548 }
113549@@ -3468,7 +3468,7 @@ static void ieee80211_mgmt_frame_register(struct wiphy *wiphy,
113550 else
113551 local->probe_req_reg--;
113552
113553- if (!local->open_count)
113554+ if (!local_read(&local->open_count))
113555 break;
113556
113557 ieee80211_queue_work(&local->hw, &local->reconfig_filter);
113558@@ -3603,8 +3603,8 @@ static int ieee80211_cfg_get_channel(struct wiphy *wiphy,
113559 if (chanctx_conf) {
113560 *chandef = sdata->vif.bss_conf.chandef;
113561 ret = 0;
113562- } else if (local->open_count > 0 &&
113563- local->open_count == local->monitors &&
113564+ } else if (local_read(&local->open_count) > 0 &&
113565+ local_read(&local->open_count) == local->monitors &&
113566 sdata->vif.type == NL80211_IFTYPE_MONITOR) {
113567 if (local->use_chanctx)
113568 *chandef = local->monitor_chandef;
113569diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
113570index 81e8dc5..5b77c58 100644
113571--- a/net/mac80211/ieee80211_i.h
113572+++ b/net/mac80211/ieee80211_i.h
113573@@ -29,6 +29,7 @@
113574 #include <net/ieee80211_radiotap.h>
113575 #include <net/cfg80211.h>
113576 #include <net/mac80211.h>
113577+#include <asm/local.h>
113578 #include "key.h"
113579 #include "sta_info.h"
113580 #include "debug.h"
113581@@ -1129,7 +1130,7 @@ struct ieee80211_local {
113582 /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */
113583 spinlock_t queue_stop_reason_lock;
113584
113585- int open_count;
113586+ local_t open_count;
113587 int monitors, cooked_mntrs;
113588 /* number of interfaces with corresponding FIF_ flags */
113589 int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll,
113590diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
113591index 81a2751..c06a026 100644
113592--- a/net/mac80211/iface.c
113593+++ b/net/mac80211/iface.c
113594@@ -544,7 +544,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
113595 break;
113596 }
113597
113598- if (local->open_count == 0) {
113599+ if (local_read(&local->open_count) == 0) {
113600 res = drv_start(local);
113601 if (res)
113602 goto err_del_bss;
113603@@ -591,7 +591,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
113604 res = drv_add_interface(local, sdata);
113605 if (res)
113606 goto err_stop;
113607- } else if (local->monitors == 0 && local->open_count == 0) {
113608+ } else if (local->monitors == 0 && local_read(&local->open_count) == 0) {
113609 res = ieee80211_add_virtual_monitor(local);
113610 if (res)
113611 goto err_stop;
113612@@ -701,7 +701,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
113613 atomic_inc(&local->iff_promiscs);
113614
113615 if (coming_up)
113616- local->open_count++;
113617+ local_inc(&local->open_count);
113618
113619 if (hw_reconf_flags)
113620 ieee80211_hw_config(local, hw_reconf_flags);
113621@@ -739,7 +739,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
113622 err_del_interface:
113623 drv_remove_interface(local, sdata);
113624 err_stop:
113625- if (!local->open_count)
113626+ if (!local_read(&local->open_count))
113627 drv_stop(local);
113628 err_del_bss:
113629 sdata->bss = NULL;
113630@@ -907,7 +907,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
113631 }
113632
113633 if (going_down)
113634- local->open_count--;
113635+ local_dec(&local->open_count);
113636
113637 switch (sdata->vif.type) {
113638 case NL80211_IFTYPE_AP_VLAN:
113639@@ -969,7 +969,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
113640 }
113641 spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);
113642
113643- if (local->open_count == 0)
113644+ if (local_read(&local->open_count) == 0)
113645 ieee80211_clear_tx_pending(local);
113646
113647 /*
113648@@ -1012,7 +1012,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
113649 if (cancel_scan)
113650 flush_delayed_work(&local->scan_work);
113651
113652- if (local->open_count == 0) {
113653+ if (local_read(&local->open_count) == 0) {
113654 ieee80211_stop_device(local);
113655
113656 /* no reconfiguring after stop! */
113657@@ -1023,7 +1023,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
113658 ieee80211_configure_filter(local);
113659 ieee80211_hw_config(local, hw_reconf_flags);
113660
113661- if (local->monitors == local->open_count)
113662+ if (local->monitors == local_read(&local->open_count))
113663 ieee80211_add_virtual_monitor(local);
113664 }
113665
113666diff --git a/net/mac80211/main.c b/net/mac80211/main.c
113667index 5e09d35..e2fdbe2 100644
113668--- a/net/mac80211/main.c
113669+++ b/net/mac80211/main.c
113670@@ -175,7 +175,7 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed)
113671 changed &= ~(IEEE80211_CONF_CHANGE_CHANNEL |
113672 IEEE80211_CONF_CHANGE_POWER);
113673
113674- if (changed && local->open_count) {
113675+ if (changed && local_read(&local->open_count)) {
113676 ret = drv_config(local, changed);
113677 /*
113678 * Goal:
113679diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c
113680index ca405b6..6cc8bee 100644
113681--- a/net/mac80211/pm.c
113682+++ b/net/mac80211/pm.c
113683@@ -12,7 +12,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
113684 struct ieee80211_sub_if_data *sdata;
113685 struct sta_info *sta;
113686
113687- if (!local->open_count)
113688+ if (!local_read(&local->open_count))
113689 goto suspend;
113690
113691 ieee80211_scan_cancel(local);
113692@@ -59,7 +59,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
113693 cancel_work_sync(&local->dynamic_ps_enable_work);
113694 del_timer_sync(&local->dynamic_ps_timer);
113695
113696- local->wowlan = wowlan && local->open_count;
113697+ local->wowlan = wowlan && local_read(&local->open_count);
113698 if (local->wowlan) {
113699 int err = drv_suspend(local, wowlan);
113700 if (err < 0) {
113701@@ -126,7 +126,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
113702 WARN_ON(!list_empty(&local->chanctx_list));
113703
113704 /* stop hardware - this must stop RX */
113705- if (local->open_count)
113706+ if (local_read(&local->open_count))
113707 ieee80211_stop_device(local);
113708
113709 suspend:
113710diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c
113711index d53355b..21f583a 100644
113712--- a/net/mac80211/rate.c
113713+++ b/net/mac80211/rate.c
113714@@ -724,7 +724,7 @@ int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local,
113715
113716 ASSERT_RTNL();
113717
113718- if (local->open_count)
113719+ if (local_read(&local->open_count))
113720 return -EBUSY;
113721
113722 if (local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL) {
113723diff --git a/net/mac80211/util.c b/net/mac80211/util.c
113724index 747bdcf..eb2b981 100644
113725--- a/net/mac80211/util.c
113726+++ b/net/mac80211/util.c
113727@@ -1741,7 +1741,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
113728 bool sched_scan_stopped = false;
113729
113730 /* nothing to do if HW shouldn't run */
113731- if (!local->open_count)
113732+ if (!local_read(&local->open_count))
113733 goto wake_up;
113734
113735 #ifdef CONFIG_PM
113736@@ -1993,7 +1993,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
113737 local->in_reconfig = false;
113738 barrier();
113739
113740- if (local->monitors == local->open_count && local->monitors > 0)
113741+ if (local->monitors == local_read(&local->open_count) && local->monitors > 0)
113742 ieee80211_add_virtual_monitor(local);
113743
113744 /*
113745@@ -2048,7 +2048,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
113746 * If this is for hw restart things are still running.
113747 * We may want to change that later, however.
113748 */
113749- if (local->open_count && (!local->suspended || reconfig_due_to_wowlan))
113750+ if (local_read(&local->open_count) && (!local->suspended || reconfig_due_to_wowlan))
113751 drv_reconfig_complete(local, IEEE80211_RECONFIG_TYPE_RESTART);
113752
113753 if (!local->suspended)
113754@@ -2072,7 +2072,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
113755 flush_delayed_work(&local->scan_work);
113756 }
113757
113758- if (local->open_count && !reconfig_due_to_wowlan)
113759+ if (local_read(&local->open_count) && !reconfig_due_to_wowlan)
113760 drv_reconfig_complete(local, IEEE80211_RECONFIG_TYPE_SUSPEND);
113761
113762 list_for_each_entry(sdata, &local->interfaces, list) {
113763diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
113764index b02660f..c0f791c 100644
113765--- a/net/netfilter/Kconfig
113766+++ b/net/netfilter/Kconfig
113767@@ -1122,6 +1122,16 @@ config NETFILTER_XT_MATCH_ESP
113768
113769 To compile it as a module, choose M here. If unsure, say N.
113770
113771+config NETFILTER_XT_MATCH_GRADM
113772+ tristate '"gradm" match support'
113773+ depends on NETFILTER_XTABLES && NETFILTER_ADVANCED
113774+ depends on GRKERNSEC && !GRKERNSEC_NO_RBAC
113775+ ---help---
113776+ The gradm match allows to match on grsecurity RBAC being enabled.
113777+ It is useful when iptables rules are applied early on bootup to
113778+ prevent connections to the machine (except from a trusted host)
113779+ while the RBAC system is disabled.
113780+
113781 config NETFILTER_XT_MATCH_HASHLIMIT
113782 tristate '"hashlimit" match support'
113783 depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
113784diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile
113785index 89f73a9..e4e5bd9 100644
113786--- a/net/netfilter/Makefile
113787+++ b/net/netfilter/Makefile
113788@@ -139,6 +139,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_DEVGROUP) += xt_devgroup.o
113789 obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) += xt_dscp.o
113790 obj-$(CONFIG_NETFILTER_XT_MATCH_ECN) += xt_ecn.o
113791 obj-$(CONFIG_NETFILTER_XT_MATCH_ESP) += xt_esp.o
113792+obj-$(CONFIG_NETFILTER_XT_MATCH_GRADM) += xt_gradm.o
113793 obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o
113794 obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o
113795 obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o
113796diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c
113797index d259da3..6a32b2c 100644
113798--- a/net/netfilter/ipset/ip_set_core.c
113799+++ b/net/netfilter/ipset/ip_set_core.c
113800@@ -1952,7 +1952,7 @@ done:
113801 return ret;
113802 }
113803
113804-static struct nf_sockopt_ops so_set __read_mostly = {
113805+static struct nf_sockopt_ops so_set = {
113806 .pf = PF_INET,
113807 .get_optmin = SO_IP_SET,
113808 .get_optmax = SO_IP_SET + 1,
113809diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c
113810index b0f7b62..0541842 100644
113811--- a/net/netfilter/ipvs/ip_vs_conn.c
113812+++ b/net/netfilter/ipvs/ip_vs_conn.c
113813@@ -572,7 +572,7 @@ ip_vs_bind_dest(struct ip_vs_conn *cp, struct ip_vs_dest *dest)
113814 /* Increase the refcnt counter of the dest */
113815 ip_vs_dest_hold(dest);
113816
113817- conn_flags = atomic_read(&dest->conn_flags);
113818+ conn_flags = atomic_read_unchecked(&dest->conn_flags);
113819 if (cp->protocol != IPPROTO_UDP)
113820 conn_flags &= ~IP_VS_CONN_F_ONE_PACKET;
113821 flags = cp->flags;
113822@@ -922,7 +922,7 @@ ip_vs_conn_new(const struct ip_vs_conn_param *p, int dest_af,
113823
113824 cp->control = NULL;
113825 atomic_set(&cp->n_control, 0);
113826- atomic_set(&cp->in_pkts, 0);
113827+ atomic_set_unchecked(&cp->in_pkts, 0);
113828
113829 cp->packet_xmit = NULL;
113830 cp->app = NULL;
113831@@ -1229,7 +1229,7 @@ static inline int todrop_entry(struct ip_vs_conn *cp)
113832
113833 /* Don't drop the entry if its number of incoming packets is not
113834 located in [0, 8] */
113835- i = atomic_read(&cp->in_pkts);
113836+ i = atomic_read_unchecked(&cp->in_pkts);
113837 if (i > 8 || i < 0) return 0;
113838
113839 if (!todrop_rate[i]) return 0;
113840diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
113841index b87ca32..76c7799 100644
113842--- a/net/netfilter/ipvs/ip_vs_core.c
113843+++ b/net/netfilter/ipvs/ip_vs_core.c
113844@@ -568,7 +568,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb,
113845 ret = cp->packet_xmit(skb, cp, pd->pp, iph);
113846 /* do not touch skb anymore */
113847
113848- atomic_inc(&cp->in_pkts);
113849+ atomic_inc_unchecked(&cp->in_pkts);
113850 ip_vs_conn_put(cp);
113851 return ret;
113852 }
113853@@ -1723,7 +1723,7 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb, int af)
113854 if (cp->flags & IP_VS_CONN_F_ONE_PACKET)
113855 pkts = sysctl_sync_threshold(ipvs);
113856 else
113857- pkts = atomic_add_return(1, &cp->in_pkts);
113858+ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
113859
113860 if (ipvs->sync_state & IP_VS_STATE_MASTER)
113861 ip_vs_sync_conn(net, cp, pkts);
113862diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
113863index ed99448..3ba6cad 100644
113864--- a/net/netfilter/ipvs/ip_vs_ctl.c
113865+++ b/net/netfilter/ipvs/ip_vs_ctl.c
113866@@ -799,7 +799,7 @@ __ip_vs_update_dest(struct ip_vs_service *svc, struct ip_vs_dest *dest,
113867 */
113868 ip_vs_rs_hash(ipvs, dest);
113869 }
113870- atomic_set(&dest->conn_flags, conn_flags);
113871+ atomic_set_unchecked(&dest->conn_flags, conn_flags);
113872
113873 /* bind the service */
113874 old_svc = rcu_dereference_protected(dest->svc, 1);
113875@@ -1664,7 +1664,7 @@ proc_do_sync_ports(struct ctl_table *table, int write,
113876 * align with netns init in ip_vs_control_net_init()
113877 */
113878
113879-static struct ctl_table vs_vars[] = {
113880+static ctl_table_no_const vs_vars[] __read_only = {
113881 {
113882 .procname = "amemthresh",
113883 .maxlen = sizeof(int),
113884@@ -1999,7 +1999,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
113885 " %-7s %-6d %-10d %-10d\n",
113886 &dest->addr.in6,
113887 ntohs(dest->port),
113888- ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
113889+ ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
113890 atomic_read(&dest->weight),
113891 atomic_read(&dest->activeconns),
113892 atomic_read(&dest->inactconns));
113893@@ -2010,7 +2010,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
113894 "%-7s %-6d %-10d %-10d\n",
113895 ntohl(dest->addr.ip),
113896 ntohs(dest->port),
113897- ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
113898+ ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
113899 atomic_read(&dest->weight),
113900 atomic_read(&dest->activeconns),
113901 atomic_read(&dest->inactconns));
113902@@ -2499,7 +2499,7 @@ __ip_vs_get_dest_entries(struct net *net, const struct ip_vs_get_dests *get,
113903
113904 entry.addr = dest->addr.ip;
113905 entry.port = dest->port;
113906- entry.conn_flags = atomic_read(&dest->conn_flags);
113907+ entry.conn_flags = atomic_read_unchecked(&dest->conn_flags);
113908 entry.weight = atomic_read(&dest->weight);
113909 entry.u_threshold = dest->u_threshold;
113910 entry.l_threshold = dest->l_threshold;
113911@@ -3040,7 +3040,7 @@ static int ip_vs_genl_fill_dest(struct sk_buff *skb, struct ip_vs_dest *dest)
113912 if (nla_put(skb, IPVS_DEST_ATTR_ADDR, sizeof(dest->addr), &dest->addr) ||
113913 nla_put_be16(skb, IPVS_DEST_ATTR_PORT, dest->port) ||
113914 nla_put_u32(skb, IPVS_DEST_ATTR_FWD_METHOD,
113915- (atomic_read(&dest->conn_flags) &
113916+ (atomic_read_unchecked(&dest->conn_flags) &
113917 IP_VS_CONN_F_FWD_MASK)) ||
113918 nla_put_u32(skb, IPVS_DEST_ATTR_WEIGHT,
113919 atomic_read(&dest->weight)) ||
113920@@ -3675,7 +3675,7 @@ static int __net_init ip_vs_control_net_init_sysctl(struct net *net)
113921 {
113922 int idx;
113923 struct netns_ipvs *ipvs = net_ipvs(net);
113924- struct ctl_table *tbl;
113925+ ctl_table_no_const *tbl;
113926
113927 atomic_set(&ipvs->dropentry, 0);
113928 spin_lock_init(&ipvs->dropentry_lock);
113929diff --git a/net/netfilter/ipvs/ip_vs_lblc.c b/net/netfilter/ipvs/ip_vs_lblc.c
113930index 127f140..553d652 100644
113931--- a/net/netfilter/ipvs/ip_vs_lblc.c
113932+++ b/net/netfilter/ipvs/ip_vs_lblc.c
113933@@ -118,7 +118,7 @@ struct ip_vs_lblc_table {
113934 * IPVS LBLC sysctl table
113935 */
113936 #ifdef CONFIG_SYSCTL
113937-static struct ctl_table vs_vars_table[] = {
113938+static ctl_table_no_const vs_vars_table[] __read_only = {
113939 {
113940 .procname = "lblc_expiration",
113941 .data = NULL,
113942diff --git a/net/netfilter/ipvs/ip_vs_lblcr.c b/net/netfilter/ipvs/ip_vs_lblcr.c
113943index 2229d2d..b32b785 100644
113944--- a/net/netfilter/ipvs/ip_vs_lblcr.c
113945+++ b/net/netfilter/ipvs/ip_vs_lblcr.c
113946@@ -289,7 +289,7 @@ struct ip_vs_lblcr_table {
113947 * IPVS LBLCR sysctl table
113948 */
113949
113950-static struct ctl_table vs_vars_table[] = {
113951+static ctl_table_no_const vs_vars_table[] __read_only = {
113952 {
113953 .procname = "lblcr_expiration",
113954 .data = NULL,
113955diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c
113956index d93ceeb..4556144 100644
113957--- a/net/netfilter/ipvs/ip_vs_sync.c
113958+++ b/net/netfilter/ipvs/ip_vs_sync.c
113959@@ -609,7 +609,7 @@ static void ip_vs_sync_conn_v0(struct net *net, struct ip_vs_conn *cp,
113960 cp = cp->control;
113961 if (cp) {
113962 if (cp->flags & IP_VS_CONN_F_TEMPLATE)
113963- pkts = atomic_add_return(1, &cp->in_pkts);
113964+ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
113965 else
113966 pkts = sysctl_sync_threshold(ipvs);
113967 ip_vs_sync_conn(net, cp->control, pkts);
113968@@ -771,7 +771,7 @@ control:
113969 if (!cp)
113970 return;
113971 if (cp->flags & IP_VS_CONN_F_TEMPLATE)
113972- pkts = atomic_add_return(1, &cp->in_pkts);
113973+ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
113974 else
113975 pkts = sysctl_sync_threshold(ipvs);
113976 goto sloop;
113977@@ -902,7 +902,7 @@ static void ip_vs_proc_conn(struct net *net, struct ip_vs_conn_param *param,
113978
113979 if (opt)
113980 memcpy(&cp->in_seq, opt, sizeof(*opt));
113981- atomic_set(&cp->in_pkts, sysctl_sync_threshold(ipvs));
113982+ atomic_set_unchecked(&cp->in_pkts, sysctl_sync_threshold(ipvs));
113983 cp->state = state;
113984 cp->old_state = cp->state;
113985 /*
113986diff --git a/net/netfilter/ipvs/ip_vs_xmit.c b/net/netfilter/ipvs/ip_vs_xmit.c
113987index 3aedbda..6a63567 100644
113988--- a/net/netfilter/ipvs/ip_vs_xmit.c
113989+++ b/net/netfilter/ipvs/ip_vs_xmit.c
113990@@ -1214,7 +1214,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
113991 else
113992 rc = NF_ACCEPT;
113993 /* do not touch skb anymore */
113994- atomic_inc(&cp->in_pkts);
113995+ atomic_inc_unchecked(&cp->in_pkts);
113996 goto out;
113997 }
113998
113999@@ -1307,7 +1307,7 @@ ip_vs_icmp_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,
114000 else
114001 rc = NF_ACCEPT;
114002 /* do not touch skb anymore */
114003- atomic_inc(&cp->in_pkts);
114004+ atomic_inc_unchecked(&cp->in_pkts);
114005 goto out;
114006 }
114007
114008diff --git a/net/netfilter/nf_conntrack_acct.c b/net/netfilter/nf_conntrack_acct.c
114009index a4b5e2a..13b1de3 100644
114010--- a/net/netfilter/nf_conntrack_acct.c
114011+++ b/net/netfilter/nf_conntrack_acct.c
114012@@ -62,7 +62,7 @@ static struct nf_ct_ext_type acct_extend __read_mostly = {
114013 #ifdef CONFIG_SYSCTL
114014 static int nf_conntrack_acct_init_sysctl(struct net *net)
114015 {
114016- struct ctl_table *table;
114017+ ctl_table_no_const *table;
114018
114019 table = kmemdup(acct_sysctl_table, sizeof(acct_sysctl_table),
114020 GFP_KERNEL);
114021diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
114022index 13fad86..18c984c 100644
114023--- a/net/netfilter/nf_conntrack_core.c
114024+++ b/net/netfilter/nf_conntrack_core.c
114025@@ -1733,6 +1733,10 @@ void nf_conntrack_init_end(void)
114026 #define DYING_NULLS_VAL ((1<<30)+1)
114027 #define TEMPLATE_NULLS_VAL ((1<<30)+2)
114028
114029+#ifdef CONFIG_GRKERNSEC_HIDESYM
114030+static atomic_unchecked_t conntrack_cache_id = ATOMIC_INIT(0);
114031+#endif
114032+
114033 int nf_conntrack_init_net(struct net *net)
114034 {
114035 int ret = -ENOMEM;
114036@@ -1758,7 +1762,11 @@ int nf_conntrack_init_net(struct net *net)
114037 if (!net->ct.stat)
114038 goto err_pcpu_lists;
114039
114040+#ifdef CONFIG_GRKERNSEC_HIDESYM
114041+ net->ct.slabname = kasprintf(GFP_KERNEL, "nf_conntrack_%08x", atomic_inc_return_unchecked(&conntrack_cache_id));
114042+#else
114043 net->ct.slabname = kasprintf(GFP_KERNEL, "nf_conntrack_%p", net);
114044+#endif
114045 if (!net->ct.slabname)
114046 goto err_slabname;
114047
114048diff --git a/net/netfilter/nf_conntrack_ecache.c b/net/netfilter/nf_conntrack_ecache.c
114049index 4e78c57..ec8fb74 100644
114050--- a/net/netfilter/nf_conntrack_ecache.c
114051+++ b/net/netfilter/nf_conntrack_ecache.c
114052@@ -264,7 +264,7 @@ static struct nf_ct_ext_type event_extend __read_mostly = {
114053 #ifdef CONFIG_SYSCTL
114054 static int nf_conntrack_event_init_sysctl(struct net *net)
114055 {
114056- struct ctl_table *table;
114057+ ctl_table_no_const *table;
114058
114059 table = kmemdup(event_sysctl_table, sizeof(event_sysctl_table),
114060 GFP_KERNEL);
114061diff --git a/net/netfilter/nf_conntrack_helper.c b/net/netfilter/nf_conntrack_helper.c
114062index bd9d315..989947e 100644
114063--- a/net/netfilter/nf_conntrack_helper.c
114064+++ b/net/netfilter/nf_conntrack_helper.c
114065@@ -57,7 +57,7 @@ static struct ctl_table helper_sysctl_table[] = {
114066
114067 static int nf_conntrack_helper_init_sysctl(struct net *net)
114068 {
114069- struct ctl_table *table;
114070+ ctl_table_no_const *table;
114071
114072 table = kmemdup(helper_sysctl_table, sizeof(helper_sysctl_table),
114073 GFP_KERNEL);
114074diff --git a/net/netfilter/nf_conntrack_proto.c b/net/netfilter/nf_conntrack_proto.c
114075index b65d586..beec902 100644
114076--- a/net/netfilter/nf_conntrack_proto.c
114077+++ b/net/netfilter/nf_conntrack_proto.c
114078@@ -52,7 +52,7 @@ nf_ct_register_sysctl(struct net *net,
114079
114080 static void
114081 nf_ct_unregister_sysctl(struct ctl_table_header **header,
114082- struct ctl_table **table,
114083+ ctl_table_no_const **table,
114084 unsigned int users)
114085 {
114086 if (users > 0)
114087diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
114088index fc823fa..8311af3 100644
114089--- a/net/netfilter/nf_conntrack_standalone.c
114090+++ b/net/netfilter/nf_conntrack_standalone.c
114091@@ -468,7 +468,7 @@ static struct ctl_table nf_ct_netfilter_table[] = {
114092
114093 static int nf_conntrack_standalone_init_sysctl(struct net *net)
114094 {
114095- struct ctl_table *table;
114096+ ctl_table_no_const *table;
114097
114098 table = kmemdup(nf_ct_sysctl_table, sizeof(nf_ct_sysctl_table),
114099 GFP_KERNEL);
114100diff --git a/net/netfilter/nf_conntrack_timestamp.c b/net/netfilter/nf_conntrack_timestamp.c
114101index 7a394df..bd91a8a 100644
114102--- a/net/netfilter/nf_conntrack_timestamp.c
114103+++ b/net/netfilter/nf_conntrack_timestamp.c
114104@@ -42,7 +42,7 @@ static struct nf_ct_ext_type tstamp_extend __read_mostly = {
114105 #ifdef CONFIG_SYSCTL
114106 static int nf_conntrack_tstamp_init_sysctl(struct net *net)
114107 {
114108- struct ctl_table *table;
114109+ ctl_table_no_const *table;
114110
114111 table = kmemdup(tstamp_sysctl_table, sizeof(tstamp_sysctl_table),
114112 GFP_KERNEL);
114113diff --git a/net/netfilter/nf_log.c b/net/netfilter/nf_log.c
114114index 675d12c..b36e825 100644
114115--- a/net/netfilter/nf_log.c
114116+++ b/net/netfilter/nf_log.c
114117@@ -386,7 +386,7 @@ static const struct file_operations nflog_file_ops = {
114118
114119 #ifdef CONFIG_SYSCTL
114120 static char nf_log_sysctl_fnames[NFPROTO_NUMPROTO-NFPROTO_UNSPEC][3];
114121-static struct ctl_table nf_log_sysctl_table[NFPROTO_NUMPROTO+1];
114122+static ctl_table_no_const nf_log_sysctl_table[NFPROTO_NUMPROTO+1] __read_only;
114123
114124 static int nf_log_proc_dostring(struct ctl_table *table, int write,
114125 void __user *buffer, size_t *lenp, loff_t *ppos)
114126@@ -417,13 +417,15 @@ static int nf_log_proc_dostring(struct ctl_table *table, int write,
114127 rcu_assign_pointer(net->nf.nf_loggers[tindex], logger);
114128 mutex_unlock(&nf_log_mutex);
114129 } else {
114130+ ctl_table_no_const nf_log_table = *table;
114131+
114132 mutex_lock(&nf_log_mutex);
114133 logger = nft_log_dereference(net->nf.nf_loggers[tindex]);
114134 if (!logger)
114135- table->data = "NONE";
114136+ nf_log_table.data = "NONE";
114137 else
114138- table->data = logger->name;
114139- r = proc_dostring(table, write, buffer, lenp, ppos);
114140+ nf_log_table.data = logger->name;
114141+ r = proc_dostring(&nf_log_table, write, buffer, lenp, ppos);
114142 mutex_unlock(&nf_log_mutex);
114143 }
114144
114145diff --git a/net/netfilter/nf_sockopt.c b/net/netfilter/nf_sockopt.c
114146index c68c1e5..8b5d670 100644
114147--- a/net/netfilter/nf_sockopt.c
114148+++ b/net/netfilter/nf_sockopt.c
114149@@ -43,7 +43,7 @@ int nf_register_sockopt(struct nf_sockopt_ops *reg)
114150 }
114151 }
114152
114153- list_add(&reg->list, &nf_sockopts);
114154+ pax_list_add((struct list_head *)&reg->list, &nf_sockopts);
114155 out:
114156 mutex_unlock(&nf_sockopt_mutex);
114157 return ret;
114158@@ -53,7 +53,7 @@ EXPORT_SYMBOL(nf_register_sockopt);
114159 void nf_unregister_sockopt(struct nf_sockopt_ops *reg)
114160 {
114161 mutex_lock(&nf_sockopt_mutex);
114162- list_del(&reg->list);
114163+ pax_list_del((struct list_head *)&reg->list);
114164 mutex_unlock(&nf_sockopt_mutex);
114165 }
114166 EXPORT_SYMBOL(nf_unregister_sockopt);
114167diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
114168index 11d85b3..7fcc420 100644
114169--- a/net/netfilter/nfnetlink_log.c
114170+++ b/net/netfilter/nfnetlink_log.c
114171@@ -83,7 +83,7 @@ static int nfnl_log_net_id __read_mostly;
114172 struct nfnl_log_net {
114173 spinlock_t instances_lock;
114174 struct hlist_head instance_table[INSTANCE_BUCKETS];
114175- atomic_t global_seq;
114176+ atomic_unchecked_t global_seq;
114177 };
114178
114179 static struct nfnl_log_net *nfnl_log_pernet(struct net *net)
114180@@ -563,7 +563,7 @@ __build_packet_message(struct nfnl_log_net *log,
114181 /* global sequence number */
114182 if ((inst->flags & NFULNL_CFG_F_SEQ_GLOBAL) &&
114183 nla_put_be32(inst->skb, NFULA_SEQ_GLOBAL,
114184- htonl(atomic_inc_return(&log->global_seq))))
114185+ htonl(atomic_inc_return_unchecked(&log->global_seq))))
114186 goto nla_put_failure;
114187
114188 if (data_len) {
114189diff --git a/net/netfilter/nft_compat.c b/net/netfilter/nft_compat.c
114190index 65f3e2b..2e9d6a0 100644
114191--- a/net/netfilter/nft_compat.c
114192+++ b/net/netfilter/nft_compat.c
114193@@ -317,14 +317,7 @@ static void nft_match_eval(const struct nft_expr *expr,
114194 return;
114195 }
114196
114197- switch(ret) {
114198- case true:
114199- data[NFT_REG_VERDICT].verdict = NFT_CONTINUE;
114200- break;
114201- case false:
114202- data[NFT_REG_VERDICT].verdict = NFT_BREAK;
114203- break;
114204- }
114205+ data[NFT_REG_VERDICT].verdict = ret ? NFT_CONTINUE : NFT_BREAK;
114206 }
114207
114208 static const struct nla_policy nft_match_policy[NFTA_MATCH_MAX + 1] = {
114209diff --git a/net/netfilter/xt_gradm.c b/net/netfilter/xt_gradm.c
114210new file mode 100644
114211index 0000000..c566332
114212--- /dev/null
114213+++ b/net/netfilter/xt_gradm.c
114214@@ -0,0 +1,51 @@
114215+/*
114216+ * gradm match for netfilter
114217